diff --git a/ereuse_devicehub/templates/workbench/settings.html b/ereuse_devicehub/templates/workbench/settings.html index ff21dfa9..387e0fbf 100644 --- a/ereuse_devicehub/templates/workbench/settings.html +++ b/ereuse_devicehub/templates/workbench/settings.html @@ -134,13 +134,14 @@ {% if not demo %} + {# WB V14.4 #}
-
Usody Data Erasure v14
+
Usody Data Erasure v14.4

A certified data erasure software to irreversibly removing data sored on hard drives.
Desktops, Servers and Laptops. @@ -148,13 +149,13 @@

- + Download ISO

- Download Checksum: SHA512SUM | + Download Checksum: SHA512SUM | Help

@@ -226,6 +227,82 @@
+ + {# WB V14.2 #} +
+
+
+
+ +
+
Usody Data Erasure v14.2
+

+ A certified data erasure software to irreversibly removing data sored on hard drives.
+ Desktops, Servers and Laptops. +

+ +
+
+ + Download ISO + +
+
+

+ Download Checksum: SHA512SUM | + Help +

+
+
+
+ +
+
+
+
Basic Erasure
+

+ Settings for basic data erasure using shred Linux command. + A software-based fast non-100%-secured way of erasing data storage. +

+

+ Performs 1 pass overwriting one round using all zeros. + Compliant with NIST SP-800-88. +

+ + Download settings file + +
+
+ +
+
+
Baseline Secure Erasure
+

+ 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. +

+

+ Performs 1 pass overwriting each sector with zeros and a final verification. + Compliant with HMG Infosec Standard 5 Baseline. +

+ + Download settings file + +
+
+
+ +
+ +
+
+
+
+ {% endif %} diff --git a/ereuse_devicehub/templates/workbench/wbSettings.ini b/ereuse_devicehub/templates/workbench/wbSettings.ini deleted file mode 100644 index 53bbc34d..00000000 --- a/ereuse_devicehub/templates/workbench/wbSettings.ini +++ /dev/null @@ -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 %} \ No newline at end of file diff --git a/ereuse_devicehub/templates/workbench/wbSettings_BE.ini b/ereuse_devicehub/templates/workbench/wbSettings_BE.ini new file mode 100644 index 00000000..c616d1a3 --- /dev/null +++ b/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 diff --git a/ereuse_devicehub/templates/workbench/wbSettings_BM.ini b/ereuse_devicehub/templates/workbench/wbSettings_BM.ini new file mode 100644 index 00000000..287af4bf --- /dev/null +++ b/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 diff --git a/ereuse_devicehub/templates/workbench/wbSettings_BSE.ini b/ereuse_devicehub/templates/workbench/wbSettings_BSE.ini new file mode 100644 index 00000000..7242b6b7 --- /dev/null +++ b/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 diff --git a/ereuse_devicehub/templates/workbench/wbSettings_ESE.ini b/ereuse_devicehub/templates/workbench/wbSettings_ESE.ini new file mode 100644 index 00000000..d101b50e --- /dev/null +++ b/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 diff --git a/ereuse_devicehub/workbench/__init__.py b/ereuse_devicehub/workbench/__init__.py index ea44bae3..a3fc446e 100644 --- a/ereuse_devicehub/workbench/__init__.py +++ b/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/', }, } diff --git a/ereuse_devicehub/workbench/views.py b/ereuse_devicehub/workbench/views.py index 25805261..39f252d7 100644 --- a/ereuse_devicehub/workbench/views.py +++ b/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 - if self.opt in ['baseline_erease', 'enhanced_erease']: - self.wbContext['baseline_erease'] = True - self.wbContext['erase_steps'] = 1 + template = 'workbench/wbSettings_BE.ini' + if self.opt == 'baseline_erease': + template = 'workbench/wbSettings_BSE.ini' 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):