additional metadata for consumer (issue Kong#550)

tyiss · Nov 10, 2015 · d978668 · d978668
1 parent 9aeb778
commit d978668
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/kong/constants.lua b/kong/constants.lua
@@ -37,6 +37,7 @@ return {
     UPSTREAM_LATENCY = "X-Kong-Upstream-Latency",
     CONSUMER_ID = "X-Consumer-ID",
     CONSUMER_CUSTOM_ID = "X-Consumer-Custom-ID",
+    CONSUMER_CUSTOM_DATA = "X-Consumer-Custom-Data",
     CONSUMER_USERNAME = "X-Consumer-Username",
     CREDENTIAL_USERNAME = "X-Credential-Username",
     RATELIMIT_LIMIT = "X-RateLimit-Limit",

diff --git a/kong/dao/cassandra/schema/migrations.lua b/kong/dao/cassandra/schema/migrations.lua
@@ -51,6 +51,7 @@ local Migrations = {
         CREATE TABLE IF NOT EXISTS consumers(
           id uuid,
           custom_id text,
+          custom_data text,
           username text,
           created_at timestamp,
           PRIMARY KEY (id)

diff --git a/kong/dao/schemas/consumers.lua b/kong/dao/schemas/consumers.lua
@@ -18,6 +18,7 @@ return {
     id = { type = "id", dao_insert_value = true },
     created_at = { type = "timestamp", dao_insert_value = true },
     custom_id = { type = "string", unique = true, queryable = true, func = check_custom_id_and_username },
+    custom_data = { type = "text" },
     username = { type = "string", unique = true, queryable = true, func = check_custom_id_and_username }
   }
 }
diff --git a/kong/plugins/basic-auth/access.lua b/kong/plugins/basic-auth/access.lua
@@ -115,6 +115,7 @@ function _M.execute(conf)
 
   ngx.req.set_header(constants.HEADERS.CONSUMER_ID, consumer.id)
   ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_ID, consumer.custom_id)
+  ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_DATA, consumer.custom_data)
   ngx.req.set_header(constants.HEADERS.CONSUMER_USERNAME, consumer.username)
   ngx.req.set_header(constants.HEADERS.CREDENTIAL_USERNAME, credential.username)
   ngx.ctx.authenticated_credential = credential

diff --git a/kong/plugins/hmac-auth/access.lua b/kong/plugins/hmac-auth/access.lua
@@ -184,6 +184,7 @@ function _M.execute(conf)
 
   ngx_set_header(constants.HEADERS.CONSUMER_ID, consumer.id)
   ngx_set_header(constants.HEADERS.CONSUMER_CUSTOM_ID, consumer.custom_id)
+  ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_DATA, consumer.custom_data)
   ngx_set_header(constants.HEADERS.CONSUMER_USERNAME, consumer.username)
   ngx.req.set_header(constants.HEADERS.CREDENTIAL_USERNAME, credential.username)
   ngx.ctx.authenticated_credential = credential

diff --git a/kong/plugins/jwt/access.lua b/kong/plugins/jwt/access.lua
@@ -110,6 +110,7 @@ function _M.execute(conf)
 
   ngx.req.set_header(constants.HEADERS.CONSUMER_ID, consumer.id)
   ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_ID, consumer.custom_id)
+  ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_DATA, consumer.custom_data)
   ngx.req.set_header(constants.HEADERS.CONSUMER_USERNAME, consumer.username)
   ngx.ctx.authenticated_credential = jwt_secret
 end

diff --git a/kong/plugins/key-auth/access.lua b/kong/plugins/key-auth/access.lua
@@ -91,6 +91,7 @@ function _M.execute(conf)
 
   ngx.req.set_header(constants.HEADERS.CONSUMER_ID, consumer.id)
   ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_ID, consumer.custom_id)
+  ngx.req.set_header(constants.HEADERS.CONSUMER_CUSTOM_DATA, consumer.custom_data)
   ngx.req.set_header(constants.HEADERS.CONSUMER_USERNAME, consumer.username)
   ngx.ctx.authenticated_credential = credential
 end