Fixed broken feature references

Author: SvenPeldszus

Resources/lib-mappings/java-se.json

@@ -214,12 +214,12 @@
             },
             {
               "namespace": "KeyStore",
-              "categories": ["KeyStorage"],
+              "categories": ["Key_Storage"],
               "children": []
             },
             {
               "namespace": "KeyStoreSpi",
-              "categories": ["KeyStorage"],
+              "categories": ["Key_Storage"],
               "children": []
             },
             {
@@ -244,12 +244,12 @@
             },
             {
               "namespace": "SecureRandom",
-              "categories": ["SourceOfRandomness"],
+              "categories": ["Source_of_Randomness"],
               "children": []
             },
             {
               "namespace": "SecureRandomSpi",
-              "categories": ["SourceOfRandomness"],
+              "categories": ["Source_of_Randomness"],
               "children": []
             },
             {
@@ -326,17 +326,17 @@
             },
             {
               "namespace": "EncryptedPrivateKeyInfo",
-              "categories": ["KeyManagement"],
+              "categories": ["Key_Management"],
               "children": []
             },
             {
               "namespace": "ExemptionMechanism",
-              "categories": ["KeyManagement"],
+              "categories": ["Key_Management"],
               "children": []
             },
             {
               "namespace": "ExemptionMechanismSpi",
-              "categories": ["KeyManagement"],
+              "categories": ["Key_Management"],
               "children": []
             },
             {

Resources/lib-mappings/java-servlet.json

@@ -10,12 +10,12 @@
       "children": [
         {
           "namespace": "HttpSession",
-          "categories": ["SessionManagement"],
+          "categories": ["Session_Management"],
           "children": []
         },
         {
           "namespace": "HttpServletRequest",
-          "categories": ["SessionManagement"],
+          "categories": ["Session_Management"],
           "children": []
         }
       ]

Resources/lib-mappings/java-standard-library.json

@@ -6,12 +6,12 @@
   "children": [
     {
       "namespace": "URLEncoder",
-      "categories": ["DataSanitization"],
+      "categories": ["Data_Sanitization"],
       "children": []
     },
     {
       "namespace": "URLDecoder",
-      "categories": ["DataSanitization"],
+      "categories": ["Data_Sanitization"],
       "children": []
     }
   ],
@@ -28,7 +28,7 @@
           "children": [
             {
               "namespace": "ReentrantLock",
-              "categories": ["StateSynchronization"],
+              "categories": ["State_Synchronization"],
               "children": []
             }
           ]
@@ -39,11 +39,6 @@
       "namespace": "Base64",
       "categories": ["Steganography"],
       "children": []
-    },
-    {
-      "namespace": "Objects",
-      "categories": ["Hashing"],
-      "children": []
     }
   ]
 }

Resources/lib-mappings/javax-crypto.json

@@ -10,7 +10,7 @@
       "children": [
         {
           "namespace": "SecretKeySpec",
-          "categories": ["KeyManagement"],
+          "categories": ["Key_Management"],
           "children": []
         }
       ]

SecurityKeywordsBasedSearchTool/SecFeatFinder/FeatureModel.py

@@ -5,7 +5,9 @@
 
 def add_to_fm(fm, taxonomy, feature_name, tag):
     taxo_feature = taxonomy.dfs(feature_name)
-
+    if taxo_feature is None:
+        print(f"Feature '{feature_name}' not found in taxonomy.")
+        return None
     feature = taxo_feature
     parents = [feature]
     while feature.parent is not None:

SecurityKeywordsBasedSearchTool/SecFeatFinder/main.py

@@ -57,7 +57,8 @@ def process_feature_annotations(features_file, repo_dir, flattened_keywords, tax
                         tag = f"API_{feature_name}_{method_name}"
                         line_annotations[line_index].add(tag)
                         library_features.add(tag)
-                        add_to_fm(fm, taxonomy, feature_name, tag)
+                        if add_to_fm(fm, taxonomy, feature_name, tag) is None:
+                            print(f"Feature '{feature_name}' not found in taxonomy, skipped for now.")
 
             # Apply annotations to lines
             for line_index, tags in line_annotations.items():
@@ -300,8 +301,7 @@ def print_top_keywords(keyword_counter, total_matches):
 
 def main():
     repo_url = input("Enter the repository URL: ")
-    keyword_file = "SecFeatFinder/git@github.com:apache/tomcat.gitSecList.json"
-    features_file = "../Resources/features.json"
+    keyword_file = "SecFeatFinder/SecList.json"
     taxonomy_file = "../Resources/taxonomy.feature_model"
 
     taxonomy = read_feature_model(taxonomy_file)
@@ -325,7 +325,7 @@ def main():
     fm = Feature(taxonomy.name, None)
 
     # Process library annotations first
-    library_features = process_feature_annotations(features_file, project_dir, flattened_keywords, taxonomy, fm)
+    library_features = process_feature_annotations(project_dir+"/result/features.json", project_dir, flattened_keywords, taxonomy, fm)
 
     # Initialize the exclusion counter ONCE here
     hans_exclusion_counter = [0]