Merge pull request #1414 from p-l-/update-logos

Update SSL blacklist (abuse.ch) & Web/UI: update logos

README.md

@@ -138,8 +138,6 @@ Here is the appropriate bibtex entry:
         author={IVRE contributors},
         url = {https://ivre.rocks/},
         howpublished = {\url{https://github.com/ivre/ivre/}},
-        institution = {{ANSSI}: the National Cybersecurity Agency of France and
-                       {CEA}: the French Alternative Energies and Atomic Energy Commission},
         year = {2011--2022},
     }
 

doc/license-external.rst

@@ -92,13 +92,8 @@ Atlas <https://github.com/mbostock/world-atlas.git>`__ from data
 published by `Natural Eath <http://www.naturalearthdata.com/>`__ in the
 public domain.
 
-Logos
------
-
-The files ``web/static/cea.png`` and ``web/static/cea-white.png`` are
-the logo of the French Alternative Energies and Atomic Energy
-Commission. They are not covered by IVRE license.
+Logo
+----
 
-The files ``web/static/anssi.png`` and ``web/static/anssi-white.png``
-are the logo of the National Cybersecurity Agency of France. They are
-not covered by IVRE license.
+The file ``web/static/droids.png`` is the logo of the Droids Corporation.
+It is not covered by IVRE license.

ivre/data/abuse_ch/sslbl.py

@@ -125,6 +125,7 @@
     "059e0e19e367bd566724ae496dfa7347846bb8e6": "Spambot C&C",
     "05a030093a5141f53b37eb6684fa7575bee0dfab": "PandaZeuS C&C",
     "05b23a86fe8e9c0a5f68ff7a72ee3c65ce6dd61f": "PandaZeuS C&C",
+    "05e140c4511c175e88e9e161164f314f2a68692b": "AsyncRAT C&C",
     "05e704d1ec2ae8543e12b0d492b8a5f2b931af38": "ServHelper C&C",
     "05f55aa751b5cf4a35443b8349e7ea5d116dba64": "BitRAT C&C",
     "06040d102db2f86e040c59ba3907d5874766c2fe": "Dridex C&C",
@@ -711,6 +712,7 @@
     "21780e91024a45a1b8067af4c0903d657c30d922": "ServHelper C&C",
     "2193fd033d695c69b0e42d190843cde97dd80507": "Shylock C&C",
     "21967736369cf93deaa3f18cc4de6647e57a0931": "TorrentLocker C&C",
+    "21a044ee092ab5955dd3353c7d19e5bc88a8811c": "DCRat C&C",
     "21a1c4b97d84ecd3eb6950c1b9f03135719e5dc0": "Gootkit C&C",
     "21ac11e8f3cfcc86cf79d789e7451bdf95b5140a": "TorrentLocker C&C",
     "21b3c901e7f01ed6590e198ad3512cb53105f018": "IcedID C&C",
@@ -881,8 +883,10 @@
     "2978e97bcc2d507d04d64df93155fcf378a2295d": "Dridex C&C",
     "2991b587994bcffa5695214345bd8c8245d7786c": "TorrentLocker C&C",
     "2999b5922e988590853f1ad83c08322e7bb5b2b0": "AsyncRAT C&C",
+    "29af53f22280549ffbfff5dc41d9d81e4a26221b": "AsyncRAT C&C",
     "29c8478a7c47926146955982de6bb2f64361b82d": "DanaBot C&C",
     "29f122fc3983d5ae144e32481e0880631eedaeab": "AsyncRAT C&C",
+    "29f1a0d5c837694d3a7761a5749a86b9217baf15": "AsyncRAT C&C",
     "2a0a86070be32a4bd2243d5475354b7d652fde3c": "Dridex C&C",
     "2a1b79495761dc5bb0cc2010060c5bd7a47f1129": "Dridex C&C",
     "2a1d3b3fb321292413b3894d086addf3d684aeca": "AsyncRAT C&C",
@@ -1078,6 +1082,7 @@
     "34a92e41d4cf61f1fc510e40afd362d2ddc00ff7": "Qadars C&C",
     "34aa83727f2be543fecc45f474fc5af46cc77287": "Dridex C&C",
     "34ad00dfbaa61d0f037a8c32d92df77ed63838ec": "Gozi C&C",
+    "34aeca221f8ef6abca6861955f5da2ca15ba88cb": "DarkWatchman C&C",
     "34b6b380f1c32fd92a4d58e1a5185d5267e05fd4": "BitRAT C&C",
     "34b8d2b09ced8ed183d89adfaf2c1b40bb2d0e64": "Gozi C&C",
     "34dc882d28b3c17ff3df9a6bbe406145449f288e": "BitRAT C&C",
@@ -1318,6 +1323,8 @@
     "401f41fceafbed65a1567b5a3f45b2fd84f19b15": "IcedID C&C",
     "40215ae376a70f622cc42e532c387a8c125696e1": "Gootkit C&C",
     "4048187e494e0a98640d8420986271518e242ff8": "Dridex C&C",
+    "40750c8022596b02fc6a1725993a7fff21100c6d": "DCRat C&C",
+    "408e8bae749f15a465abf4841734ee4ff6bb7f3b": "QuasarRAT C&C",
     "408f387e3efefa210cb5cce367d440d8f888a814": "Malware C&C",
     "409f65d36ad67c47e20e3db12050f8f643a519f7": "Dridex C&C",
     "40a558b1d436eeb6be5f6a938284f468cc30a725": "Dridex C&C",
@@ -2029,6 +2036,7 @@
     "64f2420cfa4bbac2e99d18b9680a1790ab4ddaaf": "TorrentLocker C&C",
     "64f57005ebce8529d156c465eb1944f63d228711": "Quakbot C&C",
     "65058a2a003f61572cda9611797f596a2039e104": "KINS C&C",
+    "650ed89735f41f23daabbc106360f68b874b6df8": "CobaltStrike C&C",
     "651fce4f01fb5171fe68facf2b245d9e3e6d8c47": "Dridex C&C",
     "6538fb5f1e712485d256040c21946c35d51e6244": "Dridex C&C",
     "65390d8344f382e295d8a89df6d86a98c4588edb": "OrcusRAT C&C",
@@ -2108,6 +2116,7 @@
     "69d69d6deec4efa2c8ea37698d1570b6a03cce0a": "TrickBot C&C",
     "69dca2804355564143f21cebcd428b5ccad08311": "Quakbot C&C",
     "69dd95de03dbde5eb20fef559965fed52f7de1a6": "Dridex C&C",
+    "69e398f05bcee1b4ce52665dd1d3737238b9c3ab": "BitRAT C&C",
     "69fdf0eea24052986678d0e849de279205b1beb6": "Gootkit C&C",
     "6a1352f99b9a48d538169cacbf57ace327168499": "Adwind C&C",
     "6a13917daa4ec20277cb509daf143d15f4048d8f": "TorrentLocker C&C",
@@ -2528,6 +2537,7 @@
     "7e9a9e35fcb7539615728d08c2754b8721560134": "CobaltStrike C&C",
     "7ee02116738ff4c6d430cc5e9ca3aee07960af1b": "DCRat C&C",
     "7ee0d03c2dd96572905a4d86bc0a6dac25c7377d": "IcedID C&C",
+    "7ee1218b40e55a31e8e598adad1912ba729e4fe0": "AsyncRAT C&C",
     "7ef9fa16b91542f409aa62db1b932ec1325855b1": "Dridex C&C",
     "7efaf5f1dbb6339757f5215393a5f1731348cdee": "Dridex C&C",
     "7efcb520cad9ac926a653d4dbaa8faee59faf927": "TorrentLocker C&C",
@@ -2717,6 +2727,7 @@
     "88ccf424ed71871b051bc08627670e9afd20a6f0": "AsyncRAT C&C",
     "88de16f44a04d2f67a3b1e81172fd82b850e713c": "Malware C&C",
     "88ebb21692b2adaddc520ce5e7b6c474907a2504": "Gozi C&C",
+    "88f7c7ed461814f70d38ce1e8640ead2e0b853b9": "AsyncRAT C&C",
     "8914357cce21cbdcb491c9eb2dd9bfc164ec55d8": "Dridex C&C",
     "891fbb78d42e3eb693a9ca7ccf5028fd25caf8a7": "Dridex C&C",
     "8928ff0d7b5af201974b073fe05065490e88138e": "AsyncRAT C&C",
@@ -2731,6 +2742,7 @@
     "89b0ee08a58d1d3b962e9ff962d116cecddafe06": "Malware C&C",
     "89be3a840c2d1896e44f151482e52e932fd02b9f": "TorrentLocker C&C",
     "89d680a4965fd65aec354ee76a8ccbcd377629ed": "Dridex C&C",
+    "89da54e823be88de8cf176046d5a3dd7101bfabd": "CobaltStrike C&C",
     "89df939f76dbfc4c381472475f58042c56481e19": "TrickBot C&C",
     "89f01fd3655167342d71ebdee5152a11849e0caa": "Adwind C&C",
     "89f70f43f5d81a48f48acd5cdec9d37fd8a04bba": "Gootkit C&C",
@@ -2825,6 +2837,7 @@
     "8e37e33ddefede5dded94a52e6edb1a84aedf14c": "DCRat C&C",
     "8e443089f6c370d239053c93f9d869cd60524469": "Malware C&C",
     "8eaf58223b10a7c144b20ccad3d3b1b06c6d0970": "CobaltStrike C&C",
+    "8ed5d769bd146a02f929bcb5e0c87e444add60d3": "AsyncRAT C&C",
     "8eeda18cf978e78b71c679f37bd48869f0c6fd2a": "Dridex C&C",
     "8eef8e5d5119d23d259264485fce706df2411e52": "Gootkit C&C",
     "8f0c9589674c20f84211cf27e704defc07daf7b5": "Shylock C&C",
@@ -3026,7 +3039,9 @@
     "987cf99d2b22c0511ae92ea534dcbb3a29fb5eec": "TorrentLocker C&C",
     "987ef1c359d79880b9e5d29f22ab63b948a0b09e": "Gozi C&C",
     "9882dd65376a4b6e935e4db36b5ef60ea135164b": "IcedID C&C",
+    "98837fa5f8e40e04172618ddf2d368e67bff2579": "QuasarRAT C&C",
     "98a6d68d800405d033921024b37d54510c72c4ce": "Vawtrak C&C",
+    "98c16e815205ac920be9da61d9d1395f5b953669": "AsyncRAT C&C",
     "98c97ebcf9a16f604136307bcf251f9e00755d99": "Gozi C&C",
     "98d9e62e6d2b66cd3008d4c93dc9a1b65e18c7c6": "KINS C&C",
     "9925d0f77abb064b70136c1af66c149321e5c42b": "BitRAT C&C",
@@ -3139,6 +3154,7 @@
     "9f12912f9bc3419e0670a729f9c4c16ed8fb43fa": "AsyncRAT C&C",
     "9f25a7d6ea5063b3cc5319210eed4667588fd6c4": "AsyncRAT C&C",
     "9f47cb1f50dce2bd73cedb976c21d6199ae6ebe7": "Dridex C&C",
+    "9f54a72ac8f4839a19bcefd13c54736498b2903c": "BitRAT C&C",
     "9f61ebe4e9af3aa9fd34f8f3ee82a3ffb30d0f5a": "KINS C&C",
     "9f79b209ec51390787189663796c433d905df50c": "ServHelper C&C",
     "9f8babc9282d3ceb833dd63334e6e6540423bb74": "BitRAT C&C",
@@ -3975,6 +3991,7 @@
     "cdb0cd3b9ba771e95c696437253c260479dc4cd3": "Gozi C&C",
     "cdb548cade0afb9d70daa7fac43a51fd23048540": "Corebot C&C",
     "cdbc8bc2e963ee6ce518e06a9242a54a2819eb7f": "KINS C&C",
+    "cde944a00bde38bda5aeca3a026a3ef8484b5c65": "AsyncRAT C&C",
     "ce17fdb620ce334514282bf3abd56aec1682cbc0": "AsyncRAT C&C",
     "ce1c1a0e53d310d7fce4ba516ccd9b11cc4dfd08": "IcedID C&C",
     "ce270bde797d938596efd74f983461f62bf04069": "Malware C&C",
@@ -4010,6 +4027,7 @@
     "cf38656e149dda84cfcb94f3b35034e418ba7fe6": "Gozi C&C",
     "cf3bee45f87827fa2c5ddbc50987ac6a5e5aba6c": "OrcusRAT C&C",
     "cf44b575fe4069badd8f1e8a1355cde6f99461a5": "ServHelper C&C",
+    "cf59bc1848f3fcbef9e218560acc7668346ccca9": "DCRat C&C",
     "cf5d04ddec07a64ae92454cb4e881f1d94b23050": "DCRat C&C",
     "cf5f9a814a7f14a8692513458a98c08626db3134": "TrickBot C&C",
     "cf6571b192560b2733a9038db2e1bbaa5b1a77f3": "KINS C&C",
@@ -4801,6 +4819,7 @@
     "f96d5aa2bceea3e43c00bb45aa1ab148beb45b09": "AsyncRAT C&C",
     "f986e8fab555bbdb969ff24c488cd96609435eec": "Vawtrak MITM",
     "f98dfa3174ff9c4d465529e7e61f539c22674835": "TorrentLocker C&C",
+    "f990198262e831a41879ab783eb7352696caacb0": "QuasarRAT C&C",
     "f995d2f8aec2f61df3a20c1f793fc3bed7ad8b17": "Dridex C&C",
     "f996f87d9052a7b6442bae488ddf15167cdd0a56": "Gozi C&C",
     "f998724caaffa66543e2850f525eaf191eaf1d47": "KINS C&C",

setup.py

@@ -245,10 +245,7 @@ def _write_pkg_file(self, file):
                 "web/static/favicon.png",
                 "web/static/loading.gif",
                 "web/static/logo.png",
-                "web/static/anssi.png",
-                "web/static/anssi-white.png",
-                "web/static/cea.png",
-                "web/static/cea-white.png",
+                "web/static/droids.png",
                 "web/static/world-110m.json",
             ],
         ),

web/static/doc/_sources/install/fast-install-and-first-run.rst.txt

@@ -49,7 +49,7 @@ Setup
    # ln -s /usr/local/share/ivre/dokuwiki/media/logo.png
    # ln -s /usr/local/share/ivre/dokuwiki/media/doc
    # cd /usr/share/dokuwiki
-   # patch -p0 < /usr/local/share/ivre/patches/dokuwiki/backlinks.patch
+   # patch -p0 < /usr/local/share/ivre/patches/dokuwiki/backlinks-20200729.patch
    # cd /etc/apache2/mods-enabled
    # for m in rewrite.load wsgi.conf wsgi.load ; do
    >   [ -L $m ] || ln -s ../mods-available/$m ; done

web/static/doc/_sources/license-external.rst.txt

@@ -92,13 +92,8 @@ Atlas <https://github.com/mbostock/world-atlas.git>`__ from data
 published by `Natural Eath <http://www.naturalearthdata.com/>`__ in the
 public domain.
 
-Logos
------
-
-The files ``web/static/cea.png`` and ``web/static/cea-white.png`` are
-the logo of the French Alternative Energies and Atomic Energy
-Commission. They are not covered by IVRE license.
+Logo
+----
 
-The files ``web/static/anssi.png`` and ``web/static/anssi-white.png``
-are the logo of the National Cybersecurity Agency of France. They are
-not covered by IVRE license.
+The file ``web/static/droids.png`` is the logo of the Droids Corporation.
+It is not covered by IVRE license.

web/static/doc/_static/basic.css

@@ -608,8 +608,6 @@ ol.simple p,
 ul.simple p {
     margin-bottom: 0;
 }
-
-/* Docutils 0.17 and older (footnotes & citations) */
 dl.footnote > dt,
 dl.citation > dt {
     float: left;
@@ -627,33 +625,6 @@ dl.citation > dd:after {
     clear: both;
 }
 
-/* Docutils 0.18+ (footnotes & citations) */
-aside.footnote > span,
-div.citation > span {
-    float: left;
-}
-aside.footnote > span:last-of-type,
-div.citation > span:last-of-type {
-  padding-right: 0.5em;
-}
-aside.footnote > p {
-  margin-left: 2em;
-}
-div.citation > p {
-  margin-left: 4em;
-}
-aside.footnote > p:last-of-type,
-div.citation > p:last-of-type {
-    margin-bottom: 0em;
-}
-aside.footnote > p:last-of-type:after,
-div.citation > p:last-of-type:after {
-    content: "";
-    clear: both;
-}
-
-/* Footnotes & citations ends */
-
 dl.field-list {
     display: grid;
     grid-template-columns: fit-content(30%) auto;
@@ -665,11 +636,11 @@ dl.field-list > dt {
     padding-left: 0.5em;
     padding-right: 5px;
 }
-
 dl.field-list > dt:after {
     content: ":";
 }
 
+
 dl.field-list > dd {
     padding-left: 0.5em;
     margin-top: 0em;

web/static/doc/_static/documentation_options.js

@@ -10,5 +10,5 @@ var DOCUMENTATION_OPTIONS = {
     SOURCELINK_SUFFIX: '.txt',
     NAVIGATION_WITH_KEYS: false,
     SHOW_SEARCH_SUMMARY: true,
-    ENABLE_SEARCH_SHORTCUTS: false,
+    ENABLE_SEARCH_SHORTCUTS: true,
 };

web/static/doc/_static/searchtools.js

@@ -88,7 +88,7 @@ const _displayItem = (item, highlightTerms, searchTerms) => {
   linkEl.href = linkUrl + "?" + params.toString() + anchor;
   linkEl.innerHTML = title;
   if (descr)
-    listItem.appendChild(document.createElement("span")).innerText =
+    listItem.appendChild(document.createElement("span")).innerHTML =
       " (" + descr + ")";
   else if (showSearchSummary)
     fetch(requestUrl)
@@ -155,10 +155,8 @@ const Search = {
   _pulse_status: -1,
 
   htmlToText: (htmlString) => {
-    const htmlElement = document
-      .createRange()
-      .createContextualFragment(htmlString);
-    _removeChildren(htmlElement.querySelectorAll(".headerlink"));
+    const htmlElement = new DOMParser().parseFromString(htmlString, 'text/html');
+    htmlElement.querySelectorAll(".headerlink").forEach((el) => { el.remove() });
     const docContent = htmlElement.querySelector('[role="main"]');
     if (docContent !== undefined) return docContent.textContent;
     console.warn(
@@ -504,21 +502,22 @@ const Search = {
    * latter for highlighting it.
    */
   makeSearchSummary: (htmlText, keywords, highlightWords) => {
-    const text = Search.htmlToText(htmlText).toLowerCase();
+    const text = Search.htmlToText(htmlText);
     if (text === "") return null;
 
+    const textLower = text.toLowerCase();
     const actualStartPosition = [...keywords]
-      .map((k) => text.indexOf(k.toLowerCase()))
+      .map((k) => textLower.indexOf(k.toLowerCase()))
       .filter((i) => i > -1)
       .slice(-1)[0];
     const startWithContext = Math.max(actualStartPosition - 120, 0);
 
     const top = startWithContext === 0 ? "" : "...";
     const tail = startWithContext + 240 < text.length ? "..." : "";
 
-    let summary = document.createElement("div");
+    let summary = document.createElement("p");
     summary.classList.add("context");
-    summary.innerText = top + text.substr(startWithContext, 240).trim() + tail;
+    summary.textContent = top + text.substr(startWithContext, 240).trim() + tail;
 
     highlightWords.forEach((highlightWord) =>
       _highlightText(summary, highlightWord, "highlighted")

web/static/doc/install/fast-install-and-first-run.html

@@ -140,7 +140,7 @@ <h2>Setup<a class="headerlink" href="#setup" title="Permalink to this heading">
 # ln -s /usr/local/share/ivre/dokuwiki/media/logo.png
 # ln -s /usr/local/share/ivre/dokuwiki/media/doc
 # cd /usr/share/dokuwiki
-# patch -p0 &lt; /usr/local/share/ivre/patches/dokuwiki/backlinks.patch
+# patch -p0 &lt; /usr/local/share/ivre/patches/dokuwiki/backlinks-20200729.patch
 # cd /etc/apache2/mods-enabled
 # for m in rewrite.load wsgi.conf wsgi.load ; do
 &gt;   [ -L $m ] || ln -s ../mods-available/$m ; done

web/static/doc/license-external.html

@@ -66,7 +66,7 @@
 <li class="toctree-l2"><a class="reference internal" href="#flag-icon-css">flag-icon-css</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#ike-scan-vendor-id-database">ike-scan Vendor ID database</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#natural-earth">Natural Earth</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#logos">Logos</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#logo">Logo</a></li>
 </ul>
 </li>
 </ul>
@@ -168,14 +168,10 @@ <h2>Natural Earth<a class="headerlink" href="#natural-earth" title="Permalink to
 published by <a class="reference external" href="http://www.naturalearthdata.com/">Natural Eath</a> in the
 public domain.</p>
 </section>
-<section id="logos">
-<h2>Logos<a class="headerlink" href="#logos" title="Permalink to this heading"></a></h2>
-<p>The files <code class="docutils literal notranslate"><span class="pre">web/static/cea.png</span></code> and <code class="docutils literal notranslate"><span class="pre">web/static/cea-white.png</span></code> are
-the logo of the French Alternative Energies and Atomic Energy
-Commission. They are not covered by IVRE license.</p>
-<p>The files <code class="docutils literal notranslate"><span class="pre">web/static/anssi.png</span></code> and <code class="docutils literal notranslate"><span class="pre">web/static/anssi-white.png</span></code>
-are the logo of the National Cybersecurity Agency of France. They are
-not covered by IVRE license.</p>
+<section id="logo">
+<h2>Logo<a class="headerlink" href="#logo" title="Permalink to this heading"></a></h2>
+<p>The file <code class="docutils literal notranslate"><span class="pre">web/static/droids.png</span></code> is the logo of the Droids Corporation.
+It is not covered by IVRE license.</p>
 </section>
 </section>
 

web/static/report.html

@@ -2,7 +2,7 @@
 
 <!--
     This file is part of IVRE.
-    Copyright 2011 - 2020 Pierre LALET <pierre@droids-corp.org>
+    Copyright 2011 - 2022 Pierre LALET <pierre@droids-corp.org>
 
     IVRE is free software: you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by
@@ -168,9 +168,7 @@ <h3>IVRE Report</h3>
       </div>
       <div class="col-sm-2">
 	<img style="vertical-align:middle; margin-right: 5%; max-width: 100%;"
-	     alt="CEA" src="cea.png"/>
-	<img style="vertical-align:middle; margin-right: 5%; max-width: 100%;"
-	     alt="ANSSI" src="anssi.png"/>
+	     alt="Droids Corporation" src="droids.png"/>
       </div>
     </div>
 

web/static/templates/menu.html

@@ -92,19 +92,12 @@
   </ul>
 
   <ul class="nav navbar-nav col-lg-1 col-md-2 visible-lg visible-md">
-    <a title="Agence nationale de la s&eacute;curit&eacute; des syst&egrave;mes d'information"
-       href="https://www.ssi.gouv.fr/"
+    <a title="Droids Corporation"
+       href="https://www.droids-corp.org/"
        target="_blank"
        class="navbar-link"
        style="margin-right: 15%;">
-      <img alt="ANSSI" src="anssi-white.png" class="logo"/>
-    </a>
-    <a title="Commissariat &agrave; l'&eacute;nergie atomique et aux &eacute;nergies alternatives"
-       href="http://www.cea.fr/"
-       target="_blank"
-       class="navbar-link"
-       style="margin-right: 5%;">
-      <img alt="CEA" src="cea-white.png" class="logo"/>
+      <img alt="Droids Corporation" src="droids.png" class="logo"/>
     </a>
   </ul>
 </div>