Merge pull request #2156 from akhilmhdh/feat/login-cli-token-paste

Feat/login cli token paste

cli/go.mod

@@ -4,20 +4,20 @@ go 1.21
 
 require (
  github.com/bradleyjkemp/cupaloy/v2 v2.8.0
- github.com/charmbracelet/lipgloss v0.5.0
+ github.com/charmbracelet/lipgloss v0.9.1
+ github.com/chzyer/readline v1.5.1
  github.com/creack/pty v1.1.21
  github.com/denisbrodbeck/machineid v1.0.1
  github.com/fatih/semgroup v1.2.0
  github.com/gitleaks/go-gitdiff v0.8.0
  github.com/h2non/filetype v1.1.3
  github.com/infisical/go-sdk v0.3.0
- github.com/mattn/go-isatty v0.0.14
+ github.com/mattn/go-isatty v0.0.18
  github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a
  github.com/muesli/mango-cobra v1.2.0
  github.com/muesli/reflow v0.3.0
  github.com/muesli/roff v0.1.0
  github.com/petar-dambovaliev/aho-corasick v0.0.0-20211021192214-5ab2d9280aa9
- github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
  github.com/posthog/posthog-go v0.0.0-20221221115252-24dfed35d71a
  github.com/rs/cors v1.11.0
  github.com/rs/zerolog v1.26.1
@@ -49,7 +49,7 @@ require (
  github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 // indirect
  github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 // indirect
  github.com/aws/smithy-go v1.20.2 // indirect
- github.com/chzyer/readline v1.5.1 // indirect
+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
  github.com/danieljoos/wincred v1.2.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
@@ -69,12 +69,12 @@ require (
  github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
  github.com/magiconair/properties v1.8.5 // indirect
  github.com/mattn/go-colorable v0.1.9 // indirect
- github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/mattn/go-runewidth v0.0.15 // indirect
  github.com/mitchellh/mapstructure v1.4.1 // indirect
  github.com/mtibben/percent v0.2.1 // indirect
  github.com/muesli/mango v0.1.0 // indirect
  github.com/muesli/mango-pflag v0.1.0 // indirect
- github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0 // indirect
+ github.com/muesli/termenv v0.15.2 // indirect
  github.com/oklog/ulid v1.3.1 // indirect
  github.com/pelletier/go-toml v1.9.3 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -94,7 +94,7 @@ require (
  golang.org/x/net v0.25.0 // indirect
  golang.org/x/oauth2 v0.21.0 // indirect
  golang.org/x/sync v0.7.0 // indirect
- golang.org/x/sys v0.20.0 // indirect
+ golang.org/x/sys v0.22.0 // indirect
  golang.org/x/text v0.15.0 // indirect
  golang.org/x/time v0.5.0 // indirect
  google.golang.org/api v0.183.0 // indirect

cli/go.sum

@@ -83,13 +83,15 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 h1:M/1u4HBpwLuMtjlxuI2y6HoVLzF
 github.com/aws/aws-sdk-go-v2/service/sts v1.28.12/go.mod h1:kcfd+eTdEi/40FIbLq4Hif3XMXnl5b/+t/KTfLt9xIk=
 github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
 github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8=
-github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs=
+github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=
+github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
 github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
@@ -292,13 +294,12 @@ github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69Y
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
-github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -324,13 +325,12 @@ github.com/muesli/mango-cobra v1.2.0 h1:DQvjzAM0PMZr85Iv9LIMaYISpTOliMEg+uMFtNbY
 github.com/muesli/mango-cobra v1.2.0/go.mod h1:vMJL54QytZAJhCT13LPVDfkvCUJ5/4jNUKF/8NC2UjA=
 github.com/muesli/mango-pflag v0.1.0 h1:UADqbYgpUyRoBja3g6LUL+3LErjpsOwaC9ywvBWe7Sg=
 github.com/muesli/mango-pflag v0.1.0/go.mod h1:YEQomTxaCUp8PrbhFh10UfbhbQrM/xJ4i2PB8VTLLW0=
-github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8=
 github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig=
-github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0 h1:STjmj0uFfRryL9fzRA/OupNppeAID6QJYPMavTL7jtY=
-github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -340,8 +340,6 @@ github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5d
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/petar-dambovaliev/aho-corasick v0.0.0-20211021192214-5ab2d9280aa9 h1:lL+y4Xv20pVlCGyLzNHRC0I0rIHhIL1lTvHizoS/dU8=
 github.com/petar-dambovaliev/aho-corasick v0.0.0-20211021192214-5ab2d9280aa9/go.mod h1:EHPiTAKtiFmrMldLUNswFwfZ2eJIYBHktdaUTZxYWRw=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
@@ -612,17 +610,18 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

cli/packages/cmd/login.go

@@ -24,10 +24,10 @@ import (
  "github.com/Infisical/infisical-merge/packages/models"
  "github.com/Infisical/infisical-merge/packages/srp"
  "github.com/Infisical/infisical-merge/packages/util"
+ "github.com/chzyer/readline"
  "github.com/fatih/color"
  "github.com/go-resty/resty/v2"
  "github.com/manifoldco/promptui"
- "github.com/pkg/browser"
  "github.com/posthog/posthog-go"
  "github.com/rs/cors"
  "github.com/rs/zerolog/log"
@@ -226,9 +226,9 @@ var loginCmd = &cobra.Command{
 
  //call browser login function
  if !interactiveLogin {
- fmt.Println("Logging in via browser... To login via interactive mode run [infisical login -i]")
  userCredentialsToBeStored, err = browserCliLogin()
  if err != nil {
+ fmt.Printf("Login via browser failed. %s", err.Error())
  //default to cli login on error
  cliDefaultLogin(&userCredentialsToBeStored)
  }
@@ -713,10 +713,62 @@ func askForMFACode() string {
  return mfaVerifyCode
 }
 
+func askToPasteJwtToken(stdin *readline.CancelableStdin, success chan models.UserCredentials, failure chan error) {
+ time.Sleep(time.Second * 5)
+ fmt.Println("\n\nOnce login is completed via browser, the CLI should be authenticated automatically.")
+ fmt.Println("However, if browser fails to communicate with the CLI, please paste the token from the browser below.")
+
+ fmt.Print("\n\nToken: ")
+ bytePassword, err := term.ReadPassword(int(os.Stdin.Fd()))
+ if err != nil {
+ failure <- err
+ fmt.Println("\nError reading input:", err)
+ os.Exit(1)
+ }
+
+ infisicalPastedToken := strings.TrimSpace(string(bytePassword))
+
+ userCredentials, err := decodePastedBase64Token(infisicalPastedToken)
+ if err != nil {
+ failure <- err
+ fmt.Println("Invalid user credentials provided", err)
+ os.Exit(1)
+ }
+
+ // verify JTW
+ httpClient := resty.New().
+ SetAuthToken(userCredentials.JTWToken).
+ SetHeader("Accept", "application/json")
+
+ isAuthenticated := api.CallIsAuthenticated(httpClient)
+ if !isAuthenticated {
+ fmt.Println("Invalid user credentials provided", err)
+ failure <- err
+ os.Exit(1)
+ }
+
+ success <- *userCredentials
+}
+
+func decodePastedBase64Token(token string) (*models.UserCredentials, error) {
+ data, err := base64.StdEncoding.DecodeString(token)
+ if err != nil {
+ return nil, err
+ }
+ var loginResponse models.UserCredentials
+
+ err = json.Unmarshal(data, &loginResponse)
+ if err != nil {
+ return nil, err
+ }
+
+ return &loginResponse, nil
+}
+
 // Manages the browser login flow.
 // Returns a UserCredentials object on success and an error on failure
 func browserCliLogin() (models.UserCredentials, error) {
- SERVER_TIMEOUT := 60 * 10
+ SERVER_TIMEOUT := 10 * 60
 
  //create listener
  listener, err := net.Listen("tcp", "127.0.0.1:0")
@@ -728,17 +780,12 @@ func browserCliLogin() (models.UserCredentials, error) {
  callbackPort := listener.Addr().(*net.TCPAddr).Port
  url := fmt.Sprintf("%s?callback_port=%d", config.INFISICAL_LOGIN_URL, callbackPort)
 
- //open browser and login
- err = browser.OpenURL(url)
- if err != nil {
- return models.UserCredentials{}, err
- }
+ fmt.Printf("\n\nTo complete your login, open this address in your browser: %v \n", url)
 
  //flow channels
  success := make(chan models.UserCredentials)
  failure := make(chan error)
  timeout := time.After(time.Second * time.Duration(SERVER_TIMEOUT))
- quit := make(chan bool)
 
  //terminal state
  oldState, err := term.GetState(int(os.Stdin.Fd()))
@@ -760,24 +807,27 @@ func browserCliLogin() (models.UserCredentials, error) {
 
  log.Debug().Msgf("Callback server listening on port %d", callbackPort)
 
+ stdin := readline.NewCancelableStdin(os.Stdin)
  go http.Serve(listener, corsHandler)
+ go askToPasteJwtToken(stdin, success, failure)
 
  for {
  select {
  case loginResponse := <-success:
  _ = closeListener(&listener)
+ _ = stdin.Close()
+ fmt.Println("Browser login successful")
  return loginResponse, nil
 
- case <-failure:
- err = closeListener(&listener)
- return models.UserCredentials{}, err
+ case err := <-failure:
+ serverErr := closeListener(&listener)
+ stdErr := stdin.Close()
+ return models.UserCredentials{}, errors.Join(err, serverErr, stdErr)
 
  case <-timeout:
  _ = closeListener(&listener)
+ _ = stdin.Close()
  return models.UserCredentials{}, errors.New("server timeout")
-
- case <-quit:
- return models.UserCredentials{}, errors.New("quitting browser login, defaulting to cli...")
  }
  }
 }

frontend/src/const.ts

@@ -57,6 +57,10 @@ export const plans = plansProd || plansDev;
 export const leaveConfirmDefaultMessage =
  "Your changes will be lost if you leave the page. Are you sure you want to continue?";
 
+export enum SessionStorageKeys {
+ CLI_TERMINAL_TOKEN = "CLI_TERMINAL_TOKEN"
+}
+
 export const secretTagsColors = [
  {
  id: 1,

frontend/src/hooks/api/users/queries.tsx

@@ -1,6 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
+import { SessionStorageKeys } from "@app/const";
 import { setAuthToken } from "@app/reactQuery";
 
 import { APIKeyDataV2 } from "../apiKeys/types";
@@ -293,6 +294,7 @@ export const useLogoutUser = (keepQueryClient?: boolean) => {
  localStorage.removeItem("PRIVATE_KEY");
  localStorage.removeItem("orgData.id");
  localStorage.removeItem("projectData.id");
+ sessionStorage.removeItem(SessionStorageKeys.CLI_TERMINAL_TOKEN);
 
  if (!keepQueryClient) {
  queryClient.clear();