Add support for both http and https. Remove custom regex url parsing

Author: gbbirkisson

Makefile

@@ -5,7 +5,7 @@ IMAGE?=kong-plugin-jwt-keycloak
 KONG_VERSION?=1.1.2
 FULL_IMAGE_NAME:=${REPOSITORY}/${IMAGE}:${KONG_VERSION}
 
-PLUGIN_VERSION?=1.0.2-1
+PLUGIN_VERSION?=1.0.3-1
 
 TEST_VERSIONS?=1.0.3 1.1.2
 

src/keycloak_keys.lua

@@ -1,51 +1,30 @@
+local url = require "socket.url"
+local http = require "socket.http"
 local https = require "ssl.https"
 local cjson_safe = require "cjson.safe"
 local convert = require "kong.plugins.jwt-keycloak.key_conversion"
 
-local function parse_url(url)
-    local chunk, protocol = url:match("^(([a-z0-9+]+)://)")
-    url = url:sub((chunk and #chunk or 0) + 1)
-
-    local auth
-    chunk, auth = url:match('(([%w%p]+:?[%w%p]+)@)')
-    url = url:sub((chunk and #chunk or 0) + 1)
-
-    local host
-    local hostname
-    local port
-    if protocol then
-        host = url:match("^([%a%.%d-]+:?%d*)")
-        if host then
-            hostname = host:match("^([^:/]+)")
-            port = host:match(":(%d+)$")
-        end
-        url = url:sub((host and #host or 0) + 1)
+local function get_request(url, scheme, port)
+    local req
+    if scheme == "https" then
+        req = https.request
+    else
+        req = http.request
     end
 
-    local parsed = {
-        protocol = protocol,
-        host = host,
-        hostname = hostname,
-        port = port,
-    }
-
-    return parsed
-end
-
-local function get_request(url, port)
     local res
     local status
     local err
 
     local chunks = {}
-    res, status = https.request{
+    res, status = req{
         url = url,
         port = port,
         sink = ltn12.sink.table(chunks)
     }
 
     if status ~= 200 then
-        return nil, 'Failed calling url ' .. url
+        return nil, 'Failed calling url ' .. url .. ' response status ' .. status
     end
 
     res, err = cjson_safe.decode(table.concat(chunks))
@@ -62,14 +41,14 @@ end
 
 local function get_issuer_keys(well_known_endpoint)
     -- Get port of the request: This is done because keycloak 3.X.X does not play well with lua socket.http
-    local req = parse_url(well_known_endpoint)
+    local req = url.parse(well_known_endpoint)
 
-    local res, err = get_request(well_known_endpoint, req.port)
+    local res, err = get_request(well_known_endpoint, req.scheme, req.port)
     if err then
         return nil, err
     end
 
-    local res, err = get_request(res['jwks_uri'], req.port)
+    local res, err = get_request(res['jwks_uri'], req.scheme,  req.port)
     if err then
         return nil, err
     end

tests/unit_tests/tests/key_conversion_spec.lua

@@ -10,7 +10,7 @@ describe("Keycloak key conversion", function()
     local issuer = "http://localhost:8080/auth/realms/master"
 
     res1, err1 = get_issuer_keys(get_wellknown_endpoint(well_known_template, issuer))
-    res2, err2 = get_request(issuer)
+    res2, err2 = get_request(issuer, "http")
 
     assert.same(res2['public_key'], res1[1])
   end)
@@ -22,7 +22,7 @@ describe("Keycloak key conversion", function()
     res1, err1 = get_issuer_keys(get_wellknown_endpoint(well_known_template, issuer))
 
     assert.same(nil, res1)
-    assert.same('Failed calling url http://localhost:8080/auth/realms/does_not_exist/.well-known/openid-configuration', err1)
+    assert.same('Failed calling url http://localhost:8080/auth/realms/does_not_exist/.well-known/openid-configuration response status 404', err1)
   end)
 
   it("should fail on bad issuer", function()
@@ -31,7 +31,7 @@ describe("Keycloak key conversion", function()
     res1, err1 = get_issuer_keys(get_wellknown_endpoint(well_known_template, issuer))
 
     assert.same(nil, res1)
-    assert.same('Failed calling url http://localhost:8081/auth/realms/does_not_exist/.well-known/openid-configuration', err1)
+    assert.same('Failed calling url http://localhost:8081/auth/realms/does_not_exist/.well-known/openid-configuration response status closed', err1)
   end)
 
 end)