diff --git a/pkg/provider/googleapps/example/challenge-sms-send.html b/pkg/provider/googleapps/example/challenge-sms-send.html new file mode 100644 index 000000000..ac45efe14 --- /dev/null +++ b/pkg/provider/googleapps/example/challenge-sms-send.html @@ -0,0 +1,350 @@ + + + + +
+
+
+
+
+
+
+
+
+
+
+

2-Step Verification

+
+
+

This extra step shows it’s really you trying to sign in

+
+
+
+
+
+ + + + + + + + + + + + + + + +
+ +
+ Get a verification code by text message at: + + (•••) •••-••XX + +
+ +
+ + + Don’t ask again on this device + + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + +
+
+
+ + edw@defang.io + + + Use a different account + +
+
+
+
+ +
+ + + + +
+
+
+
+ \ No newline at end of file diff --git a/pkg/provider/googleapps/example/challenge-sms.html b/pkg/provider/googleapps/example/challenge-sms.html new file mode 100644 index 000000000..f69d14645 --- /dev/null +++ b/pkg/provider/googleapps/example/challenge-sms.html @@ -0,0 +1,371 @@ + + + + +
+
+
+
+
+
+
+
+
+
+
+

+ 2-Step Verification +

+
+
+

+ This extra step shows it’s really you trying to sign in +

+
+
+
+
+
+ + + + + + + + + + + + + + + +
+ +
+ Enter a verification code +
+
+ A text message with a verification code was just sent to + + (•••) •••-••XX + +
+
+
+ G- +
+ +
+ + + Enter a code + + + +
+ + + Don’t ask again on this device + + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + +
+
+
+ + edw@defang.io + + + Use a different account + +
+
+
+
+ +
+ + + + +
+
+
+
+ + + \ No newline at end of file diff --git a/pkg/provider/googleapps/googleapps_test.go b/pkg/provider/googleapps/googleapps_test.go index 576e7362f..e7f26345d 100644 --- a/pkg/provider/googleapps/googleapps_test.go +++ b/pkg/provider/googleapps/googleapps_test.go @@ -11,7 +11,9 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/require" + "github.com/versent/saml2aws/v2/mocks" "github.com/versent/saml2aws/v2/pkg/creds" + "github.com/versent/saml2aws/v2/pkg/prompter" "github.com/versent/saml2aws/v2/pkg/provider" ) @@ -151,6 +153,48 @@ func TestChallengePage(t *testing.T) { require.NotNil(t, challengeDoc) } +func TestSMSChallengePage(t *testing.T) { + pr := &mocks.Prompter{} + prompter.SetPrompter(pr) + pr.Mock.On("StringRequired", "Enter SMS token: G-").Return("000000") + + step1, err := os.ReadFile("example/challenge-sms-send.html") + require.Nil(t, err) + step2, err := os.ReadFile("example/challenge-sms.html") + require.Nil(t, err) + + calls := 0 + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + defer func() { calls++ }() + err := r.ParseForm() + require.Nil(t, err) + + switch calls { + case 0: + _, _ = w.Write(step1) + case 1: + require.Equal(t, r.Form.Get("SendMethod"), "SMS") + _, _ = w.Write(step2) + case 2: + require.Equal(t, r.Form.Get("Pin"), "000000") + _, _ = w.Write(step2) + default: + require.Fail(t, "too many calls") + } + })) + defer ts.Close() + + opts := &provider.HTTPClientOptions{IsWithRetries: false} + kc := Client{client: &provider.HTTPClient{Client: http.Client{}, Options: opts}} + loginDetails := &creds.LoginDetails{URL: ts.URL, Username: "test", Password: "test123"} + authForm := url.Values{} + + challengeDoc, err := kc.loadChallengePage(ts.URL, "https://accounts.google.com/signin/challenge/sl/password", authForm, loginDetails) + require.Nil(t, err) + require.NotNil(t, challengeDoc) + require.Equal(t, 3, calls) +} + func TestExtractDataAttributes(t *testing.T) { data, err := os.ReadFile("example/challenge-prompt.html") require.Nil(t, err)