fix: login/logout session cookie handling

ctfer-io · Apr 15, 2024 · b14477b · b14477b
1 parent f3e57e8
commit b14477b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/api/login.go b/api/login.go
@@ -43,5 +43,15 @@ func (client *Client) Login(params *LoginParams, opts ...Option) error {
 		return err
 	}
 	client.nonce = nonce
+
+	u, _ := url.Parse(client.url)
+	hds := client.sub.Jar.Cookies(u)
+	for _, hd := range hds {
+		if hd.Name == "session" {
+			client.session = hd.Value
+			break
+		}
+	}
+
 	return nil
 }
diff --git a/api/logout.go b/api/logout.go
@@ -3,6 +3,7 @@ package api
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 )
 
 func (client *Client) Logout(opts ...Option) error {
@@ -23,5 +24,15 @@ func (client *Client) Logout(opts ...Option) error {
 		return err
 	}
 	client.nonce = nonce
+
+	u, _ := url.Parse(client.url)
+	hds := client.sub.Jar.Cookies(u)
+	for _, hd := range hds {
+		if hd.Name == "session" {
+			client.session = hd.Value
+			break
+		}
+	}
+
 	return nil
 }
diff --git a/api/setup_test.go b/api/setup_test.go
@@ -81,14 +81,15 @@ func Test_F_Setup(t *testing.T) {
 		return
 	}
 
-	// 1e. Relog :)
+	// 1e. Relog, and drop the use of the API token because... why not ¯\_(ツ)_/¯
 	err = client.Login(&api.LoginParams{
 		Name:     "ctfer",
 		Password: "password",
 	})
 	if !assert.Nil(err, "got error: %s", err) {
 		return
 	}
+	client.SetAPIKey("")
 
 	// 2. Create a challenge
 	chall, err := client.PostChallenges(&api.PostChallengesParams{