Salastil/libkiwi
1
0
Fork 0
mirror of https://gitgud.io/yats/libkiwi.git synced 2026-05-02 10:42:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix string bounds issue

Browse Source 
Better hostname handling
This commit is contained in:
y a t s
2024-09-02 11:08:50 -04:00
parent 01b6837eea
commit 0bfe254d05
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jar.go
View File

@@ -39,7 +39,7 @@ func NewKiwiJar(domain *url.URL, cookies string) (kj *KiwiJar, err error) {
}
func (kj *KiwiJar) checkAlloc(u *url.URL) {
if kj.cookieMap == nil || kj.cookieMap[u.Host] == nil {
if kj.cookieMap == nil || kj.cookieMap[u.Hostname()] == nil {
kj.newDomain(u)
}
}
@@ -55,16 +55,17 @@ func (kj *KiwiJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
func (kj *KiwiJar) Cookies(u *url.URL) []*http.Cookie {
kj.checkAlloc(u)
hn := u.Hostname()
res := make(chan []*http.Cookie, 1)
go func() {
kj.mutex.Lock()
defer kj.mutex.Unlock()
cl := len(kj.cookieMap[u.Host])
cl := len(kj.cookieMap[hn])
cs := make([]*http.Cookie, cl)
i := 0
for _, c := range kj.cookieMap[u.Host] {
for _, c := range kj.cookieMap[hn] {
if i >= cl {
break
}
@@ -84,8 +85,10 @@ func (kj *KiwiJar) CookieString(u *url.URL) (cookies string) {
for _, c := range cs {
cookies += fmt.Sprintf("; %s=%s", c.Name, c.Value)
}
// Remove leading semicolon+space.
cookies = cookies[2:]
if len(cookies) > 2 {
// Remove leading semicolon+space.
cookies = cookies[2:]
}
return
}
@@ -99,7 +102,7 @@ func (kj *KiwiJar) GetCookie(u *url.URL, name string) *http.Cookie {
kj.mutex.Lock()
defer kj.mutex.Unlock()
res <- kj.cookieMap[u.Host][name]
res <- kj.cookieMap[u.Hostname()][name]
}()
return <-res
@@ -114,7 +117,7 @@ func (kj *KiwiJar) SetCookie(u *url.URL, cookie *http.Cookie) {
kj.mutex.Lock()
defer kj.mutex.Unlock()
kj.cookieMap[u.Host][cookie.Name] = cookie
kj.cookieMap[u.Hostname()][cookie.Name] = cookie
done <- true
}()
@@ -132,7 +135,7 @@ func (kj *KiwiJar) newDomain(domain *url.URL) {
kj.mutex.Lock()
defer kj.mutex.Unlock()
kj.cookieMap[domain.Host] = make(map[string]*http.Cookie, 16)
kj.cookieMap[domain.Hostname()] = make(map[string]*http.Cookie, 16)
done <- true
}()