Skip to content

refactor: improve safe access to MFA fields during user creation #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkdy21 merged 2 commits into from
Jul 28, 2025
Merged

refactor: improve safe access to MFA fields during user creation #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a3f11
refactor: handle enforce condition when disabling MFA
kkdy21 Jul 28, 2025
98761c0
refactor: improve safe access to MFA fields during user creation
kkdy21 Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/spaceone/identity/service/user_profile_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def confirm_mfa(
user_vo = self.user_mgr.get_user(user_id, domain_id)
user_mfa = user_vo.mfa.to_dict() if user_vo.mfa else {}
mfa_state = user_mfa.get("state", "DISABLED")
mfa_enforce = user_mfa.get("options", {}).get("enforce") == True
mfa_enforce = user_mfa.get("options", {}).get("enforce", False)

if mfa_state == "DISABLED":
user_mfa = MFAManager.get_mfa_info(credentials)["user_mfa"]
Expand All @@ -359,25 +359,22 @@ def confirm_mfa(
raise ERROR_MFA_NOT_ENABLED(user_id=user_id)

mfa_manager = MFAManager.get_manager_by_mfa_type(mfa_type)
update_require_actions = list(user_vo.required_actions)
update_require_actions = set(user_vo.required_actions)

if mfa_manager.confirm_mfa(credentials, verify_code):
user_mfa = mfa_manager.set_mfa_options(user_mfa, credentials)

if mfa_state == "ENABLED" or (mfa_state == "DISABLED" and mfa_enforce):
update_require_actions = [
action
for action in update_require_actions
if action != "ENFORCE_MFA"
]

if mfa_state == "ENABLED":
if mfa_enforce:
update_require_actions.add("ENFORCE_MFA")

user_mfa = {
"state": "DISABLED",
**({"mfa_type": mfa_type, "options": {"enforce": mfa_enforce}} if mfa_enforce else {}),
}

elif mfa_state == "DISABLED":
update_require_actions.discard("ENFORCE_MFA")
user_mfa["state"] = "ENABLED"

user_vo = self.user_mgr.update_user_by_vo(
Expand Down
23 changes: 8 additions & 15 deletions src/spaceone/identity/service/user_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ def create_user(self, params: dict) -> User:
language = self._get_domain_default_language(domain_id, params.get("language"))
params["language"] = language
params["timezone"] = params.get("timezone", "UTC")
mfa_enforce = params["enforce_mfa_state"]
mfa_enforce_type = params["enforce_mfa_type"]
mfa_enforce = params.get("enforce_mfa_state")
mfa_enforce_type = params.get("enforce_mfa_type")

if mfa_enforce:
if mfa_enforce_type is None:
Expand All @@ -88,7 +88,7 @@ def create_user(self, params: dict) -> User:
"options": {"enforce": mfa_enforce},
}
params["required_actions"] = ["ENFORCE_MFA"]
else:
elif mfa_enforce is not None:
if mfa_enforce_type is not None:
raise ERROR_INVALID_PARAMETER(
key="mfa.mfa_type",
Expand Down Expand Up @@ -195,7 +195,7 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
domain_id = params.domain_id

update_user_vo = {}
update_require_actions = list(user_vo.required_actions)
update_require_actions = set(user_vo.required_actions)

if params.reset_password:
domain_name = self._get_domain_name(domain_id)
Expand All @@ -216,8 +216,7 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
temp_password = self._generate_temporary_password()
update_user_vo["password"] = temp_password

if "UPDATE_PASSWORD" not in update_require_actions:
update_require_actions.append("UPDATE_PASSWORD")
update_require_actions.add("UPDATE_PASSWORD")

if reset_password_type == "ACCESS_TOKEN":
token = self._issue_temporary_token(user_id, domain_id)
Expand Down Expand Up @@ -262,7 +261,7 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
update_mfa["options"].clear()

update_mfa["options"].update({"enforce": mfa_enforce})
update_require_actions.append("ENFORCE_MFA")
update_require_actions.add("ENFORCE_MFA")

else:
if mfa_type is not None:
Expand All @@ -271,21 +270,15 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
reason="Type can only be set when mfa enforce is True.",
)
update_mfa["options"].pop("enforce", None)
update_require_actions = [
actions
for actions in update_require_actions
if actions != "ENFORCE_MFA"
]
update_require_actions.discard("ENFORCE_MFA")

update_user_vo["mfa"] = update_mfa

general_params = params.dict(
exclude_unset=True, exclude={"reset_password", "mfa"}
)
update_user_vo.update(general_params)
update_user_vo["required_actions"] = list(
set(update_require_actions)
)
update_user_vo["required_actions"] = list(update_require_actions)

user_vo = self.user_mgr.update_user_by_vo(update_user_vo, user_vo)

Expand Down
Loading