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.

Sign up for GitHub

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

Jump to bottom

Adding DSL for hasIpAddress for WebMvc #14133

Merged
merged 2 commits into from
Dec 15, 2023
Merged

Adding DSL for hasIpAddress for WebMvc #14133

merged 2 commits into from
Dec 15, 2023

Conversation

brunodmartins
Copy link
Contributor

Closes #10577

@pivotal-cla
Copy link

@brunodmartins Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

@pivotal-cla
Copy link

@brunodmartins Thank you for signing the Contributor License Agreement!

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Nov 13, 2023
jzheaux
jzheaux requested changes Nov 14, 2023
View reviewed changes
Copy link
Contributor

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Thanks, @brunodmartins! This looks great. I've left some feedback inline for you to address before merging.

...c/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt Outdated Show resolved Hide resolved
...c/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt Show resolved Hide resolved
...ava/org/springframework/security/web/server/authorization/IpAddressAuthorizationManager.java Outdated Show resolved Hide resolved
...ava/org/springframework/security/web/server/authorization/IpAddressAuthorizationManager.java Outdated Show resolved Hide resolved
...ava/org/springframework/security/web/server/authorization/IpAddressAuthorizationManager.java Outdated Show resolved Hide resolved
@jzheaux jzheaux added this to the 6.3.0-M1 milestone Nov 14, 2023
@brunodmartins
Copy link
Contributor Author

@jzheaux thanks for the review! I have made the requested changes!

@jzheaux
Copy link
Contributor

jzheaux commented Nov 14, 2023

Thanks, @brunodmartins! Last thing, will you please squash your commits and change the commit message to include the ticket in the message like this:

Add hasIpAddress to Kotlin DSL

Closes gh-10577

I've already marked this for the 6.3 release, so once you're ready, we'll merge it after the 6.2 release goes out.

@jzheaux jzheaux self-assigned this Nov 14, 2023
@jzheaux jzheaux added status: duplicate A duplicate of another issue in: web An issue in web modules (web, webmvc) type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels Nov 14, 2023
@brunodmartins brunodmartins force-pushed the gh-10577 branch 3 times, most recently from 5c43835 to fba7922 Compare November 14, 2023 17:31
@brunodmartins
Copy link
Contributor Author

@jzheaux all requested changes were made! Linter has returned an import error and have fixed it =)

@jzheaux
Copy link
Contributor

jzheaux commented Dec 8, 2023

Thanks for your patience, @brunodmartins. Now that 6.2 is out, I'm going through 6.3 PRs to merge them.

Will you please update the PR to remove the merge commit? You may need to rebase the PR with main.

@brunodmartins brunodmartins force-pushed the gh-10577 branch 2 times, most recently from faf0dbc to 1a3a0be Compare December 8, 2023 19:32
@brunodmartins
Copy link
Contributor Author

@jzheaux done! Is it ok now?

@jzheaux jzheaux merged commit 8a34e32 into spring-projects:main Dec 15, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jzheaux jzheaux jzheaux approved these changes

Assignees

@jzheaux jzheaux

Labels
in: web An issue in web modules (web, webmvc) status: duplicate A duplicate of another issue type: enhancement A general enhancement
Projects
None yet
Milestone
6.3.0-M1
Development

Successfully merging this pull request may close these issues.

Add hasIpAddress to Kotlin DSL
4 participants
@brunodmartins @pivotal-cla @jzheaux @spring-projects-issues