Add helper class to manage Borg version and supported features. #250

m3nu · 2019-04-08T02:39:22Z

Fixes #205

ThomasWaldmann

some stuff i found.

ThomasWaldmann · 2019-04-08T20:30:17Z

src/vorta/borg/_compatibility.py

@@ -0,0 +1,24 @@
+from pkg_resources import parse_version
+
+MIN_BORG_FOR_FEATURE = {


zstd compression comes to mind. present since 1.1.4.

ThomasWaldmann · 2019-04-08T20:31:31Z

src/vorta/borg/_compatibility.py

+from pkg_resources import parse_version
+
+MIN_BORG_FOR_FEATURE = {
+    'REPOKEY_BLAKE2': parse_version('1.1.4'),


blake2 since 1.1.0.

guess the key should be rather named 'BLAKE2' (it applies to repokey and also to keyfile modes).

ThomasWaldmann · 2019-04-08T20:34:12Z

src/vorta/borg/_compatibility.py

+
+MIN_BORG_FOR_FEATURE = {
+    'REPOKEY_BLAKE2': parse_version('1.1.4'),
+    # add new version-checks here.


from our docs/changes.rst:

pre-1.1.4 potential data corruption issue

pre-1.0.9 manifest spoofing vulnerability (CVE-2016-10099)

pre-1.0.9 potential data loss

vorta could warn for < 1.1.4 or < 1.0.9 if you like.

ThomasWaldmann · 2019-04-08T20:38:35Z

src/vorta/views/repo_add_dialog.py

-                                        'keyfile-blake2')
+
+        if app.borg_compat.check('REPOKEY_BLAKE2'):
+            self.encryptionComboBox.addItem(self.tr('Keyfile-Blake2 (Key stored in home directory)'),


with the key naming fix, (see above) this will read less strange.

m3nu · 2019-04-09T04:04:42Z

Thanks for the input. Made some more changes:

Check for ZStd feature: This was tricky, as I didn't want to change existing user settings. So I ended up disabling them in the list and giving an error when a backup is created with an old version.
Renamed the BLAKE2 feature and went to just disabling the options instead of removing them altogether. And refactored into a list to have less repetitive code.
Moved the borg_compat class instance to utils. It's easier accessible there and we already have the keyring instance there, which is similar in its usage.

ThomasWaldmann · 2019-04-10T08:41:37Z

src/vorta/borg/_compatibility.py

@@ -1,7 +1,8 @@
 from pkg_resources import parse_version

 MIN_BORG_FOR_FEATURE = {
-    'REPOKEY_BLAKE2': parse_version('1.1.4'),
+    'BLAKE2': parse_version('1.1.4'),


Didn't you say there were some issues with blake2 before 1.1.4? So I figured I use the version where it was rock-solid.

ThomasWaldmann · 2019-04-10T08:46:46Z

src/vorta/views/repo_tab.py

+    def toggle_available_compression(self):
+        use_zstd = borg_compat.check('ZSTD')
+        self.repoCompression.model().item(1).setEnabled(use_zstd)
+        self.repoCompression.model().item(2).setEnabled(use_zstd)


hardcoded 1 and 2 here is a potential future bug.

maybe determine offset somehow or add a comment above the place where the compression menu items are added to update this place in case of changes?

I actually considered this, but finding the offset needs an extra statement.

Since you noticed this as well, I added selecting the offset by value, rather than index.

ThomasWaldmann · 2019-04-12T08:22:34Z

src/vorta/views/repo_tab.py

-        self.repoCompression.model().item(2).setEnabled(use_zstd)
+        for algo in ['zstd,3', 'zstd,8']:
+            ix = self.repoCompression.findData(algo)
+            self.repoCompression.model().item(ix).setEnabled(use_zstd)


nice and solid! :)

Add helper class to manage Borg version and supported features. Fixes b…

67fb6b4

…orgbase#205

m3nu requested a review from ThomasWaldmann April 8, 2019 02:39

Add setuptools as dependency to ensure pkg_resources is available.

5a237da

ThomasWaldmann reviewed Apr 8, 2019

View reviewed changes

Review fixes, check for ZStd support, refactor some relative imports.

be5e5f2

m3nu force-pushed the issue/205/limit-repokey-blake2-support branch from a86ac4c to be5e5f2 Compare April 9, 2019 03:47

Repo-add dialog: Disable Blake2 options if not available.

483ec1d

ThomasWaldmann reviewed Apr 10, 2019

View reviewed changes

When disabling compression algos, select by value, not index.

6b9de4b

ThomasWaldmann reviewed Apr 12, 2019

View reviewed changes

m3nu merged commit b9486d0 into borgbase:master Apr 14, 2019

m3nu deleted the issue/205/limit-repokey-blake2-support branch January 20, 2021 05:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add helper class to manage Borg version and supported features. #250

Add helper class to manage Borg version and supported features. #250

m3nu commented Apr 8, 2019

ThomasWaldmann left a comment

ThomasWaldmann Apr 8, 2019

ThomasWaldmann Apr 8, 2019

ThomasWaldmann Apr 8, 2019

ThomasWaldmann Apr 8, 2019

ThomasWaldmann Apr 8, 2019

m3nu commented Apr 9, 2019

ThomasWaldmann Apr 10, 2019

m3nu Apr 11, 2019

ThomasWaldmann Apr 10, 2019

m3nu Apr 11, 2019

ThomasWaldmann Apr 12, 2019

		@@ -0,0 +1,24 @@
		from pkg_resources import parse_version

		MIN_BORG_FOR_FEATURE = {

Add helper class to manage Borg version and supported features. #250

Add helper class to manage Borg version and supported features. #250

Conversation

m3nu commented Apr 8, 2019

ThomasWaldmann left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

m3nu commented Apr 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment