From a5bf59c5618e13ab4fc71c12f2d141bc03275fa4 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 21 Oct 2022 17:43:21 +0200
Subject: [PATCH 1/2] add template for Enhanced Secure Erasure

---
 .../templates/workbench/settings.html          |  8 ++++----
 .../templates/workbench/wbSettings.ini         |  5 ++---
 ereuse_devicehub/workbench/views.py            | 18 ++++++++++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ereuse_devicehub/templates/workbench/settings.html b/ereuse_devicehub/templates/workbench/settings.html
index edcf93b6..d0db7756 100644
--- a/ereuse_devicehub/templates/workbench/settings.html
+++ b/ereuse_devicehub/templates/workbench/settings.html
@@ -191,7 +191,7 @@
                     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=erease_sectors" 
+                  <a href="{{ url_for('workbench.settings') }}?opt=baseline_erease"
                   class="btn btn-primary" 
                   style="width: 100%;">
                   Download settings file
@@ -210,11 +210,11 @@
                     Performs <strong>3</strong> passes overwriting every sector with zeros and ones, and final verification.
                     Compliant with <strong>HMG Infosec Standard 5 Enhanced</strong>.
                   </p>           
-                  <span 
-                  class="btn btn-secondary" 
+                  <a href="{{ url_for('workbench.settings') }}?opt=enhanced_erease"
+                  class="btn btn-primary" 
                   style="width: 100%;">
                   Download settings file
-                  </span>
+                  </a>
                 </div>
               </div>
             </div>
diff --git a/ereuse_devicehub/templates/workbench/wbSettings.ini b/ereuse_devicehub/templates/workbench/wbSettings.ini
index 14459454..a0357ab0 100644
--- a/ereuse_devicehub/templates/workbench/wbSettings.ini
+++ b/ereuse_devicehub/templates/workbench/wbSettings.ini
@@ -16,8 +16,7 @@ WB_ERASE_STEPS = 1
 WB_ERASE_LEADING_ZEROS = False
 
 WB_DEBUG = True
-{% endif %}
-{% if erease_sectors %}
+{% elif baseline_erease %}
 DH_HOST = {{ host }}
 DH_DATABASE = {{ schema }}
 DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/
@@ -27,7 +26,7 @@ WB_STRESS_TEST = 0
 WB_SMART_TEST = short
 
 WB_ERASE = EraseSectors
-WB_ERASE_STEPS = 1
+WB_ERASE_STEPS = {{ erase_steps }}
 WB_ERASE_LEADING_ZEROS = True
 
 WB_DEBUG = True
diff --git a/ereuse_devicehub/workbench/views.py b/ereuse_devicehub/workbench/views.py
index 28842826..55ae905e 100644
--- a/ereuse_devicehub/workbench/views.py
+++ b/ereuse_devicehub/workbench/views.py
@@ -43,7 +43,13 @@ class SettingsView(GenericMixin):
             form_kangaroo.save()
 
         self.opt = request.values.get('opt')
-        if self.opt in ['register', 'erease_basic', 'erease_sectors']:
+        options = [
+            'register',
+            'erease_basic',
+            'baseline_erease',
+            'enhanced_erease',
+        ]
+        if self.opt in options:
             return self.download()
 
         return flask.render_template(self.template_name, **self.context)
@@ -54,7 +60,7 @@ class SettingsView(GenericMixin):
             'token': self.get_token(),
             'url': url,
             'erease_basic': None,
-            'erease_sectors': None,
+            'baseline_erease': None,
         }
         # if is a v14 version
         # TODO when not use more v14, we can remove this if
@@ -63,10 +69,14 @@ class SettingsView(GenericMixin):
             self.wbContext['url'] = url
             self.wbContext['host'] = app.config['HOST']
             self.wbContext['schema'] = app.config['SCHEMA']
+
             if self.opt == 'erease_basic':
                 self.wbContext['erease_basic'] = True
-            if self.opt == 'erease_sectors':
-                self.wbContext['erease_sectors'] = True
+            if self.opt in ['baseline_erease', 'enhanced_erease']:
+                self.wbContext['baseline_erease'] = True
+                self.wbContext['erase_steps'] = 1
+            if self.opt == 'enhanced_erease':
+                self.wbContext['erase_steps'] = 3
 
         data = flask.render_template('workbench/wbSettings.ini', **self.wbContext)
         return self.response_download(data)

From aba6548d9ca0ea25c0d47b6cdeabe7067a3860c6 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 21 Oct 2022 18:23:33 +0200
Subject: [PATCH 2/2] add point

---
 ereuse_devicehub/templates/workbench/settings.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ereuse_devicehub/templates/workbench/settings.html b/ereuse_devicehub/templates/workbench/settings.html
index d0db7756..d4d591f1 100644
--- a/ereuse_devicehub/templates/workbench/settings.html
+++ b/ereuse_devicehub/templates/workbench/settings.html
@@ -77,8 +77,8 @@
             <div class="row pt-3">
               <div class="col">
                   <p>Please download the ISO file and the settings file of the
-                  version you want and follow these steps
-                  <a href="https://help.usody.com/es/setup/setup-pendrive/" target="_blank" class="help">steps</a></p>
+                  version you want and follow these 
+                  <a href="https://help.usody.com/es/setup/setup-pendrive/" target="_blank" class="help">steps</a>.</p>
               </div>
             </div>
           </div>
@@ -97,8 +97,8 @@
           <div class="pt-6 pb-2">
             <h5 class="card-title pb-0 fs-4">Usody Hardware Metadata 2022</h5>
             <p class="mb-5">
-              A certified collection of hardware details and testing reports<br />
-              <small>Desktops, Servers and Laptops</small>
+              A certified collection of hardware details and testing reports.<br />
+              <small>Desktops, Servers and Laptops.</small>
             </p>
 
             <div class="row">
@@ -142,7 +142,7 @@
             <h5 class="card-title pb-0 fs-4">Usody Data Erasure v14</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>
+              <small>Desktops, Servers and Laptops.</small>
             </p>
 
             <div class="row">
@@ -170,7 +170,7 @@
                   </p>              
                   <p>
                     Performs <strong>1</strong> pass overwriting one round using all zeros. 
-                    Compliant with <strong>NIST SP-800-88</strong>
+                    Compliant with <strong>NIST SP-800-88</strong>.
                   </p>
                   <a href="{{ url_for('workbench.settings') }}?opt=erease_basic" 
                   class="btn btn-primary"