Move OAuth2 Core Server Classes to UAA namespace #2813
Conversation
because of parallel tests
- Endpoints for OAuth2 - main OIDC endpoints are in UAA implemented - Core-Beans for Server start - Client Token - Server Annotation forking (workaround for now) - OPEN. Client Annotation
|
We have created an issue in Pivotal Tracker to manage this: https://www.pivotaltracker.com/story/show/187364134 The labels on this github issue will be updated when the story is started. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...security/oauth2/config/annotation/web/configurers/AuthorizationServerSecurityConfigurer.java
Fixed
Show resolved
Hide resolved
Includes Test-Framework for OAuth2
Includes Test-Framework for OAuth2
…auth2/core-server # Conflicts: # server/src/test/java/org/cloudfoundry/identity/uaa/oauth/ClientAccessTokenValidityTest.java # server/src/test/java/org/cloudfoundry/identity/uaa/oauth/ClientRefreshTokenValidityTest.java # server/src/test/java/org/cloudfoundry/identity/uaa/oauth/TokenRevocationEndpointTests.java # server/src/test/java/org/cloudfoundry/identity/uaa/oauth/expression/IsSelfCheckTest.java # server/src/test/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsServiceTests.java # uaa/src/test/java/org/cloudfoundry/identity/uaa/login/TokenEndpointDocs.java # uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenMvcMockTests.java
|
@strehle I see the sonar link showing: |
No it is ready. The issues are solved, the coverage needs tests but I have putted the forked tests into another PR, see -> PR 2848 is this PR plus tests Why: because then this PR would have even more changes |
|
All existing tests are passing. ✅ |
|
Tests from strehle:eol/oauth2/core-server-plus-tests passing. ✅ #2843 |
|
Making progress, about 1/3rd of the way through so far. |
|
Approximately 2/3rd the way through (315 of 488 files). So far everything is looking good with some comments and questions in the review. I am out of time today, but expect I will have this completed tomorrow and ready for approval and merging. It looks like this and the PR with tests need to go together. |
...src/test/java/org/cloudfoundry/identity/uaa/oauth/beans/RedirectResolverFactoryBeanTest.java
Show resolved
Hide resolved
...rg/cloudfoundry/identity/uaa/oauth/client/resource/ResourceOwnerPasswordResourceDetails.java
Show resolved
Hide resolved
.../main/java/org/cloudfoundry/identity/uaa/oauth/common/DefaultExpiringOAuth2RefreshToken.java
Outdated
Show resolved
Hide resolved
model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/DefaultOAuth2AccessToken.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/cloudfoundry/identity/uaa/oauth/common/util/RandomValueStringGenerator.java
Show resolved
Hide resolved
server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/OAuth2Request.java
Outdated
Show resolved
Hide resolved
...org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetails.java
Outdated
Show resolved
Hide resolved
...dfoundry/identity/uaa/oauth/provider/config/xml/AuthorizationServerBeanDefinitionParser.java
Show resolved
Hide resolved
...in/java/org/cloudfoundry/identity/uaa/oauth/provider/code/JdbcAuthorizationCodeServices.java
Show resolved
Hide resolved
...main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java
Show resolved
Hide resolved
* Move tests from spring-security-oauth2 into UAA Test coverage should help to identity if we need the coding or not. Coding, which is not covered should be checked in Unit and Integration Tests and should be removed if not really used. * More Tests * Extended exception tests * more tests for client grant flows * More tests * Added tests for XML configuration * Added tests for InMemoryTokenStore * More Tests * Move tests for oauth2 authentication * Tests for OAuth2 expression parser * Token Endpoint Tests * Exception handling tests * More tests for new coding * More tests * More tests * Test coverage * Test coverage * Add test for InMemory code service. Used in tests * Refactor tests * Add client scopes for test fix * Add test * Fix test Coverage * Fix test * Test added * Test coverage * Test coverage
…auth2/core-server # Conflicts: # server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupExternalMembershipManagerTests.java # server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupProvisioningTests.java
…/oauth2/core-server
Used intellij which offers this in extras
|
@Tallicia I hope I have done all comments... / questions. If you have open questions , things I do not have answered, please let me know |
commons-codec is used / needed in uaa.war, so it comes because of different dependencies Thought before we dont need it, therefore removed the CHUCK SIZE constant. Revert JsonWebKey changes
this ID was used before and changed accidentially
|
Statistics: Moved ca. 170 classes from https://github.com/spring-attic/spring-security-oauth/tree/main/spring-security-oauth2 to UAA Moved ca. 70 tests from https://github.com/spring-attic/spring-security-oauth/tree/main/spring-security-oauth2 into UAA Did code cleanup based on CodeQL and Sonar findings. Refactored existing UAA forks , e.g. Token Endpoints uaa.war now includes 134 external libraries (before 136) Summary. UAA now has all code to run as OAuth2/OIDC Server in this project, so that further refactoring can be done,
|
Moved Endpoints for OAuth2 from library to UAA. Main OIDC endpoints are in UAA implemented, so changes needed.
Core-Beans for Server start. Entry point OAuth2SecurityNamespaceHandler.java, which supports XML key words in spring-servlet.xml. (moved to server)
Moved spring schema handlers to server - support usage of spring-servlet.xml
Client Token Creation, Main class OAuth2RestTemplate (moved to model)
Not Moved / OPEN. Client Annotation. UAA does not need it
Statistics