nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

users: yapf cosmetic changes

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-08-19 19:36:32 -07:00 committed by James Valleroy
parent 696ce3b6a5
commit 7499b687c8
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
actions/users
View File

@ -20,13 +20,14 @@ Configuration helper for the LDAP user directory
""" """
import argparse import argparse
import augeas
import os import os
import re import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
import augeas
from plinth import action_utils from plinth import action_utils
ACCESS_CONF = '/etc/security/access.conf' ACCESS_CONF = '/etc/security/access.conf'
@ -122,12 +123,13 @@ def subcommand_setup(_):
def configure_ldap_authentication(): def configure_ldap_authentication():
"""Configure LDAP authentication.""" """Configure LDAP authentication."""
action_utils.dpkg_reconfigure('nslcd', { action_utils.dpkg_reconfigure(
'ldap-uris': 'ldapi:///', 'nslcd', {
'ldap-base': 'dc=thisbox', 'ldap-uris': 'ldapi:///',
'ldap-auth-type': 'SASL', 'ldap-base': 'dc=thisbox',
'ldap-sasl-mech': 'EXTERNAL' 'ldap-auth-type': 'SASL',
}) 'ldap-sasl-mech': 'EXTERNAL'
})
action_utils.dpkg_reconfigure('libnss-ldapd', action_utils.dpkg_reconfigure('libnss-ldapd',
{'nsswitch': 'group, passwd, shadow'}) {'nsswitch': 'group, passwd, shadow'})
action_utils.service_restart('nscd') action_utils.service_restart('nscd')
@ -165,9 +167,9 @@ dn: ou={unit},dc=thisbox
objectClass: top objectClass: top
objectClass: organizationalUnit objectClass: organizationalUnit
ou: {unit}'''.format(unit=unit) ou: {unit}'''.format(unit=unit)
subprocess.run(['ldapadd', '-Q', '-Y', 'EXTERNAL', '-H', subprocess.run(['ldapadd', '-Q', '-Y', 'EXTERNAL', '-H', 'ldapi:///'],
'ldapi:///'], input=input.encode(), input=input.encode(), stdout=subprocess.DEVNULL,
stdout=subprocess.DEVNULL, check=True) check=True)
def setup_admin(): def setup_admin():
@ -185,8 +187,8 @@ def setup_admin():
if 'olcRootPW' in ldap_object: if 'olcRootPW' in ldap_object:
subprocess.run( subprocess.run(
['ldapmodify', '-Q', '-Y', 'EXTERNAL', '-H', ['ldapmodify', '-Q', '-Y', 'EXTERNAL', '-H', 'ldapi:///'],
'ldapi:///'], check=True, stdout=subprocess.DEVNULL, input=b''' check=True, stdout=subprocess.DEVNULL, input=b'''
dn: olcDatabase={1}mdb,cn=config dn: olcDatabase={1}mdb,cn=config
changetype: modify changetype: modify
delete: olcRootPW''') delete: olcRootPW''')
@ -194,8 +196,8 @@ delete: olcRootPW''')
root_dn = 'gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth' root_dn = 'gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth'
if ldap_object['olcRootDN'] != root_dn: if ldap_object['olcRootDN'] != root_dn:
subprocess.run( subprocess.run(
['ldapmodify', '-Q', '-Y', 'EXTERNAL', '-H', ['ldapmodify', '-Q', '-Y', 'EXTERNAL', '-H', 'ldapi:///'],
'ldapi:///'], check=True, stdout=subprocess.DEVNULL, input=b''' check=True, stdout=subprocess.DEVNULL, input=b'''
dn: olcDatabase={1}mdb,cn=config dn: olcDatabase={1}mdb,cn=config
changetype: modify changetype: modify
replace: olcRootDN replace: olcRootDN