Harden workflow push/rebase loops and fix parser callsites in CVE/Honeypot jobs

.github/workflows/asn_reputation_scorer.yml

@@ -423,6 +423,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs \
                   asn_blocklist_firewall.txt \

.github/workflows/auto_feed_discovery.yml

@@ -831,6 +831,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs auto_discovered_feeds.json \
                   auto_feed_discovery_report.md 2>/dev/null || true

.github/workflows/cve_to_ip_mapper.yml

@@ -37,7 +37,7 @@ jobs:
               load_whitelist, load_fp_set, is_in_fp_set,
               is_valid_public_ipv4, is_valid_public_cidr,
               is_protected_entry, is_whitelisted,
-              parse_entries, calculate_confidence,
+              parse_entries as _parse_entries, calculate_confidence,
               safe_get_date, parse_date, sort_ips, write_ip_list,
               fetch_url, check_local_feed_age,
               IPV4_RE, CIDR_RE, TIMESTAMP_RE,
@@ -138,7 +138,7 @@ jobs:
               # plain IPv4, CIDR, ip:port, FortiGate, ipset, URLhaus, CSV, DROP, netset
               # FIX BUG-WL3: use_protected_check=True → Whitelist-IPs werden bereits
               # beim Parsen herausgefiltert (vorher: nur is_valid_public_ipv4).
-              ips = parse_entries(text, use_protected_check=True)
+              ips = _parse_entries(text, use_protected_check=True)
               all_exploit_ips.update(ips)
               source_stats[name] = len(ips)
 
@@ -280,6 +280,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs cve_exploit_ips.txt cve_exploit_report.md 2>/dev/null || true
                 git add cve_exploit_ips.txt cve_exploit_report.md 2>/dev/null || true

.github/workflows/feed_health_monitor.yml

@@ -251,6 +251,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs feed_health_report.md \
                   feed_health_status.json feed_urls_cache.json 2>/dev/null || true

.github/workflows/geo_tagger.yml

@@ -317,6 +317,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs blacklist_geo_enriched.json geo_tagger_report.md 2>/dev/null || true
                 git add blacklist_geo_enriched.json geo_tagger_report.md 2>/dev/null || true

.github/workflows/honeydb_monitor.yml

@@ -370,6 +370,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs honeydb_ips.txt honeydb_report.md 2>/dev/null || true
                 git add honeydb_ips.txt honeydb_report.md 2>/dev/null || true

.github/workflows/honeypot_monitor.yml

@@ -39,7 +39,7 @@ jobs:
               load_whitelist, load_fp_set, is_in_fp_set,
               is_valid_public_ipv4, is_valid_public_cidr,
               is_protected_entry, is_whitelisted,
-              parse_entries, calculate_confidence,
+              parse_entries as _parse_entries, calculate_confidence,
               safe_get_date, parse_date, sort_ips, write_ip_list,
               fetch_url, check_local_feed_age,
               IPV4_RE, CIDR_RE, TIMESTAMP_RE,
@@ -167,7 +167,7 @@ jobs:
               if text:
                   # FIX BUG-WL7: use_protected_check=True → Whitelist-IPs
                   # werden bereits beim Parsen herausgefiltert.
-                  ips = parse_entries(text, use_protected_check=True)
+                  ips = _parse_entries(text, use_protected_check=True)
                   all_ips.update(ips)
                   stats[name] = len(ips)
                   print(f"  {name}: {len(ips)} IPs")
@@ -247,6 +247,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs honeypot_ips.txt honeypot_report.md 2>/dev/null || true
                 git add honeypot_ips.txt honeypot_report.md 2>/dev/null || true

.github/workflows/netshield_report_generator.yml

@@ -538,6 +538,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs NETSHIELD_REPORT.md README.md 2>/dev/null || true
                 git add NETSHIELD_REPORT.md README.md 2>/dev/null || true

.github/workflows/score_decay_monitor.yml

@@ -276,6 +276,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs score_decay_log.txt score_decay_report.md 2>/dev/null || true
                 git add score_decay_log.txt score_decay_report.md 2>/dev/null || true

.github/workflows/update-blocklist.yml

@@ -512,6 +512,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs -- all_countries_ipv4.txt 2>/dev/null || true
                 # FIX: --theirs auf Verzeichnisse schlägt bei Einzel-Konflikten still fehl.

.github/workflows/update_bot_detector.yml

@@ -217,6 +217,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs bot_detector_blacklist_ipv4.txt \
                   bot_detector_report.md 2>/dev/null || true

.github/workflows/update_combined_blacklist.yml

@@ -237,7 +237,7 @@ jobs:
               "firehol_webclient", "firehol_webserver", "firehol_proxies", "firehol_abusers_1d",
               "et_block", "et_compromised", "spamhaus_drop",
               "blocklist_de_all", "blocklist_de_export", "blocklist_de_strongips",
-              "blocklist_de_ssh", "c2_tracker", "c2_iplist",
+              "blocklist_de_ssh", "c2_iplist",
               "ipsum_level5", "ipsum_level7", "abuseipdb_s100_30d", "abuseipdb_s100_7d",
               "abuseipdb_score100", "turris_greylist",
               # FIX BUG-DP1: DataPlane-Feeds hatten hq=True in SOURCES, fehlten aber
@@ -337,7 +337,6 @@ jobs:
               "blocklist_de_ftp":           ("https://lists.blocklist.de/lists/ftp.txt", False),
 
               # ── C2 / Botnet ───────────────────────────────────────────────
-              "c2_tracker":                 ("https://raw.githubusercontent.com/montysecurity/C2-Tracker/main/data/all.txt", True),
               "c2_iplist":                  ("https://raw.githubusercontent.com/drb-ra/C2IntelFeeds/master/feeds/IPC2s.csv", True),
               # "cobalt_strike_ips" entfernt: Gi7w0rm/CobaltStrikeC2Tracker Repo gelöscht – C2 abgedeckt durch c2_tracker
 
@@ -1135,6 +1134,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs combined_threat_blacklist_ipv4.txt active_blacklist_ipv4.txt \
                   combined_threat_blacklist_report.md \

.github/workflows/update_confidence_blacklist.yml

@@ -439,6 +439,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs blacklist_confidence40_ipv4.txt \
                   watchlist_confidence25to39_ipv4.txt 2>/dev/null || true

.github/workflows/workflow_health_checker.yml

@@ -2343,6 +2343,7 @@ jobs:
                   exit 0
                 fi
               else
+                git rebase --abort 2>/dev/null || true
                 git stash pop 2>/dev/null || true
                 git checkout --theirs workflow_health_report.md \
                   workflow_health_status.json 2>/dev/null || true