summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/ldap_search
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2018-10-06 23:56:03 +0200
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2018-10-07 01:55:26 +0200
commit9c51bbe5016495c714789f5df01806a6d366e11a (patch)
tree19be73e896838cfbe3e87b04bd63c9fdd930c27e /kpov_judge/tasks/ldap_search
parente33085889f26c76587fdab2ad600ed336dc028b5 (diff)
Rename kpov_random_helpers to kpov_util
Diffstat (limited to 'kpov_judge/tasks/ldap_search')
-rw-r--r--kpov_judge/tasks/ldap_search/task.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/kpov_judge/tasks/ldap_search/task.py b/kpov_judge/tasks/ldap_search/task.py
index 886bf07..43704e3 100644
--- a/kpov_judge/tasks/ldap_search/task.py
+++ b/kpov_judge/tasks/ldap_search/task.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# kpov_random_helpers should be imported by add_assignment.py
+# kpov_util should be imported by add_assignment.py
# Poveži se na strežnik LDAP prek spletnega vmesnika. Ustvari uporabnika z danim imenom in geslom.
# Napiši skripto, ki izpiše podatke o tem uporabniku z ldapsearch.
#
@@ -118,7 +118,7 @@ def task(LDAP_IP, DOMAIN, LDAP_USERNAME, LDAP_PASSWORD, BIND_USERNAME, BIND_PASS
s = "ldapmodify -D {BIND_DN} -w {BIND_PASSWORD} -h {LDAP_IP}".format(
**locals())
modify = pexpect.spawn(s)
- FORTUNE = kpov_random_helpers.hostname_gen(random.Random(str(LDAP_USERNAME)))
+ FORTUNE = kpov_util.hostname_gen(random.Random(str(LDAP_USERNAME)))
results['fortune'] = FORTUNE
s1 = """
dn: cn={LDAP_USERNAME},ou=Users,{FULLDOMAIN}
@@ -138,11 +138,11 @@ description: {FORTUNE}
def gen_params(user_id, params_meta):
params = dict()
r = random.Random(user_id)
- params['DOMAIN'] = kpov_random_helpers.hostname_gen(r)
- params['LDAP_USERNAME'] = kpov_random_helpers.username_gen(r)
- params['LDAP_PASSWORD'] = kpov_random_helpers.alnum_gen(r, 6)
- params['BIND_USERNAME'] = kpov_random_helpers.username_gen(r)
- params['BIND_PASSWORD'] = kpov_random_helpers.alnum_gen(r, 6)
+ params['DOMAIN'] = kpov_util.hostname_gen(r)
+ params['LDAP_USERNAME'] = kpov_util.username_gen(r)
+ params['LDAP_PASSWORD'] = kpov_util.alnum_gen(r, 6)
+ params['BIND_USERNAME'] = kpov_util.username_gen(r)
+ params['BIND_PASSWORD'] = kpov_util.alnum_gen(r, 6)
return params
def task_check(results, params):
@@ -164,7 +164,7 @@ objectClass: organization\r
score += 2
else:
hints += ["LDAP_USERNAME missing in: " + s + str(results['ldapsearch_before'])]
- fortune = kpov_random_helpers.hostname_gen(random.Random(str(params['LDAP_USERNAME'])))
+ fortune = kpov_util.hostname_gen(random.Random(str(params['LDAP_USERNAME'])))
s = ".*cn: {0}.*description: {1}.*".format(
re.escape(params['LDAP_USERNAME']), re.escape(fortune))
if re.match(s, results['ldapsearch_after'], re.DOTALL):