it works!

humanaoffsec · Feb 8, 2022 · 4073d96 · 4073d96
1 parent 7433cd6
commit 4073d96
Show file tree

Hide file tree

Showing 29 changed files with 1,677 additions and 1,416 deletions.
diff --git a/SnaffCore/Classifiers/ArchiveClassifier.cs b/SnaffCore/Classifiers/ArchiveClassifier.cs
@@ -8,7 +8,7 @@
 using System.Security.Cryptography;
 using SnaffCore;
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class ArchiveClassifier
     {

diff --git a/SnaffCore/Classifiers/ClassifierRule.cs b/SnaffCore/Classifiers/ClassifierRule.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class ClassifierRule
     {

diff --git a/SnaffCore/Classifiers/ContentClassifier.cs b/SnaffCore/Classifiers/ContentClassifier.cs
@@ -9,7 +9,7 @@
 using Toxy;
 #endif
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class ContentClassifier
     {

diff --git a/SnaffCore/Classifiers/DirClassifier.cs b/SnaffCore/Classifiers/DirClassifier.cs
@@ -1,6 +1,6 @@
 using SnaffCore.Concurrency;
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class DirClassifier
     {

diff --git a/SnaffCore/Classifiers/FileClassifier.cs b/SnaffCore/Classifiers/FileClassifier.cs
@@ -14,7 +14,7 @@
 using static SnaffCore.Config.Options;
 using SnaffCore.Classifiers.EffectiveAccess;
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class FileClassifier
     {

diff --git a/SnaffCore/Classifiers/ShareClassifier.cs b/SnaffCore/Classifiers/ShareClassifier.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using static SnaffCore.Config.Options;
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class ShareClassifier
     {

diff --git a/SnaffCore/Classifiers/TextClassifier.cs b/SnaffCore/Classifiers/TextClassifier.cs
@@ -4,7 +4,7 @@
 using System.Text.RegularExpressions;
 using static SnaffCore.Config.Options;
 
-namespace Classifiers
+namespace SnaffCore.Classifiers
 {
     public class TextClassifier
     {

diff --git a/SnaffCore/Concurrency/BlockingMq.cs b/SnaffCore/Concurrency/BlockingMq.cs
@@ -1,4 +1,4 @@
-using Classifiers;
+using SnaffCore.Classifiers;
 using System;
 using System.Collections.Concurrent;
 

diff --git a/SnaffCore/Concurrency/SnafflerMessage.cs b/SnaffCore/Concurrency/SnafflerMessage.cs
@@ -1,4 +1,4 @@
-using Classifiers;
+using SnaffCore.Classifiers;
 using System;
 
 namespace SnaffCore.Concurrency

diff --git a/SnaffCore/Config/ClassifierOptions.cs b/SnaffCore/Config/ClassifierOptions.cs
@@ -1,4 +1,4 @@
-using Classifiers;
+using SnaffCore.Classifiers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -98,43 +98,47 @@ private bool IsInterest(ClassifierRule classifier)
              * Keep all discard & archive parsing rules.
              * Else, if rule (or child rule, recursive) interest level is lower than provided (0 default), then discard
              */
-            if (classifier.RelayTargets != null)
+            try
             {
-                int max = 0;
-                foreach (string relayTarget in classifier.RelayTargets)
+
+                if (classifier.RelayTargets != null)
                 {
-                    ClassifierRule relayRule = ClassifierRules.First(thing => thing.RuleName == relayTarget);
-                    if (
-                        (relayRule.Triage == Triage.Black && InterestLevel >3) ||
-                        (relayRule.Triage == Triage.Red && InterestLevel > 2) ||
-                    (relayRule.Triage == Triage.Yellow && InterestLevel > 1) ||
-                    (relayRule.Triage == Triage.Green && InterestLevel > 0))
+                    int max = 0;
+                    foreach (string relayTarget in classifier.RelayTargets)
                     {
-                        return true;
+                        ClassifierRule relayRule = ClassifierRules.First(thing => thing.RuleName == relayTarget);
+                        if (
+                            (relayRule.Triage == Triage.Black && InterestLevel > 3) ||
+                            (relayRule.Triage == Triage.Red && InterestLevel > 2) ||
+                        (relayRule.Triage == Triage.Yellow && InterestLevel > 1) ||
+                        (relayRule.Triage == Triage.Green && InterestLevel > 0))
+                        {
+                            return true;
+                        }
                     }
                 }
+
+
+                bool actualThing = !(
+                    (
+                        classifier.MatchAction == MatchAction.Snaffle ||
+                        classifier.MatchAction == MatchAction.CheckForKeys
+                    ) &&
+                    (
+                    (classifier.Triage == Triage.Black && InterestLevel > 3) ||
+                        (classifier.Triage == Triage.Red && InterestLevel > 2) ||
+                        (classifier.Triage == Triage.Yellow && InterestLevel > 1) ||
+                        (classifier.Triage == Triage.Green && InterestLevel > 0)
+                    )
+                );
+                return actualThing;
             }
-            return !(
-                (
-                    classifier.MatchAction == MatchAction.Snaffle ||
-                    classifier.MatchAction == MatchAction.CheckForKeys
-                ) &&
-                (
-                (classifier.Triage == Triage.Black && InterestLevel > 3) ||
-                    (classifier.Triage == Triage.Red && InterestLevel > 2) ||
-                    (classifier.Triage == Triage.Yellow && InterestLevel > 1) ||
-                    (classifier.Triage == Triage.Green && InterestLevel > 0)
-                )
-            );
-        }
-        public void BuildDefaultClassifiers()
-        {
-            this.ClassifierRules = new List<ClassifierRule>();
-            BuildShareRules();
-            BuildPathRules();
-            BuildFileDiscardRules();
-            BuildFileNameRules();
-            BuildFileContentRules();
+            catch (Exception e)
+            {
+                Console.WriteLine(classifier.RuleName);
+                Console.WriteLine(e.ToString());
+            }
+            return true;
         }
     }
 }