sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples/client: Handle relative redirects

Browse Source
This commit is contained in:
adnano 2020-09-27 20:34:59 -04:00
parent 38fe1f21dc
commit f6be76f8b8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/auth/auth.go
View File

@ -82,8 +82,7 @@ func login(rw *gmi.ResponseWriter, req *gmi.Request) {
sessions[fingerprint] = &session{ sessions[fingerprint] = &session{
username: username, username: username,
} }
// TODO: Remove scheme and host once example client can handle relative redirects rw.WriteHeader(gmi.StatusRedirect, "/login/password")
rw.WriteHeader(gmi.StatusRedirect, "gemini://localhost/login/password")
} }
} else { } else {
rw.WriteHeader(gmi.StatusClientCertificateRequired, "Certificate required") rw.WriteHeader(gmi.StatusClientCertificateRequired, "Certificate required")
@ -103,9 +102,8 @@ func loginPassword(rw *gmi.ResponseWriter, req *gmi.Request) {
} else { } else {
expected := logins[session.username].password expected := logins[session.username].password
if password == expected { if password == expected {
// TODO: Remove scheme and host once example client can handle relative redirects
session.authorized = true session.authorized = true
rw.WriteHeader(gmi.StatusRedirect, "gemini://localhost/profile") rw.WriteHeader(gmi.StatusRedirect, "/profile")
} else { } else {
rw.WriteHeader(gmi.StatusInput, "Wrong password. Please try again") rw.WriteHeader(gmi.StatusInput, "Wrong password. Please try again")
} }

8
examples/client/client.go
View File

@ -65,11 +65,15 @@ func sendRequest(req *gmi.Request) error {
return nil return nil
case gmi.StatusClassRedirect: case gmi.StatusClassRedirect:
fmt.Println("Redirecting to", resp.Meta) fmt.Println("Redirecting to", resp.Meta)
req, err := gmi.NewRequest(resp.Meta) // Make the request to the same host
red, err := gmi.NewProxyRequest(req.Host, resp.Meta)
if err != nil { if err != nil {
return err return err
} }
return sendRequest(req) // Handle relative redirects
red.URL = req.URL.ResolveReference(red.URL)
fmt.Println(red.URL, red.Host)
return sendRequest(red)
case gmi.StatusClassTemporaryFailure: case gmi.StatusClassTemporaryFailure:
return fmt.Errorf("Temporary failure: %s", resp.Meta) return fmt.Errorf("Temporary failure: %s", resp.Meta)
case gmi.StatusClassPermanentFailure: case gmi.StatusClassPermanentFailure: