Commit Graph

296 Commits (012bb4afd7078a652aa2f9ed1c97eb0a8a724521)

Author SHA1 Message Date
Amanda Anganes 6b1dad7215 Gave OAuth2AccessTokenEntity a Long Id 2012-08-09 12:44:21 -04:00
Amanda Anganes 780839dbf9 Made things compile after ClientDetailsEntity refactoring 2012-08-09 12:44:21 -04:00
Amanda Anganes a68a4f9796 Organized ClientDetailsEntity, updated JPA annotations. Updated sql files to match. Naming conventions: table and column names with multiple words should be seperated by underscores; table and column names should be singular. 2012-08-09 12:44:21 -04:00
Amanda Anganes 15428a875e Added additional fields to ClientDetailsEntity and did some reorganization, still some more to do. Added "id" field to the sql file, but the sql still needs all of the other additional fields. 2012-08-09 12:44:21 -04:00
Justin Richer 09e528e113 added discovery info for x509 and client auth 2012-08-07 17:30:36 -04:00
Justin Richer dc7aac12f9 added custom login form, changed footer to only optionally load app 2012-08-07 12:09:32 -04:00
Amanda Anganes 8d4e046408 All logging is now org.slf4j. We had a mix of org.slf4j and apache commons-logging. Added error logging to all view which throw errors. 2012-08-07 10:04:38 -04:00
Amanda Anganes a061e64abf Merge branch 'user-approval-handler-updated-rebase' 2012-08-06 16:30:03 -04:00
Amanda Anganes 32dc92119f Cleanup completed, this works for the most part. TODO: need to make an upstream change in order to inject a new set of scopes into the AuthorizationRequest. 2012-08-06 16:29:22 -04:00
Amanda Anganes 5fb67ab7bb Did a lot of cleanup; untested but compiles 2012-08-06 14:33:16 -04:00
Amanda Anganes ae44bd5e0c Works; about to do some cleanup 2012-08-06 13:40:27 -04:00
Amanda Anganes 2f28cf33e7 Changed UserInfo refs in WhitelistedSite to String ids; updated the user approval handler to check if "remember this decision" is checked and only make a new AP if so, and to pull in the scopes selected on the approval page as the saved allowed scopes for that AP. 2012-08-03 16:43:37 -04:00
Amanda Anganes b87d54b06e Changed UserInfo references to String "userId" references 2012-08-03 13:32:17 -04:00
Amanda Anganes 845976b8ac First stages of getting the graylist portion to work. Currently no mechanism for telling the system NOT to remember your decision; that will come later. All approvals will be automatically stored with this code. 2012-08-03 12:49:40 -04:00
Justin Richer 51b8dbe065 Revert "updated jwtHeader typ to use an enum" -- set things back to using a string
This reverts commit 3b2268c622.
2012-08-02 14:16:55 -04:00
Justin Richer 9a7e40fee7 moved all bean definitions to annotations, removed orphaned CheckID view 2012-08-02 12:46:35 -04:00
Justin Richer 1508369548 now with Walsh-flavored certificate generation 2012-08-01 18:04:26 -04:00
Justin Richer 61a8d4a787 x509 take -- bouncycastley version 2012-08-01 17:19:33 -04:00
Amanda Anganes db415bfa2b Working on user approval handler 2012-07-31 14:50:24 -04:00
Amanda Anganes a223565364 updating user approval handler 2012-07-31 14:50:24 -04:00
Amanda Anganes 676808bdac got things to deploy - could not reference UserInfo directly in ApprovedSite and WhitelistedSite; needed to reference DefaultUserInfo instead. 2012-07-31 14:50:24 -04:00
Amanda Anganes 4e10fce7ef Implementing user approval handler; made some modifications to ApprovedSite and WhitelistedSite models, repositories, and service layers. 2012-07-31 14:50:24 -04:00
Amanda Anganes 7c33e19950 Changed authorization endpoint to /authorize rather than /auth; updated SWD entry. Also removed checkid entry from SWD. 2012-07-31 14:39:27 -04:00
Justin Richer 863693cf59 Merge pull request #128 from mtderryberry/jwe-and-jwt-fixes
Jwe and jwt fixes
2012-07-31 10:52:04 -07:00
Amanda Anganes 3982561a5b Removing "throws exception" from views. Addresses issue #70 2012-07-31 12:28:46 -04:00
Amanda Anganes 5cf6359f7d Merge branch 'master' of github.com:mitreid-connect/OpenID-Connect-Java-Spring-Server 2012-07-31 12:14:19 -04:00
Amanda Anganes 686412757f shortened urls 2012-07-31 12:02:21 -04:00
Mike Derryberry 3b2268c622 updated jwtHeader typ to use an enum 2012-07-31 11:29:48 -04:00
Justin Richer 1b5f99efec added .json mapping to SWD 2012-07-31 10:42:42 -04:00
Amanda Anganes 02da9fceed fixed imports 2012-07-31 09:16:05 -04:00
Justin Richer d07667576e cleaned up old code 2012-07-30 16:50:44 -04:00
Justin Richer 40f39a18e0 cleaning up introspection endpoint 2012-07-30 16:50:44 -04:00
Amanda Anganes e7449901a6 Removed IdTokenGeneratorService. Addresses issue #75 2012-07-30 16:46:20 -04:00
Justin Richer ee9288a72a turned down cache in default 2012-07-30 16:16:02 -04:00
Justin Richer c80f7f1fcd removed keystore dependency where it is not needed 2012-07-30 14:58:29 -04:00
Justin Richer 319568d971 refactored JWA algorithm markers to use enum instead of string as stored class 2012-07-23 20:21:31 -04:00
Justin Richer 165f3ea292 fixed some unit tests, broke others 2012-07-23 18:44:47 -04:00
Justin Richer 1f68c835c0 updated openid connect image 2012-07-16 15:12:35 -06:00
Michael Jett 7a3ae5a757 Merge remote branch 'origin/master' 2012-07-10 17:00:30 -04:00
Michael Jett 30addb5439 Redirect URI now displayed on approval page. 2012-07-10 16:54:55 -04:00
Justin Richer 9f16f309bd updated userinfouserdetailsservice to use username instead of userid -- this should actually be a wrapper class though 2012-07-10 16:44:29 -04:00
Justin Richer b0a7ebd9b1 fixed JWK algorithm display 2012-07-10 14:57:12 -04:00
Stephen Moore 84aa451095 Added comment for spring-servlet.xml 2012-07-10 13:29:53 -04:00
Justin Richer 5657bc8f28 updated configuration, confirmed works pending SECOAUTH-299 2012-07-09 11:25:45 -04:00
Justin Richer e5eb2e03d8 added implicit beans 2012-07-09 11:25:45 -04:00
Amanda Anganes 01793ec57f added preferred_username claim to userinfo endpoint 2012-07-06 16:02:11 -04:00
Amanda Anganes 8abbce3a2d fixed broken unit tests - they were pointing to the wrong spring context file; 2012-07-06 14:22:06 -04:00
Amanda Anganes 50241e4da1 changed UserInfo.verified to UserInfo.emailVerified. 2012-07-06 14:11:43 -04:00
Justin Richer 8fe132cb53 formatting 2012-07-05 18:32:31 -04:00
Justin Richer 830e07c35c moved whole configuration from servlet context into application context 2012-07-05 18:26:12 -04:00
Justin Richer dbd563f3f2 attempting to allow make use of SPEL 2012-07-05 18:21:52 -04:00
Justin Richer f0c949fd09 added scope-based filter for userinfo 2012-07-05 17:14:51 -04:00
Justin Richer c619e736f9 removed eclipse files from repository 2012-06-29 15:13:52 -04:00
Justin Richer 5c1b07ae65 don't overwrite an existing JWT nonce 2012-06-28 17:04:21 -04:00
Justin Richer 29731d52f6 Merge branch 'refreshtokens' of file:///home/jricher/Projects/workspace-sts/OpenIDConnect-MITRE/OpenID-Connect-Java-Spring-Server into refreshtokens 2012-06-28 17:00:17 -04:00
Justin Richer de1597b214 refresh token handling fixed, removed token factory references 2012-06-28 16:55:11 -04:00
Michael Jett 0dc568e5d0 Fixed more information link on approval page 2012-06-28 14:54:59 -04:00
Michael Jett a022f4d713 Authorized grant types now supported client-side 2012-06-28 14:40:37 -04:00
Michael Jett bff34f647c Allowing a null value for redirectURIs 2012-06-28 12:07:02 -04:00
Michael Jett 8fbea2516a Updated client side variable names to reflect name changes to access token and refresh token timeout 2012-06-28 11:37:34 -04:00
Amanda Anganes 4e3c99abe4 Merge branch 'validityIntegers' 2012-06-26 13:55:26 -04:00
Amanda Anganes 81d1af40bd Updated our ClientDetailsEntity *TokenTimeout fields to be *ValiditySeconds, which are now typed as proper Integers in the SECOAUTH ClientDetails interface 2012-06-26 13:54:01 -04:00
Michael Jett b6e00b9884 Base white-list functionality and template 2012-06-26 12:50:13 -04:00
Justin Richer 1127a7cfbc refactored JWKs, updated signing servier to use them 2012-06-25 17:19:25 -04:00
Justin Richer adb8499bee merged derryberry code, plus tweaks, still WIP 2012-06-25 16:42:41 -04:00
Amanda Anganes baa7ce5e7b Merge branch 'master' of github.com:mitreid-connect/OpenID-Connect-Java-Spring-Server 2012-06-20 15:10:58 -04:00
Amanda Anganes 2930719700 Added architecture diagram 2012-06-20 15:07:37 -04:00
Mike Derryberry b94fbd7439 updated -common and -client code by removing throws exception, changing to rest templates, and updating test cases to use annotations 2012-06-20 09:36:55 -04:00
Justin Richer 94256d95a1 added crypto configuration file 2012-06-19 16:25:13 -04:00
Justin Richer a38dc0ce29 added crypto configuration file 2012-06-19 16:24:50 -04:00
Justin Richer fe3bbfb3d5 Further cleanups. Still missing:
- All tests extend TestCase, should use annotations instead
- Several elements throw Exception
- Key Fetchers should use RESTTemplates and be in a separate utility set
2012-06-15 17:11:58 -04:00
Justin Richer b86abdd761 merge from pull request, plus cleanup 2012-06-15 15:36:14 -04:00
Justin Richer 731ad2e2e2 updated SECOAUTH reference, fixed some SQL files, temporarily closed token timeout issue 2012-06-15 12:05:08 -04:00
U-MITRE\mjwalsh f9558f0955 stripped out check id endpoint interaction as it deprecated, refactored nonce checking based on spec change, pull user_id as id_token token claim 2012-06-13 18:31:13 -04:00
Justin Richer ace5dd1f1e imported userinfouserdetails filter from MITRE codebase 2012-06-13 16:33:55 -04:00
Mike Derryberry 65dc3daaf8 smart client 2012-06-12 16:09:01 -04:00
Amanda Anganes 2a05ff995d Added support for additional field in ClientDetailsEntity.java. 2012-06-11 16:27:35 -04:00
Amanda Anganes bbf9591c92 Merge branch 'master' into issue52
Conflicts:
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
	openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
	openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp
2012-06-11 15:04:01 -04:00
Justin Richer c3cffe1eac cleaned up bad config file 2012-06-05 16:42:26 -04:00
Justin Richer 195810fc63 Merge branch 'architecturedocs' 2012-06-05 16:38:07 -04:00
Justin Richer 7a207dc162 Merge branch 'discoveryupdate' 2012-06-05 16:37:04 -04:00
Justin Richer 250e0c730e Merge branch 'jwtupdate' 2012-06-05 16:36:32 -04:00
Justin Richer 7df2663e00 added final slashification of configuration URLs 2012-06-05 16:36:11 -04:00
Justin Richer fbdccdb78e added Xrd support (fixes #63), updated configuration locations (fixes #47) 2012-06-05 16:32:49 -04:00
Justin Richer e44697cef9 updated JWK display to latest, closes #58 2012-06-05 16:07:19 -04:00
Michael Jett 3b4e95ac10 Approval page updates 2012-06-05 15:52:09 -04:00
Michael Jett d424f44b8c Removing some whitespace 2012-06-05 13:08:55 -04:00
Justin Richer 46cd08071d cleaned up sql table references to redirect uris, see #48 2012-06-05 11:45:06 -04:00
Justin Richer 8e33a17307 moved DB schema files up a few levels, fixed test context to point to new locations 2012-06-05 11:32:51 -04:00
Justin Richer 5c72d8b95f revocation endpoint cleanup, still needs views 2012-06-05 11:24:11 -04:00
Justin Richer 27219c066d refactored our service to reflect upstream 2012-06-05 10:18:26 -04:00
Justin Richer e95528a08d added implementation to stub to read an access token by value 2012-06-05 10:11:24 -04:00
Amanda Anganes c89b1814d6 Fixed approve.jsp checkboxes (both had the same name). 2012-06-01 17:12:33 -04:00
Amanda Anganes 8684bb969f Updated approve.jsp with Jett's new code to display some checkboxes. This has been tested, and the additional parameters are persisted correctly and are available to the TokenGranter. 2012-05-31 13:39:24 -04:00
Michael Jett 68483536a6 Approval page updates. Approval and denial buttons are now in one form. Generic checkboxes are in place. 2012-05-31 12:12:56 -04:00
Amanda Anganes 424f8bb737 Refactored to use TokenEnhancer rather than a custom TokenGranter. 2012-05-30 16:14:00 -04:00
nemonik 998fc7f98b cleaned up beans layout 2012-05-30 15:17:33 -04:00
nemonik 8917e75010 see issue #19 2012-05-30 15:14:15 -04:00
Amanda Anganes 16aa0c59b5 Added token enhancer. Now to plug it in. 2012-05-30 12:31:12 -04:00
Amanda Anganes d4e107caf1 updating 2012-05-30 12:08:44 -04:00