From 978ef1570a7fcbefdedb5a75a5a484e33f45b323 Mon Sep 17 00:00:00 2001
From: luchua-bc <shengxin.canada@gmail.com>
Date: Sun, 16 Jan 2022 01:11:25 +0000
Subject: [PATCH] Update method names

---
 .../Security/CWE/CWE-552/UnsafeUrlForward.qll        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.qll b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.qll
index 924757ddf13..c245b7ffb0a 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.qll
@@ -81,7 +81,7 @@ private class ExactStringPathMatchGuard extends UnsafeUrlForwardBarrierGuard ins
  */
 private class AllowListCheckGuard extends UnsafeUrlForwardBarrierGuard instanceof MethodAccess {
   AllowListCheckGuard() {
-    (isStringPathMatch(this) or isFilePathMatch(this)) and
+    (isStringPartialMatch(this) or isPathPartialMatch(this)) and
     not isDisallowedWord(this.getAnArgument())
   }
 
@@ -111,7 +111,7 @@ private class AllowListCheckGuard extends UnsafeUrlForwardBarrierGuard instanceo
  */
 private class BlockListCheckGuard extends UnsafeUrlForwardBarrierGuard instanceof MethodAccess {
   BlockListCheckGuard() {
-    (isStringPathMatch(this) or isFilePathMatch(this)) and
+    (isStringPartialMatch(this) or isPathPartialMatch(this)) and
     isDisallowedWord(this.getAnArgument())
   }
 
@@ -137,18 +137,18 @@ private class BlockListCheckGuard extends UnsafeUrlForwardBarrierGuard instanceo
 }
 
 /**
- * Holds if `ma` is a call to a method that checks a path string.
+ * Holds if `ma` is a call to a method that checks a partial string match.
  */
-private predicate isStringPathMatch(MethodAccess ma) {
+private predicate isStringPartialMatch(MethodAccess ma) {
   ma.getMethod().getDeclaringType() instanceof TypeString and
   ma.getMethod().getName() =
     ["contains", "startsWith", "matches", "regionMatches", "indexOf", "lastIndexOf"]
 }
 
 /**
- * Holds if `ma` is a call to a method of `java.nio.file.Path` that checks a path.
+ * Holds if `ma` is a call to a method of `java.nio.file.Path` that checks a partial path match.
  */
-private predicate isFilePathMatch(MethodAccess ma) {
+private predicate isPathPartialMatch(MethodAccess ma) {
   ma.getMethod().getDeclaringType() instanceof TypePath and
   ma.getMethod().getName() = "startsWith"
 }