Fix redirect for directories to escape special chars in URL

gammazero · gammazero · commit 16d89a5a96f0 · 2025-01-02T02:07:58.000-10:00
Directories with a "%" in their name do not work correctly when when redirected to a URL with a trailing slash. When the original URl contains special characters, such as "%", the correcponding redirect URL must escape these characters. Fixes issue ipfs/kubo#10536
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,8 @@ The following emojis are used to highlight certain changes:
 
 ### Fixed
 
+- `gateway` Fix links for subdirectories with "%" in name. [#779](https://github.com/ipfs/boxo/pull/779)
+
 ### Security
 
 
diff --git a/gateway/handler_unixfs_dir.go b/gateway/handler_unixfs_dir.go
@@ -50,7 +50,7 @@ func (i *handler) serveDirectory(ctx context.Context, w http.ResponseWriter, r *
 				suffix = suffix + "?" + r.URL.RawQuery
 			}
 			// /ipfs/cid/foo?bar must be redirected to /ipfs/cid/foo/?bar
-			redirectURL := originalURLPath + suffix
+			redirectURL := requestURI.EscapedPath() + suffix
 			rq.logger.Debugw("directory location moved permanently", "status", http.StatusMovedPermanently)
 			http.Redirect(w, r, redirectURL, http.StatusMovedPermanently)
 			return true

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func (i handler) serveDirectory(ctx context.Context, w http.ResponseWriter, r `
`50`	`50`	`suffix = suffix + "?" + r.URL.RawQuery`
`51`	`51`	`}`
`52`	`52`	`// /ipfs/cid/foo?bar must be redirected to /ipfs/cid/foo/?bar`
`53`		`- redirectURL := originalURLPath + suffix`
	`53`	`+ redirectURL := requestURI.EscapedPath() + suffix`
`54`	`54`	`rq.logger.Debugw("directory location moved permanently", "status", http.StatusMovedPermanently)`
`55`	`55`	`http.Redirect(w, r, redirectURL, http.StatusMovedPermanently)`
`56`	`56`	`return true`