Continued:

- added metrics for column detection_mode

diff --git a/api.py b/api.py
index d1ead22ec416bb3a55b2dd1d87a9bfed901f3d7c..c7e47a70f3cdec8b15e1198857cc62fd6c68b872 100644 (file)
--- a/api.py
+++ b/api.py
@@ -69,6 +69,8 @@ def api_scoreboard(mode: str, amount: int):
         database.cursor.execute("SELECT command, COUNT(domain) AS score FROM instances WHERE command IS NOT NULL GROUP BY command ORDER BY score DESC, command ASC LIMIT ?", [amount])
     elif mode == "error_code":
         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 == "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])
     elif mode == "obfuscator":
@@ -181,6 +183,8 @@ 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=command&amount={amount}")
     elif mode == "error_code" and amount > 0:
         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 == "detection_mode" and amount > 0:
+        response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=detection_mode&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 == "obfuscator" and amount > 0:

diff --git a/templates/base.html b/templates/base.html
index 864291bdafbdd7fea2e9e80524cc2fa51f153d55..485eb445d867947fabfa4d4a2686332bcac6e66a 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -100,12 +100,24 @@
             border: 1px solid #eaeaea;
             border-radius: 5px;
         }
+        .notes > div {
+            margin: 0px;
+            padding: 5px;
+        }
         .notes > h2 {
             margin: 0px;
             padding: 5px;
             background-color: #eaeaea;
             text-align: center;
         }
+        li {
+            padding-bottom: 4px;
+        }
+        code {
+            padding: 3px;
+            background-color: #eaeaea;
+            border-radius: 5px;
+        }
     </style>
 </head>
 

diff --git a/templates/views/index.html b/templates/views/index.html
index 891fd40b9de3a374f7da32231f570a431e4ae7b0..91a714b9989c45416057c8df9131f992ed74fa57 100644 (file)
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -31,6 +31,7 @@
         <a href="{{base_url}}/scoreboard?mode=software&amp;amount=50">used software</a> /
         <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=detection_mode&amp;amount=10">detection modes</a> /
         <a href="{{base_url}}/scoreboard?mode=avg_peers&amp;amount=30">average peers</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> /

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index b4615e13dd3b2b0c488067984d6a184a527dce18..b91eb69fd5543c119b3a81002be740eb3cd94eeb 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 == 'block_level' %}TOP {{amount}} block level metrics{% 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 title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'detection_mode' %}Detection mode metrics{% elif mode == 'block_level' %}TOP {{amount}} block level metrics{% 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' %}
@@ -15,6 +15,8 @@
         <h1>TOP {{amount}} commands</h1>
     {% elif mode == 'error_code' %}
         <h1>TOP {{amount}} error codes</h1>
+    {% elif mode == 'detection_mode' %}
+        <h1>Detection mode metrics</h1>
     {% elif mode == 'avg_peers' %}
         <h1>TOP {{amount}} average peer count</h1>
     {% elif mode == 'obfuscator' %}
@@ -31,7 +33,7 @@
         <table>
             <thead>
                 <th>№</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 in ('software', 'avg_peers', 'obfuscator') %}Software{% elif mode == 'obfuscation' %}obfuscation status{% elif mode == 'detection_mode' %}Detection mode{% 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', 'block_level') %}Total{% else %}Blocks{% endif %}</th>
             </thead>
 
@@ -40,7 +42,7 @@
                 <tr>
                     <td>{{loop.index}}</td>
                     <td>
-                        {% if mode in ('software', 'command', 'error_code', 'avg_peers', 'obfuscator', 'obfuscation', 'block_level') %}
+                        {% if mode in ('software', 'command', 'error_code', 'detection_mode', 'avg_peers', 'obfuscator', 'obfuscation', 'block_level') %}
                             {{entry['domain']}}
                         {% elif entry['domain'] == None %}
                             -
@@ -61,17 +63,31 @@
 {% block footer %}
     {% if mode == 'error_code' %}
         <div class="notes">
-            <h2>Please note to error codes:</h2>
+            <h2>Error codes:</h2>
             <ul>
                 <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 == 'detection_mode' %}
+        <div class="notes">
+            <h2>Detection modes:</h2>
+            <div>
+                Detection is done in following order:
+            </div>
+            <ol>
+                <li><b>AUTO_DISCOVERY</b>: <code>/.well-known/nodeinfo</code> was reachable and software type was found in nodeinfo response</li>
+                <li><b>GENERATOR</b>: Meta data <code>generator</code> was found in HTML code</li>
+                <li><b>SITE_NAME</b>: Meta data <code>og:site_name</code> was found in HTML code</li>
+                <li><b>STATIC_CHECK</b>: All above did not reveal software type, so a check on pre-defined JSON elements was done</li>
+                <li><b>None</b>: the instance was not reachable or the used software was not stated</li>
+            </ol>
+        </div>
     {% elif mode == 'obfuscation' %}
         <div class="notes">
-            <h2>Please note to obfuscation status:</h2>
+            <h2>Obfuscation status:</h2>
             <ul>
                 <li>Only supported networks are counted here.</li>
-                <li><em>None</em> means not determined yet.</li>
+                <li><b>None</b> means not determined yet.</li>
             </ul>
         </div>
     {% endif %}