softreset

.github/workflows/benchmark.yml

@@ -22,7 +22,8 @@ jobs:
       - name: Checkout CredData
         uses: actions/checkout@v4
         with:
-          repository: Samsung/CredData
+          repository: babenek/CredData
+          ref: auxiliary
 
       - name: Markup hashing
         run: |
@@ -72,7 +73,8 @@ jobs:
       - name: Checkout CredData
         uses: actions/checkout@v4
         with:
-          repository: Samsung/CredData
+          repository: babenek/CredData
+          ref: auxiliary
 
       - name: Markup hashing
         run: |
@@ -174,7 +176,8 @@ jobs:
       - name: Checkout CredData
         uses: actions/checkout@v4
         with:
-          repository: Samsung/CredData
+          repository: babenek/CredData
+          ref: auxiliary
 
       - name: Markup hashing
         run: |
@@ -355,7 +358,8 @@ jobs:
       - name: Checkout CredData
         uses: actions/checkout@v4
         with:
-          repository: Samsung/CredData
+          repository: babenek/CredData
+          ref: auxiliary
 
       - name: Markup hashing
         run: |

credsweeper/common/constants.py

@@ -13,13 +13,13 @@ class KeywordPattern:
     # Authentication scheme ( oauth | basic | bearer | apikey ) precedes to credential
     separator = r"\s*\]?\s*" \
                 r"(?P<separator>:( [a-z]{3,9}[?]? )?=" \
-                r"|:( oauth | basic | bearer | apikey | accesskey )?" \
-                r"|=>|!=|===|==|=)" \
+                r"|:|=>|!=|===|==|=)" \
+                r"([ \"']{1,8}(oauth|basic|bearer|apikey|accesskey) )?" \
                 r"((?!\s*ENC(\(|\[))(\s|\w)*\((\s|\w|=|\()*|\s*)"
-    value = r"(?P<value_leftquote>((b|r|br|rb|u|f|rf|fr|\\)?[`'\"])+)?" \
+    value = r"(?P<value_leftquote>((b|r|br|rb|u|f|rf|fr|\\{0,8})?[`'\"]){1,3})?" \
             r"(?P<value>(?:\{[^}]{3,8000}\})|(?:<[^>]{3,8000}>)|" \
             r"(?(value_leftquote)(?:\\[tnrux0-7][0-9a-f]*|[^`'\"\\])|(?:\\n|\\r|\\?[^\s`'\"\\])){3,8000})" \
-            r"(?P<value_rightquote>(\\?[`'\"])+)?"
+            r"(?(value_leftquote)(?P<value_rightquote>(\\{0,8}[`'\"]){1,3})?)"
 
     @classmethod
     def get_keyword_pattern(cls, keyword: str) -> re.Pattern:

credsweeper/common/keyword_checklist.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import Set
+from typing import Set, List
 
 from credsweeper.app import APP_PATH
 
@@ -13,21 +13,23 @@ class KeywordChecklist:
 
     def __init__(self) -> None:
         # used suggested text read style. split() is preferred because it strips 0x0A on end the file
+        self.__keyword_list = self.KEYWORD_PATH.read_text().split()
+        self.__keyword_list.sort(key=lambda x: len(x), reverse=True)
         self.__keyword_set = set(self.KEYWORD_PATH.read_text().split())
         # The list of morphemes can be combined to form words.
         # The value is considered a variable if at least two exist.
         self.__morpheme_set = set(self.MORPHEME_PATH.read_text().split())
 
     @cached_property
     def keyword_set(self) -> Set[str]:
-        """Get set with keywords.
-
-        Return:
-            Set of strings
-
-        """
+        """Get set with keywords"""
         return self.__keyword_set
 
+    @cached_property
+    def keyword_list(self) -> List[str]:
+        """Get list with keywords in descended order of length"""
+        return self.__keyword_list
+
     @cached_property
     def keyword_len(self) -> int:
         """Length of keyword_set"""

credsweeper/common/keyword_checklist.txt

@@ -39,6 +39,7 @@ animation
 another
 anony
 apache
+api
 appearance
 apple
 application
@@ -102,6 +103,7 @@ border
 bottle
 bottom
 bound
+brain
 branch
 brand
 break
@@ -200,6 +202,7 @@ continue
 control
 convenience
 convert
+copy
 cookie
 coordinator
 corner
@@ -285,6 +288,7 @@ editing
 editor
 effect
 either
+elastic
 element
 email
 empty
@@ -297,7 +301,7 @@ ensure
 entity
 entries
 entry
-environ
+environment
 equal
 equals
 erase
@@ -331,6 +335,7 @@ feedback
 fetch
 field
 figure
+file
 files
 filename
 filter
@@ -533,6 +538,7 @@ notice
 notification
 null
 number
+oauth
 object
 oblique
 observe
@@ -581,6 +587,7 @@ patch
 paths
 pattern
 pause
+peer
 payload
 payment
 pending
@@ -602,6 +609,7 @@ plain
 platform
 player
 point
+pool
 policy
 portal
 portfolio
@@ -754,6 +762,11 @@ session
 setting
 setter
 setup
+sha256
+sha1
+sha2
+sha224
+sha512
 shadow
 shallow
 shape
@@ -765,6 +778,7 @@ showing
 shown
 shutdown
 sidebar
+signature
 sign
 similar
 simple
@@ -786,6 +800,7 @@ solid
 sorted
 source
 space
+spaces
 spacing
 spark
 speak
@@ -845,7 +860,7 @@ tablet
 target
 tasks
 teacher
-teams
+team
 temp
 terms
 test
@@ -932,13 +947,15 @@ warning
 watch
 waves
 weight
+whatever
 where
 whether
 which
 while
 white
 width
 window
+with
 within
 without
 world
@@ -949,6 +966,7 @@ written
 xxxxx
 yellow
 yield
+your
 zeros
 .json
 .xml