From 219af039cb9aa3c6df65d18a052c2757b69ca341 Mon Sep 17 00:00:00 2001
From: xumin <xumin.zhou@konghq.com>
Date: Thu, 14 Mar 2024 11:05:08 +0800
Subject: [PATCH] apply suggestions

---
 kong/db/schema/typedefs.lua | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/kong/db/schema/typedefs.lua b/kong/db/schema/typedefs.lua
index 50306da1056f..2d05a30fceea 100644
--- a/kong/db/schema/typedefs.lua
+++ b/kong/db/schema/typedefs.lua
@@ -498,7 +498,13 @@ local function validate_host_with_wildcards(host)
 end
 
 
-local function is_valid_regex(regex)
+local function is_regex_pattern(pattern)
+  return pattern:sub(1, 1) == "~"
+end
+
+
+local function is_valid_regex_pattern(pattern)
+  local regex = pattern:sub(2) -- remove the leading "~"
   -- the value will be interpreted as a regex by the router; but is it a
   -- valid one? Let's dry-run it with the same options as our router.
   local _, _, err = ngx.re.find("", regex, "aj")
@@ -513,33 +519,32 @@ end
 
 
 local function validate_path_with_regexes(path)
-
   local ok, err, err_code = typedefs.path.custom_validator(path)
 
   if err_code == "percent" then
     return ok, err, err_code
   end
 
-  if path:sub(1, 1) ~= "~" then
-    -- prefix matching. let's check if it's normalized form
-    local normalized = normalize(path, true)
-    if path ~= normalized then
-      return nil, "non-normalized path, consider use '" .. normalized .. "' instead"
-    end
+  if is_regex_pattern(path) then
+    return is_valid_regex_pattern(path)
+  end
 
-    return true
+  -- prefix matching. let's check if it's normalized form
+  local normalized = normalize(path, true)
+  if path ~= normalized then
+    return nil, "non-normalized path, consider use '" .. normalized .. "' instead"
   end
 
-  return is_valid_regex(path:sub(2))
+  return true
 end
 
 
 local function validate_regex_or_plain_pattern(pattern)
-  if pattern:sub(1, 1) ~= "~" then
+  if not is_regex_pattern(pattern) then
     return true
   end
 
-  return is_valid_regex(pattern:sub(2))
+  return is_valid_regex_pattern(pattern)
 end