fix(ci): enable TOTP support in server mode tests

Author: bdellegrazie

.github/workflows/tests_servermode.yml

@@ -21,7 +21,7 @@ jobs:
       run: |
         pip install build
         python -m build
-        docker run --rm -t --name motoserver -e TEST_SERVER_MODE=true -e MOTO_EC2_LOAD_DEFAULT_AMIS=false -e AWS_SECRET_ACCESS_KEY=server_secret -e AWS_ACCESS_KEY_ID=server_key -v `pwd`:/moto -p 5000:5000 -v /var/run/docker.sock:/var/run/docker.sock python:${{ matrix.python-version }}-slim /moto/scripts/ci_moto_server.sh &
+        docker run --rm -t --name motoserver -e TEST_SERVER_MODE=true -e MOTO_EC2_LOAD_DEFAULT_AMIS=false -e MOTO_COGNITO_IDP_USER_POOL_ENABLE_TOTP=true -e AWS_SECRET_ACCESS_KEY=server_secret -e AWS_ACCESS_KEY_ID=server_key -v `pwd`:/moto -p 5000:5000 -v /var/run/docker.sock:/var/run/docker.sock python:${{ matrix.python-version }}-slim /moto/scripts/ci_moto_server.sh &
         python scripts/ci_wait_for_server.py
     - name: Get pip cache dir
       id: pip-cache

tests/test_cognitoidp/test_cognitoidp.py

@@ -536,7 +536,7 @@ def test_create_user_pool_default_id_strategy():
 @mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_ID_STRATEGY": "HASH"})
 def test_create_user_pool_hash_id_strategy_with_equal_pool_name():
     if settings.TEST_SERVER_MODE:
-        raise SkipTest("Cannot set environemnt variables in ServerMode")
+        raise SkipTest("Cannot set environment variables in ServerMode")
 
     conn = boto3.client("cognito-idp", "us-west-2")
 
@@ -550,7 +550,7 @@ def test_create_user_pool_hash_id_strategy_with_equal_pool_name():
 @mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_ID_STRATEGY": "HASH"})
 def test_create_user_pool_hash_id_strategy_with_different_pool_name():
     if settings.TEST_SERVER_MODE:
-        raise SkipTest("Cannot set environemnt variables in ServerMode")
+        raise SkipTest("Cannot set environment variables in ServerMode")
 
     conn = boto3.client("cognito-idp", "us-west-2")
 
@@ -564,7 +564,7 @@ def test_create_user_pool_hash_id_strategy_with_different_pool_name():
 @mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_ID_STRATEGY": "HASH"})
 def test_create_user_pool_hash_id_strategy_with_different_attributes():
     if settings.TEST_SERVER_MODE:
-        raise SkipTest("Cannot set environemnt variables in ServerMode")
+        raise SkipTest("Cannot set environment variables in ServerMode")
 
     conn = boto3.client("cognito-idp", "us-west-2")
 
@@ -1002,7 +1002,7 @@ def test_create_user_pool_client_default_id_strategy():
 @mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_CLIENT_ID_STRATEGY": "HASH"})
 def test_create_user_pool_client_hash_id_strategy_with_equal_args():
     if settings.TEST_SERVER_MODE:
-        raise SkipTest("Cannot set environemnt variables in ServerMode")
+        raise SkipTest("Cannot set environment variables in ServerMode")
 
     conn = boto3.client("cognito-idp", "us-west-2")
 
@@ -1024,7 +1024,7 @@ def test_create_user_pool_client_hash_id_strategy_with_equal_args():
 @mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_CLIENT_ID_STRATEGY": "HASH"})
 def test_create_user_pool_client_hash_id_strategy_with_different_args():
     if settings.TEST_SERVER_MODE:
-        raise SkipTest("Cannot set environemnt variables in ServerMode")
+        raise SkipTest("Cannot set environment variables in ServerMode")
 
     conn = boto3.client("cognito-idp", "us-west-2")
 
@@ -3210,6 +3210,7 @@ def user_authentication_flow(
     refresh_token = result["AuthenticationResult"]["RefreshToken"]
 
     # add mfa token
+    secret_code = None
     if with_mfa:
         resp = conn.associate_software_token(
             AccessToken=result["AuthenticationResult"]["AccessToken"]
@@ -3284,6 +3285,7 @@ def user_authentication_flow(
         "client_id": client_id,
         "client_secret": client_secret,
         "secret_hash": secret_hash,
+        "secret_code": secret_code,
         "id_token": result["AuthenticationResult"]["IdToken"],
         "access_token": result["AuthenticationResult"]["AccessToken"],
         "refresh_token": refresh_token,
@@ -4842,6 +4844,7 @@ def test_initiate_auth_USER_PASSWORD_AUTH_when_software_token_mfa_enabled():
     password = result["password"]
     client_id = result["client_id"]
     secret_hash = result["secret_hash"]
+    secret_code = result["secret_code"]
 
     result = conn.admin_get_user(UserPoolId=user_pool_id, Username=username)
     assert result["PreferredMfaSetting"] == "SOFTWARE_TOKEN_MFA"
@@ -4856,12 +4859,15 @@ def test_initiate_auth_USER_PASSWORD_AUTH_when_software_token_mfa_enabled():
     assert result["ChallengeParameters"] == {}
     assert result["Session"] is not None
 
+    totp = pyotp.TOTP(secret_code)
+    user_code = totp.now()
+
     result = conn.respond_to_auth_challenge(
         ClientId=client_id,
         ChallengeName="SOFTWARE_TOKEN_MFA",
         Session=result["Session"],
         ChallengeResponses={
-            "SOFTWARE_TOKEN_MFA_CODE": "123456",
+            "SOFTWARE_TOKEN_MFA_CODE": user_code,
             "USERNAME": username,
             "SECRET_HASH": secret_hash,
         },
@@ -5372,7 +5378,8 @@ def test_admin_setting_mfa_totp_and_sms():
 
 
 @mock_aws
-def test_admin_initiate_auth_when_token_totp_masked():
+@mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_ENABLE_TOTP": "true"})
+def test_admin_initiate_auth_when_token_totp_enabled():
     conn = boto3.client("cognito-idp", "us-west-2")
 
     result = authentication_flow(conn, "ADMIN_NO_SRP_AUTH")
@@ -5419,7 +5426,7 @@ def test_admin_initiate_auth_when_token_totp_masked():
         ChallengeName="SOFTWARE_TOKEN_MFA",
         Session=result["Session"],
         ChallengeResponses={
-            "SOFTWARE_TOKEN_MFA_CODE": "123456",
+            "SOFTWARE_TOKEN_MFA_CODE": totp.now(),
             "USERNAME": username,
         },
     )
@@ -5431,8 +5438,10 @@ def test_admin_initiate_auth_when_token_totp_masked():
 
 
 @mock_aws
-@mock.patch.dict(os.environ, {"MOTO_COGNITO_IDP_USER_POOL_ENABLE_TOTP": "true"})
-def test_admin_initiate_auth_when_token_totp_enabled():
+def test_admin_initiate_auth_when_token_totp_disabled():
+    if settings.TEST_SERVER_MODE:
+        raise SkipTest("TOTP is enabled in server mode")
+
     conn = boto3.client("cognito-idp", "us-west-2")
 
     result = authentication_flow(conn, "ADMIN_NO_SRP_AUTH")
@@ -5479,7 +5488,7 @@ def test_admin_initiate_auth_when_token_totp_enabled():
         ChallengeName="SOFTWARE_TOKEN_MFA",
         Session=result["Session"],
         ChallengeResponses={
-            "SOFTWARE_TOKEN_MFA_CODE": totp.now(),
+            "SOFTWARE_TOKEN_MFA_CODE": "123456",
             "USERNAME": username,
         },
     )