Session-Cookie Support (#1713)

* Create session cookie when cookie-expire set 0

* Fix format

* add test

* fix lint error

* fix test code

* fix conflicted test case

* update test case of cookie expiration

* update tests of csrf cookies

* update docs

* Update docs/docs/configuration/overview.md

Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>

---------

Co-authored-by: tanuki884 <morkazuk@fsi.co.jp>
Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>
This commit is contained in:
t-katsumura
2023-08-16 12:23:02 +01:00
committed by GitHub
co-authored by Joel Speed tanuki884
parent d9416c3630
commit d107d885e4
11 changed files with 137 additions and 7 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ func Validate(cookie *http.Cookie, seed string, expiration time.Duration) (value
// creation timestamp stored in the cookie falls within the
// window defined by (Now()-expiration, Now()].
t = time.Unix(int64(ts), 0)
if t.After(time.Now().Add(expiration*-1)) && t.Before(time.Now().Add(time.Minute*5)) {
if (expiration == time.Duration(0)) || (t.After(time.Now().Add(expiration*-1)) && t.Before(time.Now().Add(time.Minute*5))) {
// it's a valid cookie. now get the contents
rawValue, err := base64.URLEncoding.DecodeString(parts[0])
if err == nil {
+27
View File
@@ -7,8 +7,11 @@ import (
"encoding/base64"
"fmt"
"io"
"net/http"
"strconv"
"strings"
"testing"
"time"
"unicode"
"github.com/stretchr/testify/assert"
@@ -103,6 +106,30 @@ func TestSignAndValidate(t *testing.T) {
assert.False(t, checkSignature(sha1sig, seed, key, "tampered", epoch))
}
func TestValidate(t *testing.T) {
seed := "0123456789abcdef"
key := "cookie-name"
value := base64.URLEncoding.EncodeToString([]byte("I am soooo encoded"))
epoch := int64(123456789)
epochStr := strconv.FormatInt(epoch, 10)
sha256sig, err := cookieSignature(sha256.New, seed, key, value, epochStr)
assert.NoError(t, err)
cookie := &http.Cookie{
Name: key,
Value: value + "|" + epochStr + "|" + sha256sig,
}
validValue, timestamp, ok := Validate(cookie, seed, 0)
assert.True(t, ok)
assert.Equal(t, timestamp, time.Unix(epoch, 0))
expectedValue, err := base64.URLEncoding.DecodeString(value)
assert.NoError(t, err)
assert.Equal(t, validValue, expectedValue)
}
func TestGenerateRandomASCIIString(t *testing.T) {
randomString, err := GenerateRandomASCIIString(96)
assert.NoError(t, err)