Merge branch 'main' into model_train_update

cicd/benchmark.txt

@@ -10,16 +10,16 @@ Predefined Pattern                  330            2          40
 Private Key                        1009            2          32
 Seed, Salt, Nonce                    40            4           4
 TOTAL:                             5086        63276        5642
-Detected Credentials: 5919
-credsweeper result_cnt : 5157, lost_cnt : 0, true_cnt : 4263, false_cnt : 894
+Detected Credentials: 5913
+credsweeper result_cnt : 5145, lost_cnt : 0, true_cnt : 4252, false_cnt : 893
 Category                      TP    FP        TN    FN        FPR        FNR       ACC       PRC       RCL        F1
 --------------------------  ----  ----  --------  ----  ---------  ---------  --------  --------  --------  --------
-Authentication Key & Token    60     4        28    17  0.125      0.220779   0.807339  0.9375    0.779221  0.851064
-Generic Secret               973     3       215    83  0.0137615  0.0785985  0.932496  0.996926  0.921402  0.957677
-Generic Token                289     7       596    44  0.0116086  0.132132   0.945513  0.976351  0.867868  0.918919
-Other                        586   746     62982   256  0.011706   0.304038   0.984482  0.43994   0.695962  0.539098
-Password                     998   126      4127   401  0.0296262  0.286633   0.906759  0.8879    0.713367  0.791122
-Predefined Pattern           312     2        40    18  0.0476191  0.0545455  0.946237  0.993631  0.945455  0.968944
-Private Key                 1009     4        30     0  0.117647              0.996165  0.996051  1         0.998022
-Seed, Salt, Nonce             36     2         6     4  0.25       0.1        0.875     0.947368  0.9       0.923077
-                            4263   894  19373417   823  4.614e-05  0.161817   0.999911  0.826643  0.838183  0.832373
+Authentication Key & Token    58     4        28    19  0.125      0.246753   0.788991  0.935484  0.753247  0.834532
+Generic Secret               970     3       215    86  0.0137615  0.0814394  0.930141  0.996917  0.918561  0.956136
+Generic Token                285     7       596    48  0.0116086  0.144144   0.941239  0.976027  0.855856  0.912
+Other                        591   746     62982   251  0.011706   0.2981     0.984559  0.442034  0.7019    0.542451
+Password                     986   126      4127   413  0.0296262  0.295211   0.904636  0.886691  0.704789  0.785344
+Predefined Pattern           316     2        40    14  0.0476191  0.0424242  0.956989  0.993711  0.957576  0.975309
+Private Key                 1009     3        31     0  0.0882353             0.997124  0.997036  1         0.998516
+Seed, Salt, Nonce             37     2         6     3  0.25       0.075      0.895833  0.948718  0.925     0.936709
+                            4252   893  19373418   834  4.609e-05  0.16398    0.999911  0.826433  0.83602   0.831199

credsweeper/filters/value_jfrog_token_check.py

@@ -17,7 +17,6 @@ class ValueJfrogTokenCheck(Filter):
     def __init__(self, config: Config = None) -> None:
         # reftkn:01:0123456789:abcdefGhijklmnoPqrstuVwxyz0
         self._pattern = re.compile(r"reftkn:\d+:\d+:[\w_/+-]+")
-        pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:
         """Run filter checks on received token which might be structured.

requirements.txt

@@ -4,7 +4,7 @@ cryptography==41.0.7
 GitPython==3.1.40
 google-auth-oauthlib==1.2.0
 humanfriendly==10.0
-lxml==4.9.3
+lxml==5.0.0
 oauthlib==3.2.2
 openpyxl==3.1.2
 pandas==2.0.3
@@ -15,7 +15,7 @@ requests==2.31.0
 schwifty==2023.11.2
 typing_extensions==4.9.0
 whatthepatch==1.0.5
-pdfminer.six==20221105
+pdfminer.six==20231228
 password-strength==0.0.3.post2
 python-dateutil==2.8.2
 pyjks==20.0.0
@@ -32,7 +32,7 @@ scipy==1.10.1
 onnxruntime==1.16.3
 
 # setup.py requirement
-setuptools==69.0.2
+setuptools==69.0.3
 
 # Auxiliary
 # Tests and maintenance packages