Merge branch 'master' of http://gogs.scratch.com:59515/bel/truckstop

broker/broker.go

@@ -42,14 +42,9 @@ func _do(db storage.DB, r *http.Request) (*http.Response, error) {
 		logtr.Errorf("failed to get cookies: %v", err)
 	} else {
 		logtr.Verbosef("got cookies for %s: %+v", cookieJarKey, cookies)
-		cookieV := strings.Join(r.Header["Cookie"], "; ")
 		for _, cookie := range cookies {
-			if len(cookieV) > 0 {
+			r.Header.Add("Cookie", cookie)
-				cookieV += "; "
-			}
-			cookieV += cookie
 		}
-		r.Header.Set("Cookie", cookieV)
 	}
 	logtr.Verbosef("_do: %+v", r)
 	resp, err := client.Do(r)
@@ -80,15 +75,13 @@ func setCookies(db storage.DB, host string, resp *http.Response) error {
 			continue
 		}
 		name := strings.Split(value, "=")[0]
-		value := strings.Split(value, ";")[0]
 		nameValues = append(nameValues, [2]string{name, value})
 	}
-	for _, cookie := range resp.Header["Set-Cookie"] {
+	for _, value := range resp.Header["Set-Cookie"] {
-		if len(cookie) == 0 {
+		if len(value) == 0 {
 			continue
 		}
-		name := strings.Split(cookie, "=")[0]
+		name := strings.Split(value, "=")[0]
-		value := strings.Split(cookie, ";")[0]
 		found := false
 		for i := range nameValues {
 			if nameValues[i][0] == name {

broker/broker_test.go

@@ -32,9 +32,9 @@ func TestDoCookies(t *testing.T) {
 		if calls != 1 {
 			if !strings.Contains(fmt.Sprint(r.Header["Cookie"]), "name=value"+strconv.Itoa(calls-1)) {
 				w.WriteHeader(http.StatusBadRequest)
-				t.Error("cookie not set as latest: " + fmt.Sprint(r.Header["Cookie"]))
+				t.Error("cookie not set as latest")
 			}
-			if strings.Contains(fmt.Sprint(r.Header["Cookie"]), "Expires") {
+			if !strings.Contains(fmt.Sprint(r.Header["Cookie"]), "Expires") {
 				w.WriteHeader(http.StatusBadRequest)
 				t.Error("cookie not expiration: ", r.Header["Cookie"])
 			}