github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated SECOAUTH reference, fixed some SQL files, temporarily closed token timeout issue

pull/105/merge
Justin Richer 2012-06-15 12:05:08 -04:00
parent f9558f0955
commit 731ad2e2e2
12 changed files with 139 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openid-connect-client/.classpath
View File

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>

78
openid-connect-client/.project
View File

@ -1,42 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>openid-connect-client</name> <name>openid-connect-client</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> </buildSpec>
<name>org.springframework.ide.eclipse.core.springbuilder</name> <natures>
<arguments> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</arguments> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
</buildCommand> <nature>org.eclipse.jdt.core.javanature</nature>
</buildSpec> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<natures> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature> </natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> </projectDescription>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>

3
openid-connect-common/.classpath
View File

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>

78
openid-connect-common/.project
View File

@ -1,42 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>openid-connect-common</name> <name>openid-connect-common</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> </buildSpec>
<name>org.springframework.ide.eclipse.core.springbuilder</name> <natures>
<arguments> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</arguments> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
</buildCommand> <nature>org.eclipse.jdt.core.javanature</nature>
</buildSpec> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<natures> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature> </natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> </projectDescription>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>

1
openid-connect-common/.settings/org.eclipse.wst.common.component
View File

@ -2,5 +2,6 @@
<project-modules id="moduleCoreId" project-version="1.5.0"> <project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="openid-connect-common"> <wb-module deploy-name="openid-connect-common">
<wb-resource deploy-path="/" source-path="/src/main/java"/> <wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

90
openid-connect-server/.project
View File

@ -1,48 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>openid</name> <name>openid</name>
<comment>Reference implementation of OpenID Connect spec (http://openid.net/connect/). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> <comment>Reference implementation of OpenID Connect spec (http://openid.net/connect/). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name> <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> </buildSpec>
<name>org.springframework.ide.eclipse.core.springbuilder</name> <natures>
<arguments> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</arguments> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
</buildCommand> <nature>org.eclipse.jdt.core.javanature</nature>
</buildSpec> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<natures> <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> </natures>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> </projectDescription>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

22
openid-connect-server/.settings/org.eclipse.wst.common.component
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0"> <project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="openid"> <wb-module deploy-name="openid">
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<property name="java-output-path" value="/openid/target/classes"/> <property name="java-output-path" value="/openid/target/classes"/>
<property name="context-root" value="openid-connect-server"/> <property name="context-root" value="openid-connect-server"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

2
openid-connect-server/db/tables/authorities.sql
View File

@ -1,4 +1,4 @@
CREATE TABLE authorities ( CREATE TABLE authorities (
owner_id VARCHAR(256), owner_id VARCHAR(4096),
authorities LONGBLOB authorities LONGBLOB
); );

2
openid-connect-server/db/tables/refreshtoken.sql
View File

@ -1,5 +1,5 @@
CREATE TABLE refreshtoken ( CREATE TABLE refreshtoken (
id VARCHAR(256), id VARCHAR(4096),
expiration TIMESTAMP, expiration TIMESTAMP,
client_id VARCHAR(256) client_id VARCHAR(256)
); );

4
openid-connect-server/db/tables/scope.sql
View File

@ -1,4 +1,4 @@
CREATE TABLE scope ( CREATE TABLE scope (
owner_id VARCHAR(256), owner_id VARCHAR(4096),
scope VARCHAR(2000) scope VARCHAR(2048)
); );

3
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
View File

@ -110,7 +110,8 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
} }
// make it expire if necessary // make it expire if necessary
if (client.getAccessTokenTimeout() != null) { // TODO: pending upstream updates, check for 0 or -1 value here
if (client.getAccessTokenTimeout() != null && client.getAccessTokenTimeout() > 0) {
Date expiration = new Date(System.currentTimeMillis() + (client.getAccessTokenTimeout() * 1000L)); Date expiration = new Date(System.currentTimeMillis() + (client.getAccessTokenTimeout() * 1000L));
token.setExpiration(expiration); token.setExpiration(expiration);
} }

2
spring-security-oauth

@ -1 +1 @@
Subproject commit 7c0dcf3c1579754c7061cec050b974656fc163cc Subproject commit a02ea2aa872acf188da78927d52c278ba2d3c7af