Commit Graph

421 Commits (ff3a210064b8ee3ff7ab16ca3f81eaaa00e40939)

Author SHA1 Message Date
Justin Richer 998b00fd38 moved repo references to parent, added dependencies for webapp 2013-09-24 14:14:42 -04:00
Justin Richer d9ad6d20e8 added spring core, moved servlet and test dependencies up to parent 2013-09-24 14:07:34 -04:00
Justin Richer 38f20afe04 added necessary dependencies to common 2013-09-24 13:50:36 -04:00
Justin Richer 8a5a16f374 refactored project into four modules:
Common
 Client
 Server Library
 Server Webapp

addresses #367
2013-09-23 17:19:09 -04:00
Amanda Anganes 47d304851d Created token service for OIDC special tokens; removed creation of id tokens and registration_access_tokens to the new service. 2013-09-17 16:56:46 -04:00
Amanda Anganes 26a7d0b8a8 Fixed typo 2013-09-17 11:03:09 -04:00
Amanda Anganes c98f77c405 Remove @PostConstruct from JWKSetKeyStore 2013-09-17 10:54:19 -04:00
Justin Richer b75d77495a if there's only one key, return it as the default 2013-09-16 17:27:05 -04:00
Justin Richer fb2f2f9792 spelling, property access, and cleanup 2013-09-16 17:27:04 -04:00
Justin Richer 1d0560edbc refactored some json utils to their own static class 2013-09-16 17:27:04 -04:00
Justin Richer aeab1ac3cb added encryption method list to encryption/decryption service 2013-09-16 17:27:04 -04:00
Justin Richer 6605877a1b added encryption/decryption to cached JWK-URI service 2013-09-16 17:27:04 -04:00
Justin Richer 2b0d02dc72 added additional discoverable fields to ServerConfig object 2013-09-16 17:27:04 -04:00
Amanda Anganes 85d9e07a94 Removed @PostConstruct; placed buildSignersAndVerifiers() calls inside both constructors. 2013-09-13 14:44:38 -04:00
Amanda Anganes c22cd62977 Added null check; 2013-09-13 14:44:38 -04:00
Amanda Anganes aecf4958ed Testing removing extra method calls 2013-09-13 14:44:38 -04:00
Justin Richer e67a41c556 added transient passthroughs to JOSE algorithms for client 2013-09-12 14:08:37 -04:00
Justin Richer f9ca15139d added phone-number verified, addresses #505
affects #455
2013-09-12 10:19:14 -04:00
Justin Richer 0281cf02fe calculate pairwise based on redirect uri rather than client id 2013-09-11 14:37:17 -04:00
Justin Richer b1a6127d06 added equality checks to data model objects 2013-09-11 11:59:40 -04:00
Justin Richer dbdc2e777d added pairwise identifier service and repository 2013-09-10 17:15:58 -04:00
Justin Richer 914f2e4d93 added new call to get the UserInfo in context with the requesting client to allow for pairwise identifiers.
temporary implementation of pairwise identifiers in place
2013-09-10 16:01:17 -04:00
Justin Richer 596b385d2a interceptor shouldn't ever overwrite stuff from the base model 2013-09-10 15:27:04 -04:00
Justin Richer b9da10d176 look up by username instead of subject 2013-09-10 11:39:00 -04:00
Justin Richer 61544ed774 cleanup 2013-09-06 16:07:24 -04:00
Justin Richer 72f0ab631d added transient structured value to system scope, added scope matcher function to scope service 2013-09-06 16:07:24 -04:00
Justin Richer 1ef18a3a93 missed a service definition 2013-09-06 16:07:24 -04:00
Josh Mandel b416888b07 Structured Scopes from BB+ 2013-09-06 16:07:24 -04:00
Justin Richer 0a962e17fa stopgap to prevent some leaks due to #492 2013-08-30 16:38:11 -04:00
Justin Richer 235029ba0e inject user's authorities into javascript context 2013-08-29 16:58:36 -04:00
Justin Richer be6179d1ac inject the current user into the javascript context 2013-08-29 16:44:01 -04:00
William Kim 6276ec8e66 Revert "PlainSigner and PlainVerifier created for alg:none JWS support."
This reverts commit 30d7aaa66a.
2013-08-26 15:33:14 -04:00
William Kim 2108311d65 Revert "refactored code to use the more generic JWT declaration."
This reverts commit e0b56bc72a.
2013-08-26 15:33:08 -04:00
William Kim 1514b2d2e0 Revert "placeholder"
This reverts commit d763a954da.
2013-08-26 15:33:00 -04:00
William Kim dd35dc60df Revert "implemented alg:none at the signing service."
This reverts commit 02078ebccb.
2013-08-26 15:32:55 -04:00
William Kim 78559b625a Revert "removed the plain verifer. validating a no-signature is simply handled as a special case in validateSignature(). Also, doing some type safety checks."
This reverts commit c957d59f7c.
2013-08-26 15:32:50 -04:00
William Kim 15ec027505 Revert "junit test added for signing service."
This reverts commit 9f89f84da1.
2013-08-26 15:32:43 -04:00
William Kim 9f89f84da1 junit test added for signing service. 2013-08-26 14:57:26 -04:00
William Kim c957d59f7c removed the plain verifer. validating a no-signature is simply handled as a special case in validateSignature(). Also, doing some type safety checks. 2013-08-26 14:55:52 -04:00
William Kim 02078ebccb implemented alg:none at the signing service. 2013-08-26 14:21:09 -04:00
William Kim d763a954da placeholder 2013-08-26 11:48:23 -04:00
William Kim e0b56bc72a refactored code to use the more generic JWT declaration. 2013-08-26 11:32:46 -04:00
William Kim 30d7aaa66a PlainSigner and PlainVerifier created for alg:none JWS support. 2013-08-23 14:07:19 -04:00
Justin Richer da915d8b35 explicitly try to initialize the JWK set if it's null by the time the getter is called 2013-08-22 14:08:54 -04:00
Amanda Anganes 0059c7b4cc Use clients preferred algorithm, if any, to sign 2013-08-19 16:33:18 -04:00
Justin Richer a80c19384f added 'use server default' to JOSE options, addresses #462 2013-08-19 15:52:00 -04:00
Justin Richer ba0c3c5d78 id tokens always expire, addresses #416 2013-08-19 12:42:37 -04:00
Justin Richer 21068f57e6 cached jwk services expire after an hour 2013-08-16 12:06:49 -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 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 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
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
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 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
Justin Richer 5893d8f8f8 fixed up parsing regular expression 2013-07-26 12:54:09 -04:00
William Kim f565688e59 changed name issuer->normalized. the result of normalization is not necessarily the issuer. 2013-07-25 18:12:02 -04:00
William Kim d80aaced9a reorganized test data and test methods. 2013-07-25 17:56:33 -04:00
William Kim 809a243b64 tests for webfinger url normalization. 2013-07-25 15:00:10 -04:00
William Kim eaa7298ef1 init commit for Webfinger normilizer utility class. 2013-07-25 12:15:50 -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
Justin Richer a4a18fd54c externalized introspection URL from client's introspecting token service, addresses #435
added service to parses token as JWT and pulls out issuer to find server
added introspection url to serverconfig object
added introspection parsing (and parse checks) to dynamic server config object
2013-07-16 17:00:40 -04:00
William Kim aad432c5d7 replaced stracktrace-printing with logger messages. removed some unused imports. 2013-07-16 13:52:32 -04:00
Amanda Anganes 15aea61fbe Applied code cleanup 2013-07-12 16:58:41 -04:00
William Kim e00d696c60 deleted auto-generated TODO. 2013-07-12 11:40:11 -04:00
William Kim e9c246808f only our entity version may be stored in our storage layer. removed TODO. 2013-07-12 11:40:11 -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
William Kim 77be0d0ea8 implemented getExpiresIn() for oauth access token entities. 2013-07-11 15:22:35 -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 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 a668fb964d changed String comparison implementation for better readability 2013-06-28 15:31:50 -04:00
William Kim ab4d1da9d4 added logger warning if issuer url does not use http scheme. 2013-06-28 15:31:50 -04:00
William Kim b438e87f98 passed wire testing and updated unit tests. 2013-06-24 15:09:12 -04:00
William Kim e74444e3d1 addresses issue #366 2013-06-24 15:09:12 -04:00
Amanda Anganes 530c3a75ee Applyed refactoring 2013-06-24 09:44:59 -04:00
William Kim f0f2fbea40 updated secoauth library version in poms 2013-06-21 14:23:58 -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
William Kim d6109fd1ae explicitly mapped missing JPA columns in common->openid.connect.model #317 2013-06-18 15:19:17 -04:00
William Kim 46641a2fa1 explicitly mapped missing JPA columns in common-oauth2.model #317 2013-06-18 15:19:17 -04:00
Justin Richer c577b691c7 moved OIDC auth token and userinfo interception filter to common package, addresses #353 2013-06-12 14:45:03 -04:00