cookie jar go

broker/broker.go

@@ -2,9 +2,15 @@ package broker
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
+	"local/storage"
 	"local/truckstop/config"
+	"local/truckstop/logtr"
 	"net/http"
+	"net/http/cookiejar"
 	"strings"
+	"time"
 
 	"golang.org/x/time/rate"
 )
@@ -20,9 +26,54 @@ type Broker interface {
 }
 
 func do(r *http.Request) (*http.Response, error) {
+	return _do(config.Get().DB(), r)
+}
+
+func _do(db storage.DB, r *http.Request) (*http.Response, error) {
 	limiter.Wait(context.Background())
 	if strings.Contains(strings.ToLower(r.URL.Path), "login") {
 		authlimiter.Wait(context.Background())
 	}
-	return http.DefaultClient.Do(r)
+	client := &http.Client{
+		Timeout: time.Hour,
+	}
+	newjar, err := cookiejar.New(&cookiejar.Options{})
+	if err != nil {
+		return nil, errors.New("failed to make a cookie jar: " + err.Error())
+	}
+	client.Jar = newjar
+
+	cookieJarKey := "cookies_" + r.URL.Host
+	cookies, err := getCookies(db, cookieJarKey)
+	if err != nil {
+		logtr.Errorf("failed to load cookies: %v", err)
+	} else {
+		client.Jar.SetCookies(r.URL, cookies)
+	}
+	resp, err := client.Do(r)
+	if err != nil {
+		return nil, err
+	}
+	if err := setCookies(db, cookieJarKey, client.Jar.Cookies(r.URL)); err != nil {
+		logtr.Errorf("failed to set cookies: %v", err)
+	}
+	return resp, err
+}
+
+func getCookies(db storage.DB, host string) ([]*http.Cookie, error) {
+	b, err := db.Get(host)
+	if err != nil {
+		return nil, err
+	}
+	var result []*http.Cookie
+	err = json.Unmarshal(b, &result)
+	return result, err
+}
+
+func setCookies(db storage.DB, host string, cookies []*http.Cookie) error {
+	b, err := json.Marshal(cookies)
+	if err != nil {
+		return err
+	}
+	return db.Set(host, b)
 }

broker/broker_test.go

@@ -0,0 +1,59 @@
+package broker
+
+import (
+	"fmt"
+	"local/storage"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"golang.org/x/time/rate"
+)
+
+func TestDoCookies(t *testing.T) {
+	limiter = rate.NewLimiter(rate.Limit(20.0), 1)
+	calls := 0
+	db := storage.NewMap()
+	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		calls += 1
+		if calls == 1 {
+			http.SetCookie(w, &http.Cookie{
+				Name:    "name",
+				Value:   "value",
+				Expires: time.Now().Add(time.Hour),
+			})
+		} else {
+			if !strings.Contains(fmt.Sprint(r.Header["Cookie"]), "name=value") {
+				w.WriteHeader(http.StatusBadRequest)
+				t.Error("cookie not set on calls after first")
+			}
+		}
+	}))
+	defer s.Close()
+	req, _ := http.NewRequest(http.MethodGet, s.URL, nil)
+
+	if cookies, err := getCookies(db, "cookies_"+req.URL.Host); err == nil {
+		t.Fatal(err)
+	} else if len(cookies) != 0 {
+		t.Fatal(cookies)
+	}
+
+	for i := 0; i < 3; i++ {
+		resp, err := _do(db, req)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if resp.StatusCode != http.StatusOK {
+			t.Fatal(resp.StatusCode)
+		}
+		resp.Body.Close()
+
+		if cookies, err := getCookies(db, "cookies_"+req.URL.Host); err != nil {
+			t.Fatal(err)
+		} else if len(cookies) == 0 {
+			t.Fatal(cookies)
+		}
+	}
+}

broker/ntgvision.go

@@ -93,7 +93,7 @@ func (ntgJob *ntgVisionJob) JobInfo() (ntgVisionJobInfo, error) {
 	key := fmt.Sprintf("ntg_job_info_%v", ntgJob.ID)
 	if b, err := db.Get(key); err != nil {
 	} else if err := json.Unmarshal(b, &ntgJob.jobinfo); err == nil {
-		return ntgJob.jobinfo, fmt.Errorf("failed to parse ntg job info from db: %w: %s", err, b)
+		return ntgJob.jobinfo, nil
 	}
 	ntg := NewNTGVision()
 	ji, err := ntg.SearchJob(ntgJob.ID)
@@ -228,12 +228,14 @@ func setNTGToken(token string) {
 
 func (ntg NTGVision) search(states []config.State) (io.ReadCloser, error) {
 	if getNTGToken() == "" {
+		logtr.Debugf("NTG token is empty, refreshing ntg auth")
 		if err := ntg.refreshAuth(); err != nil {
 			return nil, err
 		}
 	}
 	rc, err := ntg._search(states)
 	if err == ErrNoAuth {
+		logtr.Debugf("err no auth on search, refreshing ntg auth")
 		if err := ntg.refreshAuth(); err != nil {
 			return nil, err
 		}
@@ -295,7 +297,11 @@ func (ntg NTGVision) _search(states []config.State) (io.ReadCloser, error) {
 	if resp.StatusCode != http.StatusOK {
 		b, _ := ioutil.ReadAll(resp.Body)
 		resp.Body.Close()
-		if resp.StatusCode > 400 && resp.StatusCode < 500 && resp.StatusCode != 404 && resp.StatusCode != 410 {
+		request2, _ := ntg.newRequest(states)
+		requestb, _ := ioutil.ReadAll(request2.Body)
+		logtr.Debugf("ntg auth bad status: url=%s, status=%v, body=%s, headers=%+v, request=%+v, requestb=%s", request.URL.String(), resp.StatusCode, b, resp.Header, request2, requestb)
+		if resp.StatusCode > 400 && resp.StatusCode < 404 {
+			logtr.Debugf("ntg auth bad status: err no auth")
 			return nil, ErrNoAuth
 		}
 		return nil, fmt.Errorf("bad status searching ntg: %d: %s", resp.StatusCode, b)
@@ -305,7 +311,7 @@ func (ntg NTGVision) _search(states []config.State) (io.ReadCloser, error) {
 
 func (ntg NTGVision) newRequest(states []config.State) (*http.Request, error) {
 	body, err := json.Marshal(map[string]interface{}{
-		"OriginFromDate":        time.Now().UTC().Format("2006-01-02T15:04:05.000Z"),
+		"OriginFromDate":        time.Now().Add(time.Hour * -24).UTC().Format("2006-01-02T15:04:05.000Z"),
 		"OriginToDate":          time.Now().UTC().Add(time.Hour * 24 * 30).Format("2006-01-02T15:04:05.000Z"),
 		"DestinationFromDate":   nil,
 		"DestinationToDate":     nil,

logtr/log.go

@@ -82,15 +82,16 @@ func SetLevel(l Level) {
 }
 
 func logf(l Level, format string, args []interface{}) {
-	format = fmt.Sprintf("%v: %v: %s\n", time.Now().Format("15:04:05"), l.String(), strings.TrimSpace(format))
+	format = fmt.Sprintf("%v: %v: %s\n", time.Now().Format("01-02T15:04:05"), l.String(), strings.TrimSpace(format))
+	logContent := strings.ReplaceAll(fmt.Sprintf(format, args...), "\n", "") + "\n"
 	cLevel := level
 	cAnsoser := ansoser
 	if l >= cLevel {
-		fmt.Fprintf(os.Stderr, format, args...)
+		fmt.Fprint(os.Stderr, logContent)
 	}
-	fmt.Fprintf(logger, format, args...)
+	fmt.Fprint(logger, logContent)
 	if l == SOS && cAnsoser != nil {
-		if err := cAnsoser.Send(fmt.Sprintf(format, args...)); err != nil {
+		if err := cAnsoser.Send(logContent); err != nil {
 			Errorf("failed to SOS: %v", err)
 		}
 	}

main.go

@@ -350,9 +350,14 @@ func updateDeadJobs(jobs []broker.Job) error {
 			if err := json.Unmarshal(b, &recorded); err != nil {
 				return err
 			}
+			/* // TODO this beeps on fluffychat
 			if err := message.NewMatrix().Update(recorded.MatrixID, recorded.Job.FormatMultilineTextDead()); err != nil {
 				return err
 			}
+			*/
+			if err := message.NewMatrix().Remove(recorded.MatrixID); err != nil {
+				return err
+			}
 			if err := db.Set(listEntry, nil); err != nil {
 				return err
 			}

todo.yaml

@@ -1,4 +1,5 @@
 todo:
+- !states emits current state 
 - TEST. Just like, refactor and test to shit.
 - try search ntg by autoinc?
 - test each !command callbacks to matrix