lots of url encoding changes

gtsteffaniak · gtsteffaniak · commit a0962605b0fa · 2025-06-13T17:55:39.000-05:00
diff --git a/backend/http/raw.go b/backend/http/raw.go
@@ -44,12 +44,7 @@ func setContentDisposition(w http.ResponseWriter, r *http.Request, fileName stri
 // @Failure 500 {object} map[string]string "Internal server error"
 // @Router /api/raw [get]
 func rawHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	encodedFiles := r.URL.Query().Get("files")
-	// Decode the URL-encoded path
-	files, err := url.QueryUnescape(encodedFiles)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
+	files := r.URL.Query().Get("files")
 	fileList := strings.Split(files, "||")
 	return rawFilesHandler(w, r, d, fileList)
 }
@@ -62,10 +57,6 @@ func addFile(path string, d *requestContext, tarWriter *tar.Writer, zipWriter *z
 	source := splitFile[0]
 	path = splitFile[1]
 	var err error
-	source, err = url.QueryUnescape(source)
-	if err != nil {
-		return fmt.Errorf("invalid source encoding: %v", err)
-	}
 	fmt.Println("source", source)
 	userScope := "/"
 	if d.user.Username != "publicUser" {
@@ -195,10 +186,7 @@ func rawFilesHandler(w http.ResponseWriter, r *http.Request, d *requestContext,
 	firstFilePath := splitFile[1]
 	// decode url encoded source name
 	var err error
-	firstFileSource, err = url.QueryUnescape(firstFileSource)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid source encoding: %v", err)
-	}
+	fmt.Println("firstFileSource", firstFileSource)
 	fileName := filepath.Base(firstFilePath)
 	userscope := "/"
 	if d.user.Username != "publicUser" {
@@ -334,10 +322,6 @@ func computeArchiveSize(fileList []string, d *requestContext) (int64, error) {
 		source := splitFile[0]
 		path := splitFile[1]
 		var err error
-		source, err = url.QueryUnescape(source)
-		if err != nil {
-			return http.StatusBadRequest, fmt.Errorf("invalid source encoding: %v", err)
-		}
 		idx := indexing.GetIndex(source)
 		if idx == nil {
 			return 0, fmt.Errorf("source %s is not available", source)
diff --git a/backend/http/resource.go b/backend/http/resource.go
@@ -41,13 +41,6 @@ func resourceGetHandler(w http.ResponseWriter, r *http.Request, d *requestContex
 	source := r.URL.Query().Get("source")
 	if source == "" {
 		source = config.Server.DefaultSource.Name
-	} else {
-		var err error
-		// decode url encoded source name
-		source, err = url.QueryUnescape(source)
-		if err != nil {
-			return http.StatusBadRequest, fmt.Errorf("invalid source encoding: %v", err)
-		}
 	}
 	// Decode the URL-encoded path
 	path, err := url.QueryUnescape(encodedPath)
diff --git a/backend/http/search.go b/backend/http/search.go
@@ -78,11 +78,12 @@ func searchHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (i
 		return http.StatusForbidden, err
 	}
 	combinedPath := index.MakeIndexPath(filepath.Join(userscope, searchScope))
+	combinedPath = strings.TrimSuffix(combinedPath, "/") + "/" // Ensure trailing slash
 	// Perform the search using the provided query and user scope
 	response := index.Search(query, combinedPath, sessionId)
 	for i := range response {
 		// Remove the user scope from the path
-		response[i].Path = strings.TrimPrefix(response[i].Path, userscope)
+		response[i].Path = strings.TrimPrefix(response[i].Path, combinedPath)
 		if response[i].Path == "" {
 			response[i].Path = "/"
 		}
diff --git a/frontend/src/api/files.js b/frontend/src/api/files.js
@@ -10,7 +10,7 @@ export async function fetchFiles(url, content = false) {
     const result = extractSourceFromPath(url)
     const apiPath = getApiPath('api/resources', {
       path: encodeURIComponent(result.path),
-      source: result.source,
+      source: encodeURIComponent(result.source),
       ...(content && { content: 'true' })
     })
     const res = await fetchURL(apiPath)
@@ -26,7 +26,7 @@ export async function fetchFiles(url, content = false) {
 async function resourceAction(url, method, content) {
   try {
     const result = extractSourceFromPath(url)
-    let source = result.source
+    let source = encodeURIComponent(result.source)
     let path = result.path
     let opts = { method }
     if (content) {
@@ -69,14 +69,13 @@ export function download(format, files) {
   if (format !== 'zip') {
     format = 'tar.gz'
   }
-
   let fileargs = ''
   if (files.length === 1) {
-    const result = extractSourceFromPath(decodeURI(files[0]))
+    const result = extractSourceFromPath(decodeURIComponent(files[0]))
     fileargs = result.source + '::' + result.path + '||'
   } else {
     for (let file of files) {
-      const result = extractSourceFromPath(decodeURI(file))
+      const result = extractSourceFromPath(decodeURIComponent(file))
       fileargs += result.source + '::' + result.path + '||'
     }
   }
@@ -110,7 +109,7 @@ export async function post(url, content = '', overwrite = false, onupload) {
 
     const apiPath = getApiPath('api/resources', {
       path: result.path,
-      source: result.source,
+      source: encodeURIComponent(result.source),
       override: overwrite
     })
     return new Promise((resolve, reject) => {
@@ -164,7 +163,7 @@ export async function moveCopy(
       const toResult = extractSourceFromPath(item.to)
       let localParams = {
         ...params,
-        destination: toResult.source + '::' + toResult.path,
+        destination: encodeURIComponent(toResult.source) + '::' + toResult.path,
         from: fromResult.source + '::' + fromResult.path
       }
       const apiPath = getApiPath('api/resources', localParams)
@@ -189,12 +188,11 @@ export async function moveCopy(
   }
 }
 
-export async function checksum(url, algo) {
+export async function checksum(source, path, algo) {
   try {
-    const result = extractSourceFromPath(url)
     const params = {
-      path: encodeURIComponent(result.path),
-      source: result.source,
+      path: encodeURIComponent(path),
+      source: encodeURIComponent(source),
       checksum: algo
     }
     const apiPath = getApiPath('api/resources', params)
@@ -210,7 +208,7 @@ export async function checksum(url, algo) {
 export function getDownloadURL(source, path, inline, useExternal) {
   try {
     const params = {
-      files: source + '::' + encodeURIComponent(path),
+      files: encodeURIComponent(source) + '::' + encodeURIComponent(path),
       ...(inline && { inline: 'true' })
     }
     const apiPath = getApiPath('api/raw', params)
@@ -230,7 +228,7 @@ export function getPreviewURL(source, path, modified) {
     const params = {
       path: encodeURIComponent(path),
       key: Date.parse(modified), // Use modified date as cache key
-      source: source,
+      source: encodeURIComponent(source),
       inline: 'true'
     }
     const apiPath = getApiPath('api/preview', params)
diff --git a/frontend/src/components/Search.vue b/frontend/src/components/Search.vue
@@ -498,9 +498,9 @@ export default {
       this.ongoing = true;
       let source = this.selectedSource;
       if (source == "") {
-        source = state.sources.current;
+        this.selectedSource = state.sources.current;
       }
-      this.results = await search(this.getContext, source, searchTypesFull + this.value);
+      this.results = await search(this.getContext, this.selectedSource, searchTypesFull + this.value);
 
       this.ongoing = false;
       if (this.results.length == 0) {
@@ -519,13 +519,17 @@ export default {
       if (this.getContext === "/") {
         path = s.path;
       }
+      let urlPath = "/files/" + state.sources.current + path;
+      if (!state.serverHasMultipleSources) {
+        urlPath = "/files" + path;
+      }
       const modifiedItem = {
         name: pathParts.pop(),
         path: path,
         size: s.size,
         type: s.type,
-        source: "",
-        url: path,
+        source: this.selectedSource,
+        url: urlPath,
         fullPath: path,
       };
       mutations.resetSelected();
diff --git a/frontend/src/components/prompts/Info.vue b/frontend/src/components/prompts/Info.vue
@@ -165,7 +165,7 @@ export default {
       event.preventDefault();
       let link;
       if (state.isSearchActive) {
-        const hash = await filesApi.checksum(state.selected[0].path, algo);
+        const hash = await filesApi.checksum(state.selected[0].source, state.selected[0].path, algo);
         event.target.innerHTML = hash;
         return;
       }
@@ -175,7 +175,7 @@ export default {
         link = state.route.path;
       }
 
-      const hash = await filesApi.checksum(link, algo);
+      const hash = await filesApi.checksum(state.sources.current, link, algo);
       event.target.innerHTML = hash;
     },
   },
diff --git a/frontend/src/utils/url.js b/frontend/src/utils/url.js
@@ -121,9 +121,8 @@ export function extractSourceFromPath(url) {
   if (state.serverHasMultipleSources) {
     source = path.split('/')[2];
     path = removePrefix(path, `/files/${source}`);
-    source = encodeURIComponent(source)
   } else {
-    source = encodeURIComponent(state.sources.current);
+    source = state.sources.current;
     path = removePrefix(path, '/files');
   }
 

Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,12 @@ func searchHandler(w http.ResponseWriter, r http.Request, d requestContext) (i`
`78`	`78`	`return http.StatusForbidden, err`
`79`	`79`	`}`
`80`	`80`	`combinedPath := index.MakeIndexPath(filepath.Join(userscope, searchScope))`
	`81`	`+ combinedPath = strings.TrimSuffix(combinedPath, "/") + "/" // Ensure trailing slash`
`81`	`82`	`// Perform the search using the provided query and user scope`
`82`	`83`	`response := index.Search(query, combinedPath, sessionId)`
`83`	`84`	`for i := range response {`
`84`	`85`	`// Remove the user scope from the path`
`85`		`- response[i].Path = strings.TrimPrefix(response[i].Path, userscope)`
	`86`	`+ response[i].Path = strings.TrimPrefix(response[i].Path, combinedPath)`
`86`	`87`	`if response[i].Path == "" {`
`87`	`88`	`response[i].Path = "/"`
`88`	`89`	`}`