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

Misc fixes following tests

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-12 17:50:52 +02:00
parent b912cd0aec
commit 2e14834e6b
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
locales/en.json
View file

@ -274,9 +274,9 @@
"log_dyndns_subscribe": "Subscribe to a YunoHost subdomain '{}'", "log_dyndns_subscribe": "Subscribe to a YunoHost subdomain '{}'",
"log_dyndns_update": "Update the ip associated with your YunoHost subdomain '{}'", "log_dyndns_update": "Update the ip associated with your YunoHost subdomain '{}'",
"log_letsencrypt_cert_install": "Install Let's encrypt certificate on '{}' domain", "log_letsencrypt_cert_install": "Install Let's encrypt certificate on '{}' domain",
"log_permission_create": "Create permission '{permission}'", "log_permission_create": "Create permission '{}'",
"log_permission_delete": "Delete permission '{permission}'", "log_permission_delete": "Delete permission '{}'",
"log_permission_urls": "Update urls related to permission '{permission}'", "log_permission_urls": "Update urls related to permission '{}'",
"log_selfsigned_cert_install": "Install self signed certificate on '{}' domain", "log_selfsigned_cert_install": "Install self signed certificate on '{}' domain",
"log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate", "log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate",
"log_regen_conf": "Regenerate system configurations '{}'", "log_regen_conf": "Regenerate system configurations '{}'",
@ -286,8 +286,8 @@
"log_user_group_delete": "Delete '{}' group", "log_user_group_delete": "Delete '{}' group",
"log_user_group_update": "Update '{}' group", "log_user_group_update": "Update '{}' group",
"log_user_update": "Update information of '{}' user", "log_user_update": "Update information of '{}' user",
"log_user_permission_update": "Update accesses for permission '{permission}'", "log_user_permission_update": "Update accesses for permission '{}'",
"log_user_permission_reset": "Reset permission '{permission}'", "log_user_permission_reset": "Reset permission '{}'",
"log_tools_maindomain": "Make '{}' as main domain", "log_tools_maindomain": "Make '{}' as main domain",
"log_tools_migrations_migrate_forward": "Migrate forward", "log_tools_migrations_migrate_forward": "Migrate forward",
"log_tools_postinstall": "Postinstall your YunoHost server", "log_tools_postinstall": "Postinstall your YunoHost server",

6
src/yunohost/app.py
View file

@ -735,11 +735,9 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
if packages.dpkg_is_broken(): if packages.dpkg_is_broken():
raise YunohostError("dpkg_is_broken") raise YunohostError("dpkg_is_broken")
from yunohost.utils.ldap import _get_ldap_interface
from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback
from yunohost.log import OperationLogger from yunohost.log import OperationLogger
from yunohost.permission import permission_create, permission_urls, permission_delete, permission_sync_to_user from yunohost.permission import user_permission_list, permission_create, permission_urls, permission_delete, permission_sync_to_user
ldap = _get_ldap_interface()
# Fetch or extract sources # Fetch or extract sources
if not os.path.exists(INSTALL_TMP): if not os.path.exists(INSTALL_TMP):
@ -976,7 +974,7 @@ def app_remove(operation_logger, app):
""" """
from yunohost.hook import hook_exec, hook_remove, hook_callback from yunohost.hook import hook_exec, hook_remove, hook_callback
from yunohost.permission import permission_delete, permission_sync_to_user from yunohost.permission import user_permission_list, permission_delete, permission_sync_to_user
if not _is_installed(app): if not _is_installed(app):
raise YunohostError('app_not_installed', app=app, all_apps=_get_all_installed_apps_id()) raise YunohostError('app_not_installed', app=app, all_apps=_get_all_installed_apps_id())

6
src/yunohost/permission.py
View file

@ -45,7 +45,7 @@ SYSTEM_PERMS = ["mail", "xmpp", "stfp"]
# #
def user_permission_list(short=False, full=False, ignore_system_perms=True): def user_permission_list(short=False, full=False, ignore_system_perms=False):
""" """
List permissions and corresponding accesses List permissions and corresponding accesses
""" """
@ -273,13 +273,13 @@ def permission_create(operation_logger, permission, urls=None, sync_perm=True):
attr_dict = { attr_dict = {
'objectClass': ['top', 'permissionYnh', 'posixGroup'], 'objectClass': ['top', 'permissionYnh', 'posixGroup'],
'cn': permission, 'cn': str(permission),
'gidNumber': gid, 'gidNumber': gid,
} }
# For main permission, we add all users by default # For main permission, we add all users by default
if permission.endswith(".main"): if permission.endswith(".main"):
attr_dict['groupPermission'] = 'cn=all_users,ou=groups,dc=yunohost,dc=org' attr_dict['groupPermission'] = ['cn=all_users,ou=groups,dc=yunohost,dc=org']
if urls: if urls:
attr_dict['URL'] = [_normalize_url(url) for url in urls] attr_dict['URL'] = [_normalize_url(url) for url in urls]

2
src/yunohost/user.py
View file

@ -449,7 +449,7 @@ def user_info(username):
if service_status("dovecot")["status"] != "running": if service_status("dovecot")["status"] != "running":
logger.warning(m18n.n('mailbox_used_space_dovecot_down')) logger.warning(m18n.n('mailbox_used_space_dovecot_down'))
elif username not in user_permission_list()["permissions"]["mail.main"]["allowed_users"]: elif username not in user_permission_list(full=True)["permissions"]["mail.main"]["corresponding_users"]:
logger.warning(m18n.n('mailbox_disabled', user=username)) logger.warning(m18n.n('mailbox_disabled', user=username))
else: else:
cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0] cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0]