Merge pull request #148 from OpenVoiceOS/release-1.0.6a1

Release 1.0.6a1
OpenVoiceOS · Nov 26, 2024 · a195aab · a195aab
2 parents 7a1b71e + fa26831
commit a195aab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,20 @@
 # Changelog
 
-## [1.0.4a1](https://github.com/OpenVoiceOS/ovos-bus-client/tree/1.0.4a1) (2024-11-21)
+## [1.0.6a1](https://github.com/OpenVoiceOS/ovos-bus-client/tree/1.0.6a1) (2024-11-26)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/1.0.3...1.0.4a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/1.0.5a1...1.0.6a1)
 
 **Merged pull requests:**
 
-- chore: Update README.md [\#143](https://github.com/OpenVoiceOS/ovos-bus-client/pull/143) ([JarbasAl](https://github.com/JarbasAl))
-- chore: fix pyee import, maintain backwards compat [\#140](https://github.com/OpenVoiceOS/ovos-bus-client/pull/140) ([mikejgray](https://github.com/mikejgray))
+- fix:gui\_caching [\#147](https://github.com/OpenVoiceOS/ovos-bus-client/pull/147) ([JarbasAl](https://github.com/JarbasAl))
+
+## [1.0.5a1](https://github.com/OpenVoiceOS/ovos-bus-client/tree/1.0.5a1) (2024-11-25)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/1.0.4...1.0.5a1)
+
+**Merged pull requests:**
+
+- Update ovos-config requirement from \<1.0.0,\>=0.0.12 to \>=0.0.12,\<2.0.0 [\#145](https://github.com/OpenVoiceOS/ovos-bus-client/pull/145) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 
 

diff --git a/ovos_bus_client/apis/gui.py b/ovos_bus_client/apis/gui.py
@@ -120,13 +120,13 @@ def _cache_gui_files(self):
         for framework, bpath in self.ui_directories.items():
             if framework == "all":
                 # mostly applies to image files
-                shutil.copytree(bpath, output_path)
+                shutil.copytree(bpath, output_path, dirs_exist_ok=True)
                 LOG.debug(f"Copied {self.skill_id} shared GUI resources from {bpath} to {output_path}")
                 continue
             if not os.path.isdir(bpath):
                 LOG.error(f"invalid '{framework}' resources directory: {bpath}")
                 continue
-            shutil.copytree(bpath, f"{output_path}/{framework}")
+            shutil.copytree(bpath, f"{output_path}/{framework}", dirs_exist_ok=True)
             LOG.debug(f"Copied {self.skill_id} GUI resources from {bpath} to {output_path}/{framework}")
 
     def set_bus(self, bus=None):
@@ -552,11 +552,6 @@ def _resolve_url(self, url: str) -> str:
         if url.startswith("http"):
             return url
 
-        # Sanitize the url to prevent path traversal
-        url = os.path.normpath(url)
-        if url.startswith("..") or url.startswith("/"):
-            return url
-
         if not os.path.isfile(url):
             GUI_CACHE_PATH = get_xdg_cache_save_path('ovos_gui')
             # Use os.path.join for path construction

diff --git a/ovos_bus_client/version.py b/ovos_bus_client/version.py
@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 0
-VERSION_BUILD = 4
-VERSION_ALPHA = 0
+VERSION_BUILD = 6
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-ovos-config>=0.0.12,<1.0.0
+ovos-config>=0.0.12,<2.0.0
 ovos-utils>=0.3.5,<1.0.0
 websocket-client>=0.54.0
 pyee>= 8.1.0, < 13.0.0