thermokarst/jwt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error handling on generate handler

Browse source
This commit is contained in:
Matthew Dillon 2015-04-20 15:59:10 -08:00
parent 61507766fe
commit 26313ee041
3 changed files with 77 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/net-http.go
View file

@ -45,7 +45,7 @@ func main() {
panic(err) panic(err)
} }
protect := http.HandlerFunc(protectMe) protect := http.HandlerFunc(protectMe)
http.HandleFunc("/authenticate", j.GenerateToken) http.Handle("/authenticate", j.GenerateToken())
http.Handle("/secure", j.Secure(protect, verifyClaimsFunc)) http.Handle("/secure", j.Secure(protect, verifyClaimsFunc))
http.ListenAndServe(":8080", nil) http.ListenAndServe(":8080", nil)
} }

63
jwt.go
View file

@ -162,49 +162,62 @@ func (m *JWTMiddleware) Secure(h http.Handler, v VerifyClaimsFunc) http.Handler
return errorHandler(secureHandler) return errorHandler(secureHandler)
} }
func (m *JWTMiddleware) GenerateToken(w http.ResponseWriter, r *http.Request) { func (m *JWTMiddleware) GenerateToken() http.Handler {
generateHandler := func(w http.ResponseWriter, r *http.Request) *jwtError {
var b map[string]string var b map[string]string
err := json.NewDecoder(r.Body).Decode(&b) err := json.NewDecoder(r.Body).Decode(&b)
if err != nil { if err != nil {
log.Printf("error (%v) while parsing authorization", err) return &jwtError{
http.Error(w, ErrParsingCredentials.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: ErrParsingCredentials,
message: "parsing authorization",
}
} }
err = m.auth(b["email"], b["password"]) err = m.auth(b["email"], b["password"])
if err != nil { if err != nil {
log.Printf("error (%v) while performing authorization", err) return &jwtError{
http.Error(w, err.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: err,
message: "performing authorization",
}
} }
// For now, the header will be static // For now, the header will be static
header, err := encode(fmt.Sprintf(`{"typ":%q,"alg":%q}`, typ, alg)) header, err := encode(fmt.Sprintf(`{"typ":%q,"alg":%q}`, typ, alg))
if err != nil { if err != nil {
log.Printf("error (%v) while encoding header", err) return &jwtError{
http.Error(w, ErrEncoding.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: ErrEncoding,
message: "encoding header",
}
} }
// Generate claims for user // Generate claims for user
claims, err := m.claims(b["email"]) claims, err := m.claims(b["email"])
if err != nil { if err != nil {
log.Printf("error (%v) while generating claims", err) return &jwtError{
http.Error(w, err.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: err,
message: "generating claims",
}
} }
claimsJson, err := json.Marshal(claims) claimsJson, err := json.Marshal(claims)
if err != nil { if err != nil {
log.Printf("error (%v) while marshalling claims") return &jwtError{
http.Error(w, ErrEncoding.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: ErrEncoding,
message: "marshalling claims",
}
} }
claimsSet, err := encode(claimsJson) claimsSet, err := encode(claimsJson)
if err != nil { if err != nil {
log.Printf("error (%v) while encoding claims") return &jwtError{
http.Error(w, ErrEncoding.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: ErrEncoding,
message: "encoding claims",
}
} }
toSig := strings.Join([]string{header, claimsSet}, ".") toSig := strings.Join([]string{header, claimsSet}, ".")
@ -213,13 +226,19 @@ func (m *JWTMiddleware) GenerateToken(w http.ResponseWriter, r *http.Request) {
h.Write([]byte(toSig)) h.Write([]byte(toSig))
sig, err := encode(h.Sum(nil)) sig, err := encode(h.Sum(nil))
if err != nil { if err != nil {
log.Printf("error (%v) while encoding signature") return &jwtError{
http.Error(w, ErrEncoding.Error(), http.StatusInternalServerError) status: http.StatusInternalServerError,
return err: ErrEncoding,
message: "encoding signature",
}
} }
response := strings.Join([]string{toSig, sig}, ".") response := strings.Join([]string{toSig, sig}, ".")
w.Write([]byte(response)) w.Write([]byte(response))
return nil
}
return errorHandler(generateHandler)
} }
func encode(s interface{}) (string, error) { func encode(s interface{}) (string, error) {

2
jwt_test.go
View file

@ -72,7 +72,7 @@ func newToken(t *testing.T) (string, *JWTMiddleware) {
t.Error(err) t.Error(err)
} }
ts := httptest.NewServer(http.HandlerFunc(middleware.GenerateToken)) ts := httptest.NewServer(middleware.GenerateToken())
defer ts.Close() defer ts.Close()
resp, err := http.Post(ts.URL, "application/json", bytes.NewReader(body)) resp, err := http.Post(ts.URL, "application/json", bytes.NewReader(body))