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

Add more helper functions

Browse Source
This commit is contained in:
adnano
2020-09-27 21:13:42 -04:00
parent fdf6bbc62f
commit 3c9821d812
4 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/auth/auth.go
View File

@@ -85,7 +85,7 @@ func login(rw *gmi.ResponseWriter, req *gmi.Request) {
rw.WriteHeader(gmi.StatusRedirect, "/login/password")
}
} else {
rw.WriteHeader(gmi.StatusClientCertificateRequired, "Certificate required")
rw.WriteHeader(gmi.StatusCertificateRequired, "Certificate required")
}
}
@@ -93,7 +93,7 @@ func loginPassword(rw *gmi.ResponseWriter, req *gmi.Request) {
if len(req.TLS.PeerCertificates) > 0 {
session, ok := getSession(req.TLS.PeerCertificates[0])
if !ok {
rw.WriteHeader(gmi.StatusCertificateNotAuthorised, "Not authorized")
rw.WriteHeader(gmi.StatusCertificateNotAuthorized, "Not authorized")
return
}
@@ -109,7 +109,7 @@ func loginPassword(rw *gmi.ResponseWriter, req *gmi.Request) {
}
}
} else {
rw.WriteHeader(gmi.StatusClientCertificateRequired, "Certificate required")
rw.WriteHeader(gmi.StatusCertificateRequired, "Certificate required")
}
}
@@ -126,7 +126,7 @@ func profile(rw *gmi.ResponseWriter, req *gmi.Request) {
if len(req.TLS.PeerCertificates) > 0 {
session, ok := getSession(req.TLS.PeerCertificates[0])
if !ok {
rw.WriteHeader(gmi.StatusCertificateNotAuthorised, "Certificate not authorized")
rw.WriteHeader(gmi.StatusCertificateNotAuthorized, "Certificate not authorized")
return
}
user := logins[session.username]
@@ -134,7 +134,7 @@ func profile(rw *gmi.ResponseWriter, req *gmi.Request) {
rw.WriteHeader(gmi.StatusSuccess, "text/gemini")
rw.Write([]byte(profile))
} else {
rw.WriteHeader(gmi.StatusClientCertificateRequired, "Certificate required")
rw.WriteHeader(gmi.StatusCertificateRequired, "Certificate required")
}
}
@@ -142,17 +142,17 @@ func admin(rw *gmi.ResponseWriter, req *gmi.Request) {
if len(req.TLS.PeerCertificates) > 0 {
session, ok := getSession(req.TLS.PeerCertificates[0])
if !ok {
rw.WriteHeader(gmi.StatusCertificateNotAuthorised, "Certificate not authorized")
rw.WriteHeader(gmi.StatusCertificateNotAuthorized, "Certificate not authorized")
return
}
user := logins[session.username]
if !user.admin {
rw.WriteHeader(gmi.StatusCertificateNotAuthorised, "Admins only!")
rw.WriteHeader(gmi.StatusCertificateNotAuthorized, "Admins only!")
return
}
rw.WriteHeader(gmi.StatusSuccess, "text/gemini")
rw.Write([]byte("Welcome to the admin portal.\n"))
} else {
rw.WriteHeader(gmi.StatusClientCertificateRequired, "Certificate required")
rw.WriteHeader(gmi.StatusCertificateRequired, "Certificate required")
}
}

3
examples/client/client.go
View File

@@ -54,6 +54,7 @@ func sendRequest(req *gmi.Request) error {
return err
}
// TODO: More fine-grained analysis of the status code.
switch resp.Status / 10 {
case gmi.StatusClassInput:
fmt.Printf("%s: ", resp.Meta)
@@ -78,7 +79,7 @@ func sendRequest(req *gmi.Request) error {
return fmt.Errorf("Temporary failure: %s", resp.Meta)
case gmi.StatusClassPermanentFailure:
return fmt.Errorf("Permanent failure: %s", resp.Meta)
case gmi.StatusClassClientCertificateRequired:
case gmi.StatusClassCertificateRequired:
fmt.Println("Generating client certificate for", req.Hostname())
return nil // TODO: Generate and store client certificate
}