diff options
| author | Gina Häußge <gina@octoprint.org> | 2022-10-18 11:42:21 +0300 |
|---|---|---|
| committer | Gina Häußge <gina@octoprint.org> | 2022-10-18 11:42:21 +0300 |
| commit | ab3ebf101f499482e9531f2827d51300ae3aaf6b (patch) | |
| tree | 80662946a234ead97c431060edac461d88a782b2 | |
| parent | de3a12999e7614bde25e5e2c01ceccd24b22ffde (diff) | |
| parent | 1875623f05e14c3a197c6ff324f02dce55cec7d2 (diff) | |
Merge branch 'staging/bugfix'1.8.6staging/maintenancerc/maintenancerc/devel
| -rw-r--r-- | .versioneer-lookup | 6 | ||||
| -rw-r--r-- | src/octoprint/plugins/backup/__init__.py | 11 | ||||
| -rw-r--r-- | src/octoprint/plugins/errortracking/__init__.py | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/.versioneer-lookup b/.versioneer-lookup index e67009478..288e7a71a 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -24,10 +24,10 @@ maintenance 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev fix/.* 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev improve/.* 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev -# staging/bugfix is the branch for preparation of the 1.8.5 bugfix release +# staging/bugfix is the branch for preparation of the 1.8.6 bugfix release # so are any bug/... branches -staging/bugfix 1.8.5 27a576e352a9b3d9abee89ab92cd02012c0e39dd pep440-dev -bug/.* 1.8.5 27a576e352a9b3d9abee89ab92cd02012c0e39dd pep440-dev +staging/bugfix 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev +bug/.* 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev # staging/maintenance is currently the branch for preparation of 1.8.0rc6 # so is regressionfix/... diff --git a/src/octoprint/plugins/backup/__init__.py b/src/octoprint/plugins/backup/__init__.py index 643f9aa11..aad296fb0 100644 --- a/src/octoprint/plugins/backup/__init__.py +++ b/src/octoprint/plugins/backup/__init__.py @@ -381,16 +381,21 @@ class BackupPlugin( ) from octoprint.util import is_hidden_path + plugin_folder = self.get_plugin_data_folder() + + def path_check(path): + joined = os.path.join(plugin_folder, path) + return not is_hidden_path(joined) and self._valid_backup(joined) + return [ ( r"/download/(.*)", LargeResponseHandler, { - "path": self.get_plugin_data_folder(), + "path": plugin_folder, "as_attachment": True, "path_validation": path_validation_factory( - lambda path: not is_hidden_path(path) - and self._valid_backup(path), + path_check, status_code=404, ), "access_validation": access_validation_factory( diff --git a/src/octoprint/plugins/errortracking/__init__.py b/src/octoprint/plugins/errortracking/__init__.py index 7e0fc5647..cb633a65c 100644 --- a/src/octoprint/plugins/errortracking/__init__.py +++ b/src/octoprint/plugins/errortracking/__init__.py @@ -18,10 +18,10 @@ from octoprint.util.version import ( ) SENTRY_URL_SERVER = ( - "https://ed6946a2c4f344738768ac7f34ce27df@o118517.ingest.sentry.io/1373987" + "https://faa02914ec8f42139e12a36482cfdb60@o118517.ingest.sentry.io/1373987" ) SENTRY_URL_COREUI = ( - "https://1b37bf389cbc4150890838f99c42adab@o118517.ingest.sentry.io/1374096" + "https://be7a53389fb045b48d6c384bb8ee89eb@o118517.ingest.sentry.io/1374096" ) SETTINGS_DEFAULTS = { |