Commit Graph

118 Commits (3b6412219b170cd7f4a2842fc2b712bb4aabede7)

Author SHA1 Message Date
Justin Richer 856c0ea0b5 Merge commit '023dd440d4a0e6e59a14c88013837d79a77c74e0' into 1.1-merge
Conflicts:
	openid-connect-client/pom.xml
	openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
	openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java
	openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionAuthorityGranter.java
	openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionUrlProvider.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticServerConfigurationService.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticSingleIssuerService.java
	openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java
	openid-connect-client/src/test/java/org/mitre/openid/connect/client/AbstractOIDCAuthenticationFilterTest.java
	openid-connect-common/pom.xml
	openid-connect-common/src/main/java/org/mitre/jose/keystore/JWKSetKeyStore.java
	openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
	openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java
	openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
	openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
	openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
	openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
	openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
	openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java
	openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthorizationCodeRepository.java
	openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
	openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/config/ServerConfiguration.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java
	openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
	openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
	openid-connect-server/.gitignore
	openid-connect-server/pom.xml
	openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
	openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java
	openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java
	openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
	openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java
	openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
	openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAuthenticationProvider.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerClientAssertionTokenEndpointFilter.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtSignatureException.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/exception/UnknownUserInfoSchemaException.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/exception/UserNotFoundException.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/AbstractClientEntityView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientInformationResponseView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonErrorView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/StatsSummary.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java
	openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java
	openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/breadcrumbs.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/copyright.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag
	openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag
	openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp
	openid-connect-server/src/main/webapp/WEB-INF/views/approve.jsp
	openid-connect-server/src/main/webapp/WEB-INF/views/contact.jsp
	openid-connect-server/src/main/webapp/WEB-INF/views/exception/usernotfound.jsp
	openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp
	openid-connect-server/src/main/webapp/WEB-INF/views/manage.jsp
	openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp
	pom.xml
2013-07-29 16:21:20 -04:00
Justin Richer 023dd440d4 [maven-release-plugin] prepare for next development iteration 2013-07-29 11:30:08 -04:00
Justin Richer 5e8f93cf15 [maven-release-plugin] prepare release mitreid-connect-1.0.6 2013-07-29 11:30:04 -04:00
Justin Richer 20871852c0 updated dependencies for secoauth 1.1 2013-07-24 09:38:47 -04:00
William Kim cf0c4a7f45 added custom checkstyle configuration with a small sample set of checks, including ones with customized properties. 2013-07-16 17:18:15 -04:00
William Kim 9e9091e064 updated pom to include checkstyle maven plugin 2013-07-16 17:18:15 -04:00
Justin Richer 0d8c2442d2 [maven-release-plugin] prepare for next development iteration 2013-07-12 10:09:41 -04:00
Justin Richer 9bf5f70957 [maven-release-plugin] prepare release mitreid-connect-1.0.5 2013-07-12 10:09:38 -04:00
Justin Richer 936f581a0b [maven-release-plugin] prepare for next development iteration 2013-06-28 16:00:52 -04:00
Justin Richer 27edec1a56 [maven-release-plugin] prepare release mitreid-connect-1.0.4 2013-06-28 16:00:46 -04:00
Justin Richer 2b3376e0ed [maven-release-plugin] prepare for next development iteration 2013-06-18 16:13:04 -04:00
Justin Richer 7fe4bc3b56 [maven-release-plugin] prepare release mitreid-connect-1.0.3 2013-06-18 16:12:59 -04:00
Justin Richer aea562f565 moved mockito dependency to core project 2013-06-10 14:11:43 -04:00
Justin Richer 3252d9abf7 Added mailing list and updated description in pom, addresses #344 2013-06-10 10:09:47 -04:00
Justin Richer 567a3314d6 [maven-release-plugin] prepare for next development iteration 2013-06-06 16:05:59 -04:00
Justin Richer 1286726188 [maven-release-plugin] prepare release mitreid-connect-1.0.2 2013-06-06 16:05:52 -04:00
Justin Richer 25d75a1b30 [maven-release-plugin] prepare for next development iteration 2013-05-20 17:38:01 -04:00
Justin Richer 5418bdef5a [maven-release-plugin] prepare release mitreid-connect-1.0.1 2013-05-20 17:37:52 -04:00
Justin Richer 644f0c4480 udpated nimbus version 2013-05-20 16:17:26 -04:00
Justin Richer defa5b8fbc [maven-release-plugin] prepare for next development iteration 2013-05-02 15:01:59 -04:00
Justin Richer dbdc99361e [maven-release-plugin] prepare release mitreid-connect-1.0.0 2013-05-02 15:01:53 -04:00
Justin Richer b8c385e5c9 pom file cleanups 2013-04-29 11:47:15 -04:00
Justin Richer 9b03801f9d [maven-release-plugin] prepare for next development iteration 2013-04-26 13:21:36 -04:00
Justin Richer d76304b9a6 [maven-release-plugin] prepare release mitreid-connect-0.9.3 2013-04-26 13:21:31 -04:00
Justin Richer 94aa279290 [maven-release-plugin] prepare for next development iteration 2013-04-19 16:17:53 -04:00
Justin Richer cc92743888 [maven-release-plugin] prepare release mitreid-connect-0.9.2 2013-04-19 16:17:45 -04:00
Justin Richer 54ee688286 updated nimbus revision 2013-04-15 16:16:07 -04:00
Justin Richer daa25cb753 dependency cleanup 2013-04-12 17:06:00 -04:00
Justin Richer e665aec36f dependency cleanup 2013-04-12 16:53:55 -04:00
Justin Richer ac2993c402 [maven-release-plugin] prepare for next development iteration 2013-04-10 16:12:04 -04:00
Justin Richer f0d75f9144 [maven-release-plugin] prepare release mitreid-connect-0.9.1 2013-04-10 16:11:38 -04:00
Stephen Moore 23c318f6c2 Updating guava to 14.0.1 2013-04-10 15:31:32 -04:00
Justin Richer 6dce0ef4c5 added javadoc to mvn:site target 2013-04-10 10:20:46 -04:00
Justin Richer 5f54777109 [maven-release-plugin] prepare for next development iteration 2013-04-03 10:01:58 -04:00
Justin Richer 620a60ddc2 [maven-release-plugin] prepare release mitreid-connect-0.9.0 2013-04-03 10:01:52 -04:00
Justin Richer 9d24a7c6cb added javadoc and source links 2013-04-02 16:38:45 -04:00
Justin Richer 54f1ae972b Added properties and updated poms for sync to central 2013-04-02 12:42:40 -04:00
Justin Richer f101dcc512 moved to released version of SECOAUTH 2013-04-01 11:59:40 -04:00
Justin Richer 5f7c46aecd updated to nimbus 2.13 2013-03-28 15:06:30 -04:00
Justin Richer 217916603f cleaned out broken unit tests -- now we can start fresh 2013-03-06 09:48:04 -05:00
Justin Richer 1f5f7c8aac updates for java 7 2013-03-04 16:00:12 -05:00
Justin Richer 13a3e97113 updated request object forwarding hack 2013-03-01 17:42:48 -05:00
Justin Richer 913320d7a3 spring beans explicit version tag 2013-03-01 17:42:48 -05:00
Justin Richer 0712d8c340 updated spring version 2013-03-01 17:42:48 -05:00
Amanda Anganes dce36bfde1 Added explicit dependency to net.minidev (for JSONObject) - not sure if this is really needed or only needed right now b/c nimbus dependency is not up-to-date on maven central 2013-02-25 09:51:11 -05:00
Justin Richer b2c572f13f updated to newest nimbus-jose-jwt release 2013-02-22 12:08:01 -05:00
Justin Richer ef12ed375f added NimbusDS 2013-01-18 15:10:48 -05:00
Justin Richer 79c53a639d trimmed POM a bit 2012-12-13 10:33:13 -05:00
Justin Richer 67ec5b7bf9 removed gson repository -- not needed anymore? 2012-12-12 16:49:29 -05:00
Justin Richer eda84e1d58 removed account chooser java implementation 2012-12-06 10:15:11 -05:00
Justin Richer ba76c539b0 added bouncycastle non-ext exclusion to pom 2012-09-12 14:14:15 -04:00
Justin Richer 61a8d4a787 x509 take -- bouncycastley version 2012-08-01 17:19:33 -04:00
Amanda Anganes fd34c28916 updated eclipselink version 2012-07-30 16:57:23 -04:00
Michael Joseph Walsh 755d0d4c88 issue #39 2012-05-08 19:52:13 -04:00
nemonik 6eb8284695 version needed to be modified to 0.1-SNAPSHOT in order to deploy snapshot to nexus 2012-04-13 13:43:39 -04:00
Justin Richer baf7c1c166 fixed dependencies and project configurations 2012-03-16 16:18:33 -04:00
Justin Richer e6e7504213 added files and shuffled things to new packages 2012-03-16 15:46:23 -04:00
Justin Richer ed621b1b99 added maven default profile 2012-01-06 16:49:22 -05:00
Justin Richer 4db5d50864 it builds 2012-01-04 15:40:22 -05:00
Justin Richer d7a3fa1652 trying to fix maven dependencies 2012-01-04 14:57:59 -05:00
Justin Richer ceb91123b5 shuffled projects around so that it builds in maven and eclipse 2012-01-04 14:15:03 -05:00
Justin Richer 988fcb4c93 moved to multi-layer maven project 2012-01-04 12:19:23 -05:00
Justin Richer cd0a117031 tweaked pom, refactored jwt claims 2012-01-04 10:00:45 -05:00
Justin Richer c87346a4ab fixed build path, updated to SECOATH latest, added jackson dependency 2012-01-03 12:38:55 -05:00
Justin Richer 7a6af8c07d started a JWT library 2011-12-21 11:47:40 -05:00
Justin Richer 9ada098b75 cleaned up project, added in some model components, added in shells for repositories 2011-12-15 16:31:25 -05:00
Justin Richer 82a02a1d1d moved to Spring Security 3.1, local build against spring security oauth checkout 2011-12-13 12:50:50 -05:00
Amanda Anganes edd6f7a0f3 Importing to remote 2011-11-02 12:31:29 -04:00