Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Revert DHIS2-15246 and new security config #16214

Merged
merged 6 commits into from
Jan 18, 2024
Merged

Conversation

netroms
Copy link
Contributor

@netroms netroms commented Jan 18, 2024

Summary

This PR reverts the removal of OAuth2 in 2.41 from Jira DHIS2-15246.
It also reverts the changes made in the #15727, related to migration of the Spring security deprecated configuration methods, since this is not compatible with the now reverted removal of the deprecated OAuth2 features.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

sonarcloud bot commented Jan 18, 2024

Copy link

codecov bot commented Jan 18, 2024

Codecov Report

Attention: 146 lines in your changes are missing coverage. Please review.

Comparison is base (83ad6f9) 66.53% compared to head (55d4199) 66.48%.
Report is 3 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master   #16214      +/-   ##
============================================
- Coverage     66.53%   66.48%   -0.06%     
- Complexity    31695    31701       +6     
============================================
  Files          3519     3528       +9     
  Lines        131331   131311      -20     
  Branches      15303    15306       +3     
============================================
- Hits          87384    87305      -79     
- Misses        36818    36871      +53     
- Partials       7129     7135       +6     
Flag Coverage Δ
integration 50.11% <15.01%> (+0.04%) ⬆️
integration-h2 32.62% <43.68%> (-0.08%) ⬇️
unit 30.35% <3.41%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...g/hisp/dhis/security/oauth2/OAuth2ClientStore.java 100.00% <100.00%> (ø)
...i/src/main/java/org/hisp/dhis/sqlview/SqlView.java 91.89% <100.00%> (ø)
...y/oauth2/hibernate/HibernateOAuth2ClientStore.java 100.00% <100.00%> (ø)
...ava/org/hisp/dhis/schema/DefaultSchemaService.java 93.72% <100.00%> (+0.02%) ⬆️
...hema/descriptors/OAuth2ClientSchemaDescriptor.java 100.00% <100.00%> (ø)
...dhis/webapi/controller/OAuth2ClientController.java 100.00% <100.00%> (ø)
...th2/OAuth2AuthorizationServerEnabledCondition.java 0.00% <0.00%> (ø)
...is/security/oauth2/DefaultOAuth2ClientService.java 40.00% <40.00%> (ø)
...va/org/hisp/dhis/security/oauth2/OAuth2Client.java 69.56% <69.56%> (ø)
...api/oprovider/DhisOauthAuthenticationProvider.java 29.41% <29.41%> (ø)
... and 4 more

... and 14 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 83ad6f9...55d4199. Read the comment docs.

@netroms netroms merged commit 0f3be5b into master Jan 18, 2024
17 checks passed
@netroms netroms deleted the DHIS2-15246_revert branch January 18, 2024 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants