diff options
Diffstat (limited to 'kpov_judge/tasks/radius_mysql_pam/task.py')
| -rw-r--r-- | kpov_judge/tasks/radius_mysql_pam/task.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kpov_judge/tasks/radius_mysql_pam/task.py b/kpov_judge/tasks/radius_mysql_pam/task.py index 8957c6b..a3f86f7 100644 --- a/kpov_judge/tasks/radius_mysql_pam/task.py +++ b/kpov_judge/tasks/radius_mysql_pam/task.py @@ -3,7 +3,7 @@ # kpov_random_helpers should be imported by add_assignment.py instructions = { - 'si':u""" + 'si':""" Ustvari dva navidezna računalnika - SimpleArbiter z diska simpleArbiterDhcp ter RadiusServer. Na RadiusServer namesti FreeRadius ter MySQL. @@ -26,7 +26,7 @@ Nastavi PAM za prijavo (login) tako, da bo dovolj, če se uporabnik na ssh predstavi z uporabniškim imenom in geslom, ki sta veljavna na FreeRadius, ne glede na /etc/shadow oziroma /etc/password. """, - 'en':u""" + 'en':""" Create two virtual machines - SimpleArbiter using the disk simpleArbiterDhcp and RadiusServer. On RadiusServer, install FreeRadius and MySQL. @@ -89,10 +89,10 @@ networks = { 'net1': {'public': False}, 'test-net': {'public': True} } params_meta = { 'IP_RS': {'descriptions': {'si': 'Naslov RadiusServer', 'en': 'RadiusServer IP address'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False}, 'RADIUS_SECRET':{'descriptions': {'si': 'Skrivnost RADIUS', 'en': 'RADIUS secret'}, 'w': False, 'public':True, 'type': 'password', 'generated': True}, - 'RADIUS_USERNAME': {'descriptions': {'si': u'Uporabniško ime', 'en': 'Username'}, 'w': True, 'public':True, 'type': 'username', 'generated': False}, - 'RADIUS_PASSWORD': {'descriptions': {'si': u'Geslo uporabnika', 'en': 'Password'}, 'w': False, 'public':True, 'type': None, 'generated': True}, - 'MYSQL_DB_NAME': {'descriptions': {'si': u'Ime baze v mysql', 'en': 'Database name'}, 'w': False, 'public':True, 'type': None, 'generated': True}, - 'MYSQL_ADMIN_USER':{'descriptions': {'si': u'Uporabniško ime za dostop do MySQL', 'en': 'MySQL username'}, 'w': False, 'public':True, 'type': 'username', 'generated': True}, + 'RADIUS_USERNAME': {'descriptions': {'si': 'Uporabniško ime', 'en': 'Username'}, 'w': True, 'public':True, 'type': 'username', 'generated': False}, + 'RADIUS_PASSWORD': {'descriptions': {'si': 'Geslo uporabnika', 'en': 'Password'}, 'w': False, 'public':True, 'type': None, 'generated': True}, + 'MYSQL_DB_NAME': {'descriptions': {'si': 'Ime baze v mysql', 'en': 'Database name'}, 'w': False, 'public':True, 'type': None, 'generated': True}, + 'MYSQL_ADMIN_USER':{'descriptions': {'si': 'Uporabniško ime za dostop do MySQL', 'en': 'MySQL username'}, 'w': False, 'public':True, 'type': 'username', 'generated': True}, 'MYSQL_ADMIN_PASSWORD': {'descriptions': {'si': 'Geslo za dostop do MySQL', 'en': 'MySQL password'}, 'w': True, 'public':True, 'type': 'password', 'generated': True}, 'MYSQL_SEED':{'descriptions': {'si': 'seed', 'en': 'seed'}, 'w': False, 'public':True, 'type': None, 'generated': True}, } @@ -169,8 +169,8 @@ def task_check(results, params): # print "Test OK" score += 2 else: - hints.append(u'radtest connect output incorrect:' + results['Test_RadiusServer']) - print (results['Test_RadiusServer'], s) + hints.append('radtest connect output incorrect:' + results['Test_RadiusServer']) + print((results['Test_RadiusServer'], s)) # Testiranje podatkovne base mysql s = "Welcome to the MySQL monitor.*Type 'help;' or '\\\\h' for help\\. Type '\\\\c' to clear the current input statement\\.\r\n" if re.search(s, results['mysql_login'], flags=re.DOTALL): @@ -178,44 +178,44 @@ def task_check(results, params): score += 1 else: hints.append("mysql connection string incorrect") - print (results['mysql_login'], s) + print((results['mysql_login'], s)) s = " USE {MYSQL_DB_NAME}\r\nReading table information.*Database changed\r\n".format(**params) if re.search(s, results['database_connect'], flags=re.DOTALL): # print "database_connect OK" score += 1 else: hints.append('mysql table information string incorrect') - print (results['database_connect'],) + print((results['database_connect'],)) s = " SELECT UserName, Value FROM radcheck;\r\n.*{RADIUS_USERNAME} *| *{RADIUS_PASSWORD}".format(**params) if re.search(s, results['select_from_users'], flags=re.DOTALL): # print "select_from_users OK" score += 2 else: hints.append('mysql user entry in table check failed') - print (results['select_from_users'], ) + print((results['select_from_users'], )) s = r"Sent Access-Request Id [0-9]+ from ([0-9]|\.)+:[0-9]+ to {0}:1812 length [0-9]+\r\n\tUser-Name = \"{1}\"\r\n\tUser-Password = \"{2}\".*Access-Accept Id [0-9]+ from {0}".format(params['IP_RS'], MYSQL_TEST_USER, MYSQL_TEST_PASSWORD) if re.search(s, results['radtest_OK'], flags=re.DOTALL): # print "radtest_OK OK" score += 2 else: - hints.append(u'radtest output incorrect:' + results['radtest_OK']) - print (s, results['radtest_OK']) + hints.append('radtest output incorrect:' + results['radtest_OK']) + print((s, results['radtest_OK'])) - s = ur"Sent Access-Request Id [0-9]+ from ([0-9]|\.)+:[0-9]+ to {0}:1812 length [0-9]+\r\n\tUser-Name = \"{1}\"\r\n\tUser-Password = \"Flügzeug\".*Access-Reject Id [0-9]+ from {0}".format(params['IP_RS'], MYSQL_TEST_USER) + s = r"Sent Access-Request Id [0-9]+ from ([0-9]|\.)+:[0-9]+ to {0}:1812 length [0-9]+\r\n\tUser-Name = \"{1}\"\r\n\tUser-Password = \"Flügzeug\".*Access-Reject Id [0-9]+ from {0}".format(params['IP_RS'], MYSQL_TEST_USER) if re.search(s, results['radtest_NOK'], flags=re.DOTALL): # print "radtest_NOK OK" score += 1 else: - hints.append(u'radtest negative output incorrect: ' + results['radtest_NOK']) - print (results['radtest_NOK'], s) + hints.append('radtest negative output incorrect: ' + results['radtest_NOK']) + print((results['radtest_NOK'], s)) s = "{RADIUS_USERNAME}@.*:~\\$".format(**params) if re.search(s, results['login_test'], flags=re.DOTALL): # print "login_test OK" score += 1 else: hints.append('login test failed') - print (results['login_test'],s) + print((results['login_test'],s)) return score, hints def prepare_disks(templates, task_params, global_params): |