moto 5.0.14.dev22__tar.gz → 5.0.14.dev30__tar.gz

{moto-5.0.14.dev22/moto.egg-info → moto-5.0.14.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.14.dev22
+Version: 5.0.14.dev30
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.14.dev22 → moto-5.0.14.dev30}/moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.14.dev22"
+__version__ = "5.0.14.dev30"

{moto-5.0.14.dev22 → moto-5.0.14.dev30}/moto/cognitoidp/models.py

@@ -404,7 +404,7 @@ class CognitoIdpUserPool(BaseModel):
         self.creation_date = utcnow()
         self.last_modified_date = utcnow()
 
-        self.mfa_config = "OFF"
+        self.mfa_config = extended_config.get("MfaConfiguration") or "OFF"
         self.sms_mfa_config: Optional[Dict[str, Any]] = None
         self.token_mfa_config: Optional[Dict[str, bool]] = None
 
@@ -948,7 +948,7 @@ class CognitoIdpBackend(BaseBackend):
         super().__init__(region_name, account_id)
         self.user_pools: Dict[str, CognitoIdpUserPool] = OrderedDict()
         self.user_pool_domains: Dict[str, CognitoIdpUserPoolDomain] = OrderedDict()
-        self.sessions: Dict[str, CognitoIdpUserPool] = {}
+        self.sessions: Dict[str, Tuple[str, CognitoIdpUserPool]] = {}
 
     # User pool
     def create_user_pool(
@@ -1456,7 +1456,7 @@ class CognitoIdpBackend(BaseBackend):
                 UserStatus.RESET_REQUIRED,
             ]:
                 session = str(random.uuid4())
-                self.sessions[session] = user_pool
+                self.sessions[session] = (username, user_pool)
 
                 return {
                     "ChallengeName": "NEW_PASSWORD_REQUIRED",
@@ -1469,7 +1469,7 @@ class CognitoIdpBackend(BaseBackend):
                 and user.preferred_mfa_setting == "SOFTWARE_TOKEN_MFA"
             ):
                 session = str(random.uuid4())
-                self.sessions[session] = user_pool
+                self.sessions[session] = (username, user_pool)
 
                 return {
                     "ChallengeName": "SOFTWARE_TOKEN_MFA",
@@ -1479,7 +1479,7 @@ class CognitoIdpBackend(BaseBackend):
 
             if user.sms_mfa_enabled and user.preferred_mfa_setting == "SMS_MFA":
                 session = str(random.uuid4())
-                self.sessions[session] = user_pool
+                self.sessions[session] = (username, user_pool)
 
                 return {
                     "ChallengeName": "SMS_MFA",
@@ -1535,9 +1535,9 @@ class CognitoIdpBackend(BaseBackend):
         if challenge_name == "PASSWORD_VERIFIER":
             session = challenge_responses.get("PASSWORD_CLAIM_SECRET_BLOCK")  # type: ignore[assignment]
 
-        user_pool = self.sessions.get(session)
-        if not user_pool:
+        if session not in self.sessions:
             raise ResourceNotFoundError(session)
+        _, user_pool = self.sessions[session]
 
         client = user_pool.clients.get(client_id)
         if not client:
@@ -1553,8 +1553,26 @@ class CognitoIdpBackend(BaseBackend):
 
             user.password = new_password
             user.status = UserStatus.CONFIRMED
-            del self.sessions[session]
 
+            if user_pool.mfa_config == "ON":
+                mfas_can_setup = []
+                if user_pool.token_mfa_config == {"Enabled": True}:
+                    mfas_can_setup.append("SOFTWARE_TOKEN_MFA")
+                if user_pool.sms_mfa_config:
+                    mfas_can_setup.append("SMS_MFA")
+
+                if (
+                    mfas_can_setup
+                    and not user.software_token_mfa_enabled
+                    and not user.sms_mfa_enabled
+                ):
+                    return {
+                        "ChallengeName": "MFA_SETUP",
+                        "ChallengeParameters": {"MFAS_CAN_SETUP": mfas_can_setup},
+                        "Session": session,
+                    }
+
+            del self.sessions[session]
             return self._log_user_in(user_pool, client, username)
         elif challenge_name == "PASSWORD_VERIFIER":
             username: str = challenge_responses.get("USERNAME")  # type: ignore[no-redef]
@@ -1617,6 +1635,11 @@ class CognitoIdpBackend(BaseBackend):
             del self.sessions[session]
             return self._log_user_in(user_pool, client, username)
 
+        elif challenge_name == "MFA_SETUP":
+            username, user_pool = self.sessions[session]
+            auth_params = self._log_user_in(user_pool, client, username)
+            return {"ChallengeParameters": {}, **auth_params}
+
         else:
             return {}
 
@@ -1945,7 +1968,7 @@ class CognitoIdpBackend(BaseBackend):
                 raise UserNotConfirmedException("User is not confirmed.")
 
             session = str(random.uuid4())
-            self.sessions[session] = user_pool
+            self.sessions[session] = (username, user_pool)
 
             return {
                 "ChallengeName": "PASSWORD_VERIFIER",
@@ -1977,7 +2000,7 @@ class CognitoIdpBackend(BaseBackend):
                 raise UserNotConfirmedException("User is not confirmed.")
 
             session = str(random.uuid4())
-            self.sessions[session] = user_pool
+            self.sessions[session] = (username, user_pool)
 
             if user.status is UserStatus.FORCE_CHANGE_PASSWORD:
                 return {
@@ -2056,20 +2079,40 @@ class CognitoIdpBackend(BaseBackend):
             # We shouldn't get here due to enum validation of auth_flow
             return None  # type: ignore[return-value]
 
-    def associate_software_token(self, access_token: str) -> Dict[str, str]:
+    def associate_software_token(
+        self, access_token: str, session: str
+    ) -> Dict[str, str]:
+        secret_code = "asdfasdfasdf"
+        if session:
+            if session in self.sessions:
+                return {"SecretCode": secret_code, "Session": session}
+            raise NotAuthorizedError(session)
+
         for user_pool in self.user_pools.values():
             if access_token in user_pool.access_tokens:
                 _, username = user_pool.access_tokens[access_token]
                 self.admin_get_user(user_pool.id, username)
 
-                return {"SecretCode": str(random.uuid4())}
+                return {"SecretCode": secret_code}
 
         raise NotAuthorizedError(access_token)
 
-    def verify_software_token(self, access_token: str) -> Dict[str, str]:
+    def verify_software_token(self, access_token: str, session: str) -> Dict[str, str]:
         """
         The parameter UserCode has not yet been implemented
         """
+        if session:
+            if session not in self.sessions:
+                raise ResourceNotFoundError(session)
+
+            username, user_pool = self.sessions[session]
+            user = self.admin_get_user(user_pool.id, username)
+            user.token_verified = True
+
+            session = str(random.uuid4())
+            self.sessions[session] = (username, user_pool)
+            return {"Status": "SUCCESS", "Session": session}
+
         for user_pool in self.user_pools.values():
             if access_token in user_pool.access_tokens:
                 _, username = user_pool.access_tokens[access_token]
@@ -2077,7 +2120,9 @@ class CognitoIdpBackend(BaseBackend):
 
                 user.token_verified = True
 
-                return {"Status": "SUCCESS"}
+                session = str(random.uuid4())
+                self.sessions[session] = (username, user_pool)
+                return {"Status": "SUCCESS", "Session": session}
 
         raise NotAuthorizedError(access_token)
 

{moto-5.0.14.dev22 → moto-5.0.14.dev30}/moto/cognitoidp/responses.py

@@ -623,12 +623,14 @@ class CognitoIdpResponse(BaseResponse):
 
     def associate_software_token(self) -> str:
         access_token = self._get_param("AccessToken")
-        result = self.backend.associate_software_token(access_token)
+        session = self._get_param("Session")
+        result = self.backend.associate_software_token(access_token, session)
         return json.dumps(result)
 
     def verify_software_token(self) -> str:
         access_token = self._get_param("AccessToken")
-        result = self.backend.verify_software_token(access_token)
+        session = self._get_param("Session")
+        result = self.backend.verify_software_token(access_token, session)
         return json.dumps(result)
 
     def set_user_mfa_preference(self) -> str:

{moto-5.0.14.dev22 → moto-5.0.14.dev30}/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json

@@ -659,6 +659,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-east-1a"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-east-1a"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-east-1a"
@@ -3795,6 +3815,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-east-1b"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-east-1b"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-east-1b"
@@ -6935,6 +6975,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-east-1c"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-east-1c"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-east-1c"
@@ -9243,6 +9303,10 @@
   "InstanceType": "u-9tb1.112xlarge",
   "Location": "us-east-1c"
  },
+ {
+  "InstanceType": "u7i-12tb.224xlarge",
+  "Location": "us-east-1c"
+ },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "us-east-1c"
@@ -10019,6 +10083,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-east-1d"
@@ -10383,6 +10467,30 @@
   "InstanceType": "i3en.xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "i4g.16xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "i4g.2xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "i4g.4xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "i4g.8xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "i4g.large",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "i4g.xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "i4i.12xlarge",
   "Location": "us-east-1d"
@@ -13231,6 +13339,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-east-1f"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-east-1f"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-east-1f"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-east-1f"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-east-1f"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-east-1f"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-east-1f"

{moto-5.0.14.dev22 → moto-5.0.14.dev30}/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json

@@ -607,6 +607,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "use1-az1"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "use1-az1"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "use1-az1"
@@ -971,6 +991,30 @@
   "InstanceType": "i3en.xlarge",
   "Location": "use1-az1"
  },
+ {
+  "InstanceType": "i4g.16xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "i4g.2xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "i4g.4xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "i4g.8xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "i4g.large",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "i4g.xlarge",
+  "Location": "use1-az1"
+ },
  {
   "InstanceType": "i4i.12xlarge",
   "Location": "use1-az1"
@@ -3627,6 +3671,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "use1-az2"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "use1-az2"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "use1-az2"
@@ -7019,6 +7083,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "use1-az4"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "use1-az4"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "use1-az4"
@@ -10095,6 +10179,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "use1-az5"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "use1-az5"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "use1-az5"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "use1-az5"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "use1-az5"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "use1-az5"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "use1-az5"
@@ -12739,6 +12843,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "use1-az6"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "use1-az6"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "use1-az6"
@@ -15047,6 +15171,10 @@
   "InstanceType": "u-9tb1.112xlarge",
   "Location": "use1-az6"
  },
+ {
+  "InstanceType": "u7i-12tb.224xlarge",
+  "Location": "use1-az6"
+ },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "use1-az6"

{moto-5.0.14.dev22 → moto-5.0.14.dev30}/moto/ec2/resources/instance_type_offerings/region/us-east-1.json

@@ -659,6 +659,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-east-1"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-east-1"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-east-1"