Merge pull request #405 from 3scale/oidc-config-crash

[oidc] don't crash when config is missing

CHANGELOG.md

@@ -6,7 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [3.1.0-beta1] - 2017-07-21
+### Changed
+
+- OIDC is now used based on settings on the API Manager [PR #405](https://github.com/3scale/apicast/pull/405)
+
+## [3.1.0-beta2] - 2017-08-21
 
 ### Added
 

apicast/src/configuration.lua

@@ -134,6 +134,7 @@ function _M.parse_service(service)
   return Service.new({
       id = tostring(service.id or 'default'),
       backend_version = backend_version,
+      authentication_method = proxy.authentication_method or backend_version,
       hosts = proxy.hosts or { 'localhost' }, -- TODO: verify localhost is good default
       api_backend = proxy.api_backend,
       error_auth_failed = proxy.error_auth_failed,

apicast/src/configuration/service.lua

@@ -171,16 +171,14 @@ function _M:extract_credentials()
 end
 
 function _M:oauth()
-  if self.backend_version ~= 'oauth' then
-    return nil, 'not oauth'
-  end
-
-  local oidc = self.oidc
+  local authentication = self.authentication_method or self.backend_version
 
-  if oidc and oidc.issuer then
+  if authentication == 'oidc' then
     return oauth.oidc.new(self)
-  else
+  elseif authentication == 'oauth' then
     return oauth.apicast.new(self)
+  else
+    return nil, 'not oauth'
   end
 end
 

apicast/src/oauth/oidc.lua

@@ -27,8 +27,9 @@ local mt = {
 }
 
 function _M.new(service)
-  local issuer = service.oidc.issuer
-  local config = service.oidc.config or {}
+  local oidc = service.oidc
+  local issuer = oidc.issuer or oidc.issuer_endpoint
+  local config = oidc.config or {}
   local openid = config.openid or {}
 
   return setmetatable({

spec/configuration/service_spec.lua

@@ -163,7 +163,7 @@ describe('Service object', function()
   describe(':oauth()', function()
     describe('backend_version=oauth', function()
       it('returns OIDC object when there is OIDC config', function()
-        local service = Service.new({backend_version = 'oauth', oidc = { issuer = 'http://example.com' }})
+        local service = Service.new({authentication_method = 'oidc', oidc = { issuer = 'http://example.com' }})
 
         local oauth = service:oauth()
 

t/019-apicast-oidc.t

@@ -32,6 +32,7 @@ __DATA__
         { id = 42,
           backend_version = 'oauth',
           proxy = {
+            authentication_method = 'oidc',
             oidc_issuer_endpoint = 'https://example.com/auth/realms/apicast',
             api_backend = "http://127.0.0.1:$TEST_NGINX_SERVER_PORT/api-backend/",
             proxy_rules = {