lprimak commented on code in PR #1026:
URL: https://github.com/apache/shiro/pull/1026#discussion_r2738208870
##########
web/src/main/java/org/apache/shiro/web/filter/InvalidRequestFilter.java:
##########
@@ -205,35 +189,52 @@ public void setBlockNonAscii(boolean blockNonAscii) {
this.blockNonAscii = blockNonAscii;
}
- public boolean isBlockTraversal() {
- return blockTraversal;
+ public PathTraversalBlockMode getPathTraversalBlockMode() {
+ return pathTraversalBlockMode;
}
- public void setBlockTraversal(boolean blockTraversal) {
- this.blockTraversal = blockTraversal;
+ public void setBlockPathTraversal(PathTraversalBlockMode mode) {
+ this.pathTraversalBlockMode = mode;
}
public boolean isBlockEncodedPeriod() {
- return blockEncodedPeriod;
+ return pathTraversalBlockMode == PathTraversalBlockMode.STRICT;
}
public void setBlockEncodedPeriod(boolean blockEncodedPeriod) {
- this.blockEncodedPeriod = blockEncodedPeriod;
+ setBlockPathTraversal(blockEncodedPeriod ?
PathTraversalBlockMode.STRICT : PathTraversalBlockMode.NORMAL);
}
public boolean isBlockEncodedForwardSlash() {
- return blockEncodedForwardSlash;
+ return pathTraversalBlockMode == PathTraversalBlockMode.STRICT;
}
public void setBlockEncodedForwardSlash(boolean blockEncodedForwardSlash) {
- this.blockEncodedForwardSlash = blockEncodedForwardSlash;
+ setBlockPathTraversal(blockEncodedForwardSlash ?
PathTraversalBlockMode.STRICT : PathTraversalBlockMode.NORMAL);
}
public boolean isBlockRewriteTraversal() {
- return blockRewriteTraversal;
+ return pathTraversalBlockMode == PathTraversalBlockMode.NORMAL;
}
public void setBlockRewriteTraversal(boolean blockRewriteTraversal) {
- this.blockRewriteTraversal = blockRewriteTraversal;
+ setBlockPathTraversal(blockRewriteTraversal ?
PathTraversalBlockMode.NORMAL : PathTraversalBlockMode.NO_BLOCK);
+ }
+
+ /**
+ * @deprecated use {@link #getPathTraversalBlockMode()} instead
+ */
+ @Deprecated
+ public boolean isBlockTraversal() {
+ return pathTraversalBlockMode != PathTraversalBlockMode.NO_BLOCK;
+ }
+
+ /**
+ *
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
