Compare commits
5 Commits
8d38a86f86
...
ef05d66787
Author | SHA1 | Date | |
---|---|---|---|
ef05d66787 | |||
b3296c45ad | |||
7fd163f957 | |||
0f0d50a684 | |||
68074e02bc |
@ -96,6 +96,7 @@ func (h *AuthHandler) RegisterRoutes(api chi.Router) {
|
|||||||
protected.Post("/email", h.requestEmailOtp)
|
protected.Post("/email", h.requestEmailOtp)
|
||||||
protected.Post("/email/otp", h.confirmOtp)
|
protected.Post("/email/otp", h.confirmOtp)
|
||||||
protected.Post("/verify", h.finishVerification)
|
protected.Post("/verify", h.finishVerification)
|
||||||
|
protected.Post("/signout", h.signOut)
|
||||||
})
|
})
|
||||||
|
|
||||||
r.Post("/login", h.login)
|
r.Post("/login", h.login)
|
||||||
|
40
internal/auth/signout.go
Normal file
40
internal/auth/signout.go
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
package auth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"gitea.local/admin/hspguard/internal/util"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (h *AuthHandler) signOut(w http.ResponseWriter, r *http.Request) {
|
||||||
|
defer func() {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
w.Write([]byte("{\"status\": \"ok\"}"))
|
||||||
|
}()
|
||||||
|
|
||||||
|
jti, ok := util.GetRequestJTI(r.Context())
|
||||||
|
if !ok {
|
||||||
|
log.Println("WARN: No JTI found in request")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
jtiId, err := uuid.Parse(jti)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("ERR: Failed to parse jti '%s' as v4 uuid: %v\n", jti, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
session, err := h.repo.GetUserSessionByAccessJTI(r.Context(), &jtiId)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("WARN: Could not find session by jti id '%s': %v\n", jtiId.String(), err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := h.repo.RevokeUserSession(r.Context(), session.ID); err != nil {
|
||||||
|
log.Printf("ERR: Failed to revoke session with '%s' id: %v\n", session.ID.String(), err)
|
||||||
|
} else {
|
||||||
|
log.Printf("INFO: Revoked session with jti = '%s' and session id = '%s'\n", jtiId.String(), session.ID.String())
|
||||||
|
}
|
||||||
|
}
|
@ -46,6 +46,7 @@ func (m *AuthMiddleware) Runner(next http.Handler) http.Handler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ctx := context.WithValue(r.Context(), types.UserIdKey, userClaims.Subject)
|
ctx := context.WithValue(r.Context(), types.UserIdKey, userClaims.Subject)
|
||||||
|
ctx = context.WithValue(ctx, types.JTIKey, userClaims.ID)
|
||||||
next.ServeHTTP(w, r.WithContext(ctx))
|
next.ServeHTTP(w, r.WithContext(ctx))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -3,4 +3,4 @@ package types
|
|||||||
type contextKey string
|
type contextKey string
|
||||||
|
|
||||||
const UserIdKey contextKey = "userID"
|
const UserIdKey contextKey = "userID"
|
||||||
|
const JTIKey contextKey = "jti"
|
||||||
|
@ -11,3 +11,7 @@ func GetRequestUserId(ctx context.Context) (string, bool) {
|
|||||||
return userId, ok
|
return userId, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetRequestJTI(ctx context.Context) (string, bool) {
|
||||||
|
jti, ok := ctx.Value(types.JTIKey).(string)
|
||||||
|
return jti, ok
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user