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

Swap 'main' in permission namespace

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-10 22:55:37 +02:00
parent 51171b84bf
commit 0f688caccd
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/other/ldap_scheme.yml
View file

@ -59,16 +59,16 @@ children:
- groupOfNamesYnh - groupOfNamesYnh
depends_children: depends_children:
cn=main.mail,ou=permission: cn=mail.main,ou=permission:
cn: main.mail cn: mail.main
gidNumber: "5001" gidNumber: "5001"
objectClass: objectClass:
- posixGroup - posixGroup
- permissionYnh - permissionYnh
groupPermission: groupPermission:
- "cn=all_users,ou=groups,dc=yunohost,dc=org" - "cn=all_users,ou=groups,dc=yunohost,dc=org"
cn=main.xmpp,ou=permission: cn=xmpp.main,ou=permission:
cn: main.xmpp cn: xmpp.main
gidNumber: "5002" gidNumber: "5002"
objectClass: objectClass:
- posixGroup - posixGroup

4
data/templates/dovecot/dovecot-ldap.conf
View file

@ -3,7 +3,7 @@ auth_bind = yes
ldap_version = 3 ldap_version = 3
base = ou=users,dc=yunohost,dc=org base = ou=users,dc=yunohost,dc=org
user_attrs = uidNumber=500,gidNumber=8,mailuserquota=quota_rule=*:bytes=%$ user_attrs = uidNumber=500,gidNumber=8,mailuserquota=quota_rule=*:bytes=%$
user_filter = (&(objectClass=inetOrgPerson)(uid=%n)(permission=cn=main.mail,ou=permission,dc=yunohost,dc=org)) user_filter = (&(objectClass=inetOrgPerson)(uid=%n)(permission=cn=mail.main,ou=permission,dc=yunohost,dc=org))
pass_filter = (&(objectClass=inetOrgPerson)(uid=%n)(permission=cn=main.mail,ou=permission,dc=yunohost,dc=org)) pass_filter = (&(objectClass=inetOrgPerson)(uid=%n)(permission=cn=mail.main,ou=permission,dc=yunohost,dc=org))
default_pass_scheme = SSHA default_pass_scheme = SSHA

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.xmpp,ou=permission,dc=yunohost,dc=org))", filter = "(&(objectClass=posixAccount)(mail=*@{{ domain }})(permission=cn=xmpp.main,ou=permission,dc=yunohost,dc=org))",
usernamefield = "mail", usernamefield = "mail",
namefield = "cn", namefield = "cn",
}, },

2
data/templates/postfix/plain/ldap-accounts.cf
View file

@ -1,5 +1,5 @@
server_host = localhost server_host = localhost
server_port = 389 server_port = 389
search_base = dc=yunohost,dc=org search_base = dc=yunohost,dc=org
query_filter = (&(objectClass=mailAccount)(mail=%s)(permission=cn=main.mail,ou=permission,dc=yunohost,dc=org)) query_filter = (&(objectClass=mailAccount)(mail=%s)(permission=cn=mail.main,ou=permission,dc=yunohost,dc=org))
result_attribute = uid result_attribute = uid

2
data/templates/postfix/plain/ldap-aliases.cf
View file

@ -1,5 +1,5 @@
server_host = localhost server_host = localhost
server_port = 389 server_port = 389
search_base = dc=yunohost,dc=org search_base = dc=yunohost,dc=org
query_filter = (&(objectClass=mailAccount)(mail=%s)(permission=cn=main.mail,ou=permission,dc=yunohost,dc=org)) query_filter = (&(objectClass=mailAccount)(mail=%s)(permission=cn=mail.main,ou=permission,dc=yunohost,dc=org))
result_attribute = maildrop result_attribute = maildrop

2
src/yunohost/app.py
View file

@ -432,7 +432,7 @@ def app_map(app=None, raw=False, user=None):
if user is not None: if user is not None:
ldap = _get_ldap_interface() ldap = _get_ldap_interface()
if not ldap.search(base='ou=permission,dc=yunohost,dc=org', if not ldap.search(base='ou=permission,dc=yunohost,dc=org',
filter='(&(objectclass=permissionYnh)(cn=main.%s)(inheritPermission=uid=%s,ou=users,dc=yunohost,dc=org))' % (app_id, user), filter='(&(objectclass=permissionYnh)(cn=%s.main)(inheritPermission=uid=%s,ou=users,dc=yunohost,dc=org))' % (app_id, user),
attrs=['cn']): attrs=['cn']):
continue continue

2
src/yunohost/backup.py
View file

@ -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.xmpp))(!(cn=main.sftp)))', '(&(objectClass=permissionYnh)(!(cn=mail.main))(!(cn=xmpp.main))(!(cn=sftp.main)))',
['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',