sync_patches: refactor extracting cve patches

Author: DrRamm

src/sync_patches.py

@@ -30,6 +30,51 @@ def prepare_link(link):
     #print("Replaced " + link)
     return link
 
+def get_version(desc, link):
+    if ("msm-3.4" in link) or ("3.4" in desc):
+        return "3.4"
+    elif ("msm-3.10" in link) or ("3.10" in desc):
+        return "3.10"
+    elif ("msm-3.18" in link) or ("3.18" in desc):
+        return "3.18"
+    elif ("msm-4.4" in link) or ("4.4" in desc):
+        return "4.4"
+    elif ("msm-4.9" in link) or ("4.9" in desc):
+        return "4.9"
+    elif ("msm-" in link) or ("2." in desc) or ("3." in desc) or ("4." in desc):
+        return "other"
+    else:
+        return "None"
+
+def skip_link(link):
+    # skip all vendor stuff
+    if "vendor" in link:
+       return True
+    
+    # skip lineage coz IDK how to parse it
+    if "lineageos" in link:
+        return True
+
+    if "cve.mitre.org" in link:
+        return True
+
+    if "www.codeaurora.org" in link:
+        return True
+    
+    if "chromium" in link:
+        return True
+
+    if "bulletin" in link:
+        return True
+
+    if "alephsecurity.com" in link:
+        return True
+
+    if ("codeaurora.org" in link) and ("/log/?" in link):
+        return True
+
+    return False
+
 
 def load_tracker_cves():
 
@@ -49,46 +94,24 @@ def load_tracker_cves():
                 version = curr_link["desc"]
                 patch_link = curr_link["link"]
 
-                # skip all vendor stuff
-                if "vendor" in patch_link:
+                if (skip_link(patch_link)):
                     continue
 
-                # skip lineage coz IDK how to parse it
-                if "lineageos" in patch_link:
-                    continue
-
-                if "cve.mitre.org" in patch_link:
-                    continue
+                kernel_version = get_version(version, patch_link)
 
-                if "www.codeaurora.org" in patch_link:
-                    continue
-                
-                if "chromium" in patch_link:
+                if (kernel_version == "other"):
                     continue
 
-                if (version == "3.4") or (version == "3.10") or (version == "3.18") or (version == "4.4") or (version == "4.9"):
-                    cve_object.patchfiles[version] = prepare_link(patch_link)
-                # handle all patches without desc or with dummy desc
-                elif (version.lower() == "patch") or (version == ""):
-                    if "msm-3.4" in patch_link:
-                        cve_object.patchfiles["3.4"]  = prepare_link(patch_link)
-                    elif "msm-3.10" in patch_link:
-                        cve_object.patchfiles["3.10"] = prepare_link(patch_link)
-                    elif "msm-3.18" in patch_link:
-                        cve_object.patchfiles["3.18"] = prepare_link(patch_link)
-                    elif "msm-4.4" in patch_link:
-                        cve_object.patchfiles["4.4"]  = prepare_link(patch_link)
-                    elif "msm-4.9" in patch_link:
-                        cve_object.patchfiles["4.9"]  = prepare_link(patch_link)
-                    elif "msm-" in patch_link:
-                        # skip other versions 
-                        continue
-                    else:
-                        cve_object.patchfiles["3.4"]  = prepare_link(patch_link)
-                        cve_object.patchfiles["3.10"] = prepare_link(patch_link)
-                        cve_object.patchfiles["3.18"] = prepare_link(patch_link)
-                        cve_object.patchfiles["4.4"]  = prepare_link(patch_link)
-                        cve_object.patchfiles["4.9"]  = prepare_link(patch_link)
+                prepared_link = prepare_link(patch_link)
+    
+                if (kernel_version == "None"):
+                    cve_object.patchfiles["3.4"]  = prepared_link
+                    cve_object.patchfiles["3.10"] = prepared_link
+                    cve_object.patchfiles["3.18"] = prepared_link
+                    cve_object.patchfiles["4.4"]  = prepared_link
+                    cve_object.patchfiles["4.9"]  = prepared_link
+                else:
+                    cve_object.patchfiles[kernel_version] = prepared_link
 
         # collect all our CveWrapper instances
         cves[name] = cve_object
@@ -151,23 +174,13 @@ def run(patches_dir, replace_local_files=False):
             if os.path.exists(target_path):
                 if not replace_local_files:
                     print("[I] " + target_path + " already exists!")
-                    answer = ""
-                    while answer == "":
-                        answer = input("options: (r)emove local file" +
-                                       " and sync from server\n" +
-                                       "         (s)kip\n" +
-                                       "answer: ")
-                    if answer == "r":
-                        # remove the local file
-                        os.remove(target_path)
-                    elif answer == "s":
-                        continue
+                    continue
                 else:
                     # remove the local file
                     os.remove(target_path)
 
             # download the patch
-            print("[I] Downloading " + os.path.basename(target_path) + " from " + remote_patchfile)
+            print("[I] Downloading " + os.path.basename(target_path) + " from " + remote_patchfile, end = '')
             try:
                 urllib.request.urlretrieve(remote_patchfile, target_path)
                 print("    * Saved!")