Skip to content

Commit d074573

Browse files
jricherjricher
authoredApr 19, 2022
Merge pull request #1570 from shrexster42/master
Upgrade to Java 11 and Spring 5
2 parents 05fd73e + 5e87fa7 commit d074573

23 files changed

+229
-204
lines changed
 

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: java
22
jdk:
3-
- oraclejdk8
3+
- oraclejdk11
44
sudo: false
55

66
after_success:

‎openid-connect-common/pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,26 @@
8787
<groupId>org.bouncycastle</groupId>
8888
<artifactId>bcprov-jdk15on</artifactId>
8989
</dependency>
90+
<dependency>
91+
<groupId>javax.annotation</groupId>
92+
<artifactId>javax.annotation-api</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>jakarta.xml.bind</groupId>
96+
<artifactId>jakarta.xml.bind-api</artifactId>
97+
</dependency>
98+
<dependency>
99+
<groupId>javax.xml.bind</groupId>
100+
<artifactId>jaxb-api</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>javax.activation</groupId>
104+
<artifactId>activation</artifactId>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.glassfish.jaxb</groupId>
108+
<artifactId>jaxb-runtime</artifactId>
109+
</dependency>
90110
</dependencies>
91111

92112
<packaging>jar</packaging>

‎openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/UriEncodedClientUserDetailsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public UserDetails loadUserByUsername(String clientId) throws UsernameNotFoundE
9191
} else {
9292
throw new UsernameNotFoundException("Client not found: " + clientId);
9393
}
94-
} catch (UnsupportedEncodingException | InvalidClientException e) {
94+
} catch (InvalidClientException e) {
9595
throw new UsernameNotFoundException("Client not found: " + clientId);
9696
}
9797

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xmlns:util="http://www.springframework.org/schema/util"
2727
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
28-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
29-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
30-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
31-
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd
32-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
33-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
28+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
29+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
30+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
31+
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
32+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
33+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3434

3535
<!-- Scan for components -->
3636
<context:component-scan annotation-config="true" base-package="org.mitre" />
@@ -246,9 +246,15 @@
246246
<property name="authenticationManager" ref="clientAssertionAuthenticationManager" />
247247
</bean>
248248

249+
<bean id="noOpPasswordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
250+
249251
<security:authentication-manager id="clientAuthenticationManager">
250-
<security:authentication-provider user-service-ref="clientUserDetailsService" />
251-
<security:authentication-provider user-service-ref="uriEncodedClientUserDetailsService" />
252+
<security:authentication-provider user-service-ref="clientUserDetailsService">
253+
<security:password-encoder ref="noOpPasswordEncoder"/>
254+
</security:authentication-provider>
255+
<security:authentication-provider user-service-ref="uriEncodedClientUserDetailsService">
256+
<security:password-encoder ref="noOpPasswordEncoder"/>
257+
</security:authentication-provider>
252258
</security:authentication-manager>
253259

254260
<security:authentication-manager id="clientAssertionAuthenticationManager">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131
<!-- validate incoming tokens for JWT assertions -->
3232
<bean id="jwtAssertionValidator" class="org.mitre.jwt.assertion.impl.NullAssertionValidator" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131

3232
<oauth:authorization-server

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333
<bean id="defaultKeyStore" class="org.mitre.jose.keystore.JWKSetKeyStore">
3434
<property name="location" value="classpath:keystore.jwks" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<beans xmlns="http://www.springframework.org/schema/beans"
2020
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
2121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
23-
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd">
22+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
23+
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
2424

2525
<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
2626
<property name="driverClassName" value="org.hsqldb.jdbcDriver" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131

3232
<!-- This file allows you to define additional endpoints, it's normally empty in the OIDC server and has entries in the UMA server -->

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
3232
<property name="entityManagerFactory" ref="entityManagerFactory" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333

3434
<!-- Empty: Override this file in your local project to change configuration options. -->

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333
<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
3434

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/spring-servlet.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333
<!-- This file has been left blank -->
3434
<!-- Feel free to override this by using a maven overlay. -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<beans xmlns="http://www.springframework.org/schema/beans"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xmlns:task="http://www.springframework.org/schema/task"
22-
xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd
23-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
22+
xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
23+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
2424

2525
<!-- Configuration for scheduled tasks -->
2626
<task:scheduler id="taskScheduler" pool-size="10" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131

3232
<!-- This file allows you to define components to the UI -->

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333
<security:authentication-manager id="authenticationManager">
3434
<security:authentication-provider>
3535
<security:jdbc-user-service data-source-ref="dataSource"/>
36+
<security:password-encoder ref="noOpPasswordEncoder"/>
3637
</security:authentication-provider>
3738
</security:authentication-manager>
3839

‎openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@ public String registerNewClient(@RequestBody String jsonString, Model m) {
246246
m.addAttribute(HttpCodeView.CODE, HttpStatus.CREATED); // http 201
247247

248248
return ClientInformationResponseView.VIEWNAME;
249-
} catch (UnsupportedEncodingException e) {
250-
logger.error("Unsupported encoding", e);
251-
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
252-
return HttpCodeView.VIEWNAME;
253249
} catch (IllegalArgumentException e) {
254250
logger.error("Couldn't save client", e);
255251

@@ -284,20 +280,14 @@ public String readClientConfiguration(@PathVariable("id") String clientId, Model
284280

285281
if (client != null && client.getClientId().equals(auth.getOAuth2Request().getClientId())) {
286282

287-
try {
288-
OAuth2AccessTokenEntity token = rotateRegistrationTokenIfNecessary(auth, client);
289-
RegisteredClient registered = new RegisteredClient(client, token.getValue(), config.getIssuer() + "register/" + UriUtils.encodePathSegment(client.getClientId(), "UTF-8"));
283+
OAuth2AccessTokenEntity token = rotateRegistrationTokenIfNecessary(auth, client);
284+
RegisteredClient registered = new RegisteredClient(client, token.getValue(), config.getIssuer() + "register/" + UriUtils.encodePathSegment(client.getClientId(), "UTF-8"));
290285

291-
// send it all out to the view
292-
m.addAttribute("client", registered);
293-
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200
286+
// send it all out to the view
287+
m.addAttribute("client", registered);
288+
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200
294289

295-
return ClientInformationResponseView.VIEWNAME;
296-
} catch (UnsupportedEncodingException e) {
297-
logger.error("Unsupported encoding", e);
298-
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
299-
return HttpCodeView.VIEWNAME;
300-
}
290+
return ClientInformationResponseView.VIEWNAME;
301291

302292
} else {
303293
// client mismatch
@@ -382,10 +372,6 @@ public String updateClient(@PathVariable("id") String clientId, @RequestBody Str
382372
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200
383373

384374
return ClientInformationResponseView.VIEWNAME;
385-
} catch (UnsupportedEncodingException e) {
386-
logger.error("Unsupported encoding", e);
387-
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
388-
return HttpCodeView.VIEWNAME;
389375
} catch (IllegalArgumentException e) {
390376
logger.error("Couldn't save client", e);
391377

‎openid-connect-server/src/main/java/org/mitre/openid/connect/web/ProtectedResourceRegistrationEndpoint.java

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@ public String registerNewProtectedResource(@RequestBody String jsonString, Model
177177
m.addAttribute(HttpCodeView.CODE, HttpStatus.CREATED); // http 201
178178

179179
return ClientInformationResponseView.VIEWNAME;
180-
} catch (UnsupportedEncodingException e) {
181-
logger.error("Unsupported encoding", e);
182-
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
183-
return HttpCodeView.VIEWNAME;
184180
} catch (IllegalArgumentException e) {
185181
logger.error("Couldn't save client", e);
186182

@@ -231,25 +227,18 @@ public String readResourceConfiguration(@PathVariable("id") String clientId, Mod
231227
ClientDetailsEntity client = clientService.loadClientByClientId(clientId);
232228

233229
if (client != null && client.getClientId().equals(auth.getOAuth2Request().getClientId())) {
230+
231+
// possibly update the token
232+
OAuth2AccessTokenEntity token = fetchValidRegistrationToken(auth, client);
234233

234+
RegisteredClient registered = new RegisteredClient(client, token.getValue(), config.getIssuer() + "resource/" + UriUtils.encodePathSegment(client.getClientId(), "UTF-8"));
235235

236+
// send it all out to the view
237+
m.addAttribute("client", registered);
238+
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200
236239

237-
try {
238-
// possibly update the token
239-
OAuth2AccessTokenEntity token = fetchValidRegistrationToken(auth, client);
240-
241-
RegisteredClient registered = new RegisteredClient(client, token.getValue(), config.getIssuer() + "resource/" + UriUtils.encodePathSegment(client.getClientId(), "UTF-8"));
242-
243-
// send it all out to the view
244-
m.addAttribute("client", registered);
245-
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200
246-
247-
return ClientInformationResponseView.VIEWNAME;
248-
} catch (UnsupportedEncodingException e) {
249-
logger.error("Unsupported encoding", e);
250-
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
251-
return HttpCodeView.VIEWNAME;
252-
}
240+
return ClientInformationResponseView.VIEWNAME;
241+
253242
} else {
254243
// client mismatch
255244
logger.error("readResourceConfiguration failed, client ID mismatch: "
@@ -356,10 +345,6 @@ public String updateProtectedResource(@PathVariable("id") String clientId, @Requ
356345
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200
357346

358347
return ClientInformationResponseView.VIEWNAME;
359-
} catch (UnsupportedEncodingException e) {
360-
logger.error("Unsupported encoding", e);
361-
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
362-
return HttpCodeView.VIEWNAME;
363348
} catch (IllegalArgumentException e) {
364349
logger.error("Couldn't save client", e);
365350

‎openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public int compare(OAuth2RefreshTokenEntity entity1, OAuth2RefreshTokenEntity en
144144

145145
@Test
146146
public void testImportRefreshTokens() throws IOException, ParseException {
147-
Date expirationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
147+
Date expirationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
148148

149149
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
150150
when(mockedClient1.getClientId()).thenReturn("mocked_client_1");
@@ -159,7 +159,7 @@ public void testImportRefreshTokens() throws IOException, ParseException {
159159
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
160160
token1.setAuthenticationHolder(mockedAuthHolder1);
161161

162-
Date expirationDate2 = formatter.parse("2015-01-07T18:31:50.079+0000", Locale.ENGLISH);
162+
Date expirationDate2 = formatter.parse("2015-01-07T18:31:50.079+00:00", Locale.ENGLISH);
163163

164164
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
165165
when(mockedClient2.getClientId()).thenReturn("mocked_client_2");
@@ -184,9 +184,9 @@ public void testImportRefreshTokens() throws IOException, ParseException {
184184
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
185185
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
186186

187-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
187+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
188188
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
189-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
189+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
190190
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
191191

192192
" ]" +
@@ -261,7 +261,7 @@ public int compare(OAuth2AccessTokenEntity entity1, OAuth2AccessTokenEntity enti
261261

262262
@Test
263263
public void testImportAccessTokens() throws IOException, ParseException {
264-
Date expirationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
264+
Date expirationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
265265

266266
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
267267
when(mockedClient1.getClientId()).thenReturn("mocked_client_1");
@@ -278,7 +278,7 @@ public void testImportAccessTokens() throws IOException, ParseException {
278278
token1.setScope(ImmutableSet.of("id-token"));
279279
token1.setTokenType("Bearer");
280280

281-
String expiration2 = "2015-01-07T18:31:50.079+0000";
281+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
282282
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
283283

284284
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -310,10 +310,10 @@ public void testImportAccessTokens() throws IOException, ParseException {
310310
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
311311
"\"" + MITREidDataService.ACCESSTOKENS + "\": [" +
312312

313-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
313+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
314314
+ "\"refreshTokenId\":null,\"idTokenId\":null,\"scope\":[\"id-token\"],\"type\":\"Bearer\","
315315
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3ODk5NjgsInN1YiI6IjkwMzQyLkFTREZKV0ZBIiwiYXRfaGFzaCI6InptTmt1QmNRSmNYQktNaVpFODZqY0EiLCJhdWQiOlsiY2xpZW50Il0sImlzcyI6Imh0dHA6XC9cL2xvY2FsaG9zdDo4MDgwXC9vcGVuaWQtY29ubmVjdC1zZXJ2ZXItd2ViYXBwXC8iLCJpYXQiOjE0MTI3ODkzNjh9.xkEJ9IMXpH7qybWXomfq9WOOlpGYnrvGPgey9UQ4GLzbQx7JC0XgJK83PmrmBZosvFPCmota7FzI_BtwoZLgAZfFiH6w3WIlxuogoH-TxmYbxEpTHoTsszZppkq9mNgOlArV4jrR9y3TPo4MovsH71dDhS_ck-CvAlJunHlqhs0\"}," +
316-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
316+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
317317
+ "\"refreshTokenId\":1,\"idTokenId\":1,\"scope\":[\"openid\",\"offline_access\",\"email\",\"profile\"],\"type\":\"Bearer\","
318318
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3OTI5NjgsImF1ZCI6WyJjbGllbnQiXSwiaXNzIjoiaHR0cDpcL1wvbG9jYWxob3N0OjgwODBcL29wZW5pZC1jb25uZWN0LXNlcnZlci13ZWJhcHBcLyIsImp0aSI6IjBmZGE5ZmRiLTYyYzItNGIzZS05OTdiLWU0M2VhMDUwMzNiOSIsImlhdCI6MTQxMjc4OTM2OH0.xgaVpRLYE5MzbgXfE0tZt823tjAm6Oh3_kdR1P2I9jRLR6gnTlBQFlYi3Y_0pWNnZSerbAE8Tn6SJHZ9k-curVG0-ByKichV7CNvgsE5X_2wpEaUzejvKf8eZ-BammRY-ie6yxSkAarcUGMvGGOLbkFcz5CtrBpZhfd75J49BIQ\"}" +
319319

@@ -576,8 +576,8 @@ public WhitelistedSite answer(InvocationOnMock invocation) throws Throwable {
576576

577577
@Test
578578
public void testImportGrants() throws IOException, ParseException {
579-
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
580-
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
579+
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
580+
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+00:00", Locale.ENGLISH);
581581

582582
OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
583583
when(mockToken1.getId()).thenReturn(1L);
@@ -591,9 +591,9 @@ public void testImportGrants() throws IOException, ParseException {
591591
site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
592592
when(mockToken1.getApprovedSite()).thenReturn(site1);
593593

594-
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+0000", Locale.ENGLISH);
595-
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+0000", Locale.ENGLISH);
596-
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+0000", Locale.ENGLISH);
594+
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+00:00", Locale.ENGLISH);
595+
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+00:00", Locale.ENGLISH);
596+
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+00:00", Locale.ENGLISH);
597597

598598
ApprovedSite site2 = new ApprovedSite();
599599
site2.setId(2L);
@@ -614,11 +614,11 @@ public void testImportGrants() throws IOException, ParseException {
614614
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
615615
"\"" + MITREidDataService.GRANTS + "\": [" +
616616

617-
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+0000\",\"accessDate\":\"2014-09-10T23:49:44.090+0000\","
617+
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+00:00\",\"accessDate\":\"2014-09-10T23:49:44.090+00:00\","
618618
+ "\"userId\":\"user1\",\"whitelistedSiteId\":null,\"allowedScopes\":[\"openid\",\"phone\"], \"whitelistedSiteId\":1,"
619619
+ "\"approvedAccessTokens\":[1]}," +
620-
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+0000\",\"accessDate\":\"2014-09-11T20:49:44.090+0000\","
621-
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+0000\",\"userId\":\"user2\","
620+
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+00:00\",\"accessDate\":\"2014-09-11T20:49:44.090+00:00\","
621+
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+00:00\",\"userId\":\"user2\","
622622
+ "\"allowedScopes\":[\"openid\",\"offline_access\",\"email\",\"profile\"]}" +
623623

624624
" ]" +
@@ -831,7 +831,7 @@ public void testImportSystemScopes() throws IOException {
831831

832832
@Test
833833
public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException, ParseException {
834-
String expiration1 = "2014-09-10T22:49:44.090+0000";
834+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
835835
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
836836

837837
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -854,7 +854,7 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
854854
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
855855
token1.setAuthenticationHolder(holder1);
856856

857-
String expiration2 = "2015-01-07T18:31:50.079+0000";
857+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
858858
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
859859

860860
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -893,9 +893,9 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
893893
" ]," +
894894
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
895895

896-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
896+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
897897
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
898-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
898+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
899899
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
900900

901901
" ]" +

‎openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public int compare(OAuth2RefreshTokenEntity entity1, OAuth2RefreshTokenEntity en
145145

146146
@Test
147147
public void testImportRefreshTokens() throws IOException, ParseException {
148-
String expiration1 = "2014-09-10T22:49:44.090+0000";
148+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
149149
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
150150

151151
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -161,7 +161,7 @@ public void testImportRefreshTokens() throws IOException, ParseException {
161161
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
162162
token1.setAuthenticationHolder(mockedAuthHolder1);
163163

164-
String expiration2 = "2015-01-07T18:31:50.079+0000";
164+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
165165
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
166166

167167
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -187,9 +187,9 @@ public void testImportRefreshTokens() throws IOException, ParseException {
187187
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
188188
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
189189

190-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
190+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
191191
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
192-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
192+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
193193
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
194194

195195
" ]" +
@@ -264,7 +264,7 @@ public int compare(OAuth2AccessTokenEntity entity1, OAuth2AccessTokenEntity enti
264264

265265
@Test
266266
public void testImportAccessTokens() throws IOException, ParseException {
267-
String expiration1 = "2014-09-10T22:49:44.090+0000";
267+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
268268
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
269269

270270
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -282,7 +282,7 @@ public void testImportAccessTokens() throws IOException, ParseException {
282282
token1.setScope(ImmutableSet.of("id-token"));
283283
token1.setTokenType("Bearer");
284284

285-
String expiration2 = "2015-01-07T18:31:50.079+0000";
285+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
286286
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
287287

288288
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -314,10 +314,10 @@ public void testImportAccessTokens() throws IOException, ParseException {
314314
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
315315
"\"" + MITREidDataService.ACCESSTOKENS + "\": [" +
316316

317-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
317+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
318318
+ "\"refreshTokenId\":null,\"idTokenId\":null,\"scope\":[\"id-token\"],\"type\":\"Bearer\","
319319
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3ODk5NjgsInN1YiI6IjkwMzQyLkFTREZKV0ZBIiwiYXRfaGFzaCI6InptTmt1QmNRSmNYQktNaVpFODZqY0EiLCJhdWQiOlsiY2xpZW50Il0sImlzcyI6Imh0dHA6XC9cL2xvY2FsaG9zdDo4MDgwXC9vcGVuaWQtY29ubmVjdC1zZXJ2ZXItd2ViYXBwXC8iLCJpYXQiOjE0MTI3ODkzNjh9.xkEJ9IMXpH7qybWXomfq9WOOlpGYnrvGPgey9UQ4GLzbQx7JC0XgJK83PmrmBZosvFPCmota7FzI_BtwoZLgAZfFiH6w3WIlxuogoH-TxmYbxEpTHoTsszZppkq9mNgOlArV4jrR9y3TPo4MovsH71dDhS_ck-CvAlJunHlqhs0\"}," +
320-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
320+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
321321
+ "\"refreshTokenId\":1,\"idTokenId\":1,\"scope\":[\"openid\",\"offline_access\",\"email\",\"profile\"],\"type\":\"Bearer\","
322322
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3OTI5NjgsImF1ZCI6WyJjbGllbnQiXSwiaXNzIjoiaHR0cDpcL1wvbG9jYWxob3N0OjgwODBcL29wZW5pZC1jb25uZWN0LXNlcnZlci13ZWJhcHBcLyIsImp0aSI6IjBmZGE5ZmRiLTYyYzItNGIzZS05OTdiLWU0M2VhMDUwMzNiOSIsImlhdCI6MTQxMjc4OTM2OH0.xgaVpRLYE5MzbgXfE0tZt823tjAm6Oh3_kdR1P2I9jRLR6gnTlBQFlYi3Y_0pWNnZSerbAE8Tn6SJHZ9k-curVG0-ByKichV7CNvgsE5X_2wpEaUzejvKf8eZ-BammRY-ie6yxSkAarcUGMvGGOLbkFcz5CtrBpZhfd75J49BIQ\"}" +
323323

@@ -579,8 +579,8 @@ public WhitelistedSite answer(InvocationOnMock invocation) throws Throwable {
579579

580580
@Test
581581
public void testImportGrants() throws IOException, ParseException {
582-
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
583-
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
582+
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
583+
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+00:00", Locale.ENGLISH);
584584

585585
OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
586586
when(mockToken1.getId()).thenReturn(1L);
@@ -594,9 +594,9 @@ public void testImportGrants() throws IOException, ParseException {
594594
site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
595595
when(mockToken1.getApprovedSite()).thenReturn(site1);
596596

597-
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+0000", Locale.ENGLISH);
598-
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+0000", Locale.ENGLISH);
599-
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+0000", Locale.ENGLISH);
597+
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+00:00", Locale.ENGLISH);
598+
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+00:00", Locale.ENGLISH);
599+
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+00:00", Locale.ENGLISH);
600600

601601
ApprovedSite site2 = new ApprovedSite();
602602
site2.setId(2L);
@@ -617,11 +617,11 @@ public void testImportGrants() throws IOException, ParseException {
617617
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
618618
"\"" + MITREidDataService.GRANTS + "\": [" +
619619

620-
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+0000\",\"accessDate\":\"2014-09-10T23:49:44.090+0000\","
620+
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+00:00\",\"accessDate\":\"2014-09-10T23:49:44.090+00:00\","
621621
+ "\"userId\":\"user1\",\"whitelistedSiteId\":null,\"allowedScopes\":[\"openid\",\"phone\"], \"whitelistedSiteId\":1,"
622622
+ "\"approvedAccessTokens\":[1]}," +
623-
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+0000\",\"accessDate\":\"2014-09-11T20:49:44.090+0000\","
624-
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+0000\",\"userId\":\"user2\","
623+
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+00:00\",\"accessDate\":\"2014-09-11T20:49:44.090+00:00\","
624+
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+00:00\",\"userId\":\"user2\","
625625
+ "\"allowedScopes\":[\"openid\",\"offline_access\",\"email\",\"profile\"]}" +
626626

627627
" ]" +
@@ -833,7 +833,7 @@ public void testImportSystemScopes() throws IOException {
833833

834834
@Test
835835
public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException, ParseException {
836-
String expiration1 = "2014-09-10T22:49:44.090+0000";
836+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
837837
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
838838

839839
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -856,7 +856,7 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
856856
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
857857
token1.setAuthenticationHolder(holder1);
858858

859-
String expiration2 = "2015-01-07T18:31:50.079+0000";
859+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
860860
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
861861

862862
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -895,9 +895,9 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
895895
" ]," +
896896
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
897897

898-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
898+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
899899
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
900-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
900+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
901901
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
902902

903903
" ]" +

‎openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public int compare(OAuth2RefreshTokenEntity entity1, OAuth2RefreshTokenEntity en
147147

148148
@Test
149149
public void testImportRefreshTokens() throws IOException, ParseException {
150-
String expiration1 = "2014-09-10T22:49:44.090+0000";
150+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
151151
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
152152

153153
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -163,7 +163,7 @@ public void testImportRefreshTokens() throws IOException, ParseException {
163163
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
164164
token1.setAuthenticationHolder(mockedAuthHolder1);
165165

166-
String expiration2 = "2015-01-07T18:31:50.079+0000";
166+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
167167
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
168168

169169
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -189,9 +189,9 @@ public void testImportRefreshTokens() throws IOException, ParseException {
189189
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
190190
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
191191

192-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
192+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
193193
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
194-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
194+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
195195
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
196196

197197
" ]" +
@@ -266,7 +266,7 @@ public int compare(OAuth2AccessTokenEntity entity1, OAuth2AccessTokenEntity enti
266266

267267
@Test
268268
public void testImportAccessTokens() throws IOException, ParseException {
269-
String expiration1 = "2014-09-10T22:49:44.090+0000";
269+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
270270
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
271271

272272
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -284,7 +284,7 @@ public void testImportAccessTokens() throws IOException, ParseException {
284284
token1.setScope(ImmutableSet.of("id-token"));
285285
token1.setTokenType("Bearer");
286286

287-
String expiration2 = "2015-01-07T18:31:50.079+0000";
287+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
288288
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
289289

290290
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -316,10 +316,10 @@ public void testImportAccessTokens() throws IOException, ParseException {
316316
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
317317
"\"" + MITREidDataService.ACCESSTOKENS + "\": [" +
318318

319-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
319+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
320320
+ "\"refreshTokenId\":null,\"idTokenId\":null,\"scope\":[\"id-token\"],\"type\":\"Bearer\","
321321
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3ODk5NjgsInN1YiI6IjkwMzQyLkFTREZKV0ZBIiwiYXRfaGFzaCI6InptTmt1QmNRSmNYQktNaVpFODZqY0EiLCJhdWQiOlsiY2xpZW50Il0sImlzcyI6Imh0dHA6XC9cL2xvY2FsaG9zdDo4MDgwXC9vcGVuaWQtY29ubmVjdC1zZXJ2ZXItd2ViYXBwXC8iLCJpYXQiOjE0MTI3ODkzNjh9.xkEJ9IMXpH7qybWXomfq9WOOlpGYnrvGPgey9UQ4GLzbQx7JC0XgJK83PmrmBZosvFPCmota7FzI_BtwoZLgAZfFiH6w3WIlxuogoH-TxmYbxEpTHoTsszZppkq9mNgOlArV4jrR9y3TPo4MovsH71dDhS_ck-CvAlJunHlqhs0\"}," +
322-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
322+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
323323
+ "\"refreshTokenId\":1,\"idTokenId\":1,\"scope\":[\"openid\",\"offline_access\",\"email\",\"profile\"],\"type\":\"Bearer\","
324324
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3OTI5NjgsImF1ZCI6WyJjbGllbnQiXSwiaXNzIjoiaHR0cDpcL1wvbG9jYWxob3N0OjgwODBcL29wZW5pZC1jb25uZWN0LXNlcnZlci13ZWJhcHBcLyIsImp0aSI6IjBmZGE5ZmRiLTYyYzItNGIzZS05OTdiLWU0M2VhMDUwMzNiOSIsImlhdCI6MTQxMjc4OTM2OH0.xgaVpRLYE5MzbgXfE0tZt823tjAm6Oh3_kdR1P2I9jRLR6gnTlBQFlYi3Y_0pWNnZSerbAE8Tn6SJHZ9k-curVG0-ByKichV7CNvgsE5X_2wpEaUzejvKf8eZ-BammRY-ie6yxSkAarcUGMvGGOLbkFcz5CtrBpZhfd75J49BIQ\"}" +
325325

@@ -581,8 +581,8 @@ public WhitelistedSite answer(InvocationOnMock invocation) throws Throwable {
581581

582582
@Test
583583
public void testImportGrants() throws IOException, ParseException {
584-
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
585-
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
584+
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
585+
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+00:00", Locale.ENGLISH);
586586

587587
OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
588588
when(mockToken1.getId()).thenReturn(1L);
@@ -596,9 +596,9 @@ public void testImportGrants() throws IOException, ParseException {
596596
site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
597597
when(mockToken1.getApprovedSite()).thenReturn(site1);
598598

599-
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+0000", Locale.ENGLISH);
600-
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+0000", Locale.ENGLISH);
601-
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+0000", Locale.ENGLISH);
599+
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+00:00", Locale.ENGLISH);
600+
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+00:00", Locale.ENGLISH);
601+
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+00:00", Locale.ENGLISH);
602602

603603
ApprovedSite site2 = new ApprovedSite();
604604
site2.setId(2L);
@@ -619,11 +619,11 @@ public void testImportGrants() throws IOException, ParseException {
619619
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
620620
"\"" + MITREidDataService.GRANTS + "\": [" +
621621

622-
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+0000\",\"accessDate\":\"2014-09-10T23:49:44.090+0000\","
622+
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+00:00\",\"accessDate\":\"2014-09-10T23:49:44.090+00:00\","
623623
+ "\"userId\":\"user1\",\"whitelistedSiteId\":null,\"allowedScopes\":[\"openid\",\"phone\"], \"whitelistedSiteId\":1,"
624624
+ "\"approvedAccessTokens\":[1]}," +
625-
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+0000\",\"accessDate\":\"2014-09-11T20:49:44.090+0000\","
626-
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+0000\",\"userId\":\"user2\","
625+
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+00:00\",\"accessDate\":\"2014-09-11T20:49:44.090+00:00\","
626+
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+00:00\",\"userId\":\"user2\","
627627
+ "\"allowedScopes\":[\"openid\",\"offline_access\",\"email\",\"profile\"]}" +
628628

629629
" ]" +
@@ -835,7 +835,7 @@ public void testImportSystemScopes() throws IOException {
835835

836836
@Test
837837
public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException, ParseException {
838-
String expiration1 = "2014-09-10T22:49:44.090+0000";
838+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
839839
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
840840

841841
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -858,7 +858,7 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
858858
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
859859
token1.setAuthenticationHolder(holder1);
860860

861-
String expiration2 = "2015-01-07T18:31:50.079+0000";
861+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
862862
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
863863

864864
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -897,9 +897,9 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
897897
" ]," +
898898
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
899899

900-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
900+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
901901
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
902-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
902+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
903903
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
904904

905905
" ]" +

‎openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_3.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void prepare() {
150150

151151
@Test
152152
public void testExportRefreshTokens() throws IOException, ParseException {
153-
String expiration1 = "2014-09-10T22:49:44.090+0000";
153+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
154154
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
155155

156156
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -166,7 +166,7 @@ public void testExportRefreshTokens() throws IOException, ParseException {
166166
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
167167
token1.setAuthenticationHolder(mockedAuthHolder1);
168168

169-
String expiration2 = "2015-01-07T18:31:50.079+0000";
169+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
170170
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
171171

172172
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -273,7 +273,7 @@ public int compare(OAuth2RefreshTokenEntity entity1, OAuth2RefreshTokenEntity en
273273

274274
@Test
275275
public void testImportRefreshTokens() throws IOException, ParseException {
276-
String expiration1 = "2014-09-10T22:49:44.090+0000";
276+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
277277
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
278278

279279
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -289,7 +289,7 @@ public void testImportRefreshTokens() throws IOException, ParseException {
289289
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
290290
token1.setAuthenticationHolder(mockedAuthHolder1);
291291

292-
String expiration2 = "2015-01-07T18:31:50.079+0000";
292+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
293293
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
294294

295295
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -315,9 +315,9 @@ public void testImportRefreshTokens() throws IOException, ParseException {
315315
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
316316
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
317317

318-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
318+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
319319
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
320-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
320+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
321321
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
322322

323323
" ]" +
@@ -385,7 +385,7 @@ public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Thr
385385

386386
@Test
387387
public void testExportAccessTokens() throws IOException, ParseException {
388-
String expiration1 = "2014-09-10T22:49:44.090+0000";
388+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
389389
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
390390

391391
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -403,7 +403,7 @@ public void testExportAccessTokens() throws IOException, ParseException {
403403
token1.setScope(ImmutableSet.of("id-token"));
404404
token1.setTokenType("Bearer");
405405

406-
String expiration2 = "2015-01-07T18:31:50.079+0000";
406+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
407407
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
408408

409409
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -523,7 +523,7 @@ public int compare(OAuth2AccessTokenEntity entity1, OAuth2AccessTokenEntity enti
523523

524524
@Test
525525
public void testImportAccessTokens() throws IOException, ParseException {
526-
String expiration1 = "2014-09-10T22:49:44.090+0000";
526+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
527527
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
528528

529529
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -541,7 +541,7 @@ public void testImportAccessTokens() throws IOException, ParseException {
541541
token1.setScope(ImmutableSet.of("id-token"));
542542
token1.setTokenType("Bearer");
543543

544-
String expiration2 = "2015-01-07T18:31:50.079+0000";
544+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
545545
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
546546

547547
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -573,10 +573,10 @@ public void testImportAccessTokens() throws IOException, ParseException {
573573
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
574574
"\"" + MITREidDataService.ACCESSTOKENS + "\": [" +
575575

576-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
576+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
577577
+ "\"refreshTokenId\":null,\"idTokenId\":null,\"scope\":[\"id-token\"],\"type\":\"Bearer\","
578578
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3ODk5NjgsInN1YiI6IjkwMzQyLkFTREZKV0ZBIiwiYXRfaGFzaCI6InptTmt1QmNRSmNYQktNaVpFODZqY0EiLCJhdWQiOlsiY2xpZW50Il0sImlzcyI6Imh0dHA6XC9cL2xvY2FsaG9zdDo4MDgwXC9vcGVuaWQtY29ubmVjdC1zZXJ2ZXItd2ViYXBwXC8iLCJpYXQiOjE0MTI3ODkzNjh9.xkEJ9IMXpH7qybWXomfq9WOOlpGYnrvGPgey9UQ4GLzbQx7JC0XgJK83PmrmBZosvFPCmota7FzI_BtwoZLgAZfFiH6w3WIlxuogoH-TxmYbxEpTHoTsszZppkq9mNgOlArV4jrR9y3TPo4MovsH71dDhS_ck-CvAlJunHlqhs0\"}," +
579-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
579+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
580580
+ "\"refreshTokenId\":1,\"idTokenId\":1,\"scope\":[\"openid\",\"offline_access\",\"email\",\"profile\"],\"type\":\"Bearer\","
581581
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE0MTI3OTI5NjgsImF1ZCI6WyJjbGllbnQiXSwiaXNzIjoiaHR0cDpcL1wvbG9jYWxob3N0OjgwODBcL29wZW5pZC1jb25uZWN0LXNlcnZlci13ZWJhcHBcLyIsImp0aSI6IjBmZGE5ZmRiLTYyYzItNGIzZS05OTdiLWU0M2VhMDUwMzNiOSIsImlhdCI6MTQxMjc4OTM2OH0.xgaVpRLYE5MzbgXfE0tZt823tjAm6Oh3_kdR1P2I9jRLR6gnTlBQFlYi3Y_0pWNnZSerbAE8Tn6SJHZ9k-curVG0-ByKichV7CNvgsE5X_2wpEaUzejvKf8eZ-BammRY-ie6yxSkAarcUGMvGGOLbkFcz5CtrBpZhfd75J49BIQ\"}" +
582582

@@ -1131,8 +1131,8 @@ public WhitelistedSite answer(InvocationOnMock invocation) throws Throwable {
11311131

11321132
@Test
11331133
public void testExportGrants() throws IOException, ParseException {
1134-
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
1135-
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
1134+
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
1135+
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+00:00", Locale.ENGLISH);
11361136

11371137
OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
11381138
when(mockToken1.getId()).thenReturn(1L);
@@ -1146,9 +1146,9 @@ public void testExportGrants() throws IOException, ParseException {
11461146
site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
11471147
when(mockToken1.getApprovedSite()).thenReturn(site1);
11481148

1149-
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+0000", Locale.ENGLISH);
1150-
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+0000", Locale.ENGLISH);
1151-
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+0000", Locale.ENGLISH);
1149+
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+00:00", Locale.ENGLISH);
1150+
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+00:00", Locale.ENGLISH);
1151+
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+00:00", Locale.ENGLISH);
11521152

11531153
ApprovedSite site2 = new ApprovedSite();
11541154
site2.setId(2L);
@@ -1246,8 +1246,8 @@ public void testExportGrants() throws IOException, ParseException {
12461246

12471247
@Test
12481248
public void testImportGrants() throws IOException, ParseException {
1249-
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
1250-
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
1249+
Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+00:00", Locale.ENGLISH);
1250+
Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+00:00", Locale.ENGLISH);
12511251

12521252
OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
12531253
when(mockToken1.getId()).thenReturn(1L);
@@ -1261,9 +1261,9 @@ public void testImportGrants() throws IOException, ParseException {
12611261
site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
12621262
when(mockToken1.getApprovedSite()).thenReturn(site1);
12631263

1264-
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+0000", Locale.ENGLISH);
1265-
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+0000", Locale.ENGLISH);
1266-
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+0000", Locale.ENGLISH);
1264+
Date creationDate2 = formatter.parse("2014-09-11T18:49:44.090+00:00", Locale.ENGLISH);
1265+
Date accessDate2 = formatter.parse("2014-09-11T20:49:44.090+00:00", Locale.ENGLISH);
1266+
Date timeoutDate2 = formatter.parse("2014-10-01T20:49:44.090+00:00", Locale.ENGLISH);
12671267

12681268
ApprovedSite site2 = new ApprovedSite();
12691269
site2.setId(2L);
@@ -1284,11 +1284,11 @@ public void testImportGrants() throws IOException, ParseException {
12841284
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [], " +
12851285
"\"" + MITREidDataService.GRANTS + "\": [" +
12861286

1287-
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+0000\",\"accessDate\":\"2014-09-10T23:49:44.090+0000\","
1287+
"{\"id\":1,\"clientId\":\"foo\",\"creationDate\":\"2014-09-10T22:49:44.090+00:00\",\"accessDate\":\"2014-09-10T23:49:44.090+00:00\","
12881288
+ "\"userId\":\"user1\",\"whitelistedSiteId\":null,\"allowedScopes\":[\"openid\",\"phone\"], \"whitelistedSiteId\":1,"
12891289
+ "\"approvedAccessTokens\":[1]}," +
1290-
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+0000\",\"accessDate\":\"2014-09-11T20:49:44.090+0000\","
1291-
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+0000\",\"userId\":\"user2\","
1290+
"{\"id\":2,\"clientId\":\"bar\",\"creationDate\":\"2014-09-11T18:49:44.090+00:00\",\"accessDate\":\"2014-09-11T20:49:44.090+00:00\","
1291+
+ "\"timeoutDate\":\"2014-10-01T20:49:44.090+00:00\",\"userId\":\"user2\","
12921292
+ "\"allowedScopes\":[\"openid\",\"offline_access\",\"email\",\"profile\"]}" +
12931293

12941294
" ]" +
@@ -1717,7 +1717,7 @@ public void testImportSystemScopes() throws IOException {
17171717

17181718
@Test
17191719
public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException, ParseException {
1720-
String expiration1 = "2014-09-10T22:49:44.090+0000";
1720+
String expiration1 = "2014-09-10T22:49:44.090+00:00";
17211721
Date expirationDate1 = formatter.parse(expiration1, Locale.ENGLISH);
17221722

17231723
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
@@ -1740,7 +1740,7 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
17401740
token1.setJwt(JWTParser.parse("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ."));
17411741
token1.setAuthenticationHolder(holder1);
17421742

1743-
String expiration2 = "2015-01-07T18:31:50.079+0000";
1743+
String expiration2 = "2015-01-07T18:31:50.079+00:00";
17441744
Date expirationDate2 = formatter.parse(expiration2, Locale.ENGLISH);
17451745

17461746
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
@@ -1779,9 +1779,9 @@ public void testFixRefreshTokenAuthHolderReferencesOnImport() throws IOException
17791779
" ]," +
17801780
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
17811781

1782-
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
1782+
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+00:00\","
17831783
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
1784-
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
1784+
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+00:00\","
17851785
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
17861786

17871787
" ]" +

‎pom.xml

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</mailingLists>
7171

7272
<properties>
73-
<java-version>1.8</java-version>
73+
<java-version>11</java-version>
7474
<org.slf4j-version>1.7.25</org.slf4j-version>
7575
</properties>
7676
<description>A reference implementation of OpenID Connect (http://openid.net/connect/), OAuth 2.0, and UMA built on top of Java, Spring, and Spring Security. The project contains a fully functioning server, client, and utility library.</description>
@@ -96,7 +96,7 @@
9696
<plugin>
9797
<groupId>org.jacoco</groupId>
9898
<artifactId>jacoco-maven-plugin</artifactId>
99-
<version>0.7.9</version>
99+
<version>0.8.7</version>
100100
</plugin>
101101
<plugin>
102102
<groupId>org.apache.maven.plugins</groupId>
@@ -178,7 +178,7 @@
178178
<plugin>
179179
<groupId>ro.isdc.wro4j</groupId>
180180
<artifactId>wro4j-maven-plugin</artifactId>
181-
<version>1.8.0</version>
181+
<version>1.10.0</version>
182182
<executions>
183183
<execution>
184184
<phase>compile</phase>
@@ -191,7 +191,7 @@
191191
<dependency>
192192
<groupId>ro.isdc.wro4j</groupId>
193193
<artifactId>wro4j-extensions</artifactId>
194-
<version>1.8.0</version>
194+
<version>1.10.0</version>
195195
</dependency>
196196
</dependencies>
197197
</plugin>
@@ -365,7 +365,7 @@
365365
<dependency>
366366
<groupId>org.springframework</groupId>
367367
<artifactId>spring-framework-bom</artifactId>
368-
<version>4.3.22.RELEASE</version>
368+
<version>5.3.9</version>
369369
<type>pom</type>
370370
<scope>import</scope>
371371
</dependency>
@@ -386,7 +386,7 @@
386386
<dependency>
387387
<groupId>org.springframework.security</groupId>
388388
<artifactId>spring-security-bom</artifactId>
389-
<version>4.2.11.RELEASE</version>
389+
<version>5.5.2</version>
390390
<type>pom</type>
391391
<scope>import</scope>
392392
</dependency>
@@ -605,7 +605,34 @@
605605
<dependency>
606606
<groupId>ro.isdc.wro4j</groupId>
607607
<artifactId>wro4j-extensions</artifactId>
608-
<version>1.8.0</version>
608+
<version>1.10.0</version>
609+
</dependency>
610+
611+
<!-- java11 -->
612+
<dependency>
613+
<groupId>javax.annotation</groupId>
614+
<artifactId>javax.annotation-api</artifactId>
615+
<version>1.3.2</version>
616+
</dependency>
617+
<dependency>
618+
<groupId>jakarta.xml.bind</groupId>
619+
<artifactId>jakarta.xml.bind-api</artifactId>
620+
<version>3.0.0</version>
621+
</dependency>
622+
<dependency>
623+
<groupId>javax.xml.bind</groupId>
624+
<artifactId>jaxb-api</artifactId>
625+
<version>2.3.1</version>
626+
</dependency>
627+
<dependency>
628+
<groupId>javax.activation</groupId>
629+
<artifactId>activation</artifactId>
630+
<version>1.1</version>
631+
</dependency>
632+
<dependency>
633+
<groupId>org.glassfish.jaxb</groupId>
634+
<artifactId>jaxb-runtime</artifactId>
635+
<version>2.3.0-b170127.1453</version>
609636
</dependency>
610637
</dependencies>
611638
</dependencyManagement>

0 commit comments

Comments
 (0)
Please sign in to comment.