-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Add InetAddressMatcher #18634
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
Open
rwinch
wants to merge
6
commits into
spring-projects:main
Choose a base branch
from
rwinch:google-ssrf
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add InetAddressMatcher #18634
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d82601f
Add InetAddressMatcher
rwinch 7d614ac
Use consistent match terminology
rwinch 59984df
Remove unnecessary since tag
rwinch 46120d2
IpInetAddressMatcher Should Use Authors from IpAddressMatcher
rwinch d85df0c
Update InetAddressMatcher.matches(InetAddress) to allow null
rwinch 6510838
IpAddressServerWebExchangeMatcher uses InetAddressMatcher
rwinch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
web/src/main/java/org/springframework/security/web/util/matcher/InetAddressMatcher.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 2004-present the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.security.web.util.matcher; | ||
|
|
||
| import java.net.InetAddress; | ||
|
|
||
| import org.jspecify.annotations.Nullable; | ||
|
|
||
| /** | ||
| * Matches an {@link InetAddress}. | ||
| * | ||
| * @author Rossen Stoyanchev | ||
| * @author Rob Winch | ||
| * @since 7.1 | ||
| */ | ||
| @FunctionalInterface | ||
| public interface InetAddressMatcher { | ||
|
|
||
| /** | ||
| * Whether the given address matches. | ||
| * @param address the {@link InetAddress} to check | ||
| * @return {@code true} if the address matches, {@code false} otherwise | ||
| */ | ||
| boolean matches(InetAddress address); | ||
|
|
||
| /** | ||
| * Whether the given address string matches. | ||
| * @param address the IP address string to check (may be {@code null}) | ||
| * @return {@code true} if the address matches, {@code false} otherwise or if | ||
| * {@code null} | ||
| * @since 7.1 | ||
rwinch marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| */ | ||
| default boolean matches(@Nullable String address) { | ||
| return (address != null) ? matches(InetAddressParser.parseAddress(address)) : false; | ||
rwinch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.