cleaned up UMA server overlay

Author: jricher

openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml

@@ -144,7 +144,7 @@
 create-session="stateless"
 authentication-manager-ref="clientAuthenticationManager">
 <security:http-basic entry-point-ref="oauthAuthenticationEntryPoint" />
-<!-- <security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" /> -->
+<security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" />
 <security:custom-filter ref="clientAssertionEndpointFilter" after="PRE_AUTH_FILTER" /> <!-- this one has to go first -->
 <security:custom-filter ref="corsFilter" after="SECURITY_CONTEXT_FILTER" />
 <security:custom-filter ref="clientCredentialsEndpointFilter" after="BASIC_AUTH_FILTER" />
@@ -157,7 +157,7 @@
 create-session="stateless"
 authentication-manager-ref="clientAuthenticationManager">
 <security:http-basic entry-point-ref="oauthAuthenticationEntryPoint" />
-<!-- <security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" /> -->
+<security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" />
 <security:custom-filter ref="clientAssertionEndpointFilter" after="PRE_AUTH_FILTER" /> <!-- this one has to go first -->
 <security:custom-filter ref="corsFilter" after="SECURITY_CONTEXT_FILTER" />
 <security:custom-filter ref="clientCredentialsEndpointFilter" after="BASIC_AUTH_FILTER" />
@@ -170,6 +170,10 @@
 
 <bean id="http403EntryPoint" class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint" />
 
+<!-- Additional endpoints for extensions (such as UMA) -->
+
+<import resource="endpoint-config.xml" />
+
 <!-- SECOAUTH Authorization Server -->
 
 <import resource="authz-config.xml" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/endpoint-config.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 The MITRE Corporation
+ and the MIT Internet Trust Consortium
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+xmlns:mvc="http://www.springframework.org/schema/mvc"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tx="http://www.springframework.org/schema/tx"
+xmlns:context="http://www.springframework.org/schema/context"
+xmlns:security="http://www.springframework.org/schema/security"
+xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
+xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
+http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
+http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
+http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+
+
+<!-- This file allows you to define additional endpoints, it's normally empty in the OIDC server and has entries in the UMA server -->
+
+</beans>

uma-server-webapp/src/main/resources/db/hsql/scopes.sql

@@ -10,25 +10,25 @@ START TRANSACTION;
 -- Insert scope information into the temporary tables.
 -- 
 
-INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope, structured, structured_param_description) VALUES
- ('openid', 'log in using your identity', 'user', false, true, false, null),
- ('profile', 'basic profile information', 'list-alt', false, true, false, null),
- ('email', 'email address', 'envelope', false, true, false, null),
- ('address', 'physical address', 'home', false, true, false, null),
- ('phone', 'telephone number', 'bell', false, true, false, null),
- ('offline_access', 'offline access', 'time', false, false, false, null),
- ('uma_protection', 'manage protected resources', 'briefcase', false, false, false, null),
- ('uma_authorization', 'request access to protected resources', 'share', false, false, false, null);
+INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES
+ ('openid', 'log in using your identity', 'user', false, true),
+ ('profile', 'basic profile information', 'list-alt', false, true),
+ ('email', 'email address', 'envelope', false, true),
+ ('address', 'physical address', 'home', false, true),
+ ('phone', 'telephone number', 'bell', false, true),
+ ('offline_access', 'offline access', 'time', false, false),
+ ('uma_protection', 'manage protected resources', 'briefcase', false, false),
+ ('uma_authorization', 'request access to protected resources', 'share', false, false);
 
 --
 -- Merge the temporary scopes safely into the database. This is a two-step process to keep scopes from being created on every startup with a persistent store.
 --
 
 MERGE INTO system_scope
-USING (SELECT scope, description, icon, restricted, default_scope, structured, structured_param_description FROM system_scope_TEMP) AS vals(scope, description, icon, restricted, default_scope, structured, structured_param_description)
+USING (SELECT scope, description, icon, restricted, default_scope FROM system_scope_TEMP) AS vals(scope, description, icon, restricted, default_scope)
 ON vals.scope = system_scope.scope
 WHEN NOT MATCHED THEN
- INSERT (scope, description, icon, restricted, default_scope, structured, structured_param_description) VALUES(vals.scope, vals.description, vals.icon, vals.restricted, vals.default_scope, vals.structured, vals.structured_param_description);
+ INSERT (scope, description, icon, restricted, default_scope) VALUES(vals.scope, vals.description, vals.icon, vals.restricted, vals.default_scope);
 
 COMMIT;