add cookies in keyring

Author: soham-sl

helper/credentials/saml.go

@@ -33,6 +33,15 @@ func LookupCredentials(loginDetails *creds.LoginDetails, provider string) error
 		loginDetails.ClientID = id
 		loginDetails.ClientSecret = secret
 	}
+
+	if provider == "Browser" {
+		_, cookiesJson, err := CurrentHelper.Get(path.Join(loginDetails.URL, "/browserCookieJson"))
+		if err != nil {
+			return err
+		}
+		loginDetails.CookiesJson = cookiesJson
+	}
+
 	return nil
 }
 

pkg/creds/creds.go

@@ -5,6 +5,7 @@ type LoginDetails struct {
 	ClientID          string // used by OneLogin
 	ClientSecret      string // used by OneLogin
 	DownloadBrowser   bool   // used by Browser
+	CookiesJson		  string // used by Browser
 	MFAIPAddress      string // used by OneLogin
 	Username          string
 	Password          string

pkg/provider/browser/browser.go

@@ -1,17 +1,19 @@
 package browser
 
 import (
+	"path"
 	"errors"
 	"fmt"
 	"net/url"
-	"os"
 	"regexp"
 	"strings"
+	"encoding/json"
 
 	"github.com/playwright-community/playwright-go"
 	"github.com/sirupsen/logrus"
 	"github.com/versent/saml2aws/v2/pkg/cfg"
 	"github.com/versent/saml2aws/v2/pkg/creds"
+	"github.com/versent/saml2aws/v2/helper/credentials"
 )
 
 var logger = logrus.WithField("provider", "browser")
@@ -113,20 +115,25 @@ func (cl *Client) Authenticate(loginDetails *creds.LoginDetails) (string, error)
 	// create Context Optionsf
 	contextOptions := playwright.BrowserNewContextOptions{}
 
-	// load saved storageState if present and add to contextOptions
-	userHomeDir, err := os.UserHomeDir()
-	storageStatePath := fmt.Sprintf("%s/.aws/saml2aws/storageState.json", userHomeDir)
+	context, err := browser.NewContext(contextOptions)
 	if err != nil {
 		return "", err
 	}
-	if _, err := os.Stat(storageStatePath); err == nil {
-		contextOptions.StorageStatePath = playwright.String(storageStatePath)
+
+
+    if loginDetails.CookiesJson == "" {
+        logger.Info("could not retrieve cookies")
+    } else {
+		logger.Info("cookie json string length: ", len(loginDetails.CookiesJson))
 	}
 
-	// Create new broswer context
-	context, err := browser.NewContext(contextOptions)
-	if err != nil {
-		return "", err
+	var cookies []playwright.OptionalCookie
+	if err := json.Unmarshal([]byte(loginDetails.CookiesJson), &cookies); err != nil {
+		logger.Info("could not unmarshal cookies: %v", err)
+	}
+
+	if err := context.AddCookies(cookies); err != nil {
+		logger.Info("could not add cookies: %v", err)
 	}
 
 	page, err := context.NewPage()
@@ -136,7 +143,16 @@ func (cl *Client) Authenticate(loginDetails *creds.LoginDetails) (string, error)
 
 	defer func() {
 		logger.Info("saving storage state")
-		_, err := context.StorageState(storageStatePath)
+		cookies, err := context.Cookies(loginDetails.URL)
+		if err != nil {
+			logger.Info("could not get cookies: %v", err)
+		}
+
+		cookiesByteArr, err := json.Marshal(cookies)
+		if err != nil {
+			logger.Info("Error converting storage state", err)
+		}
+		err = credentials.SaveCredentials(path.Join(loginDetails.URL, "/browserCookieJson"), loginDetails.Username,  string(cookiesByteArr))
 		if err != nil {
 			logger.Info("Error saving storage state", err)
 		}