From fee61c8210a647545435727df3e1d57bb2c8d5a6 Mon Sep 17 00:00:00 2001 From: y a t s <140337963+y-a-t-s@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:16:09 -0400 Subject: [PATCH] Fix jar hostname handling Update firebird version --- go.mod | 9 +++- go.sum | 11 ++++- jar.go | 121 ++++++++++++++++++++++++++++------------------------- libkiwi.go | 8 ++-- 4 files changed, 82 insertions(+), 67 deletions(-) diff --git a/go.mod b/go.mod index 69bc6e2..de5d566 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,11 @@ module github.com/y-a-t-s/libkiwi go 1.23.0 -require github.com/y-a-t-s/firebird v0.0.0-20240902150251-4943d1802500 +require github.com/y-a-t-s/firebird v0.0.0-20240927151147-c1c3219d176b -require golang.org/x/net v0.28.0 // indirect +require ( + github.com/klauspost/cpuid/v2 v2.2.3 // indirect + github.com/minio/sha256-simd v1.0.1 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sys v0.23.0 // indirect +) diff --git a/go.sum b/go.sum index 9d3210c..4240de2 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,11 @@ -github.com/y-a-t-s/firebird v0.0.0-20240902150251-4943d1802500 h1:D7egbhaHIVqiYF/aOPS89xYurCTHwqDgxivKpoYr8/o= -github.com/y-a-t-s/firebird v0.0.0-20240902150251-4943d1802500/go.mod h1:iaOF6bre/MgFaBH513kb3RxcJ+x8vSPPAeOjN7RNkn8= +github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= +github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= +github.com/y-a-t-s/firebird v0.0.0-20240927151147-c1c3219d176b h1:zX9Hj9mK7cSExqPUxdO2LS0OsEpflRqGu94yC1BuDfU= +github.com/y-a-t-s/firebird v0.0.0-20240927151147-c1c3219d176b/go.mod h1:aq9EHq1B6MDC0RdIRbcFHI5SsGaeztoMjL7tRdgJCAQ= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/jar.go b/jar.go index 9e0c338..fdb2de5 100644 --- a/jar.go +++ b/jar.go @@ -9,51 +9,25 @@ import ( type cookieMap map[string]map[string]*http.Cookie +// An http cookiejar implementation that doesn't suck ass. type KiwiJar struct { cookieMap - mutex *sync.Mutex + mutex sync.Mutex + + init func() } -func newCookieMap() cookieMap { - return make(cookieMap, 2) -} +func NewKiwiJar() *KiwiJar { + kj := new(KiwiJar) + kj.init = sync.OnceFunc(func() { + kj.cookieMap = make(cookieMap, 2) + }) -func NewKiwiJar(domain *url.URL, cookies string) (kj *KiwiJar, err error) { - kj = &KiwiJar{ - cookieMap: newCookieMap(), - mutex: &sync.Mutex{}, - } - kj.newDomain(domain) - - if cookies == "" { - return - } - - cs, err := parseCookieString(cookies) - if err != nil { - return - } - kj.SetCookies(domain, cs) - - return -} - -func (kj *KiwiJar) checkAlloc(u *url.URL) { - if kj.cookieMap == nil || kj.cookieMap[u.Hostname()] == nil { - kj.newDomain(u) - } -} - -func (kj *KiwiJar) SetCookies(u *url.URL, cookies []*http.Cookie) { - kj.checkAlloc(u) - - for _, c := range cookies { - kj.SetCookie(u, c) - } + return kj } func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie { - kj.checkAlloc(u) + kj.newDomain(u) hn := u.Hostname() res := make(chan []*http.Cookie, 1) @@ -62,16 +36,9 @@ func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie { kj.mutex.Lock() defer kj.mutex.Unlock() - cl := len(kj.cookieMap[hn]) - cs := make([]*http.Cookie, cl) - i := 0 + cs := make([]*http.Cookie, 0, len(kj.cookieMap[hn])) for _, c := range kj.cookieMap[hn] { - if i >= cl { - break - } - - cs[i] = c - i++ + cs = append(cs, c) } res <- cs @@ -80,6 +47,22 @@ func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie { return <-res } +func (kj *KiwiJar) ParseString(u *url.URL, cookies string) error { + if cookies == "" { + return nil + } + + cs, err := parseCookieString(cookies) + if err != nil { + return err + } + + kj.init() + kj.SetCookies(u, cs) + + return nil +} + func (kj *KiwiJar) CookieString(u *url.URL) (cookies string) { cs := kj.Cookies(u) for _, c := range cs { @@ -94,7 +77,7 @@ func (kj *KiwiJar) CookieString(u *url.URL) (cookies string) { } func (kj *KiwiJar) GetCookie(u *url.URL, name string) *http.Cookie { - kj.checkAlloc(u) + kj.newDomain(u) res := make(chan *http.Cookie, 1) @@ -108,35 +91,57 @@ func (kj *KiwiJar) GetCookie(u *url.URL, name string) *http.Cookie { return <-res } +func (kj *KiwiJar) set(u *url.URL, cookie *http.Cookie) { + kj.mutex.Lock() + defer kj.mutex.Unlock() + + kj.cookieMap[u.Hostname()][cookie.Name] = cookie +} + func (kj *KiwiJar) SetCookie(u *url.URL, cookie *http.Cookie) { - kj.checkAlloc(u) + kj.newDomain(u) done := make(chan bool, 1) go func() { - kj.mutex.Lock() - defer kj.mutex.Unlock() - - kj.cookieMap[u.Hostname()][cookie.Name] = cookie - done <- true + defer close(done) + kj.set(u, cookie) }() <-done } -func (kj *KiwiJar) newDomain(domain *url.URL) { - if kj.cookieMap == nil { - kj.cookieMap = newCookieMap() +func (kj *KiwiJar) SetCookies(u *url.URL, cookies []*http.Cookie) { + kj.newDomain(u) + + var wg sync.WaitGroup + + for _, c := range cookies { + wg.Add(1) + go func() { + defer wg.Done() + kj.set(u, c) + }() + } + + wg.Wait() +} + +func (kj *KiwiJar) newDomain(u *url.URL) { + kj.init() + if kj.cookieMap[u.Hostname()] != nil { + return } done := make(chan bool, 1) go func() { + defer close(done) + kj.mutex.Lock() defer kj.mutex.Unlock() - kj.cookieMap[domain.Hostname()] = make(map[string]*http.Cookie, 16) - done <- true + kj.cookieMap[u.Hostname()] = make(map[string]*http.Cookie, 16) }() <-done diff --git a/libkiwi.go b/libkiwi.go index bde9b58..4cdf9cc 100644 --- a/libkiwi.go +++ b/libkiwi.go @@ -26,10 +26,8 @@ func NewKF(hc http.Client, host string, cookies string) (kf *KF, err error) { return } - jar, err := NewKiwiJar(u, cookies) - if err != nil { - return - } + jar := NewKiwiJar() + jar.ParseString(u, cookies) hc.Jar = jar kf = &KF{ @@ -95,7 +93,7 @@ func (kf *KF) solveKiwiFlare(ctx context.Context) error { if err != nil { return err } - _, err = firebird.Submit(kf.Client, kf.domain.String(), s) + _, err = firebird.Submit(kf.Client, s) if err != nil { return err }