tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Complete LDAP API functions and simplify

Browse Source
This commit is contained in:
Tanner Collin 2020-02-04 23:16:07 -07:00
parent 036623d473
commit e250af14f7
2 changed files with 45 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
ldapserver/ldap_functions.py
View File

@ -16,90 +16,29 @@ l.set_option(ldap.OPT_X_TLS,ldap.OPT_X_TLS_DEMAND)
l.set_option(ldap.OPT_X_TLS_DEMAND, True) l.set_option(ldap.OPT_X_TLS_DEMAND, True)
l.set_option(ldap.OPT_DEBUG_LEVEL, 255) l.set_option(ldap.OPT_DEBUG_LEVEL, 255)
# === Protospace === BASE_MEMBERS = 'OU=Test,OU=GroupsOU,DC=ps,DC=protospace,DC=ca' # testing
BASE = 'DC=ps,DC=protospace,DC=ca' #BASE_MEMBERS = 'OU=MembersOU,DC=ps,DC=protospace,DC=ca' # prod
#BASE_Members = 'OU=XTest,OU=GroupsOU,DC=ps,DC=protospace,DC=ca'
BASE_Members = 'OU=MembersOU,DC=ps,DC=protospace,DC=ca'
BASE_Groups = 'OU=GroupsOU,DC=ps,DC=protospace,DC=ca'
def search(query): def find_user(username):
''' '''
Search for a user by sAMAccountname Search for a user by sAMAccountname
''' '''
try: l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
bind = l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) criteria = '(&(objectClass=user)(sAMAccountName={})(!(objectClass=computer)))'.format(username)
results = l.search_s(BASE_MEMBERS, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName','email'] )
criteria = '(&(objectClass=user)(sAMAccountName={})(!(objectClass=computer)))'.format(query)
results = l.search_s(BASE_Members, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName','email'] )
print(" =============")
print(" Found %d Objects" % len(results))
print(" =============")
for result in results:
dn, attr = result
print(dn, attr)
if (len(results) == 1):
print("length = 1")
return(len(results))
finally:
l.unbind()
def find_user(query):
'''
Search for a user by sAMAccountname
'''
try:
bind = l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
criteria = '(&(objectClass=user)(sAMAccountName={})(!(objectClass=computer)))'.format(query)
results = l.search_s(BASE_Members, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName','email'] )
if len(results) != 1: if len(results) != 1:
return False abort(HTTP_NOTFOUND)
return results[0][0] return results[0][0]
finally:
l.unbind()
print('unbound find')
def findgroup(query):
'''
Search for a group by sAMAccountname
'''
try:
bind = l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
criteria = '(&(objectClass=group)(sAMAccountName={}))'.format(query)
results = l.search_s(BASE_Groups, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName'] )
for result in results:
#print(" --- ")
#print(results)
dn, attr = result
print(dn, attr)
rCode = "OK"
except Exception as inst:
print("== Entering Except ==")
rCode = type(inst)
print(type(inst)) # the exception instance
finally:
l.unbind()
return(rCode)
def create_user(first, last, username, email, password): def create_user(first, last, username, email, password):
''' '''
Create a User; required data is first, last, email, username, password Create a User; required data is first, last, email, username, password
Note: this creates a disabled user, then sets a password, then enables the user Note: this creates a disabled user, then sets a password, then enables the user
''' '''
try: l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
bind = l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD) dn = 'CN={} {},{}'.format(first, last, BASE_MEMBERS)
dn = 'CN={} {},{}'.format(first, last, BASE_Members)
full_name = '{} {}'.format(first, last) full_name = '{} {}'.format(first, last)
ldif = [ ldif = [
@ -115,7 +54,6 @@ def create_user(first, last, username, email, password):
] ]
l.add_s(dn, ldif) l.add_s(dn, ldif)
rCode = "OK"
# set password # set password
pass_quotes = '"{}"'.format(password) pass_quotes = '"{}"'.format(password)
@ -127,37 +65,10 @@ def create_user(first, last, username, email, password):
mod_acct = [(ldap.MOD_REPLACE, 'userAccountControl', b'512')] mod_acct = [(ldap.MOD_REPLACE, 'userAccountControl', b'512')]
result = l.modify_s(dn, mod_acct) result = l.modify_s(dn, mod_acct)
finally:
print("== Entering Finally ==")
l.unbind()
return(rCode)
def create_group(groupname):
'''
Create a group, for proof of concept, will usually be done manually
'''
try:
dn = 'CN={},{}'.format(groupname, BASE)
bind = l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
ldif = [
('objectClass', [b'group']),
('groupType', [b'-2147483646']),
('cn', [groupname.encode()]),
('name', [groupname.encode()]),
('sAMAccountName', [groupname.encode()]),
]
l.add_s(dn, ldif)
finally:
l.unbind()
def set_password(username, password): def set_password(username, password):
try: l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
bind = l.simple_bind_s(secrets.LDAP_USERNAME, secrets.LDAP_PASSWORD)
criteria = '(&(objectClass=user)(sAMAccountName={})(!(objectClass=computer)))'.format(username) criteria = '(&(objectClass=user)(sAMAccountName={})(!(objectClass=computer)))'.format(username)
results = l.search_s(BASE_Members, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName','email'] ) results = l.search_s(BASE_MEMBERS, ldap.SCOPE_SUBTREE, criteria, ['displayName','sAMAccountName','email'] )
if len(results) != 1: if len(results) != 1:
abort(HTTP_NOTFOUND) abort(HTTP_NOTFOUND)
@ -169,37 +80,7 @@ def set_password(username, password):
pass_uni = pass_quotes.encode('utf-16-le') pass_uni = pass_quotes.encode('utf-16-le')
change_des = [(ldap.MOD_REPLACE, 'unicodePwd', [pass_uni])] change_des = [(ldap.MOD_REPLACE, 'unicodePwd', [pass_uni])]
result = l.modify_s(dn, change_des) result = l.modify_s(dn, change_des)
finally:
l.unbind()
if __name__ == '__main__': if __name__ == '__main__':
# ===========================================
# Sample Progams
# ===========================================
#print("----------------------------------------------------------------------------------------")
#i = 3
#
#if ( i == 1):
# rCode = find_user('*')
#elif (i == 2):
# rCode = search('*')
#elif (i == 3):
# rCode = create_user(
# 'billy',
# 'gates',
# 'billy.gates',
# 'billy.gates@protospace.ca',
# 'P@ssw0rd99'
# )
#elif ( i == 4):
# create_group('testgroup')
#else:
# print("No function selected")
#
#
#print("ReturnCode = " + str(rCode))
#print(find_user('tanner.collin')) #print(find_user('tanner.collin'))
print(set_password('dsaftanner.collin', 'Supersecret@@')) print(set_password('dsaftanner.collin', 'Supersecret@@'))

4
ldapserver/server.py
View File

@ -15,13 +15,13 @@ def check_auth():
def index(): def index():
return '<i>SEE YOU SPACE SAMURAI...</i>' return '<i>SEE YOU SPACE SAMURAI...</i>'
@app.route('/check-username-exists', methods=['GET']) @app.route('/find-user', methods=['POST'])
def check_username_exists(): def check_username_exists():
check_auth() check_auth()
username = request.form['username'] username = request.form['username']
return ldap_functions.check_username_exists(username) return ldap_functions.find_user(username)
@app.route('/create-user', methods=['POST']) @app.route('/create-user', methods=['POST'])
def create_user(): def create_user():