Merge pull request #10667 from jumpserver/pr@dev@fix_login_regex_error

perf: 修复正则匹配的 bug
2023-06-09 18:35:23 +08:00 · 2023-06-09 18:35:23 +08:00 · ba353271ad
parent ef2ecb225a adfc22ae85
commit ba353271ad
1 changed files with 6 additions and 1 deletions
--- a/apps/common/db/fields.py
+++ b/apps/common/db/fields.py
@ -468,7 +468,12 @@ class JSONManyToManyDescriptor:
            elif rule_match == 'endswith':
                res &= str(value).endswith(str(rule_value))
            elif rule_match == 'regex':
-                res &= re.match(rule_value, value)
+                try:
+                    matched = bool(re.match(rule_value, value))
+                except Exception as e:
+                    logging.error('Error regex match: %s', e)
+                    matched = False
+                res &= matched
            elif rule_match == 'not':
                res &= value != rule_value
            elif rule['match'] == 'gte':