YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

return domain from _get_user_infos

Browse source
This commit is contained in:
axolotle 2023-09-04 16:27:06 +02:00
parent 20d21b57e0
commit 2136db32b6
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/portal.py
View file

@ -18,7 +18,7 @@
along with this program; if not, see http://www.gnu.org/licenses along with this program; if not, see http://www.gnu.org/licenses
""" """
from typing import Union from typing import Any, Union
import ldap import ldap
from moulinette.utils.filesystem import read_json from moulinette.utils.filesystem import read_json
@ -37,7 +37,9 @@ logger = getActionLogger("portal")
ADMIN_ALIASES = ["root", "admin", "admins", "webmaster", "postmaster", "abuse"] ADMIN_ALIASES = ["root", "admin", "admins", "webmaster", "postmaster", "abuse"]
def _get_user_infos(user_attrs: list[str]): def _get_user_infos(
user_attrs: list[str],
) -> tuple[str, str, dict[str, Any], LDAPInterface]:
auth = Auth().get_session_cookie(decrypt_pwd=True) auth = Auth().get_session_cookie(decrypt_pwd=True)
username = auth["user"] username = auth["user"]
ldap_interface = LDAPInterface(username, auth["pwd"]) ldap_interface = LDAPInterface(username, auth["pwd"])
@ -45,15 +47,14 @@ def _get_user_infos(user_attrs: list[str]):
if not result: if not result:
raise YunohostValidationError("user_unknown", user=username) raise YunohostValidationError("user_unknown", user=username)
return username, result[0], ldap_interface return username, auth["host"], result[0], ldap_interface
def portal_me(): def portal_me():
""" """
Get user informations Get user informations
""" """
username, domain, user, _ = _get_user_infos(
username, user, _ = _get_user_infos(
["cn", "mail", "maildrop", "mailuserquota", "memberOf", "permission"] ["cn", "mail", "maildrop", "mailuserquota", "memberOf", "permission"]
) )
@ -106,7 +107,7 @@ def portal_update(
from yunohost.domain import domain_list from yunohost.domain import domain_list
domains = domain_list()["domains"] domains = domain_list()["domains"]
username, current_user, ldap_interface = _get_user_infos( username, domain, current_user, ldap_interface = _get_user_infos(
["givenName", "sn", "cn", "mail", "maildrop", "memberOf"] ["givenName", "sn", "cn", "mail", "maildrop", "memberOf"]
) )
new_attr_dict = {} new_attr_dict = {}
@ -176,8 +177,12 @@ def portal_update(
# Ensure compatibility and sufficiently complex password # Ensure compatibility and sufficiently complex password
try: try:
assert_password_is_compatible(newpassword) assert_password_is_compatible(newpassword)
is_admin = "cn=admins,ou=groups,dc=yunohost,dc=org" in current_user["memberOf"] is_admin = (
assert_password_is_strong_enough("admin" if is_admin else "user", newpassword) "cn=admins,ou=groups,dc=yunohost,dc=org" in current_user["memberOf"]
)
assert_password_is_strong_enough(
"admin" if is_admin else "user", newpassword
)
except YunohostValidationError as e: except YunohostValidationError as e:
raise YunohostValidationError(e.key, path="newpassword") raise YunohostValidationError(e.key, path="newpassword")