Continued:

- again tpzo fixed:
  ALTER TABLE instances RENAME has_obfucation TO has_obfuscation

diff --git a/api.py b/api.py
index d08cc4427754c9595f791972222d04d1192d9d76..9217716f6e5e3a921e4985d29f59887a06b2a646 100644 (file)
--- a/api.py
+++ b/api.py
@@ -71,10 +71,10 @@ def api_scoreboard(mode: str, amount: int):
         database.cursor.execute("SELECT last_status_code, COUNT(domain) AS score FROM instances WHERE last_status_code IS NOT NULL AND last_status_code != '200' GROUP BY last_status_code ORDER BY score DESC LIMIT ?", [amount])
     elif mode == "avg_peers":
         database.cursor.execute("SELECT software, AVG(total_peers) AS average FROM instances WHERE software IS NOT NULL GROUP BY software HAVING average>0 ORDER BY average DESC LIMIT ?", [amount])
-    elif mode == "obfucator":
-        database.cursor.execute("SELECT software, COUNT(domain) AS cnt FROM instances WHERE has_obfucation = 1 GROUP BY software ORDER BY cnt DESC LIMIT ?", [amount])
-    elif mode == "obfucation":
-        database.cursor.execute("SELECT has_obfucation, COUNT(domain) AS cnt FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica') GROUP BY has_obfucation ORDER BY cnt DESC LIMIT ?", [amount])
+    elif mode == "obfuscator":
+        database.cursor.execute("SELECT software, COUNT(domain) AS cnt FROM instances WHERE has_obfuscation = 1 GROUP BY software ORDER BY cnt DESC LIMIT ?", [amount])
+    elif mode == "obfuscation":
+        database.cursor.execute("SELECT has_obfuscation, COUNT(domain) AS cnt FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica') GROUP BY has_obfuscation ORDER BY cnt DESC LIMIT ?", [amount])
     else:
         raise HTTPException(status_code=400, detail="No filter specified")
 
@@ -181,10 +181,10 @@ def scoreboard(request: Request, mode: str, amount: int):
         response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=error_code&amount={amount}")
     elif mode == "avg_peers" and amount > 0:
         response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=avg_peers&amount={amount}")
-    elif mode == "obfucator" and amount > 0:
-        response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=obfucator&amount={amount}")
-    elif mode == "obfucation" and amount > 0:
-        response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=obfucation&amount={amount}")
+    elif mode == "obfuscator" and amount > 0:
+        response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=obfuscator&amount={amount}")
+    elif mode == "obfuscation" and amount > 0:
+        response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=obfuscation&amount={amount}")
     else:
         raise HTTPException(status_code=400, detail="No filter specified")
 

diff --git a/blocks_empty.db b/blocks_empty.db
index 903c30980895603445fda714a93187dc716f6254..1df20d02238b5f3bb19c72b235f3c3e1ca33b8c9 100644 (file)
Binary files a/blocks_empty.db and b/blocks_empty.db differ

diff --git a/fba/commands.py b/fba/commands.py
index 83934f30f208f7e023db9aa42502e1787c79c9bf..1d430578b1f55ab219319786a6e331a709e34e95 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -188,7 +188,7 @@ def fetch_blocks(args: argparse.Namespace):
 
         logger.debug("blocker='%s'", blocker)
         instances.set_last_blocked(blocker)
-        instances.set_has_obfucation(blocker, False)
+        instances.set_has_obfuscation(blocker, False)
 
         blocking = list()
         if software == "pleroma":
@@ -226,30 +226,30 @@ def fetch_blocks(args: argparse.Namespace):
                 logger.warning("blocked is empty, blocker='%s'", blocker)
                 continue
             elif block['blocked'].count("*") > 0:
-                logger.debug("blocker='%s' uses obfucated domains, marking ...", blocker)
-                instances.set_has_obfucation(blocker, True)
+                logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker)
+                instances.set_has_obfuscation(blocker, True)
 
                 # Some friendica servers also obscure domains without hash
-                row = instances.deobfucate("*", block['blocked'])
+                row = instances.deobfuscate("*", block['blocked'])
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block['blocked'], blocker, software)
+                    logger.warning("Cannot deobfuscate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block['blocked'], blocker, software)
                     continue
 
                 block['blocked'] = row[0]
                 origin           = row[1]
                 nodeinfo_url     = row[2]
             elif block['blocked'].count("?") > 0:
-                logger.debug("blocker='%s' uses obfucated domains, marking ...", blocker)
-                instances.set_has_obfucation(blocker, True)
+                logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker)
+                instances.set_has_obfuscation(blocker, True)
 
                 # Some obscure them with question marks, not sure if that's dependent on version or not
-                row = instances.deobfucate("?", block['blocked'])
+                row = instances.deobfuscate("?", block['blocked'])
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block['blocked'], blocker, software)
+                    logger.warning("Cannot deobfuscate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block['blocked'], blocker, software)
                     continue
 
                 block['blocked'] = row[0]

diff --git a/fba/models/instances.py b/fba/models/instances.py
index dc163570aba3703919b6eaf33b2338dfd9743091..66fc29204497ffa8764a0cf65d6a620e41e89dab 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -60,8 +60,8 @@ _pending = {
     "last_status_code"   : {},
     # Last error details
     "last_error_details" : {},
-    # Wether obfucation has been used
-    "has_obfucation"    : {},
+    # Wether obfuscation has been used
+    "has_obfuscation"    : {},
 }
 
 def _set_data(key: str, domain: str, value: any):
@@ -287,7 +287,7 @@ def is_recent(domain: str) -> bool:
     logger.debug("recently='%s' - EXIT!", recently)
     return recently
 
-def deobfucate(char: str, domain: str, blocked_hash: str = None) -> tuple:
+def deobfuscate(char: str, domain: str, blocked_hash: str = None) -> tuple:
     logger.debug("char='%s',domain='%s',blocked_hash='%s' - CALLED!", char, domain, blocked_hash)
 
     if not isinstance(domain, str):
@@ -321,7 +321,7 @@ def deobfucate(char: str, domain: str, blocked_hash: str = None) -> tuple:
 
         if row is None:
             logger.debug("blocked_hash='%s' not found, trying domain='%s' ...", blocked_hash, domain)
-            return deobfucate(char, domain)
+            return deobfuscate(char, domain)
     else:
         logger.debug("Looking up domain='%s' ...", domain)
         database.cursor.execute(
@@ -386,7 +386,7 @@ def set_detection_mode(domain: str, mode: str):
     _set_data("detection_mode", domain, mode)
     logger.debug("EXIT!")
 
-def set_has_obfucation(domain: str, status: bool):
+def set_has_obfuscation(domain: str, status: bool):
     logger.debug("domain(%d)='%s',status='%s' - CALLED!", len(domain), domain, status)
     domain_helper.raise_on(domain)
 
@@ -394,5 +394,5 @@ def set_has_obfucation(domain: str, status: bool):
         raise ValueError(f"Parameter status[]='{type(status)}' is not 'bool'")
 
     # Set timestamp
-    _set_data("has_obfucation", domain, status)
+    _set_data("has_obfuscation", domain, status)
     logger.debug("EXIT!")

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index 83ab193feabf0e9e17d9c67bdf5cfa8f3b7fd306..c4a90c16b3413216aeb744cac6bf9e66aa4b12b8 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -82,29 +82,29 @@ def fetch_blocks(domain: str) -> list:
             logger.debug("line[]='%s' returned empty blocked domain - SKIPPED!")
             continue
         elif blocked.count("*") > 0:
-            logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-            instances.set_has_obfucation(domain, True)
+            logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+            instances.set_has_obfuscation(domain, True)
 
             # Obscured domain name with no hash
-            row = instances.deobfucate("*", blocked)
+            row = instances.deobfuscate("*", blocked)
 
             logger.debug("row[]='%s'", type(row))
             if row is None:
-                logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                 continue
 
             logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
             blocked = row[0]
         elif blocked.count("?") > 0:
-            logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-            instances.set_has_obfucation(domain, True)
+            logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+            instances.set_has_obfuscation(domain, True)
 
             # Obscured domain name with no hash
-            row = instances.deobfucate("?", blocked)
+            row = instances.deobfuscate("?", blocked)
 
             logger.debug("row[]='%s'", type(row))
             if row is None:
-                logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                 continue
 
             logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index c2481ce82a53d3de892cb9ed490408e7728f9c52..0d2960429066af06a8c1f987eb26b81a1f11e1ea 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -113,29 +113,29 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                         logger.debug("blocked='%s' is a fake domain - SKIPPED!", blocked)
                         continue
                     elif blocked.count("*") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("*", blocked)
+                        row = instances.deobfuscate("*", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
                     elif blocked.count("?") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("?", blocked)
+                        row = instances.deobfuscate("?", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -174,35 +174,35 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                 logger.debug("blocked='%s' is a fake domain - SKIPPED!", blocked)
                 continue
             elif blocked.count("*") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("*", blocked)
+                row = instances.deobfuscate("*", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
             elif blocked.count("?") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("?", blocked)
+                row = instances.deobfuscate("?", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
 
-            logger.debug("blocked='%s' - DEOBFUCATED!", blocked)
+            logger.debug("blocked='%s' - DEobfuscatED!", blocked)
             if not utils.is_domain_wanted(blocked):
                 logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                 continue
@@ -263,35 +263,35 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                     logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                     continue
                 elif blocked.count("*") > 0:
-                    logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                    instances.set_has_obfucation(domain, True)
+                    logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                    instances.set_has_obfuscation(domain, True)
 
                     # Obscured domain name with no hash
-                    row = instances.deobfucate("*", blocked)
+                    row = instances.deobfuscate("*", blocked)
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                        logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                         continue
 
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                     blocked = row[0]
                 elif blocked.count("?") > 0:
-                    logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                    instances.set_has_obfucation(domain, True)
+                    logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                    instances.set_has_obfuscation(domain, True)
 
                     # Obscured domain name with no hash
-                    row = instances.deobfucate("?", blocked)
+                    row = instances.deobfuscate("?", blocked)
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                        logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                         continue
 
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                     blocked = row[0]
 
-                logger.debug("blocked='%s' - DEOBFUCATED!", blocked)
+                logger.debug("blocked='%s' - DEobfuscatED!", blocked)
                 if not utils.is_domain_wanted(blocked):
                     logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                     continue
@@ -326,29 +326,29 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                 logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                 continue
             elif blocked.count("*") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("*", blocked)
+                row = instances.deobfuscate("*", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
             elif blocked.count("?") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("?", blocked)
+                row = instances.deobfuscate("?", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -390,35 +390,35 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                         logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                         continue
                     elif blocked.count("*") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("*", blocked)
+                        row = instances.deobfuscate("*", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
                     elif blocked.count("?") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("?", blocked)
+                        row = instances.deobfuscate("?", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
 
-                    logger.debug("blocked='%s' - DEOBFUCATED!", blocked)
+                    logger.debug("blocked='%s' - DEobfuscatED!", blocked)
                     if not utils.is_domain_wanted(blocked):
                         logger.warning("blocked='%s' is not wanted - SKIPPED!", blocked)
                         continue

diff --git a/fba/utils.py b/fba/utils.py
index 1a1dffec0ab69fbda7458a137e3f85179e04060e..56d7116eaa8c9379c522e45640609e0284c34632 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -82,36 +82,36 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
         raise ValueError("Parameter 'command' is empty")
 
     if domain.find("*") > 0:
-        logger.debug("blocker='%s' uses obfucated domains, marking ...", blocker)
-        instances.set_has_obfucation(blocker, True)
+        logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker)
+        instances.set_has_obfuscation(blocker, True)
 
         # Try to de-obscure it
-        row = instances.deobfucate("*", domain)
+        row = instances.deobfuscate("*", domain)
 
         logger.debug(f"row[{type(row)}]='{row}'")
         if row is None:
-            logger.warning("Cannot de-obfucate domain='%s' - SKIPPED!", domain)
+            logger.warning("Cannot de-obfuscate domain='%s' - SKIPPED!", domain)
             return False
 
         logger.debug(f"domain='{domain}' de-obscured to '{row[0]}'")
         domain = row[0]
     elif domain.find("?") > 0:
-        logger.debug("blocker='%s' uses obfucated domains, marking ...", blocker)
-        instances.set_has_obfucation(blocker, True)
+        logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker)
+        instances.set_has_obfuscation(blocker, True)
 
         # Try to de-obscure it
-        row = instances.deobfucate("?", domain)
+        row = instances.deobfuscate("?", domain)
 
         logger.debug(f"row[{type(row)}]='{row}'")
         if row is None:
-            logger.warning("Cannot de-obfucate domain='%s' - SKIPPED!", domain)
+            logger.warning("Cannot de-obfuscate domain='%s' - SKIPPED!", domain)
             return False
 
         logger.debug(f"domain='{domain}' de-obscured to '{row[0]}'")
         domain = row[0]
     else:
-        logger.debug("blocker='%s' has NO obfucation on their block list", blocker)
-        instances.set_has_obfucation(blocker, False)
+        logger.debug("blocker='%s' has NO obfuscation on their block list", blocker)
+        instances.set_has_obfuscation(blocker, False)
 
     if instances.has_pending(blocker):
         logger.debug("Invoking instances.update_data(%s) ...", blocker)

diff --git a/templates/views/index.html b/templates/views/index.html
index 5e5a56fab7d891a60a0f688984d6189158be6893..4c91f2beee09307fa32f74bf34f31e7598e9816c 100644 (file)
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -32,8 +32,8 @@
         <a href="{{base_url}}/scoreboard?mode=command&amp;amount=10">commands</a> /
         <a href="{{base_url}}/scoreboard?mode=error_code&amp;amount=30">error codes</a> /
         <a href="{{base_url}}/scoreboard?mode=avg_peers&amp;amount=30">average peers</a> /
-        <a href="{{base_url}}/scoreboard?mode=obfucator&amp;amount=30">obfucating software</a> /
-        <a href="{{base_url}}/scoreboard?mode=obfucation&amp;amount=10">obfucation metrics</a>
+        <a href="{{base_url}}/scoreboard?mode=obfuscator&amp;amount=30">obfuscating software</a> /
+        <a href="{{base_url}}/scoreboard?mode=obfuscation&amp;amount=10">obfuscation metrics</a>
     </p>
 {% endblock %}
 {% block footer %}

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index b3f4a77be56e3bc700b9ca32bcc9f2f1d9a6533b..547a5ea8e83ac49a9f407f36d609ae6a9f6ccfd6 100644 (file)
--- a/templates/views/scoreboard.html
+++ b/templates/views/scoreboard.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'obfucation' %}obfucation metrics{% elif mode == 'obfucator' %}TOP {{amount}} obfucating software{% elif mode == 'avg_peers' %}TOP {{amount}} average peer count{% elif mode == 'command' %}TOP {{amount}} commands{% elif mode == 'error_code' %}TOP {{amount}} error codes{% elif mode == 'reference' %}TOP {{amount}} referencing instances{% elif mode == 'blocked' %}TOP {{amount}} deferated instances{% elif mode == 'blocker' %}TOP {{amount}} deferating instances{% endif %}{% endblock %}
+{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'obfuscation' %}obfuscation metrics{% elif mode == 'obfuscator' %}TOP {{amount}} obfuscating software{% elif mode == 'avg_peers' %}TOP {{amount}} average peer count{% elif mode == 'command' %}TOP {{amount}} commands{% elif mode == 'error_code' %}TOP {{amount}} error codes{% elif mode == 'reference' %}TOP {{amount}} referencing instances{% elif mode == 'blocked' %}TOP {{amount}} deferated instances{% elif mode == 'blocker' %}TOP {{amount}} deferating instances{% endif %}{% endblock %}
 
 {% block header %}
     {% if mode == 'blocker' %}
@@ -17,10 +17,10 @@
         <h1>TOP {{amount}} error codes</h1>
     {% elif mode == 'avg_peers' %}
         <h1>TOP {{amount}} average peer count</h1>
-    {% elif mode == 'obfucator' %}
-        <h1>TOP {{amount}} obfucating software</h1>
-    {% elif mode == 'obfucation' %}
-        <h1>obfucation metrics</h1>
+    {% elif mode == 'obfuscator' %}
+        <h1>TOP {{amount}} obfuscating software</h1>
+    {% elif mode == 'obfuscation' %}
+        <h1>obfuscation metrics</h1>
     {% endif %}
 {% endblock %}
 
@@ -29,8 +29,8 @@
         <table>
             <thead>
                 <th>№</th>
-                <th>{% if mode in ('software', 'avg_peers', 'obfucator') %}Software{% elif mode == 'obfucation' %}obfucation status{% elif mode == 'error_code' %}Error code{% else %}Instance{% endif %}</th>
-                <th>{% if mode == 'reference' %}References{% elif mode == 'avg_peers' %}Average{% elif mode in('software', 'error_code', 'obfucator', 'obfucation') %}Total{% else %}Blocks{% endif %}</th>
+                <th>{% if mode in ('software', 'avg_peers', 'obfuscator') %}Software{% elif mode == 'obfuscation' %}obfuscation status{% elif mode == 'error_code' %}Error code{% else %}Instance{% endif %}</th>
+                <th>{% if mode == 'reference' %}References{% elif mode == 'avg_peers' %}Average{% elif mode in('software', 'error_code', 'obfuscator', 'obfuscation') %}Total{% else %}Blocks{% endif %}</th>
             </thead>
 
             <tbody>
@@ -38,7 +38,7 @@
                 <tr>
                     <td>{{loop.index}}</td>
                     <td>
-                        {% if mode in ('software', 'command', 'error_code', 'avg_peers', 'obfucator', 'obfucation') %}
+                        {% if mode in ('software', 'command', 'error_code', 'avg_peers', 'obfuscator', 'obfuscation') %}
                             {{entry['domain']}}
                         {% elif entry['domain'] == None %}
                             -
@@ -64,9 +64,9 @@
                 <li>Error code 999 is fake and covers a lot of reasons why the domain/instance is not reachable. Mostly that the domain is not resolvable or the server refused connection.</li>
             </ul>
         </div>
-    {% elif mode == 'obfucation' %}
+    {% elif mode == 'obfuscation' %}
         <div class="notes">
-            <h2>Please note to obfucation status:</h2>
+            <h2>Please note to obfuscation status:</h2>
             <ul>
                 <li>Only supported networks are counted here.</li>
                 <li><em>None</em> means not determined yet.</li>