Polish SecurityFilterChain Validation
Issue gh-15982
This commit is contained in:
committed by
Josh Cummings
parent
fa58ebbc0c
commit
e9bdb5b96e
+55
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright 2002-2024 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;
|
||||
|
||||
import org.springframework.security.core.SpringSecurityCoreVersion;
|
||||
|
||||
/**
|
||||
* Thrown if {@link SecurityFilterChain securityFilterChain} is not valid.
|
||||
*
|
||||
* @author Max Batischev
|
||||
* @since 6.5
|
||||
*/
|
||||
public class UnreachableFilterChainException extends IllegalArgumentException {
|
||||
|
||||
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
|
||||
|
||||
private final SecurityFilterChain filterChain;
|
||||
|
||||
private final SecurityFilterChain unreachableFilterChain;
|
||||
|
||||
/**
|
||||
* Constructs an <code>UnreachableFilterChainException</code> with the specified
|
||||
* message.
|
||||
* @param message the detail message
|
||||
*/
|
||||
public UnreachableFilterChainException(String message, SecurityFilterChain filterChain,
|
||||
SecurityFilterChain unreachableFilterChain) {
|
||||
super(message);
|
||||
this.filterChain = filterChain;
|
||||
this.unreachableFilterChain = unreachableFilterChain;
|
||||
}
|
||||
|
||||
public SecurityFilterChain getFilterChain() {
|
||||
return this.filterChain;
|
||||
}
|
||||
|
||||
public SecurityFilterChain getUnreachableFilterChain() {
|
||||
return this.unreachableFilterChain;
|
||||
}
|
||||
|
||||
}
|
||||
+19
-1
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2023 the original author or authors.
|
||||
* Copyright 2002-2024 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.
|
||||
@@ -20,6 +20,7 @@ import java.util.Arrays;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.apache.commons.logging.Log;
|
||||
@@ -90,6 +91,23 @@ public final class AndRequestMatcher implements RequestMatcher {
|
||||
return MatchResult.match(variables);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
AndRequestMatcher that = (AndRequestMatcher) o;
|
||||
return Objects.equals(this.requestMatchers, that.requestMatchers);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(this.requestMatchers);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "And " + this.requestMatchers;
|
||||
|
||||
+19
-1
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2023 the original author or authors.
|
||||
* Copyright 2002-2024 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.
|
||||
@@ -18,6 +18,7 @@ package org.springframework.security.web.util.matcher;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -81,6 +82,23 @@ public final class OrRequestMatcher implements RequestMatcher {
|
||||
return MatchResult.notMatch();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
OrRequestMatcher that = (OrRequestMatcher) o;
|
||||
return Objects.equals(this.requestMatchers, that.requestMatchers);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(this.requestMatchers);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Or " + this.requestMatchers;
|
||||
|
||||
Reference in New Issue
Block a user