Merge branch 'develop' into develop

Author: sebix

.github/workflows/debian-packaging.yml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Upload artifact
       if: ${{ github.event_name == 'push' }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: debian-package-${{ matrix.codename }}-${{ github.sha }}
         path: '~/artifacts'

CHANGELOG.md

@@ -7,12 +7,20 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 CHANGELOG
 =========
 
-Unreleased changes
+3.3.1 (unreleased)
 ------------------
 
+ * Improve the error popup window to make its contents more readable (PR#304 by Radek Vyhnal).
+ * Tests: Update/Fix Debian package build scripts (PR#305 by Sebastian Wagner).
+
 ### Configuration
-- Sort bots alphabetically in side menu.
-  
+- Sort bots alphabetically in side menu (PR#298 by Psych0meter).
+
+3.3.0 (2024-03-01)
+------------------
+
+Bump version to be in sync with the main intelmq release
+
 3.2.0 (2023-07-19)
 ------------------
 

README.md

@@ -4,15 +4,15 @@ SPDX-FileCopyrightText: 2020 IntelMQ Team
 SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-![IntelMQ](https://raw.githubusercontent.com/certtools/intelmq/master/docs/images/Logo_Intel_MQ.png)
+![IntelMQ](https://github.com/certtools/intelmq/raw/develop/docs/static/images/Logo_Intel_MQ.svg)
 
 **IntelMQ Manager** is a graphical interface to manage configurations for the [IntelMQ](https://github.com/certtools/intelmq) framework.
 A IntelMQ configuration is a set of config files which describe which bots and processing steps should be run in which order. It is similar to describing the dataflow in [dataflow oriented](https://en.wikipedia.org/wiki/Dataflow_programming) languages.
 **IntelMQ Manager** is therefore an intuitive tool to allow non-programmers to specify the data flow in IntelMQ.
 
 ## Documentation
 
-The documentation for IntelMQ-Manager is part of the [IntelMQ documentation on readthedocs](https://intelmq.readthedocs.io/en/latest/user/intelmq-manager.html).
+The documentation for IntelMQ-Manager is part of the [IntelMQ documentation]([https://intelmq.readthedocs.io/en/latest/user/intelmq-manager.html](https://docs.intelmq.org/latest/user/manager/)).
 
 ## Licence
 

debian/changelog

@@ -1,3 +1,9 @@
+intelmq-manager (3.3.0-1) stable; urgency=medium
+
+  * Update to 3.3.0:  Bump version to be in sync with the main intelmq release
+
+ -- Aaron Kaplan <[email protected]>  Fr, 01 Mar 2024 14:19:00 +0100
+
 intelmq-manager (3.2.0-1) stable; urgency=medium
 
   * Update to 3.2.0

intelmq_manager/static/css/style.css

@@ -23,7 +23,7 @@ nav ul.nav.navbar-top-links li.active {
   padding: 5px;
   width: 500px;
   height: 44px;
-  overflow: auto;
+  overflow: hidden;
   resize: vertical;
   position: absolute;
   top: 0;
@@ -33,9 +33,8 @@ nav ul.nav.navbar-top-links li.active {
 #wrapper .navbar #log-window.extended {
   height: auto;
   max-height: 100vh;
-  width: auto;
   cursor: unset;
-  overflow: scroll;
+  overflow-y: auto;
 }
 #wrapper .navbar #log-window [role=close] {
   float: right;
@@ -146,4 +145,3 @@ nav ul.nav.navbar-top-links li.active {
 #network-container .network-right-menu .vis-physics-toggle {
   right: 480px;
 }
-/*# sourceMappingURL=style.css.map */

intelmq_manager/static/js/about.js

@@ -12,7 +12,7 @@ function get_versions() {
         .done(function (data) {
             intelmq_version_element.innerHTML = data.intelmq;
             intelmq_api_version_element.innerHTML = data['intelmq-api'];
-            intelmq_manager_version_element.innerHTML = '3.2.0';
+            intelmq_manager_version_element.innerHTML = '3.3.0';
         })
         .fail(function (jqxhr, textStatus, error) {
             let err = `${textStatus}, ${error}`;

intelmq_manager/static/js/static.js

@@ -105,28 +105,32 @@ if (!String.prototype.format) {
 let lw_tips = new Set();
 $(function () {
     let $lw = $("#log-window");
+    
+    // close log window on Escape 
+    $(document).on('keydown.close-log-window', event => {
+        if (event.key == "Escape") {
+            $lw.removeClass("extended");
+        }
+    });
+    
+    // toggle log window expanded state - if not selecting text
+    let mDownSelection = 0
+    $lw.on("mousedown", e => {
+        mDownSelection = document.getSelection().toString().length
+    });
+    $lw.on("mouseup", e => {
+        if (mDownSelection == document.getSelection().toString().length) {
+            $lw.toggleClass("extended");
+        }
+    });
+    
+    // close log window via X
     let closeFn = () => {
         $lw.hide();
         $(".contents", $lw).html("");
         lw_tips.clear(); // no tips displayed
         return false;
     };
-
-    $lw.on("click", e => { // clicking enlarges but not shrinks so that we may copy the text
-        let btn = $(e.target);
-        if (!btn.hasClass("extended")) {
-            btn.toggleClass("extended");
-
-            //$(".alert", this).prependTo(btn);
-
-            $(document).on('keydown.close-log-window', event => {
-                if (event.key == "Escape") {
-                    $(document).off('keydown.close-log-window');
-                    $lw.removeClass("extended");
-                }
-            });
-        }
-    });
     $("#log-window [role=close]").click(closeFn);
 });
 

intelmq_manager/static/less/style.less

@@ -25,20 +25,20 @@ nav ul.nav.navbar-top-links li.active {
   padding: 5px;
   width: 500px;
   height: 44px;
-  overflow: auto;
+  overflow: hidden; 
   resize: vertical;
   position: absolute;
   top: 0;
   right: 0;
   cursor: pointer;
 
   &.extended {
-    height: auto;
+    height: auto;  
     max-height: 100vh;
-    width: auto;
-    cursor: unset;
-    overflow:scroll;
-  }
+    // width: auto;   
+    cursor: unset;  
+    overflow-y: auto;
+  } 
 
   [role=close] {
     float: right;
@@ -61,13 +61,13 @@ nav ul.nav.navbar-top-links li.active {
     font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
   }
 
-    .alert a{
-        text-decoration: underline;
-        display: inline-block;
-        padding: 4px;
-        border: 1px solid #ccc;
-        border-radius: 10px;
-    }
+  .alert a {
+    text-decoration: underline;
+    display: inline-block;
+    padding: 4px;
+    border: 1px solid #ccc;
+    border-radius: 10px;
+  }
 }
 
 .fa {
@@ -81,8 +81,9 @@ nav ul.nav.navbar-top-links li.active {
 /*
  * Management page
  */
-#botnet-panels > .panel[data-botnet-group] {
+#botnet-panels>.panel[data-botnet-group] {
   display: none; // initially, all other panels are hidden
+
   &[data-botnet-group=botnet] {
     display: block;
   }
@@ -119,11 +120,10 @@ nav ul.nav.navbar-top-links li.active {
 
 #templates {
   display: none;
-}
-
-#side-menu {
-}
+} 
 
+#side-menu {} 
+ 
 #network-container {
 
   .control-buttons {
@@ -139,6 +139,7 @@ nav ul.nav.navbar-top-links li.active {
   }
 
   .monitor-button {
+
     //background-image: url('../plugins/vis.js/img/network/rightArrow.png');
     //background-size: 24%;
     div a {
@@ -151,11 +152,12 @@ nav ul.nav.navbar-top-links li.active {
   }
 
   .network-right-menu {
-    > div {
+    >div {
       display: block;
     }
 
-    .vis-live-toggle, .vis-physics-toggle {
+    .vis-live-toggle,
+    .vis-physics-toggle {
       border-radius: 10px;
       position: absolute;
       right: 560px;
@@ -185,4 +187,4 @@ nav ul.nav.navbar-top-links li.active {
       right: 480px;
     }
   }
-}
+}

intelmq_manager/templates/base.mako

@@ -107,7 +107,7 @@
                            class="btn btn-primary" style="display: none;">
                 </div>
                 <!-- /.navbar-top-links -->
-                <div title="Click to expand, then escape to minimize again." id='log-window'>
+                <div title="Click to expand, then escape to minimize again." id='log-window' class="extended">
                     <i role="close" class="fa fa-times"></i>
                     <div class="contents"></div>
                 </div>

intelmq_manager/version.py

@@ -3,5 +3,5 @@
 SPDX-FileCopyrightText: 2020-2021 Intelmq Team <[email protected]>, 2022-2023 Intevation GmbH
 SPDX-License-Identifier: AGPL-3.0-or-later
 """
-__version_info__ = (3, 2, 0)
+__version_info__ = (3, 3, 0)
 __version__ = '.'.join(map(str, __version_info__))