Merge pull request #51 from UKB-IT-Sec/48-show-vlan-blacklist-for-arm…

…is-import-if-configured

add vlan blacklist as infobox if configured

src/helper/armis.py

@@ -39,6 +39,9 @@ def _remove_existing_devices(deviceList):
     _mac_list = MacList()
     return [device for device in deviceList if not _mac_list.check_existing_mac(device)[0]]
 
+def get_vlan_blacklist():
+    return armis_config['armis-server'].get('vlan_blacklist', '').strip() or None
+
 # flake8: noqa: E231
 @armiscloud
 def get_devices(acloud, sites):

src/nac/subviews/armis.py

@@ -19,7 +19,7 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 
 
-from helper.armis import get_armis_sites, get_devices, get_tenant_url, get_boundaries, map_ids_to_names
+from helper.armis import get_armis_sites, get_devices, get_tenant_url, get_boundaries, map_ids_to_names, get_vlan_blacklist
 
 
 class ArmisView(LoginRequiredMixin, View):
@@ -33,6 +33,7 @@ def _get_context(self):  # sets the site-context for armis_import.html, uses cac
             cache.set('armis_sites', armis_sites, 3600)
         context['armis_sites'] = armis_sites
         context['tenant_url'] = get_tenant_url()
+        context['vlan_blacklist'] = get_vlan_blacklist()
         return context
 
     def get(self, request, *args, **kwargs):  # rendering the html base with site-context

src/static/default.css

@@ -86,6 +86,8 @@ td {
 	grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)); /* displays checkbox in 100pt width columns, as many as possible based on window size*/
 	gap: 10px 20px;
 	padding: 10px;
+	flex: 1;
+    margin-right: 20px;
   }
 
   .checkbox-item {
@@ -102,4 +104,10 @@ td {
 	width: 20px;
 	height: 20px;
 	cursor: pointer;
+  }
+
+  .split-content {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 15px;
   }

src/templates/armis_import.html

@@ -4,20 +4,34 @@
 {% block content %}
 <div class="container">
   <h1>Armis Import</h1>
+  <p>
   <button id="toggleSiteForm" class="btn btn-secondary btn-sm">
     {% if display %}Hide Sites{% else %}Show Sites{% endif %}
   </button>
+    <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#vlan_blacklist" aria-expanded="false" aria-controls="vlan_blacklist">
+      VLAN Blacklist
+    </button>
+  </p>
+  <div>
+    <div class="collapse" id="vlan_blacklist">
+      <div class="card card-body" style="background-color:rgb(190, 190, 190);">
+        <strong>{{vlan_blacklist}}</strong>
+      </div>
+    </div>
+  </div>
   <div id="formContainer" style="display: {% if display %}block{% else %}none{% endif %}">
     <form id="siteSubmitForm" method="POST" action="{% url 'armis_import' %}">
         {% csrf_token %}
-        <div class="checkbox-container">
-            {% for site_id, site_info in armis_sites.items %}
-                <div class="checkbox-item">
-                    <input type="checkbox" id="site-{{ site_id }}" name="site-ids[]" value="{{ site_id }}" class="custom-checkbox">
-                    <label for="site-{{ site_id }}" class="checkbox-label">{{ site_info.name }}</label>
-                </div>
-            {% endfor %}
-        </div>
+        <div class="split-content">
+          <div class="checkbox-container">
+              {% for site_id, site_info in armis_sites.items %}
+                  <div class="checkbox-item">
+                      <input type="checkbox" id="site-{{ site_id }}" name="site-ids[]" value="{{ site_id }}" class="custom-checkbox">
+                      <label for="site-{{ site_id }}" class="checkbox-label">{{ site_info.name }}</label>
+                  </div>
+              {% endfor %}
+          </div>
+      </div>
         <button type="submit" class="btn btn-secondary btn-sm">Select</button>
     </form>
   </div>