forked from tangled.org/core
Monorepo for Tangled — https://tangled.org

appview/router: fix url rewriter

the appview rewrites urls of the form:

host.com/did-plc-foo/repo => host.com/did:plc:foo/repo
host.com/@handle.com/repo => host.com/handle.com/repo

however, the rewriter did not preserve query parameters or fragments:

host.com/@handle.com/repo?foo=bar => host.com/handle.com/repo?

this resulted in url rewrites being broken for git clones, which usees
the "service" query parameter:

../repo/info/refs?service=git-upload-pack => ../repo/info/refs?

the new url rewriter simply takes the existing url and replaces the path
component, thus preserving all other bits of the url.

Signed-off-by: oppiliappan <me@oppi.li>

Changed files
+10 -2
appview
state
+10 -2
appview/state/router.go
···
if userutil.IsFlattenedDid(firstPart) {
unflattenedDid := userutil.UnflattenDid(firstPart)
redirectPath := strings.Join(append([]string{unflattenedDid}, pathParts[1:]...), "/")
-
http.Redirect(w, r, "/"+redirectPath, http.StatusFound)
+
+
redirectURL := *r.URL
+
redirectURL.Path = "/" + redirectPath
+
+
http.Redirect(w, r, redirectURL.String(), http.StatusFound)
return
}
// if using a handle with @, rewrite to work without @
if normalized := strings.TrimPrefix(firstPart, "@"); userutil.IsHandle(normalized) {
redirectPath := strings.Join(append([]string{normalized}, pathParts[1:]...), "/")
-
http.Redirect(w, r, "/"+redirectPath, http.StatusFound)
+
+
redirectURL := *r.URL
+
redirectURL.Path = "/" + redirectPath
+
+
http.Redirect(w, r, redirectURL.String(), http.StatusFound)
return
}