Continued:

- formatted template block
- added average blocks

diff --git a/daemon.py b/daemon.py
index 9f96e11acf4af090142d7cc2affb73879627fda1..bfa0e41db1c0ca421fbf3d58d074a25d89617f75 100755 (executable)
--- a/daemon.py
+++ b/daemon.py
@@ -86,7 +86,9 @@ def api_scoreboard(mode: str, amount: int):
     elif mode == "detection_mode":
         database.cursor.execute("SELECT detection_mode, COUNT(domain) AS cnt FROM instances GROUP BY detection_mode ORDER BY cnt 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])
+        database.cursor.execute("SELECT software, AVG(total_peers) AS average FROM instances WHERE software IS NOT NULL AND total_peers IS NOT NULL GROUP BY software HAVING average > 0 ORDER BY average DESC LIMIT ?", [amount])
+    elif mode == "avg_blocks":
+        database.cursor.execute("SELECT software, AVG(total_blocks) AS average FROM instances WHERE software IS NOT NULL AND total_blocks IS NOT NULL GROUP BY software HAVING average > 0 ORDER BY average 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":

diff --git a/templates/views/index.html b/templates/views/index.html
index 88024a9c93029d69c79544433eb9beea6d6e8ac3..4630c102be01c4b8d4161cfe4f403b7cb7cef0fa 100644 (file)
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -63,6 +63,7 @@
         <li><a href="scoreboard?mode=error_code&amp;amount=50">Error codes</a></li>
         <li><a href="scoreboard?mode=detection_mode&amp;amount=10">Detection modes</a></li>
         <li><a href="scoreboard?mode=avg_peers&amp;amount=50">Average peers</a></li>
+        <li><a href="scoreboard?mode=avg_blocks&amp;amount=50">Average blocks</a></li>
         <li><a href="scoreboard?mode=obfuscator&amp;amount=10">Obfuscating software</a></li>
         <li><a href="scoreboard?mode=obfuscation&amp;amount=10">Obfuscation statistics</a></li>
         <li><a href="scoreboard?mode=block_level&amp;amount=20">Block level statistics</a></li>

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index 04bf8b9abf5b6146c017642501d0c8b61c546f9e..2f7619485f73bff71c0458f4772a64dd5cd86891 100644 (file)
--- a/templates/views/scoreboard.html
+++ b/templates/views/scoreboard.html
@@ -1,6 +1,21 @@
 {% extends "base.html" %}
 
-{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'detection_mode' %}Detection mode statistics{% elif mode == 'block_level' %}TOP {{amount}} block level statistics{% elif mode == 'obfuscation' %}Obfuscation statistics{% 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 title %}
+    Scoreboard -
+    {% if mode == 'software' %}TOP {{amount}} used software
+    {% elif mode == 'detection_mode' %}Detection mode statistics
+    {% elif mode == 'block_level' %}TOP {{amount}} block level statistics
+    {% elif mode == 'obfuscation' %}Obfuscation statistics
+    {% elif mode == 'obfuscator' %}TOP {{amount}} obfuscating software
+    {% elif mode == 'avg_peers' %}TOP {{amount}} average peer count
+    {% elif mode == 'avg_blocks' %}TOP {{amount}} average block 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' %}
@@ -19,6 +34,8 @@
         <h1>Detection mode statistics</h1>
     {% elif mode == 'avg_peers' %}
         <h1>TOP {{amount}} average peer count</h1>
+    {% elif mode == 'avg_blocks' %}
+        <h1>TOP {{amount}} average block count</h1>
     {% elif mode == 'obfuscator' %}
         <h1>TOP {{amount}} obfuscating software</h1>
     {% elif mode == 'obfuscation' %}
@@ -36,7 +53,7 @@
             <thead>
                 <th>№</th>
                 <th>
-                    {% if mode in ('software', 'avg_peers', 'obfuscator') %}Software
+                    {% if mode in ('software', 'avg_peers', 'avg_blocks', 'obfuscator') %}Software
                     {% elif mode == 'obfuscation' %}Obfuscation status
                     {% elif mode == 'detection_mode' %}Detection mode
                     {% elif mode == 'error_code' %}Error code
@@ -45,7 +62,7 @@
                 </th>
                 <th>
                     {% if mode == 'reference' %}References
-                    {% elif mode == 'avg_peers' %}Average
+                    {% elif mode in('avg_peers', 'avg_blocks') %}Average
                     {% elif mode in('software', 'error_code', 'obfuscator', 'obfuscation', 'block_level', 'detection_mode', 'command') %}Total
                     {% else %}Blocks
                     {% endif %}
@@ -63,7 +80,7 @@
                             {{entry['domain']}}
                         {% elif mode == 'block_level' %}
                             <a href="top?mode={{mode}}&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
-                        {% elif mode in ('avg_peers', 'obfuscator') %}
+                        {% elif mode in ('avg_peers', 'avg_blocks', 'obfuscator') %}
                             <a href="list?mode=software&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
                         {% elif mode in ('software', 'detection_mode', 'command') %}
                             <a href="list?mode={{mode}}&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>