Add Base

Author: emersion

client.go

@@ -33,7 +33,7 @@ func Discover(addr string) ([]*openpgp.Entity, error) {
 }
 }
 
-url := "https://" + domain + wellKnownBase + "/hu/" + hashLocal(local)
+url := "https://" + domain + Base + "/hu/" + hashLocal(local)
 resp, err := http.Get(url)
 if err != nil {
 return nil, err

server.go

@@ -37,12 +37,12 @@ func (h *Handler) serveDiscovery(w http.ResponseWriter, r *http.Request, hash st
 
 // ServeHTTP implements http.Handler.
 func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-if !strings.HasPrefix(r.URL.Path, wellKnownBase) {
+if !strings.HasPrefix(r.URL.Path, Base) {
 http.NotFound(w, r)
 return
 }
+path := strings.TrimPrefix(r.URL.Path, Base)
 
-path := strings.TrimPrefix(r.URL.Path, wellKnownBase)
 if path == "/policy" {
 h.servePolicy(w, r)
 return

wkd.go

@@ -10,7 +10,8 @@ import (
 "github.com/tv42/zbase32"
 )
 
-const wellKnownBase = "/.well-known/openpgpkey"
+// Base is the well-known base path for WKD.
+const Base = "/.well-known/openpgpkey"
 
 // ErrNotFound is returned when the directory doesn't contain a public key for
 // the provided address.