Merge pull request #452 from eReuse/changes/4377-setup-page

new wbSettings templates

ereuse_devicehub/templates/workbench/settings.html

@@ -134,13 +134,14 @@
     </div>
   </div>
   {% if not demo %}
+  {# WB V14.4 #}
   <div class="row">
     <div class="col">
       <div class="card">
         <div class="card-body">
 
           <div class="pt-8 pb-2">
-            <h5 class="card-title pb-0 fs-4">Usody Data Erasure v14</h5>
+            <h5 class="card-title pb-0 fs-4">Usody Data Erasure v14.4</h5>
             <p class="mb-5">
               A certified data erasure software to irreversibly removing data sored on hard drives.<br />
               <small>Desktops, Servers and Laptops.</small>
@@ -148,13 +149,13 @@
 
             <div class="row">
               <div class="col-2">
-                <a href="{{ iso_erease.url }}{{ iso_erease.iso }}" class="btn btn-primary" style="max-width: 200px;">
+                <a href="{{ iso_erease4.url }}{{ iso_erease4.iso }}" class="btn btn-primary" style="max-width: 200px;">
                   Download ISO
                 </a>
               </div>
               <div class="col-3">
                 <p class="small">
-                  Download Checksum: <a class="help" href="{{ iso_erease.url }}SHA512SUM">SHA512SUM</a> |
+                  Download Checksum: <a class="help" href="{{ iso_erease4.url }}SHA512SUM">SHA512SUM</a> |
                   <a href="https://help.usody.com/es/setup/setup-pendrive/" target="_blank" class="help">Help</a>
                 </p>
               </div>
@@ -226,6 +227,82 @@
       </div>
     </div>
   </div>
+
+  {# WB V14.2 #}
+  <div class="row">
+    <div class="col">
+      <div class="card">
+        <div class="card-body">
+
+          <div class="pt-8 pb-2">
+            <h5 class="card-title pb-0 fs-4">Usody Data Erasure v14.2</h5>
+            <p class="mb-5">
+              A certified data erasure software to irreversibly removing data sored on hard drives.<br />
+              <small>Desktops, Servers and Laptops.</small>
+            </p>
+
+            <div class="row">
+              <div class="col-2">
+                <a href="{{ iso_erease2.url }}{{ iso_erease2.iso }}" class="btn btn-primary" style="max-width: 200px;">
+                  Download ISO
+                </a>
+              </div>
+              <div class="col-3">
+                <p class="small">
+                  Download Checksum: <a class="help" href="{{ iso_erease2.url }}SHA512SUM">SHA512SUM</a> |
+                  <a href="https://help.usody.com/es/setup/setup-pendrive/" target="_blank" class="help">Help</a>
+                </p>
+              </div>
+              <div class="col"></div>
+            </div>
+
+            <div class="row mt-3">
+              <div class="col-3">
+                <div class="border mr-2 p-2">
+                  <h5>Basic Erasure</h5>
+                  <p>
+                    Settings for basic data erasure using shred Linux command.
+                    A software-based fast non-100%-secured way of erasing data storage.
+                  </p>              
+                  <p>
+                    Performs <strong>1</strong> pass overwriting one round using all zeros. 
+                    Compliant with <strong>NIST SP-800-88</strong>.
+                  </p>
+                  <a href="{{ url_for('workbench.settings') }}?opt=erease_basic" 
+                  class="btn btn-primary" 
+                  style="width: 100%;">
+                  Download settings file
+                  </a>
+                </div>
+              </div>
+
+              <div class="col-3">
+                <div class="border mr-2 p-2">
+                  <h5>Baseline Secure Erasure</h5>
+                  <p>
+                    Settings for advanced data erasure using badblocks Linux software.
+                    A secured-way of erasing data storages, erase hidden areas, checking the erase sector by sector.
+                  </p>  
+                  <p>
+                    Performs <strong>1</strong> pass overwriting each sector with zeros and a final verification.
+                    Compliant with <strong>HMG Infosec Standard 5 Baseline</strong>.
+                  </p>              
+                  <a href="{{ url_for('workbench.settings') }}?opt=baseline_erease"
+                  class="btn btn-primary" 
+                  style="width: 100%;">
+                  Download settings file
+                  </a>
+                </div>
+              </div>
+            </div>
+
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+  
   {% endif %}
 
 </section>

ereuse_devicehub/templates/workbench/wbSettings.ini

@@ -1,38 +0,0 @@
-[settings]
-
-DH_TOKEN = {{ token }}
-DH_URL = {{ url }}
-{% if erease_basic %}
-DH_HOST = {{ api_host }}
-DH_DATABASE = {{ schema }}
-DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/
-
-WB_BENCHMARK = False
-WB_STRESS_TEST = 0
-WB_SMART_TEST = short
-
-WB_ERASE = EraseBasic
-WB_ERASE_STEPS = 1
-WB_ERASE_LEADING_ZEROS = False
-VERSION = Basic Erasure (BE)
-
-{% elif baseline_erease %}
-DH_HOST = {{ api_host }}
-DH_DATABASE = {{ schema }}
-DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/
-
-WB_BENCHMARK = False
-WB_STRESS_TEST = 0
-WB_SMART_TEST = short
-
-WB_ERASE = EraseSectors
-WB_ERASE_STEPS = {{ erase_steps }}
-WB_ERASE_LEADING_ZEROS = True
-VERSION = {%if erase_steps < 3 %}Baseline Secure Erasure (BSE){% else %}Enhanced Secure Erasure (ESE){% endif %}
-
-{% else %}
-SNAPSHOTS_PATH = /mnt
-LOGS_PATH = /mnt
-VERSION = Basic Metadata (BM)
-
-{% endif %}

ereuse_devicehub/templates/workbench/wbSettings_BE.ini

@@ -0,0 +1,15 @@
+[settings]
+VERSION = Basic Metadata (BM)
+
+DH_TOKEN = {{ token }}
+DH_URL = {{ url }}
+DH_HOST = {{ api_host }}
+DH_DATABASE = {{ schema }}
+
+WB_BENCHMARK = False
+WB_STRESS_TEST = 0
+WB_SMART_TEST = short
+
+WB_ERASE = EraseBasic
+WB_ERASE_STEPS = 1
+WB_ERASE_LEADING_ZEROS = False

ereuse_devicehub/templates/workbench/wbSettings_BM.ini

@@ -0,0 +1,8 @@
+[settings]
+VERSION = Basic Metadata (BM)
+
+DH_TOKEN = {{ token }}
+DH_URL = {{ url }}
+
+SNAPSHOTS_PATH = /mnt
+LOGS_PATH = /mnt

ereuse_devicehub/templates/workbench/wbSettings_BSE.ini

@@ -0,0 +1,20 @@
+[settings]
+VERSION = Baseline Secure Erasure (BSE)
+
+DH_TOKEN = {{ token }}
+DH_URL = {{ url }}
+DH_HOST = {{ api_host }}
+DH_DATABASE = {{ schema }}
+
+WB_BENCHMARK = False
+WB_STRESS_TEST = 0
+WB_SMART_TEST = short
+
+WB_ERASE = EraseSectors
+WB_ERASE_STEPS = 1
+WB_ERASE_LEADING_ZEROS = True
+
+WB_ERASE_1_METHOD = EraseBasic
+WB_ERASE_1_STEP_TYPE = 0
+WB_ERASE_2_METHOD = EraseSectors
+WB_ERASE_2_STEP_TYPE = 1

ereuse_devicehub/templates/workbench/wbSettings_ESE.ini

@@ -0,0 +1,22 @@
+[settings]
+VERSION = Enhanced Secure Erasure (ESE)
+
+DH_TOKEN = {{ token }}
+DH_URL = {{ url }}
+DH_HOST = {{ api_host }}
+DH_DATABASE = {{ schema }}
+
+WB_BENCHMARK = False
+WB_STRESS_TEST = 0
+WB_SMART_TEST = short
+
+WB_ERASE = EraseSectors
+
+#WB_ERASE_CONFIRMATION = True
+
+WB_ERASE_1_METHOD = EraseBasic
+WB_ERASE_1_STEP_TYPE = 1
+WB_ERASE_2_METHOD = EraseBasic
+WB_ERASE_2_STEP_TYPE = 0
+WB_ERASE_3_METHOD = EraseSectors
+WB_ERASE_3_STEP_TYPE = 1

ereuse_devicehub/workbench/__init__.py

@@ -7,8 +7,12 @@ isos = {
         'iso': "USODY_2022.12.2-beta.iso",
         'url': 'https://releases.usody.com/2022/',
     },
-    "erease": {
+    "erease2": {
         'iso': "USODY_14.2.0.iso",
-        'url': 'https://releases.usody.com/v14/',
+        'url': 'https://releases.usody.com/v14.2/',
+    },
+    "erease4": {
+        'iso': "USODY_14.4.0.iso",
+        'url': 'https://releases.usody.com/v14.4/',
     },
 }

ereuse_devicehub/workbench/views.py

@@ -34,7 +34,8 @@ class SettingsView(GenericMixin):
                 'demo': g.user.email == app.config['EMAIL_DEMO'],
                 'iso_demo': isos['demo'],
                 'iso_register': isos['register'],
-                'iso_erease': isos['erease'],
+                'iso_erease2': isos['erease2'],
+                'iso_erease4': isos['erease4'],
                 'form': form_kangaroo,
             }
         )
@@ -64,6 +65,7 @@ class SettingsView(GenericMixin):
         }
         # if is a v14 version
         # TODO when not use more v14, we can remove this if
+        template = 'workbench/wbSettings_BM.ini'
         if 'erease' in self.opt:
             url = "https://{}/actions/".format(app.config['API_HOST'])
             self.wbContext['url'] = url
@@ -72,14 +74,13 @@ class SettingsView(GenericMixin):
             self.wbContext['schema'] = app.config['SCHEMA']
 
             if self.opt == 'erease_basic':
-                self.wbContext['erease_basic'] = True
+                template = 'workbench/wbSettings_BE.ini'
-            if self.opt in ['baseline_erease', 'enhanced_erease']:
+            if self.opt == 'baseline_erease':
-                self.wbContext['baseline_erease'] = True
+                template = 'workbench/wbSettings_BSE.ini'
-                self.wbContext['erase_steps'] = 1
             if self.opt == 'enhanced_erease':
-                self.wbContext['erase_steps'] = 3
+                template = 'workbench/wbSettings_ESE.ini'
 
-        data = flask.render_template('workbench/wbSettings.ini', **self.wbContext)
+        data = flask.render_template(template, **self.wbContext)
         return self.response_download(data)
 
     def response_download(self, data):