Commit Graph

398 Commits (cac0d21894b2fd8ac1af983c1d492d615058d438)

Author SHA1 Message Date
Justin Richer 37d6d63772 inject userinfo into context for use in JSPs
addresses #99 (for real this time)
2012-08-23 18:23:52 -04:00
Michael Jett 6cb0269629 Merge remote branch 'origin/master' 2012-08-23 18:08:13 -04:00
Michael Jett dc1f1965af Refactoring breadcrumbs. The breadcrumb bar will disappear momentarily. 2012-08-23 18:07:22 -04:00
Amanda Anganes c23b176567 Database backed authorization-code-service now works. 2012-08-23 10:46:08 -04:00
Justin Richer e5b62e8935 fixed patterns and expressions on http blocks 2012-08-21 14:02:35 -04:00
Justin Richer 9eb328831f changed to proper prefix 2012-08-21 13:55:47 -04:00
Stephen Moore af01e26e10 Split up permitAll on enpoints 2012-08-21 12:54:55 -04:00
Stephen Moore d2f7e8edf9 Moved SPEL to app-context, and added enpoint permitAlls 2012-08-21 12:53:48 -04:00
Justin Richer 6cb7e74046 updated default handling to user proper backbone model handling 2012-08-20 16:49:39 -04:00
Justin Richer 74b4fab58c Client secret processing 2012-08-20 16:06:12 -04:00
Justin Richer 9e60da2675 added controls for client secret processing 2012-08-20 12:22:38 -04:00
Justin Richer a65504c0cb added new exception for userinfo, addresses #133 2012-08-15 16:02:06 -04:00
Mike Derryberry ec286b9644 removed auth bean from application-context. Added extra parameter checks in request object auth endpoint 2012-08-14 10:55:08 -04:00
Justin Richer c0a61fe47a moved jquery to page header instead of footer, added focus call on login form 2012-08-14 10:48:38 -04:00
Michael Jett 5e898a7b0b Id toke timeout binding for UI 2012-08-10 17:20:23 -04:00
Michael Jett aaa38a761d Mis-type for client secret 2012-08-10 17:18:43 -04:00
Michael Jett b99d2ed9dc Client Id null fix 2012-08-10 17:15:35 -04:00
Michael Jett 935b5ed43a Client Id is now editable 2012-08-10 17:11:13 -04:00
Michael Jett 0f9d4ef255 Id refactor UI 2012-08-10 17:05:28 -04:00
Michael Jett 480fb8e593 Id refactor UI 2012-08-10 16:26:54 -04:00
Michael Jett 3f9e2cfa52 Horizontal UI refactor 2012-08-10 15:29:11 -04:00
Michael Jett 66e5cf3f04 Client table button UI tweaks 2012-08-10 14:23:54 -04:00
Michael Jett 8d57e0e9ef Issue # 81 Client UI - Creating new client creates duplicate 2012-08-10 14:19:33 -04:00
Michael Jett a5a102bbe4 Github Issue #116 2012-08-10 11:25:50 -04:00
Amanda Anganes 49cb8bd0cb fixing bugs; needed to make all ids BIGINT AUTO-INCREMENT PRIMARY KEY in sql files 2012-08-09 12:44:21 -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 a061e64abf Merge branch 'user-approval-handler-updated-rebase' 2012-08-06 16:30:03 -04:00
Amanda Anganes 5fb67ab7bb Did a lot of cleanup; untested but compiles 2012-08-06 14:33:16 -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 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 9a7e40fee7 moved all bean definitions to annotations, removed orphaned CheckID view 2012-08-02 12:46:35 -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
Amanda Anganes 686412757f shortened urls 2012-07-31 12:02:21 -04:00
Justin Richer d07667576e cleaned up old code 2012-07-30 16:50:44 -04:00
Justin Richer 1f68c835c0 updated openid connect image 2012-07-16 15:12:35 -06:00
Michael Jett 30addb5439 Redirect URI now displayed on approval page. 2012-07-10 16:54:55 -04:00
Stephen Moore 84aa451095 Added comment for spring-servlet.xml 2012-07-10 13:29:53 -04:00
Justin Richer e5eb2e03d8 added implicit beans 2012-07-09 11:25:45 -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
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
Michael Jett b6e00b9884 Base white-list functionality and template 2012-06-26 12:50:13 -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 ace5dd1f1e imported userinfouserdetails filter from MITRE codebase 2012-06-13 16:33:55 -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 7a207dc162 Merge branch 'discoveryupdate' 2012-06-05 16:37:04 -04:00
Justin Richer fbdccdb78e added Xrd support (fixes #63), updated configuration locations (fixes #47) 2012-06-05 16:32:49 -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 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
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
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
Justin Richer 7d4d65c359 Merge branch 'userinfo_integration' 2012-05-23 13:39:03 -04:00
Justin Richer 06fadb5f2b oauth provider configuration started 2012-05-23 12:55:21 -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 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 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 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 Jett 0c7ea88323 Client updates. 2012-05-15 17:03:17 -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 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
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 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 df67c23dba Removing Resig templating. Backbone.js provides template support. 2012-04-30 11:31:52 -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 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
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
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
Amanda Anganes 17f6e2a2fb Removed tables.sql. 2012-04-10 14:05:39 -04:00
Amanda Anganes 269a354f8c Added tables.sql, which is just a concatenation of all the other sql files. Added redirect_uris.sql, which is a NEW table needed to support clients registering multiple redirect uris.
This updates us to the HEAD revision of SECOAUTH, where the redirect uri field on ClientDetails has been updated to be a Set<String> instead of a single string. I updated the UI code so that it will still work, but it will need to be updated to allow users to register multiple uris.
This also closes issue #2 from the issue tracker.
2012-04-10 13:44:10 -04:00
Amanda Anganes 5b09c93024 Cleaned up the context files a bit, no big changes yet. 2012-04-09 10:53:02 -04:00
Amanda Anganes b986b30695 Fixed unit tests - they were broken due to an error in application-context.xml; not because of the refactor. App context was trying to instantiate an Hmac signer with name "HMACSHA256", which should have been "HS256". I updated the exceptions thrown by the signer impls so that if an Algorithm name mismatch occurs it will tell you what it is trying to match against. 2012-03-30 13:45:04 -04:00
Justin Richer 6c3552ebfa changed mitre account names 2012-03-23 10:37:58 -04:00
Amanda Anganes 27fe3c9eca Implemented signing. Works, but validation does not fail if you remove the signature. 2012-03-22 14:49:02 -04:00
Justin Richer c51bb72fe5 merged keystore changes 2012-03-22 13:50:47 -04:00
Amanda Anganes ae9b5e792a Added a ConfigurationPropertiesBean.java to hold configuration properties. Fixed up CheckIDEndpoint.java a bit - it works, but is outputting the wrong thing. 2012-03-22 13:43:30 -04:00
Justin Richer 524a8e153e signers turned into a map 2012-03-22 13:37:21 -04:00
Justin Richer c59d3fe963 it spits out JWTs! and id tokens! JWT still needs to handle nulls 2012-03-21 17:59:48 -04:00
Amanda Anganes ebe72412fe Authorization Grant flow works up to serializing the returned Access Token. Justin is investigating serialization problems. 2012-03-21 16:44:16 -04:00
Amanda Anganes d94eb338ee Auth code flow works through user approval page. Current problem is that it doesn't seem to be matching up auth codes correctly (I keep getting "invalid code" error). But, it looks like it's going through our custom token granter so that is good. 2012-03-20 15:07:18 -04:00
Justin Richer b463cabc69 fixed configuration, moved sql file 2012-03-16 16:46:46 -04:00
Justin Richer 2f29cc52b2 Merge branch 'client_refactor' 2012-03-16 16:28:51 -04:00
Justin Richer a0cdd8bf2f moved server to new package location 2012-03-16 15:01:53 -04:00