Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: Fix flaky cookies test

Browse Source
This commit is contained in:
James Houlahan
2022-10-11 19:40:28 +02:00
parent 14a578f319
commit 1c922ca083
16 changed files with 379 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/cookies/jar.go
View File

@ -22,7 +22,6 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/http/cookiejar"
"net/url"
"sync"
"time"
@ -38,18 +37,14 @@ type Persister interface {
// Jar implements http.CookieJar by wrapping the standard library's cookiejar.Jar.
// The jar uses a pantry to load cookies at startup and save cookies when set.
type Jar struct {
jar *cookiejar.Jar
jar http.CookieJar
persister Persister
cookies cookiesByHost
locker sync.Locker
locker sync.RWMutex
}
func NewCookieJar(persister Persister) (*Jar, error) {
jar, err := cookiejar.New(nil)
if err != nil {
return nil, err
}
func NewCookieJar(jar http.CookieJar, persister Persister) (*Jar, error) {
cookiesByHost, err := loadCookies(persister)
if err != nil {
return nil, err
@ -65,10 +60,10 @@ func NewCookieJar(persister Persister) (*Jar, error) {
}
return &Jar{
jar: jar,
jar: jar,
persister: persister,
cookies: cookiesByHost,
locker: &sync.Mutex{},
}, nil
}
@ -88,16 +83,16 @@ func (j *Jar) SetCookies(u *url.URL, cookies []*http.Cookie) {
}
func (j *Jar) Cookies(u *url.URL) []*http.Cookie {
j.locker.Lock()
defer j.locker.Unlock()
j.locker.RLock()
defer j.locker.RUnlock()
return j.jar.Cookies(u)
}
// PersistCookies persists the cookies to disk.
func (j *Jar) PersistCookies() error {
j.locker.Lock()
defer j.locker.Unlock()
j.locker.RLock()
defer j.locker.RUnlock()
rawCookies, err := json.Marshal(j.cookies)
if err != nil {