Commit Graph

1394 Commits (15ec027505ffe12af4f5fe79f420835b9cc0dfbc)

Author SHA1 Message Date
William Kim 6687e3a831 override createOAuth2Request method for factory iss #465. 2013-08-09 13:03:46 -04:00
Amanda Anganes ef4482249c Dyn-reg endpoint now creates the registration access token from scratch instead of calling token services; token services no longer needs to check for RAT scope to avoid expiring RATs 2013-08-09 11:49:11 -04:00
William Kim a1d6901bcc using nimbusds's new data-type specific claim getter. 2013-08-09 10:06:01 -04:00
William Kim c7495a6ae3 Revert "made having a nonce not required for id tokens iss #464"
This reverts commit d0486cc1ec.
2013-08-09 10:00:53 -04:00
William Kim d0486cc1ec made having a nonce not required for id tokens iss #464 2013-08-09 09:44:31 -04:00
Justin Richer 15e512cec3 renamed JWSUtils -> IdTokenHashUtils, renamed internal variables 2013-08-08 14:34:19 -04:00
William Kim 0f16bacc63 TestJWSUtils done. 2013-08-08 14:10:35 -04:00
William Kim 2ba8ad71f1 updated hash tests. 2013-08-08 14:10:35 -04:00
William Kim cdd3a6d478 changed at_hash/c_hash impl. HMAC-SHA --> regular SHA. 2013-08-08 14:10:35 -04:00
Amanda Anganes fd611ce353 Had an unsaved file hanging around - formatting JSPs 2013-08-08 14:03:59 -04:00
Amanda Anganes a91f160e34 Fixed formatting in tag files 2013-08-08 14:00:01 -04:00
Amanda Anganes 5beac9d50d Fixed formatting in JSPs 2013-08-08 13:18:14 -04:00
William Kim 6e2baa3ec4 updated comments for jwe service. 2013-08-08 09:13:54 -04:00
William Kim e1b072c991 Updated nimbusds library version to 2.17.2 and made relevant changes in enc./dec. service and test 2013-08-07 18:07:58 -04:00
William Kim 372675fd2a changed encrypt/decrypt parameter to use JWEObject instead of EncryptedJWT 2013-08-07 18:07:58 -04:00
William Kim f0b77f8614 RSA encryption service tested. 2013-08-07 18:07:58 -04:00
William Kim 3a1c551ff7 implemented symmetric key encryption. 2013-08-07 18:07:58 -04:00
William Kim dfbefe0780 encrypt/decrypt implemented. initial commit for unit testing of jwe service. 2013-08-07 18:07:58 -04:00
William Kim ae6721dd10 jwe service accessor methods and private initializing method done. 2013-08-07 18:07:58 -04:00
William Kim 887338b2d9 jwe service init commit. 2013-08-07 18:07:57 -04:00
Amanda Anganes 2d4d7f7be9 Had to hand-merge some things; git got confused 2013-08-07 10:59:55 -04:00
Amanda Anganes 861beeba64 Added c_hash function, added stub of unit test for JWSUtils 2013-08-07 10:43:26 -04:00
Amanda Anganes 37580cc21e JWSUtils uses JWSAlgorithm to match bit length; ConnectTokenEnhancer calls the util method now 2013-08-07 10:41:53 -04:00
Amanda Anganes 3a591dc1f4 Added JWSUtils class; 2013-08-07 10:38:28 -04:00
Amanda Anganes be97aedbc7 Used Predicates to filter expired tokens and approved sites; 2013-08-06 16:42:49 -04:00
Amanda Anganes b3bb43881d Moved getExpired to service layers 2013-08-06 16:33:27 -04:00
Amanda Anganes eea37cf79c Fixed token expiration bug by removing jsql queries. Instead expired tokens or approved sites are filtered at the repository level 2013-08-06 11:28:13 -04:00
Amanda Anganes fc314fe2d1 Updated spring-security version number 2013-08-06 10:20:11 -04:00
Amanda Anganes ce4ab6a766 Updated spring version to 3.2.3; added a 10-minute initial delay to the scheduled tasks in task-config.xml 2013-08-05 16:31:56 -04:00
Amanda Anganes 265214511c Renamed oAuth2RequestFactory 2013-08-05 14:04:48 -04:00
Amanda Anganes a4c1a7a37d Issue 449 2013-08-02 11:20:47 -04:00
Amanda Anganes 9dda789488 Updated database tables 2013-08-02 11:16:11 -04:00
Amanda Anganes 2f711c88a7 Removed nonce service 2013-08-02 10:56:28 -04:00
Amanda Anganes d4fbb4f599 Removed Event class 2013-08-02 10:06:41 -04:00
William Kim 88863f4910 replaced mock TokenRequest and the storedAuth test field with concrete objects. test should pass now. 2013-07-30 11:42:11 -04:00
William Kim 1392faa83c replaced mock client auth with concrete OAuth2Request object 2013-07-30 11:42:11 -04:00
Amanda Anganes ad2ace6d74 Do not expire registration tokens 2013-07-30 11:33:15 -04:00
Justin Richer eadeded09c updated license file 2013-07-29 17:44:12 -04:00
Justin Richer beaeaa4ccc I can spell "consortium", I promise 2013-07-29 17:40:26 -04:00
Justin Richer b2b6fd6448 further cleanup 2013-07-29 17:00:35 -04:00
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 e658ffd7fc format/cleanup and copyright 2013-07-29 11:28:51 -04:00
Justin Richer d4b544d519 disable token API (for now) 2013-07-29 11:23:07 -04:00
Amanda Anganes 906db0ac86 Opened token api access to all users; restricted to only show currently-logged-in-users tokens 2013-07-29 09:18:08 -04:00
Justin Richer 71da5b3d94 clean up some discovery values 2013-07-26 17:07:28 -04:00
Justin Richer c62bed37ff convert server to use normalizer 2013-07-26 17:07:08 -04:00
Justin Richer fb448a246a converted test data to map, use new serializer 2013-07-26 12:55:22 -04:00
Justin Richer 8edd6da136 added serializer for non-heirarchical URIs 2013-07-26 12:55:03 -04:00