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

Update LDAP schema for permission protection

Browse source
This commit is contained in:
Josué Tille 2019-12-22 14:44:10 +01:00
parent 9f81d77693
commit 5d4f62b222
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/templates/slapd/yunohost.schema
View file

@ -15,6 +15,9 @@ attributetype ( 1.3.6.1.4.1.17953.9.1.3 NAME 'inheritPermission'
attributetype ( 1.3.6.1.4.1.17953.9.1.4 NAME 'URL'
DESC 'Yunohost application URL'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
attributetype ( 1.3.6.1.4.1.17953.9.1.5 NAME 'isProtected'
DESC 'Yunohost application permission protection'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
# OBJECTCLASS
# For Applications
objectclass ( 1.3.6.1.4.1.17953.9.2.1 NAME 'groupOfNamesYnh'
@ -25,7 +28,7 @@ objectclass ( 1.3.6.1.4.1.17953.9.2.2 NAME 'permissionYnh'
DESC 'a Yunohost application'
SUP top AUXILIARY
MUST cn
MAY ( groupPermission $ inheritPermission $ URL ) )
MAY ( groupPermission $ inheritPermission $ URL $ isProtected ) )
# For User
objectclass ( 1.3.6.1.4.1.17953.9.2.3 NAME 'userPermissionYnh'
DESC 'a Yunohost application'

2
src/yunohost/user.py
View file

@ -718,7 +718,7 @@ def user_group_update(operation_logger, groupname, add=None, remove=None, force=
new_group_dns = ["uid=" + user + ",ou=users,dc=yunohost,dc=org" for user in new_group]
if set(new_group) != set(current_group):
if set(new_group) != set(current_group) or True:
operation_logger.start()
ldap = _get_ldap_interface()
try: