Merge pull request #11078 from owncloud/merge-stable-8.0-to-master-20…

…240620 Merge stable 8.0 to master
owncloud · Jun 21, 2024 · a61cc35 · a61cc35
2 parents cdf19b9 + e4d14be
commit a61cc35
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/changelog/8.0.3_2024-06-20/bugfix-enforce-shortcut-url-protocol b/changelog/8.0.3_2024-06-20/bugfix-enforce-shortcut-url-protocol
@@ -0,0 +1,6 @@
+Bugfix: Enforce shortcut URL protocol
+
+We've fixed a bug where the protocol in shortcut URLs was not enforced. Now, the shortcut URL always starts `https://` if no protocol is provided by the user.
+
+https://github.com/owncloud/web/issues/11063
+https://github.com/owncloud/web/pull/11076
diff --git a/...6-17/bugfix-oc-modal-scroll-small-screens → ...6-20/bugfix-oc-modal-scroll-small-screens b/...6-17/bugfix-oc-modal-scroll-small-screens → ...6-20/bugfix-oc-modal-scroll-small-screens
diff --git a/...ugfix-resource-deselection-on-right-click → ...ugfix-resource-deselection-on-right-click b/...ugfix-resource-deselection-on-right-click → ...ugfix-resource-deselection-on-right-click
diff --git a/...-consist-of-numbers-wont-show-up-in-trash → ...-consist-of-numbers-wont-show-up-in-trash b/...-consist-of-numbers-wont-show-up-in-trash → ...-consist-of-numbers-wont-show-up-in-trash
diff --git a/....0.0_2024-06-17/bugfix-space-not-updating → ....0.3_2024-06-20/bugfix-space-not-updating b/....0.0_2024-06-17/bugfix-space-not-updating → ....0.3_2024-06-20/bugfix-space-not-updating
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -178,14 +178,16 @@ export default defineComponent({
     const isDropOpen = ref(false)
     let markInstance: Mark = null
 
-    const dropItemUrl = computed(() => {
-      let url = unref(inputUrl).trim()
-
+    const getInputUrlWithProtocol = (input: string) => {
+      let url = input.trim()
       if (isMaybeUrl(url)) {
         return url
       }
-
       return `https://${url}`
+    }
+
+    const dropItemUrl = computed(() => {
+      return getInputUrlWithProtocol(unref(inputUrl))
     })
 
     const fileAlreadyExists = computed(
@@ -360,7 +362,9 @@ export default defineComponent({
     const onConfirm = async () => {
       try {
         // Omit possible xss code
-        const sanitizedUrl = DOMPurify.sanitize(unref(inputUrl), { USE_PROFILES: { html: true } })
+        const sanitizedUrl = DOMPurify.sanitize(getInputUrlWithProtocol(unref(inputUrl)), {
+          USE_PROFILES: { html: true }
+        })
 
         const content = `[InternetShortcut]\nURL=${sanitizedUrl}`
         const path = urlJoin(unref(currentFolder).path, `${unref(inputFilename)}.url`)