Salastil/libkiwi
1
0
Fork 0
mirror of https://gitgud.io/yats/libkiwi.git synced 2026-05-02 02:32:05 -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

18
libkiwi.go
View File

@@ -1,6 +1,7 @@
package libkiwi
import (
"context"
"errors"
"net/http"
"net/url"
@@ -39,17 +40,16 @@ func NewKF(hc http.Client, host string, cookies string) (kf *KF, err error) {
return
}
func (kf *KF) GetPage(u *url.URL) (resp *http.Response, err error) {
func (kf *KF) GetPage(ctx context.Context, u *url.URL) (resp *http.Response, err error) {
if u == nil {
err = errors.New("Received nil URL.")
return
}
req, err := http.NewRequest("GET", u.String(), nil)
req, err := http.NewRequestWithContext(ctx, "GET", u.String(), nil)
if err != nil {
return
}
// req.Header.Set("Cookie", kf.cookies)
resp, err = kf.Client.Do(req)
if err != nil {
@@ -58,25 +58,25 @@ func (kf *KF) GetPage(u *url.URL) (resp *http.Response, err error) {
// KiwiFlare redirect is signaled by 203 status.
if resp.StatusCode == 203 {
err = kf.solveKiwiFlare()
err = kf.solveKiwiFlare(ctx)
if err != nil {
return
}
// Try fetching the page again now that we're authed.
return kf.GetPage(u)
return kf.GetPage(ctx, u)
}
return
}
func (kf *KF) RefreshSession() (tk string, err error) {
func (kf *KF) RefreshSession(ctx context.Context) (tk string, err error) {
// Clear any existing session token to request a new one.
kf.Client.Jar.(*KiwiJar).SetCookie(kf.domain, &http.Cookie{
Name: "xf_session",
Value: "",
})
resp, err := kf.GetPage(kf.domain)
resp, err := kf.GetPage(ctx, kf.domain)
if err != nil {
return
}
@@ -86,12 +86,12 @@ func (kf *KF) RefreshSession() (tk string, err error) {
return
}
func (kf *KF) solveKiwiFlare() error {
func (kf *KF) solveKiwiFlare(ctx context.Context) error {
c, err := firebird.NewChallenge(kf.Client, kf.domain.String())
if err != nil {
return err
}
s, err := firebird.Solve(c)
s, err := firebird.Solve(ctx, c)
if err != nil {
return err
}