Merge pull request #32 from dignajar/bugfixes/fix-regex-and-search-cn

Fix regex
dignajar · Jun 18, 2021 · 0d4e9de · 0d4e9de
2 parents 6e53544 + 961f8e5
commit 0d4e9de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/files/aldap.py b/files/aldap.py
@@ -70,8 +70,12 @@ def __decode__(self, word:bytes) -> str:
 		return word.decode("utf-8")
 
 	def __findMatch__(self, group:str, adGroup:str):
-		# Extract the Common Name from the string (letters, spaces, underscores and hyphens)
-		adGroup = re.match('(?i)CN=((\w*\s?_?-?)*)', adGroup).group(1)
+		try:
+			# Extract the Common Name from the string (letters, spaces, underscores and hyphens)
+			adGroup = re.search('(?i)CN=((\w*\s?_?-?)*)', adGroup).group(1)
+		except Exception as e:
+			self.logs.warning({'message':'There was an error trying to search CN: %s' % e})
+			return None
 
 		# Disable case sensitive
 		if not self.groupCaseSensitive:

diff --git a/files/cache.py b/files/cache.py
@@ -69,8 +69,12 @@ def validateUser(self, username:str, password:str) -> bool:
 		return False
 
 	def __findMatch__(self, group:str, adGroup:str):
-		# Extract the Common Name from the string (letters, spaces, underscores and hyphens)
-		adGroup = re.match('(?i)CN=((\w*\s?_?-?)*)', adGroup).group(1)
+		try:
+			# Extract the Common Name from the string (letters, spaces, underscores and hyphens)
+			adGroup = re.search('(?i)CN=((\w*\s?_?-?)*)', adGroup).group(1)
+		except Exception as e:
+			self.logs.warning({'message':'There was an error trying to search CN: %s' % e})
+			return None
 
 		# Disable case sensitive
 		if not self.groupCaseSensitive: