From 2d7c67a2075f50c77e09e20d9892010122181752 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 14 Sep 2020 00:13:00 +0000 Subject: [PATCH] Improve LDAP logging and group functions --- ldapserver/ldap_functions.py | 45 +++++++++++++++++++++++++----------- ldapserver/server.py | 26 +++++++++++++++++---- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/ldapserver/ldap_functions.py b/ldapserver/ldap_functions.py index 4e14e6f..1763bf0 100644 --- a/ldapserver/ldap_functions.py +++ b/ldapserver/ldap_functions.py @@ -1,3 +1,8 @@ +import logging +logger = logging.getLogger(__name__) + +logging.info('Logging enabled.') + import time import ldap import ldap.modlist as modlist @@ -7,14 +12,14 @@ import base64 from flask import abort HTTP_NOTFOUND = 404 -BASE_MEMBERS = 'OU=MembersOU,DC=ps,DC=protospace,DC=ca' # prod -BASE_GROUPS = 'OU=GroupsOU,DC=ps,DC=protospace,DC=ca' # prod +BASE_MEMBERS = 'OU=MembersOU,DC=lab39,DC=lab' # prod +BASE_GROUPS = 'OU=MembersOU,DC=lab39,DC=lab' # prod ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER) -ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, './ProtospaceAD.cer') +ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, './lab39-dc1.cer') def init_ldap(): - ldap_conn = ldap.initialize('ldaps://ldap.ps.protospace.ca:636') + ldap_conn = ldap.initialize('ldaps://ldap.lab39.lab:636') ldap_conn.set_option(ldap.OPT_REFERRALS, 0) ldap_conn.set_option(ldap.OPT_PROTOCOL_VERSION, 3) ldap_conn.set_option(ldap.OPT_X_TLS,ldap.OPT_X_TLS_DEMAND) @@ -32,7 +37,10 @@ def convert(data): else: return [convert(element) for element in data] elif isinstance(data, (bytes, bytearray)): - return data.decode() + try: + return data.decode() + except UnicodeDecodeError: + return data.hex() else: return data @@ -42,10 +50,13 @@ def find_user(query): ''' ldap_conn = init_ldap() try: + logger.info('Looking up user', query) ldap_conn.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) criteria = '(&(objectClass=user)(|(mail={})(sAMAccountName={}))(!(objectClass=computer)))'.format(query, query) results = ldap_conn.search_s(BASE_MEMBERS, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName','email']) + logger.info(results) + if len(results) != 1: abort(HTTP_NOTFOUND) @@ -91,7 +102,9 @@ def create_user(first, last, username, email, password): ('company', [b'Spaceport']), ] - ldap_conn.add_s(dn, ldif) + result = ldap_conn.add_s(dn, ldif) + + logger.info(result) # set password pass_quotes = '"{}"'.format(password) @@ -99,9 +112,13 @@ def create_user(first, last, username, email, password): change_des = [(ldap.MOD_REPLACE, 'unicodePwd', [pass_uni])] result = ldap_conn.modify_s(dn, change_des) + logger.info(result) + # 512 will set user account to enabled mod_acct = [(ldap.MOD_REPLACE, 'userAccountControl', b'512')] result = ldap_conn.modify_s(dn, mod_acct) + + logger.info(result) finally: ldap_conn.unbind() @@ -131,10 +148,13 @@ def find_group(groupname): ''' ldap_conn = init_ldap() try: + logger.info('Looking up group', groupname) ldap_conn.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) criteria = '(&(objectClass=group)(sAMAccountName={}))'.format(groupname) results = ldap_conn.search_s(BASE_GROUPS, ldap.SCOPE_SUBTREE, criteria, ['name','groupType'] ) + logger.info(results) + if len(results) != 1: abort(HTTP_NOTFOUND) @@ -172,8 +192,8 @@ def add_to_group(groupname, username): ldap_conn = init_ldap() try: ldap_conn.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) - group_dn = find_group(groupname) user_dn = find_user(username) + group_dn = find_group(groupname) if not is_member(groupname, username): mod_acct = [(ldap.MOD_ADD, 'member', user_dn.encode())] @@ -192,8 +212,8 @@ def remove_from_group(groupname, username): ldap_conn = init_ldap() try: ldap_conn.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) - group_dn = find_group(groupname) user_dn = find_user(username) + group_dn = find_group(groupname) if is_member(groupname, username): mod_acct = [(ldap.MOD_DELETE, 'member', user_dn.encode())] @@ -248,8 +268,8 @@ def dump_users(): ldap_conn = init_ldap() try: ldap_conn.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) - criteria = '(&(objectClass=user)(sAMAccountName=*))' - attributes = ['cn', 'sAMAccountName', 'mail', 'displayName', 'givenName', 'name', 'sn', 'logonCount'] + criteria = '(&(objectClass=user)(objectGUID=*))' + attributes = ['cn', 'sAMAccountName', 'mail', 'displayName', 'givenName', 'name', 'sn', 'logonCount', 'objectGUID'] results = ldap_conn.search_s(BASE_MEMBERS, ldap.SCOPE_SUBTREE, criteria, attributes) results = convert(results) @@ -261,7 +281,6 @@ def dump_users(): import json return json.dumps(output, indent=4) - finally: ldap_conn.unbind() @@ -275,8 +294,8 @@ def dump_users(): if __name__ == '__main__': pass - #print(find_user('tanner.collin')) - #print(find_user('mail@tannercollin.com')) + #print(create_user('Elon', 'Tusk', 'elon.tusk', 'elont@example.com', 'protospace*&^g87g6')) + print(find_user('test.testerb')) #print(set_password('tanner.collin', 'Supersecret@@')) #print(find_dn('CN=Tanner Collin,OU=MembersOU,DC=ps,DC=protospace,DC=ca')) #print("============================================================") diff --git a/ldapserver/server.py b/ldapserver/server.py index e2f7009..39174e6 100644 --- a/ldapserver/server.py +++ b/ldapserver/server.py @@ -1,6 +1,24 @@ from flask import Flask, abort, request app = Flask(__name__) +from logging.config import dictConfig + +dictConfig({ + 'version': 1, + 'formatters': {'default': { + 'format': '[%(asctime)s] [%(process)d] [%(levelname)7s] %(message)s', + }}, + 'handlers': {'wsgi': { + 'class': 'logging.StreamHandler', + 'stream': 'ext://flask.logging.wsgi_errors_stream', + 'formatter': 'default' + }}, + 'root': { + 'level': 'INFO', + 'handlers': ['wsgi'] + } +}) + import ldap_functions import secrets @@ -50,8 +68,8 @@ def set_password(): def add_to_group(): check_auth() - groupname = request.form['groupname'] - username = request.form['username'] + groupname = request.form['group'] + username = request.form.get('username', None) or request.form.get('email', None) ldap_functions.add_to_group(groupname, username) return '' @@ -60,8 +78,8 @@ def add_to_group(): def remove_from_group(): check_auth() - groupname = request.form['groupname'] - username = request.form['username'] + groupname = request.form['group'] + username = request.form.get('username', None) or request.form.get('email', None) ldap_functions.remove_from_group(groupname, username) return ''