修复用户安全信息弹窗与会话校验
This commit is contained in:
1 parent
31ee54942a
commit
306af4b7b0
12 files changed
+295
-19
No files matched your search
@@ -4,6 +4,7 @@ import (
|
||||
"crypto/rand"
|
||||
"crypto/subtle"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/session"
|
||||
@@ -29,6 +30,20 @@ func Issue(w http.ResponseWriter, r *http.Request, secure bool) (string, error)
|
||||
return token, nil
|
||||
}
|
||||
|
||||
// Ensure 为已认证会话恢复双提交 CSRF Cookie。
|
||||
// Cookie 缺失或与服务端会话不一致时轮换令牌,避免继续信任过期的浏览器状态。
|
||||
func Ensure(w http.ResponseWriter, r *http.Request, secure bool) (string, error) {
|
||||
if session.Instance == nil {
|
||||
return "", errors.New("session manager is unavailable")
|
||||
}
|
||||
stored := session.Instance.GetString(r.Context(), SessionKey)
|
||||
cookie, err := r.Cookie(CookieName)
|
||||
if err == nil && stored != "" && constantTimeEqual(stored, cookie.Value) {
|
||||
return stored, nil
|
||||
}
|
||||
return Issue(w, r, secure)
|
||||
}
|
||||
|
||||
func Clear(w http.ResponseWriter, r *http.Request, secure bool) {
|
||||
if session.Instance != nil {
|
||||
session.Instance.Remove(r.Context(), SessionKey)
|
||||
@@ -49,9 +64,12 @@ func Valid(r *http.Request) bool {
|
||||
return false
|
||||
}
|
||||
stored := session.Instance.GetString(r.Context(), SessionKey)
|
||||
if stored == "" || len(stored) != len(header) || len(cookie.Value) != len(header) {
|
||||
if stored == "" {
|
||||
return false
|
||||
}
|
||||
return subtle.ConstantTimeCompare([]byte(stored), []byte(header)) == 1 &&
|
||||
subtle.ConstantTimeCompare([]byte(cookie.Value), []byte(header)) == 1
|
||||
return constantTimeEqual(stored, header) && constantTimeEqual(cookie.Value, header)
|
||||
}
|
||||
|
||||
func constantTimeEqual(left, right string) bool {
|
||||
return len(left) == len(right) && subtle.ConstantTimeCompare([]byte(left), []byte(right)) == 1
|
||||
}
|
||||
@@ -76,3 +76,73 @@ func TestClearInvalidatesExistingToken(t *testing.T) {
|
||||
t.Fatalf("unexpected CSRF clear cookie: %+v", cookies)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureRestoresMissingCookieWithRotatedToken(t *testing.T) {
|
||||
old := session.Instance
|
||||
manager := scs.New()
|
||||
session.Instance = manager
|
||||
t.Cleanup(func() { session.Instance = old })
|
||||
|
||||
request := testRequestWithToken(t, manager, "old-token", "", "")
|
||||
recorder := httptest.NewRecorder()
|
||||
token, err := Ensure(recorder, request, true)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if token == "" || token == "old-token" {
|
||||
t.Fatal("missing cookie did not rotate the CSRF token")
|
||||
}
|
||||
if stored := manager.GetString(request.Context(), SessionKey); stored != token {
|
||||
t.Fatalf("rotated token was not stored in session: %q", stored)
|
||||
}
|
||||
cookies := recorder.Result().Cookies()
|
||||
if len(cookies) != 1 {
|
||||
t.Fatalf("unexpected CSRF cookies: %+v", cookies)
|
||||
}
|
||||
cookie := cookies[0]
|
||||
if cookie.Name != CookieName || cookie.Value != token || cookie.Path != "/" ||
|
||||
cookie.MaxAge != 86400 || !cookie.Secure || cookie.HttpOnly ||
|
||||
cookie.SameSite != http.SameSiteStrictMode {
|
||||
t.Fatalf("unexpected restored CSRF cookie: %+v", cookie)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureKeepsMatchingTokenWithoutReissuingCookie(t *testing.T) {
|
||||
old := session.Instance
|
||||
manager := scs.New()
|
||||
session.Instance = manager
|
||||
t.Cleanup(func() { session.Instance = old })
|
||||
|
||||
request := testRequestWithToken(t, manager, "current-token", "", "current-token")
|
||||
recorder := httptest.NewRecorder()
|
||||
token, err := Ensure(recorder, request, false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if token != "current-token" {
|
||||
t.Fatalf("matching token was unexpectedly rotated: %q", token)
|
||||
}
|
||||
if cookies := recorder.Result().Cookies(); len(cookies) != 0 {
|
||||
t.Fatalf("matching token unexpectedly reissued cookies: %+v", cookies)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureRotatesMismatchedCookie(t *testing.T) {
|
||||
old := session.Instance
|
||||
manager := scs.New()
|
||||
session.Instance = manager
|
||||
t.Cleanup(func() { session.Instance = old })
|
||||
|
||||
request := testRequestWithToken(t, manager, "stored-token", "", "stale-token")
|
||||
recorder := httptest.NewRecorder()
|
||||
token, err := Ensure(recorder, request, false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if token == "" || token == "stored-token" || token == "stale-token" {
|
||||
t.Fatalf("mismatched cookie did not rotate token: %q", token)
|
||||
}
|
||||
if cookies := recorder.Result().Cookies(); len(cookies) != 1 || cookies[0].Secure {
|
||||
t.Fatalf("unexpected development CSRF cookie: %+v", cookies)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user