Commit Graph

846 Commits (b2b6fd6448bec9fe75c346fa07e1f76d687bb394)

Author SHA1 Message Date
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
William Kim 93c3e7906f put in line breaks into the extra long comments in DiscoveryEndpoint.java 2013-07-25 09:25:06 -04:00
Justin Richer 20871852c0 updated dependencies for secoauth 1.1 2013-07-24 09:38:47 -04:00
Amanda Anganes b397f0ae15 First go at adding token API; needs to be tested 2013-07-24 09:14:46 -04:00
Amanda Anganes 88db457fc4 Removed .springBeans from tracking; removed initializingbean in favor of @PostConstruct 2013-07-18 09:34:52 -04:00
Amanda Anganes dfbf01c9e3 Added .springBeans to gitignore 2013-07-16 15:03:44 -04:00
William Kim aad432c5d7 replaced stracktrace-printing with logger messages. removed some unused imports. 2013-07-16 13:52:32 -04:00
William Kim f483d41b88 getCustomClaim -> getClaim. Also, removed outdated TODOs. 2013-07-16 13:17:25 -04:00
William Kim 17a96ca122 removed resolved TODOs. Fixed by the resolution of issue #345. 2013-07-15 14:54:01 -04:00
William Kim 0d882faeca added a TODO and fixed some comment typos. 2013-07-15 14:24:04 -04:00
Amanda Anganes 15aea61fbe Applied code cleanup 2013-07-12 16:58:41 -04:00
Amanda Anganes 3e23967b46 Updated code to reflect SECOAUTH changes 2013-07-12 16:21:05 -04:00
William Kim 9a6f345e15 yes, allow default scoping if the client doesn't ask for any. 2013-07-12 15:05:17 -04:00
William Kim 3d312b7eb5 Deleted PermissionDeniedException class. Unused. 2013-07-12 11:40:11 -04:00
William Kim c5743dc810 updated unit tests to reflect new exception-throwing behavior. 2013-07-12 11:36:34 -04:00
William Kim ada54c297d addresses issue #382. Throw an exception when client tries to upscope. 2013-07-12 11:36:33 -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
Amanda Anganes 12cb672c6d Added new file for task config 2013-07-12 09:46:18 -04:00
Amanda Anganes 059c2545c9 Split task configuration out into its own spring file 2013-07-12 09:46:18 -04:00
William Kim 910839e5d9 fixed typo referring to client id as a client secret in code comments. 2013-07-10 16:53:49 -04:00
Amanda Anganes 2d3f43e3b8 Added task scheduling for deleting expired tokens and approved sites. Configuration is all done in application-context.xml so that it is easy to configure 2013-07-10 14:34:37 -04:00
Justin Richer 93a0492e97 made optional parameters optional 2013-07-10 12:50:57 -04:00
Justin Richer a9da88fb79 brought introspection endpoint and introspection token services into compliance with draft, addresses #376 2013-07-10 12:50:57 -04:00
Josh Mandel 34373d777c base URL of the server is set by the issuer. 2013-07-08 13:06:52 -04:00
William Kim 3eddd58ae4 added unit test for checking expiration date of refreshed tokens. 2013-07-05 15:35:23 -04:00
William Kim 24b24f6fa3 More unit tests for refreshing access tokens--specifically, checking scope processing. 2013-07-05 15:22:45 -04:00
William Kim 5ffe1a50a2 Added null-handling for Scope values from the auth request. (Without this, a NullPointerException gets thrown with null scope values). 2013-07-05 15:14:56 -04:00
William Kim ed2223cae3 unit tests of exceptions cases for refreshing access tokens. 2013-07-05 12:32:45 -04:00
William Kim 3353b92426 deeper unit tests on access token creation. 2013-07-05 12:03:56 -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
William Kim 10f9858870 fixed typo on the about page. 2013-06-28 15:44:08 -04:00
William Kim 42027e451c added REQUIRED response types to discovery doc. Also, fixed 2 typos in the list of supported grant types. 2013-06-28 15:31:50 -04:00
William Kim 2a92185433 added introspection endpoint URL to discovery document. 2013-06-28 15:31:50 -04:00
William Kim 741946d1ae updated server discovery code comments. 2013-06-28 15:31:50 -04:00
William Kim f27b69d06b removed Version field from server discovery configuration. 2013-06-28 15:31:50 -04:00
Justin Richer 5505b26aac Form fix for login elements
addresses #352
2013-06-28 13:17:58 -04:00
William Kim 4f9cbb4b3f added check for null 2013-06-27 09:29:47 -04:00
William Kim 1528c93acd TestDefaultSystemScopeService unit tests done. 2013-06-25 16:31:45 -04:00
William Kim eca62f2d36 initial commit for TestDefaultSystemScopeService. 2013-06-25 16:31:45 -04:00
William Kim d0dc3c79cb more unit tests for TestDefaultOAuth2ProviderTokenService. 2013-06-25 16:31:45 -04:00