From c069ff449dfce0d3095142120d1be6e3b6b0810a Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@mashape.com>
Date: Mon, 30 May 2016 14:24:07 +0200
Subject: [PATCH 1/7] Fixed a failed error parsing on Postgres. Prevent it from
 exploding into a Lua error, obfuscating the real error. Now returns the DB
 error. See issue #1239

---
 kong/dao/postgres_db.lua | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/kong/dao/postgres_db.lua b/kong/dao/postgres_db.lua
index d37e11693973..ec8ad9fb6e0c 100644
--- a/kong/dao/postgres_db.lua
+++ b/kong/dao/postgres_db.lua
@@ -95,15 +95,17 @@ local function parse_error(err_str)
   local err
   if string.find(err_str, "Key .* already exists") then
     local col, value = string.match(err_str, "%((.+)%)=%((.+)%)")
-    err = Errors.unique {[col] = value}
+    if col then
+      err = Errors.unique {[col] = value}
+    end
   elseif string.find(err_str, "violates foreign key constraint") then
     local col, value = string.match(err_str, "%((.+)%)=%((.+)%)")
-    err = Errors.foreign {[col] = value}
-  else
-    err = Errors.db(err_str)
+    if col then
+      err = Errors.foreign {[col] = value}
+    end
   end
-
-  return err
+  
+  return err or Errors.db(err_str)
 end
 
 local function get_select_fields(schema)

From d301d8b493d3087fb8ddf604f8d8418ab32097d3 Mon Sep 17 00:00:00 2001
From: thefosk <marco@mashape.com>
Date: Mon, 30 May 2016 17:42:35 -0700
Subject: [PATCH 2/7] Closes #1267

---
 kong/plugins/oauth2/daos.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kong/plugins/oauth2/daos.lua b/kong/plugins/oauth2/daos.lua
index ad05ede69462..90e2a501277e 100644
--- a/kong/plugins/oauth2/daos.lua
+++ b/kong/plugins/oauth2/daos.lua
@@ -11,6 +11,9 @@ end
 
 local function validate_uris(v, t, column)
   if v then
+    if #v < 1 then
+      return false, "at least one URI is required"
+    end
     for _, uri in ipairs(v) do
       local parsed_uri = url.parse(uri)
       if not (parsed_uri and parsed_uri.host and parsed_uri.scheme) then

From 0be3ee95347fa14c5ba19b46b91822afc1bb0be9 Mon Sep 17 00:00:00 2001
From: thefosk <marco@mashape.com>
Date: Tue, 31 May 2016 13:38:04 -0700
Subject: [PATCH 3/7] (test) More CORS testing

---
 spec/plugins/cors/access_spec.lua | 36 +++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/spec/plugins/cors/access_spec.lua b/spec/plugins/cors/access_spec.lua
index 8711995c6e05..ce9d622741a0 100644
--- a/spec/plugins/cors/access_spec.lua
+++ b/spec/plugins/cors/access_spec.lua
@@ -75,7 +75,7 @@ describe("CORS Plugin", function()
       assert.are.equal(tostring(true), headers["access-control-allow-credentials"])
     end)
     
-    it("should work with preflight_continue=true", function()
+    it("should work with preflight_continue=true and a duplicate header set by the API", function()
       -- An OPTIONS preflight request with preflight_continue=true should have the same response as directly invoking the final API
       
       local response, status, headers = http_client.options(PROXY_URL.."/headers", {}, {host = "cors3.com"})
@@ -131,7 +131,39 @@ describe("CORS Plugin", function()
       assert.are.equal(tostring(23), headers["access-control-max-age"])
       
       -- Any other request that's not a preflight request, should match our plugin configuration
-      local _, status, headers = http_client.get(PROXY_URL.."/get", {}, {host = "cors3.com"})
+      local _, status, headers = http_client.get(PROXY_URL.."/get", {}, {host = "cors4.com"})
+      
+      assert.are.equal(200, status)
+      assert.are.equal("example.com", headers["access-control-allow-origin"])
+      assert.are.equal("x-auth-token", headers["access-control-expose-headers"])
+      assert.are.equal(tostring(true), headers["access-control-allow-credentials"])
+    end)
+
+    it("should work with preflight_continue=false and a duplicate header set by the API", function()
+      -- An OPTIONS preflight request with preflight_continue=false should be handled by Kong instead
+      
+      local response, status, headers = http_client.options(PROXY_URL.."/headers", {}, {host = "cors4.com"})
+      local response2, status2, headers2 = http_client.options("http://httpbin.org/response-headers", {}, {host = "cors4.com"})
+      
+      headers["via"] = nil
+      headers["x-kong-proxy-latency"] = nil
+      headers["x-kong-upstream-latency"] = nil
+      headers["date"] = nil
+      headers2["date"] = nil
+      
+      assert.are.equal(response, response2)
+      assert.are_not.equal(status, status2)
+      assert.are_not.same(headers, headers2)
+      
+      assert.are.equal("example.com", headers["access-control-allow-origin"])
+      assert.are.equal("GET", headers["access-control-allow-methods"])
+      assert.are.equal("origin,type,accepts", headers["access-control-allow-headers"])
+      assert.are.equal(nil, headers["access-control-expose-headers"])
+      assert.are.equal(tostring(true), headers["access-control-allow-credentials"])
+      assert.are.equal(tostring(23), headers["access-control-max-age"])
+      
+      -- Any other request that's not a preflight request, should match our plugin configuration
+      local _, status, headers = http_client.get(PROXY_URL.."/response-headers", {["access-control-allow-origin"] = "*"}, {host = "cors4.com"})
       
       assert.are.equal(200, status)
       assert.are.equal("example.com", headers["access-control-allow-origin"])

From 9fa1cbaa9f81a8206d268396cdabe3acc9de6c36 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@mashape.com>
Date: Fri, 27 May 2016 15:56:07 +0200
Subject: [PATCH 4/7] Fix response transformer hang. See issues #1260 and #1207

---
 kong/plugins/response-transformer/handler.lua |  7 +-
 .../header_transformer.lua                    |  4 +
 .../response-transformer/skip_body_spec.lua   | 85 +++++++++++++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 spec/plugins/response-transformer/skip_body_spec.lua

diff --git a/kong/plugins/response-transformer/handler.lua b/kong/plugins/response-transformer/handler.lua
index f6f176ef0743..3b0a7541e0e6 100644
--- a/kong/plugins/response-transformer/handler.lua
+++ b/kong/plugins/response-transformer/handler.lua
@@ -2,8 +2,12 @@ local BasePlugin = require "kong.plugins.base_plugin"
 local body_filter = require "kong.plugins.response-transformer.body_transformer"
 local header_filter = require "kong.plugins.response-transformer.header_transformer"
 
+local is_body_transform_set = header_filter.is_body_transform_set
+local is_json_body = header_filter.is_json_body
+
 local ResponseTransformerHandler = BasePlugin:extend()
 
+
 function ResponseTransformerHandler:new()
   ResponseTransformerHandler.super.new(self, "response-transformer")
 end
@@ -20,7 +24,8 @@ end
 
 function ResponseTransformerHandler:body_filter(conf)
   ResponseTransformerHandler.super.body_filter(self)
-  if body_filter.is_json_body(ngx.header["content-type"]) then
+  
+  if is_body_transform_set(conf) and is_json_body(ngx.header["content-type"]) then
     local chunk, eof = ngx.arg[1], ngx.arg[2]
     if eof then
       local body = body_filter.transform_json_body(conf, ngx.ctx.buffer)
diff --git a/kong/plugins/response-transformer/header_transformer.lua b/kong/plugins/response-transformer/header_transformer.lua
index a823d698bbd4..88c5ab0ba84a 100644
--- a/kong/plugins/response-transformer/header_transformer.lua
+++ b/kong/plugins/response-transformer/header_transformer.lua
@@ -40,6 +40,10 @@ local function is_body_transform_set(conf)
   return #conf.add.json > 0  or #conf.remove.json > 0 or #conf.replace.json > 0 or #conf.append.json > 0
 end
 
+-- export utility functions
+_M.is_json_body = is_json_body
+_M.is_body_transform_set = is_body_transform_set
+
 ---
 --   # Example:
 --   ngx.headers = header_filter.transform_headers(conf, ngx.headers)
diff --git a/spec/plugins/response-transformer/skip_body_spec.lua b/spec/plugins/response-transformer/skip_body_spec.lua
new file mode 100644
index 000000000000..522703b03a9c
--- /dev/null
+++ b/spec/plugins/response-transformer/skip_body_spec.lua
@@ -0,0 +1,85 @@
+-- Related to issue https://github.com/Mashape/kong/issues/1207 
+-- unit test to check body remains unaltered
+describe("response-transformer body-check", function()
+  
+  local old_ngx, handler
+  
+  setup(function()
+    old_ngx = ngx
+    _G.ngx = {       -- busted requires explicit _G to access the global environment
+      log = function() end,
+      header = {
+          ["content-type"] = "application/json",
+        },
+      arg = {},
+      ctx = {
+          buffer = "",
+        },
+    }
+    handler = require("kong.plugins.response-transformer.handler")
+    handler:new()
+  end)
+  
+  teardown(function()
+    ngx = old_ngx
+  end)
+
+  it("check the body to remain unaltered if no transforms have been set", function()
+    -- only a header transform, no body changes
+    local conf = {
+      remove = {
+        headers = {"h1", "h2", "h3"},
+        json = {}
+      },
+      add = {
+        headers = {},
+        json = {},
+      },
+      append = {
+        headers = {},
+        json = {},
+      },
+      replace = {
+        headers = {},
+        json = {},
+      },
+    }
+    local body = [[
+
+  {
+    "id": 1,
+    "name": "Some One",
+    "username": "Bretchen",
+    "email": "Not@here.com",
+    "address": {
+      "street": "Down Town street",
+      "suite": "Apt. 23",
+      "city": "Gwendoline"
+    },
+    "phone": "1-783-729-8531 x56442",
+    "website": "hardwork.org",
+    "company": {
+      "name": "BestBuy",
+      "catchPhrase": "just a bunch of words",
+      "bs": "bullshit words"
+    }
+  }
+
+]]
+    
+    ngx.arg[1] = body
+    handler:body_filter(conf)
+    local result = ngx.arg[1]
+    ngx.arg[1] = ""
+    ngx.arg[2] = true -- end of body marker
+    handler:body_filter(conf)
+    result = result .. ngx.arg[1]
+    
+    -- body filter should not execute, it would parse and reencode the json, removing
+    -- the whitespace. So check equality to make sure whitespace is still there, and hence
+    -- body was not touched.
+    assert.are.same(body, result)
+
+  end)
+
+end)

From f593c76b40358a501bafc8a98538339ed19d736a Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@mashape.com>
Date: Wed, 25 May 2016 13:49:59 +0200
Subject: [PATCH 5/7] duplicate headers are no longer allowed. Test is pending
 because the setup does not allow duplicates

---
 kong/plugins/oauth2/access.lua | 22 +++-------
 kong/plugins/ssl/handler.lua   | 14 +-----
 kong/tools/utils.lua           | 29 ++++++++++++
 spec/unit/02-utils_spec.lua    | 80 ++++++++++++++++++++++++++++++++++
 4 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/kong/plugins/oauth2/access.lua b/kong/plugins/oauth2/access.lua
index c76a9ca4ac0d..1ede8af9ac31 100644
--- a/kong/plugins/oauth2/access.lua
+++ b/kong/plugins/oauth2/access.lua
@@ -9,6 +9,7 @@ local url = require "socket.url"
 local Multipart = require "multipart"
 local string_find = string.find
 local req_get_headers = ngx.req.get_headers
+local check_https = utils.check_https
 
 local _M = {}
 
@@ -83,17 +84,6 @@ local function get_redirect_uri(client_id)
   return client and client.redirect_uri or nil, client
 end
 
-local HTTPS = "https"
-
-local function is_https(conf)
-  local result = ngx.var.scheme:lower() == HTTPS
-  if not result and conf.accept_http_if_already_terminated then
-    local forwarded_proto_header = ngx.req.get_headers()["x-forwarded-proto"]
-    result = forwarded_proto_header and forwarded_proto_header:lower() == HTTPS
-  end
-  return result
-end
-
 local function retrieve_parameters()
   ngx.req.read_body()
   -- OAuth2 parameters could be in both the querystring or body
@@ -132,8 +122,9 @@ local function authorize(conf)
   local state = parameters[STATE]
   local allowed_redirect_uris, client, redirect_uri, parsed_redirect_uri
 
-  if not is_https(conf) then
-    response_params = {[ERROR] = "access_denied", error_description = "You must use HTTPS"}
+  local is_https, err = check_https(conf.accept_http_if_already_terminated)
+  if not is_https then
+    response_params = {[ERROR] = "access_denied", error_description = err or "You must use HTTPS"}
   else
     if conf.provision_key ~= parameters.provision_key then
       response_params = {[ERROR] = "invalid_provision_key", error_description = "Invalid Kong provision_key"}
@@ -252,8 +243,9 @@ local function issue_token(conf)
   local parameters = retrieve_parameters()
   local state = parameters[STATE]
 
-  if not is_https(conf) then
-    response_params = {[ERROR] = "access_denied", error_description = "You must use HTTPS"}
+  local is_https, err = check_https(conf.accept_http_if_already_terminated)
+  if not is_https then
+    response_params = {[ERROR] = "access_denied", error_description = err or "You must use HTTPS"}
   else
     local grant_type = parameters[GRANT_TYPE]
     if not (grant_type == GRANT_AUTHORIZATION_CODE or
diff --git a/kong/plugins/ssl/handler.lua b/kong/plugins/ssl/handler.lua
index 7a6e34311577..2c8517b3fff5 100644
--- a/kong/plugins/ssl/handler.lua
+++ b/kong/plugins/ssl/handler.lua
@@ -3,22 +3,12 @@
 local BasePlugin = require "kong.plugins.base_plugin"
 local responses = require "kong.tools.responses"
 local cache = require "kong.tools.database_cache"
+local check_https = require("kong.tools.utils").check_https
 
 local SSLHandler = BasePlugin:extend()
 
 SSLHandler.PRIORITY = 3000
 
-local HTTPS = "https"
-
-local function is_https(conf)
-  local result = ngx.var.scheme:lower() == HTTPS
-  if not result and conf.accept_http_if_already_terminated then
-    local forwarded_proto_header = ngx.req.get_headers()["x-forwarded-proto"]
-    result = forwarded_proto_header and forwarded_proto_header:lower() == HTTPS
-  end
-  return result
-end
-
 function SSLHandler:new()
   SSLHandler.super.new(self, "ssl")
 end
@@ -50,7 +40,7 @@ end
 
 function SSLHandler:access(conf)
   SSLHandler.super.access(self)
-  if conf.only_https and not is_https(conf) then
+  if conf.only_https and not check_https(conf.accept_http_if_already_terminated) then
     ngx.header["connection"] = { "Upgrade" }
     ngx.header["upgrade"] = "TLS/1.0, HTTP/1.1"
     return responses.send(426, {message="Please use HTTPS protocol"})
diff --git a/kong/tools/utils.lua b/kong/tools/utils.lua
index 969eaf8004a9..e2241ca5d924 100644
--- a/kong/tools/utils.lua
+++ b/kong/tools/utils.lua
@@ -118,6 +118,35 @@ function _M.encode_args(args, raw)
   return table_concat(query, "&")
 end
 
+--- Checks whether a request is https or was originally https (but already terminated).
+-- It will check in the current request (global `ngx` table). If the header `X-Forwarded-Proto` exists 
+-- with value `https` then it will also be considered as an https connection. 
+-- @param allow_terminated if truthy, the `X-Forwarded-Proto` header will be checked as well. 
+-- @return boolean or nil+error in case the header exists multiple times
+_M.check_https = function(allow_terminated)
+  if ngx.var.scheme:lower() == "https" then
+    return true
+  end
+  
+  if not allow_terminated then
+    return false
+  end
+  
+  local forwarded_proto_header = ngx.req.get_headers()["x-forwarded-proto"]
+  if tostring(forwarded_proto_header):lower() == "https" then
+    return true
+  end
+  
+  if type(forwarded_proto_header) == "table" then
+    -- we could use the first entry (lower security), or check the contents of each of them (slow). So for now defensive, and error
+    -- out on multiple entries for the x-forwarded-proto header.
+    return nil, "Only one X-Forwarded-Proto header allowed"
+  end
+  
+  return false
+end
+
+
 --- Calculates a table size.
 -- All entries both in array and hash part.
 -- @param t The table to use
diff --git a/spec/unit/02-utils_spec.lua b/spec/unit/02-utils_spec.lua
index c3ddcbd30162..a2bee2fb11ed 100644
--- a/spec/unit/02-utils_spec.lua
+++ b/spec/unit/02-utils_spec.lua
@@ -6,6 +6,86 @@ describe("Utils", function()
     assert.truthy(utils.get_hostname())
   end)
 
+  describe("https_check", function()
+    
+    local old_ngx
+    local headers = {}
+    
+    setup(function()
+      old_ngx = ngx
+      _G.ngx = {
+        var = {
+          scheme = nil
+        },
+        req = {
+          get_headers = function() return headers end
+        }
+      }
+    end)
+    
+    teardown(function()
+      _G.ngx = old_ngx
+    end)
+    
+    describe("without X-Forwarded-Proto header", function()
+      setup(function()
+        headers["x-forwarded-proto"] = nil
+      end)
+      
+      it("should validate an HTTPS scheme", function()
+        ngx.var.scheme = "hTTps" -- mixed casing to ensure case insensitiveness
+        assert.is.truthy(utils.check_https())
+      end)
+      
+      it("should invalidate non-HTTPS schemes", function()
+        ngx.var.scheme = "hTTp" 
+        assert.is.falsy(utils.check_https())
+        ngx.var.scheme = "something completely different"
+        assert.is.falsy(utils.check_https())
+      end)
+      
+      it("should invalidate non-HTTPS schemes with proto header allowed", function()
+        ngx.var.scheme = "hTTp" 
+        assert.is.falsy(utils.check_https(true))
+      end)
+    end)
+    
+    describe("with X-Forwarded-Proto header", function()
+        
+      teardown(function()
+        headers["x-forwarded-proto"] = nil
+      end)
+      
+      it("should validate any scheme with X-Forwarded_Proto as HTTPS", function()
+        headers["x-forwarded-proto"] = "hTTPs"  -- check mixed casing for case insensitiveness
+        ngx.var.scheme = "hTTps" 
+        assert.is.truthy(utils.check_https(true))
+        ngx.var.scheme = "hTTp" 
+        assert.is.truthy(utils.check_https(true))
+        ngx.var.scheme = "something completely different"
+        assert.is.truthy(utils.check_https(true))
+      end)
+    
+      it("should validate only https scheme with X-Forwarded_Proto as non-HTTPS", function()
+        headers["x-forwarded-proto"] = "hTTP"
+        ngx.var.scheme = "hTTps" 
+        assert.is.truthy(utils.check_https(true))
+        ngx.var.scheme = "hTTp" 
+        assert.is.falsy(utils.check_https(true))
+        ngx.var.scheme = "something completely different"
+        assert.is.falsy(utils.check_https(true))
+      end)
+    
+      it("should return an error with multiple X-Forwarded_Proto headers", function()
+        headers["x-forwarded-proto"] = { "hTTP", "https" }
+        ngx.var.scheme = "hTTps"
+        assert.is.truthy(utils.check_https(true))
+        ngx.var.scheme = "hTTp"
+        assert.are.same({ nil, "Only one X-Forwarded-Proto header allowed" }, { utils.check_https(true) })
+      end)
+    end)  
+  end)
+
   describe("string", function()
     describe("random_string()", function()
       it("should return a random string", function()

From 150f856260208d16bde5d3829128256ef130a7ed Mon Sep 17 00:00:00 2001
From: thefosk <marco@mashape.com>
Date: Tue, 31 May 2016 17:09:54 -0700
Subject: [PATCH 6/7] Closing #1255

---
 kong/cli/services/serf.lua | 14 ++++++++++----
 kong/core/cluster.lua      |  4 ++--
 kong/tools/cluster.lua     | 25 +++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/kong/cli/services/serf.lua b/kong/cli/services/serf.lua
index 5db39e99562e..e54460ff5e25 100644
--- a/kong/cli/services/serf.lua
+++ b/kong/cli/services/serf.lua
@@ -75,6 +75,12 @@ echo $COMMAND | ]]..luajit_path..[[
     return false, res
   end
 
+  -- Create the unique identifier if it doesn't exist
+  local _, err = cluster_utils.create_node_identifier(self._configuration)
+  if err then
+    return false, err
+  end
+
   return true
 end
 
@@ -112,7 +118,7 @@ function Serf:_autojoin(current_node_name)
       return false, tostring(err)
     else
       if #nodes == 0 then
-        logger:warn("Cannot auto-join the cluster because no nodes were found")
+        logger:info("No other Kong nodes were found in the cluster")
       else
         -- Sort by newest to oldest (although by TTL would be a better sort)
         table.sort(nodes, function(a, b)
@@ -144,7 +150,7 @@ function Serf:_add_node()
     return false, err
   end
 
-  local name = cluster_utils.get_node_name(self._configuration)
+  local name = cluster_utils.get_node_identifier(self._configuration)
   local addr
   for _, member in ipairs(members) do
     if member.name == name then
@@ -178,7 +184,7 @@ function Serf:start()
     return nil, err
   end
 
-  local node_name = cluster_utils.get_node_name(self._configuration)
+  local node_name = cluster_utils.get_node_identifier(self._configuration)
 
   -- Prepare arguments
   local cmd_args = {
@@ -269,7 +275,7 @@ function Serf:stop()
     -- Remove the node from the datastore.
     -- This is useful when this is the only node running in the cluster.
     self._dao_factory.nodes:delete({
-      name = cluster_utils.get_node_name(self._configuration)
+      name = cluster_utils.get_node_identifier(self._configuration)
     })
 
     -- Finally stop Serf
diff --git a/kong/core/cluster.lua b/kong/core/cluster.lua
index a87918af9833..fd91689d80cf 100644
--- a/kong/core/cluster.lua
+++ b/kong/core/cluster.lua
@@ -43,7 +43,7 @@ local function async_autojoin(premature)
         ngx.log(ngx.ERR, tostring(err))
       elseif #members < 2 then
         -- Trigger auto-join
-        local _, err = singletons.serf:_autojoin(cluster_utils.get_node_name(singletons.configuration))
+        local _, err = singletons.serf:_autojoin(cluster_utils.get_node_identifier(singletons.configuration))
         if err then
           ngx.log(ngx.ERR, tostring(err))
         end
@@ -73,7 +73,7 @@ local function send_keepalive(premature)
   local elapsed = lock:lock("keepalive")
   if elapsed and elapsed == 0 then
     -- Send keepalive
-    local node_name = cluster_utils.get_node_name(singletons.configuration)
+    local node_name = cluster_utils.get_node_identifier(singletons.configuration)
     local nodes, err = singletons.dao.nodes:find_all {name = node_name}
     if err then
       ngx.log(ngx.ERR, tostring(err))
diff --git a/kong/tools/cluster.lua b/kong/tools/cluster.lua
index 613067ca7db1..5d4a5afc884b 100644
--- a/kong/tools/cluster.lua
+++ b/kong/tools/cluster.lua
@@ -1,9 +1,30 @@
+local IO = require "kong.tools.io"
 local utils = require "kong.tools.utils"
+local singletons = require "kong.singletons"
 
 local _M = {}
 
-function _M.get_node_name(conf)
-  return utils.get_hostname().."_"..conf.cluster_listen
+local IDENTIFIER = "serf.id"
+
+function _M.get_node_identifier(conf)
+  local id = singletons.serf_id
+  if not id then
+    id = IO.read_file(IO.path:join(conf.nginx_working_dir, IDENTIFIER))
+    singletons.serf_id = id
+  end
+  return id
+end
+
+function _M.create_node_identifier(conf)
+  local path = IO.path:join(conf.nginx_working_dir, IDENTIFIER)
+  if not IO.file_exists(path) then
+    local id = utils.get_hostname().."_"..conf.cluster_listen.."_"..utils.random_string()
+    local _, err = IO.write_to_file(path, id)
+    if err then
+      return false, err
+    end
+  end
+  return true
 end
 
 return _M
\ No newline at end of file

From fbd529051b1925c38c1c1aa13ba4b5568968211d Mon Sep 17 00:00:00 2001
From: thefosk <marco@mashape.com>
Date: Wed, 1 Jun 2016 16:56:29 -0700
Subject: [PATCH 7/7] Version bump to 0.8.3

---
 CHANGELOG.md                                  | 21 ++++++++++++++++++-
 ...-0.8.2-0.rockspec => kong-0.8.3-0.rockspec |  4 ++--
 kong/meta.lua                                 |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)
 rename kong-0.8.2-0.rockspec => kong-0.8.3-0.rockspec (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f99b5089936..014fa08bd469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 ## [Unreleased][unreleased]
 
+## [0.8.3] - 2016/06/01
+
+This release includes some bugfixes:
+
+### Changed
+
+- Switched the log level of the "No nodes found in cluster" warning to `INFO`, that was printed when starting up the first Kong node in a new cluster.
+- Kong now requires OpenResty `1.9.7.5`.
+
+### Fixed
+
+- New nodes are now properly registered into the `nodes` table when running on the same machine. [#1281](https://github.com/Mashape/kong/pull/1281)
+- Fixed a failed error parsing on Postgres. [#1269](https://github.com/Mashape/kong/pull/1269)
+- Plugins:
+  - Response Transformer: Slashes are now encoded properly, and fixed a bug that hang the execution of the plugin. [#1257](https://github.com/Mashape/kong/pull/1257) and [#1263](https://github.com/Mashape/kong/pull/1263)
+  - JWT: If a value for `algorithm` is missing, it's now `HS256` by default. This problem occured when migrating from older versions of Kong.
+  - OAuth 2.0: Fixed a Postgres problem that was preventing an application from being created, and fixed a check on the `redirect_uri` field. [#1264](https://github.com/Mashape/kong/pull/1264) and [#1267](https://github.com/Mashape/kong/issues/1267)
+
 ## [0.8.2] - 2016/05/25
 
 This release includes bugfixes and minor updates:
@@ -589,7 +607,8 @@ First version running with Cassandra.
 - CLI `bin/kong` script.
 - Database migrations (using `db.lua`).
 
-[unreleased]: https://github.com/mashape/kong/compare/0.8.2...next
+[unreleased]: https://github.com/mashape/kong/compare/0.8.3...next
+[0.8.3]: https://github.com/mashape/kong/compare/0.8.2...0.8.3
 [0.8.2]: https://github.com/mashape/kong/compare/0.8.1...0.8.2
 [0.8.1]: https://github.com/mashape/kong/compare/0.8.0...0.8.1
 [0.8.0]: https://github.com/mashape/kong/compare/0.7.0...0.8.0
diff --git a/kong-0.8.2-0.rockspec b/kong-0.8.3-0.rockspec
similarity index 99%
rename from kong-0.8.2-0.rockspec
rename to kong-0.8.3-0.rockspec
index 427581fb79f5..9dd4253989de 100644
--- a/kong-0.8.2-0.rockspec
+++ b/kong-0.8.3-0.rockspec
@@ -1,9 +1,9 @@
 package = "kong"
-version = "0.8.2-0"
+version = "0.8.3-0"
 supported_platforms = {"linux", "macosx"}
 source = {
   url = "git://github.com/Mashape/kong",
-  tag = "0.8.2"
+  tag = "0.8.3"
 }
 description = {
   summary = "Kong is a scalable and customizable API Management Layer built on top of Nginx.",
diff --git a/kong/meta.lua b/kong/meta.lua
index 1a415840970c..a23b6800f938 100644
--- a/kong/meta.lua
+++ b/kong/meta.lua
@@ -1,7 +1,7 @@
 local version = setmetatable({
   major = 0,
   minor = 8,
-  patch = 2,
+  patch = 3,
   --pre_release = "alpha"
 }, {
   __tostring = function(t)