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

main.metronome -> main.xmpp

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-10 22:24:49 +02:00
parent 6d604d711f
commit 51171b84bf
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/other/ldap_scheme.yml
View file

@ -67,8 +67,8 @@ depends_children:
- permissionYnh - permissionYnh
groupPermission: groupPermission:
- "cn=all_users,ou=groups,dc=yunohost,dc=org" - "cn=all_users,ou=groups,dc=yunohost,dc=org"
cn=main.metronome,ou=permission: cn=main.xmpp,ou=permission:
cn: main.metronome cn: main.xmpp
gidNumber: "5002" gidNumber: "5002"
objectClass: objectClass:
- posixGroup - posixGroup

2
data/templates/metronome/domain.tpl.cfg.lua
View file

@ -8,7 +8,7 @@ VirtualHost "{{ domain }}"
hostname = "localhost", hostname = "localhost",
user = { user = {
basedn = "ou=users,dc=yunohost,dc=org", basedn = "ou=users,dc=yunohost,dc=org",
filter = "(&(objectClass=posixAccount)(mail=*@{{ domain }})(permission=cn=main.metronome,ou=permission,dc=yunohost,dc=org))", filter = "(&(objectClass=posixAccount)(mail=*@{{ domain }})(permission=cn=main.xmpp,ou=permission,dc=yunohost,dc=org))",
usernamefield = "mail", usernamefield = "mail",
namefield = "cn", namefield = "cn",
}, },

4
src/yunohost/backup.py
View file

@ -1191,7 +1191,7 @@ class RestoreManager():
old_apps_permission = [] old_apps_permission = []
try: try:
old_apps_permission = ldap.search('ou=permission,dc=yunohost,dc=org', old_apps_permission = ldap.search('ou=permission,dc=yunohost,dc=org',
'(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.metronome))(!(cn=main.sftp)))', '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.xmpp))(!(cn=main.sftp)))',
['cn', 'objectClass', 'groupPermission', 'URL', 'gidNumber']) ['cn', 'objectClass', 'groupPermission', 'URL', 'gidNumber'])
except: except:
logger.info(m18n.n('apps_permission_not_found')) logger.info(m18n.n('apps_permission_not_found'))
@ -1247,7 +1247,7 @@ class RestoreManager():
# Remove all permission for all app which sill in the LDAP # Remove all permission for all app which sill in the LDAP
for per in ldap.search('ou=permission,dc=yunohost,dc=org', for per in ldap.search('ou=permission,dc=yunohost,dc=org',
'(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.metronome))(!(cn=main.sftp)))', '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.xmpp))(!(cn=main.sftp)))',
['cn']): ['cn']):
if not ldap.remove('cn=%s,ou=permission' % per['cn'][0]): if not ldap.remove('cn=%s,ou=permission' % per['cn'][0]):
raise YunohostError('permission_deletion_failed', raise YunohostError('permission_deletion_failed',

14
src/yunohost/tests/test_permission.py
View file

@ -135,7 +135,7 @@ def check_LDAP_db_integrity():
def check_permission_for_apps(): def check_permission_for_apps():
# We check that the for each installed apps we have at last the "main" permission # We check that the for each installed apps we have at last the "main" permission
# and we don't have any permission linked to no apps. The only exception who is not liked to an app # and we don't have any permission linked to no apps. The only exception who is not liked to an app
# is mail, metronome, and sftp # is mail, xmpp, and sftp
from yunohost.utils.ldap import _get_ldap_interface from yunohost.utils.ldap import _get_ldap_interface
ldap = _get_ldap_interface() ldap = _get_ldap_interface()
@ -146,7 +146,7 @@ def check_permission_for_apps():
installed_apps = {app['id'] for app in app_list(installed=True)['apps']} installed_apps = {app['id'] for app in app_list(installed=True)['apps']}
permission_list_set = {permission['cn'][0].split(".")[1] for permission in permission_search} permission_list_set = {permission['cn'][0].split(".")[1] for permission in permission_search}
extra_service_permission = set(['mail', 'metronome']) extra_service_permission = set(['mail', 'xmpp'])
if 'sftp' in permission_list_set: if 'sftp' in permission_list_set:
extra_service_permission.add('sftp') extra_service_permission.add('sftp')
assert installed_apps == permission_list_set - extra_service_permission assert installed_apps == permission_list_set - extra_service_permission
@ -164,8 +164,8 @@ def test_list_permission():
assert "main" in res['blog'] assert "main" in res['blog']
assert "mail" in res assert "mail" in res
assert "main" in res['mail'] assert "main" in res['mail']
assert "metronome" in res assert "xmpp" in res
assert "main" in res['metronome'] assert "main" in res['xmpp']
assert ["all_users"] == res['wiki']['main']['allowed_groups'] assert ["all_users"] == res['wiki']['main']['allowed_groups']
assert ["alice"] == res['blog']['main']['allowed_groups'] assert ["alice"] == res['blog']['main']['allowed_groups']
assert set(["alice", "bob"]) == set(res['wiki']['main']['allowed_users']) assert set(["alice", "bob"]) == set(res['wiki']['main']['allowed_users'])
@ -220,9 +220,9 @@ def test_remove_bad_permission():
assert "blog" in res assert "blog" in res
assert "main" in res['blog'] assert "main" in res['blog']
assert "mail" in res assert "mail" in res
assert "main" in res ['mail'] assert "main" in res['mail']
assert "metronome" in res assert "xmpp" in res
assert "main" in res['metronome'] assert "main" in res['xmpp']
def test_remove_main_permission(): def test_remove_main_permission():
with pytest.raises(YunohostError): with pytest.raises(YunohostError):