Commit Graph

296 Commits (012bb4afd7078a652aa2f9ed1c97eb0a8a724521)

Author SHA1 Message Date
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
Amanda Anganes 2070d2e413 Updated to use AuthorizationRequestFactory rather than ClientCredentialsChecker. 2012-05-30 12:08:08 -04:00
Justin Richer ce847dd4f7 updated poco user view to contain name 2012-05-24 15:57:34 -04:00
Stephen Moore c418ccabb1 Merge branch 'master' into userInfoEndpoint 2012-05-24 13:06:29 -04:00
Stephen Moore 1bff5ef19f Added POCO view, Added UnknownUserInfoScheamException runtime exception 2012-05-24 11:00:49 -04:00
Michael Jett b838ddb786 Client ID display fix 2012-05-23 14:24:53 -04:00
Michael Jett a1d85e281e Client ID now showing on display and edit page 2012-05-23 14:21:08 -04:00
Michael Jett 48ff2d3d77 Merge remote branch 'origin/master' 2012-05-23 14:01:40 -04:00
Michael Jett f8af7bf884 Adding help text for time-out options 2012-05-23 14:01:31 -04:00
Stephen Moore 5c544dfe7c Merge branch 'master' into userInfoEndpoint 2012-05-23 13:43:32 -04:00
Justin Richer 7d4d65c359 Merge branch 'userinfo_integration' 2012-05-23 13:39:03 -04:00
Justin Richer a8e9f1d2cd fixed rendering issues with user info view 2012-05-23 13:36:53 -04:00
Stephen Moore 9612fde10e Check for null address, and added email 2012-05-23 13:35:05 -04:00
Justin Richer 08958d4137 Merge remote-tracking branch 'remotes/steve/userInfoEndpoint' into userinfo_integration 2012-05-23 13:11:40 -04:00
Justin Richer 06fadb5f2b oauth provider configuration started 2012-05-23 12:55:21 -04:00
Stephen Moore 9b03831d4e Filled in the UserInfoEndpoint, and added the JSON view for userInfo (openIdSchema) 2012-05-22 16:56:22 -04:00
Michael Jett 668952ec09 Fixing typo 2012-05-22 16:12:21 -04:00
Michael Jett b59baa09a9 Cleaning up placeholder fields 2012-05-22 16:07:51 -04:00
Michael Jett c85248c40c Editing bug fix for validation 2012-05-22 15:19:47 -04:00
Michael Jett a44dee1fd6 Fixing IE compatibility with saving and editing clients 2012-05-22 15:06:06 -04:00
Michael Jett e5312b4c99 Client secret now editable and dynamically generated if not present 2012-05-22 14:36:40 -04:00
Michael Jett bd054bfd58 Client delete now requires confirmation 2012-05-22 12:28:48 -04:00
Michael Jett 6c8aeba041 Default scope is "openid" 2012-05-22 12:25:29 -04:00
Michael Jett e4f2446569 - no restraints on client name and description (neither of them required)
- URI regex updated
2012-05-22 12:23:05 -04:00
Michael Jett 51fe98b383 ClientAPI now sets owner for clients 2012-05-18 14:23:19 -04:00
Michael Jett f7a0b8de32 Client scope now supported 2012-05-18 14:09:23 -04:00
Michael Jett a1234a4fcd Timeout form fields now supported. Backbone.JS Validation error handling updates. 2012-05-17 17:15:37 -04:00
Michael Jett 2d980a4d8f Refactoring of routing. Client updates 2012-05-17 16:33:22 -04:00
Michael Joseph Walsh 6f43040587 slight sequence diagrams tweaks, mods to account-chooser and openid-connect-client 2012-05-16 21:12:58 -04:00
Michael Jett b06640c921 First stages of client-side validation worked into application 2012-05-16 17:22:25 -04:00
Michael Jett c45991b561 Adding backbone.js validations framework 2012-05-16 16:04:30 -04:00
Michael Jett 3402a3e463 ClientAPI now fully supports RESTful DELETE 2012-05-16 14:32:40 -04:00
Michael Jett 7f5b9e2c82 ClientAPI now supports DELETE method 2012-05-16 14:03:49 -04:00
Michael Jett abf3f0ec33 Merge remote branch 'origin/master' 2012-05-16 13:28:24 -04:00
Michael Jett af6e043239 Client Entity now initialized with non-null values so JPA won't flip. Added unified method for saving. Sync'd class member names to allow proper binding. 2012-05-16 13:27:53 -04:00
Michael Joseph Walsh 7e3ce2d583 mods to reflect client <-> account chooser protocol, and refactoring... 2012-05-15 18:43:45 -04:00
Michael Jett 0c7ea88323 Client updates. 2012-05-15 17:03:17 -04:00
Michael Jett 0f9b828066 ClientAPI admin requirement now global 2012-05-15 14:10:12 -04:00
Michael Jett 32e67730d8 ClientAPI maps to individual clients by IDs 2012-05-15 13:41:27 -04:00
Michael Jett 6b481cd3bb ClientAPI header updates 2012-05-15 13:09:16 -04:00
Michael Jett a4fc4e939e ClientAPI cleanup 2012-05-15 12:41:41 -04:00
Michael Jett f91071c350 New clients now attempt to POST to client API 2012-05-14 15:33:27 -04:00
Justin Richer 5e81ed6346 added some content to the architecture file 2012-05-14 15:00:06 -04:00
Justin Richer 7375d00e88 added taglib hack 2012-05-11 16:10:06 -04:00
Justin Richer e00bba7ede factored out one more piece of the security config 2012-05-11 13:43:29 -04:00
Stephen Moore fd91c884bb Made interfaces... deleted a thing. 2012-05-10 17:45:10 -04:00
Justin Richer ffe31e6049 merged config from bean config config bean bean 2012-05-09 15:32:13 -04:00
Justin Richer e158ef6fc2 added config bean 2012-05-09 15:20:15 -04:00
Amanda Anganes 95fc66de31 Merge branch 'master' of github.com:jricher/OpenID-Connect-Java-Spring-Server 2012-05-09 15:17:53 -04:00
Amanda Anganes e33f277bbe Updated classes to track newest version of SECOAUTH. This update closes issues #3, #4, #8, and #36 (infinite redirects). This revision changes the authorization and token endpoints to be /openidconnect/auth and /openidconnect/token, respectively. 2012-05-09 15:16:56 -04:00
Michael Jett 9abb15a559 Approval page style upgraded to bootstrap 2 classes 2012-05-09 14:20:44 -04:00
Justin Richer e6f77fd061 Merge branch 'master' of github.com:jricher/OpenID-Connect-Java-Spring-Server 2012-05-08 16:58:37 -04:00
Justin Richer c003bbf2c6 extracted user information from spring servlet config 2012-05-08 16:58:04 -04:00
Michael Jett 4f0ffd872b Removing older version of bootstrap 2012-05-08 14:31:24 -04:00
Michael Jett c8e3f70115 Now requiring homepage login 2012-05-08 14:09:24 -04:00
Michael Jett 7dd81ac2de Server-side dynamics 2012-05-08 13:53:21 -04:00
Michael Jett eb9f2617ba New look 2012-05-08 12:11:39 -04:00
Michael Jett 23fd7b1b21 Renaming Client View class 2012-05-08 11:20:40 -04:00
Michael Jett eda7505b7b Client API now renders JSON for all Clients 2012-05-08 11:16:45 -04:00
Michael Jett ba56c00318 Backbone JS support for creating a new client. 2012-05-07 18:20:40 -04:00
Michael Jett c02bac8c38 New client actions rendered as buttons rather than anchors 2012-05-07 14:41:39 -04:00
Michael Jett 4c503a7f40 Client table now fully rendered client-side with JS templates. 2012-05-07 14:39:32 -04:00
Michael Jett e9954f4439 Bootstrap spelling correction 2012-05-07 13:18:04 -04:00
Michael Jett df174a1695 Test Client JS now valid. App.JS updates 2012-05-04 15:56:12 -04:00
Michael Jett e2e2dfca43 TD now rendered dynamically 2012-05-03 18:00:50 -04:00
Michael Jett 9f979cb742 Views now load after fetching templates 2012-05-03 12:57:09 -04:00
Michael Jett 784fd14917 Client manager now renders views in bootstrap. 2012-05-01 15:50:24 -04:00
Michael Jett 3859429ed6 Client javascript test updates 2012-04-30 17:04:22 -04:00
Michael Jett 5622ccbf41 Removing Javascript CDN. This will fix cross domain issue when requesting JSON objects. 2012-04-30 11:45:37 -04:00
Michael Jett 0134c4ea96 Merge remote branch 'origin/master' 2012-04-30 11:32:05 -04:00
Michael Jett df67c23dba Removing Resig templating. Backbone.js provides template support. 2012-04-30 11:31:52 -04:00
Justin Richer 97dffb6414 added copyright to all java files. closes #11 2012-04-27 17:55:58 -04:00
Justin Richer 6724866099 moved jwt components, utilities, and various interfaces to -common from -server 2012-04-27 15:20:49 -04:00
Justin Richer 59ecb03548 added getter/setter for userinforepository, closes #40 2012-04-27 15:11:25 -04:00
Michael Jett 37452f4bb5 Client side JS updates 2012-04-26 16:30:03 -04:00
Michael Jett c98204e705 Renamed mockup directory 2012-04-26 16:29:46 -04:00
Michael Jett d1a773d512 Client backbone.js Model initial commit 2012-04-24 16:37:25 -04:00
Michael Jett 181b0ce605 Removing unneeded div el 2012-04-24 13:02:20 -04:00
Michael Jett 703a8abab5 client management now bootstrap 2 compatible 2012-04-20 12:14:06 -04:00
Michael Jett 57ebb7d287 Adding global JS to template 2012-04-20 12:13:29 -04:00
Michael Jett 897e6e85d3 Removing inline client editing popup 2012-04-20 11:35:15 -04:00
Michael Jett 2573c98c2d Re-write of base template using bootstrap 2 2012-04-19 16:27:25 -04:00
Michael Jett b38c8c18d6 Edit form mock-up updates. Organized forms and input. 2012-04-19 15:51:38 -04:00
Michael Jett 51b8650327 Bootstrap 2 html test updates - removing compile javascript 2012-04-19 12:37:40 -04:00
Amanda Anganes 2e4f312f79 Fixed tests - they were pointing to the wrong context file. 2012-04-18 10:55:28 -04:00
Amanda Anganes a9088b4999 Merge branch 'Single_Spring_Context_file' 2012-04-18 10:33:57 -04:00
Amanda Anganes 07a305b8b7 Refactored code to use a single spring context file. This uses the default oauth/authorize and oauth/token URLs, but it seems to be free of the infinite redirect issue. Next up: try putting in our custom URLs. 2012-04-17 15:32:07 -04:00
Michael Jett 8ab1fc1b60 Bootstrap 2 html tests 2012-04-16 16:44:31 -04:00
Michael Jett 9c86a23ee1 Bootstrap 2 2012-04-16 16:14:25 -04:00
Michael Jett ed304fa391 Edit client mock-up. 2012-04-16 15:09:06 -04:00
Michael Jett c4edd7111e Breadcrumb tag renders "crumb" attribute 2012-04-16 13:13:41 -04:00
Michael Jett dc42eb7789 Client management page now renders test JSON 2012-04-16 13:13:41 -04:00
Justin Richer 59078cc68d eclipse updates from maven 2012-04-16 12:56:08 -04:00
Amanda Anganes 6899a16c2f Merge branch 'Really_fixing_redirects' 2012-04-16 12:39:06 -04:00
Amanda Anganes 5d78bc4e0a Infinite redirect issue fully fixed, with our custom urls for the authorization and token endpoints. See issue #8. 2012-04-16 12:37:14 -04:00
Amanda Anganes 67edc1c191 Seems to be fixed! Added the "security:" prefix to the first http block in application-context. The compiler should have been catching that there was no matching for http w/o it, but it was just letting it through. 2012-04-16 12:23:23 -04:00
Justin Richer 05b2cf8fff removed vestigial user details code 2012-04-16 12:02:24 -04:00
Amanda Anganes f0f339d45f current state 2012-04-16 11:05:36 -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
Amanda Anganes 69dc1fe361 Removing our custom authorization endpoint and token endpoint urls, as well as the filter required by those custom urls (in web.xml), fixes the infinite redirect problem. This has been submitted as an issue to the SECOAUTH team. 2012-04-11 17:08:15 -04:00
Amanda Anganes 2fc4ce177c This commit fixes the infinite redirect, somewhat. See updated issue #8. 2012-04-11 15:55:19 -04:00