Remove caddy simulation

This commit is contained in:
cheddar 2025-02-20 23:12:04 -05:00
parent 8d6102c58f
commit d0958d2366
No known key found for this signature in database
3 changed files with 12 additions and 25 deletions

View file

@ -13,7 +13,7 @@ import (
"golang.org/x/crypto/ssh"
)
func Start(isCaddyAuth bool, keyDir keydirectory.RegistrationDirectory) error {
func Start(keyDir keydirectory.RegistrationDirectory) error {
mux := http.NewServeMux()
verifier := httpsig.Middleware(httpsig.MiddlewareOpts{
@ -32,15 +32,11 @@ func Start(isCaddyAuth bool, keyDir keydirectory.RegistrationDirectory) error {
},
})
verifyHandler := verifier(getDefaultHandler(isCaddyAuth))
verifyHandler := verifier(getDefaultHandler())
var handler http.Handler
if isCaddyAuth {
handler = rewriteHeaders(verifyHandler)
} else {
handler = verifyHandler
}
handler = rewriteHeaders(verifyHandler)
mux.Handle("/auth", handler)
mux.Handle("/register", getRegistrationHandler(keyDir))
@ -50,14 +46,11 @@ func Start(isCaddyAuth bool, keyDir keydirectory.RegistrationDirectory) error {
return err
}
func getDefaultHandler(isCaddyAuth bool) http.Handler {
func getDefaultHandler() http.Handler {
handler := func(w http.ResponseWriter, r *http.Request) {
attr := httpsig.AttributesFromContext(r.Context()).(string)
if isCaddyAuth {
w.Header().Add("Remote-User", attr)
}
w.Header().Add("Remote-User", attr)
msg := fmt.Sprintf("hello, %s!", attr)
w.Write([]byte(msg))
}