summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'kpov_judge/tasks')
-rw-r--r--kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html19
-rw-r--r--kpov_judge/tasks/ldap_search/task.py2
-rw-r--r--kpov_judge/tasks/mock_entrance_exam/task.py35
-rw-r--r--kpov_judge/tasks/set_motd/howtos/images/img7.pngbin7107 -> 32530 bytes
4 files changed, 21 insertions, 35 deletions
diff --git a/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html b/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html
index 4d3ccd4..1ce8b44 100644
--- a/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html
+++ b/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html
@@ -1,3 +1,6 @@
+<html>
+<body>
+
<!--
Prijavi se na sistem.
V domači mapi najdeš imenik Mapa z 20 datotekami.
@@ -18,16 +21,18 @@ in the home directory find the directory Mapa with 20 files.
-set the environment variable TEST, so it has the same value as the environmental variable USER + the number of invironmental variables which in their name do not contain the word TEST (example: polz37)
-->
<h2>Namen vaje</h2>
- <p>Nau?ite se uporabe nekaj BASH ukazov.</p>
+ <p>Naučite se uporabe nekaj BASH ukazov.</p>
<h2>Naloga na hitro</h2>
<p>Uporabljali boste BASH ukaze kot so: mv, grep, env in druge.</p>
<h2>Navodila</h2>
<h2><ol>
- <li>Prijavite se v sistem in v domaÄŤem imeniku najdete imenik Mapa z 20 datotekami.</li>
- <li>Preimenujete vse datoteke tako, da zamenjate minuse s pod?rtaji z ukazom: "rename 's/-/_/' *".</li>
- <li>Premaknite vse datoteke mkdir iz /home/user/mapa/mojimenik v /home/user/novi z ukazom: "mkdir-p /home/user/novi && mv /home/user/mapa/mojimenik/* /home/user/novi"</li>
- <li>V datoteko "mama.txt" zapi¨ite vse navadne datoteke v trenutnem imeniku, ki vsebujejo niz "mama", v datoteko "napake.txt" pa zapi¨ite vse morebitne napake z ukazom: "find . -type f | grep mama 1> mama.txt 2> napake.txt".</li>
- <li>Sledite vsebini /var/log/syslog za 5 sekund in v primeru, da se v syslogu pojavi niz "zmeda", izpi¨ite "imam ga". Poleg tega med sledenjem syslog-u od¨tevajte od 5 do 1 z ukazom: "for i in 5 4 3 2 1; do echo $i; echo $(sed -n "$i p" /var/log/syslog | grep zmeda > /dev/null && echo "imam ga"); sleep 1; done".</li>
- <li>Nastavite okoljsko spremenljivko TEST, da bo imela isto vrednost kot okoljska spremenljivka USER + ¨tevilo okoljskih spremenljivk, ki v imenu ali vrednosti ne vsebujejo besede TEST tako, da na koncu datoteke ~/.bashrc dodate: "export TEST=$USER" + "$(env | grep -v TEST | wc -l)"</li>
+ <li>Prijavite se v sistem. V domačem imeniku najdete imenik Mapa z 20 datotekami.</li>
+ <li>Preimenujete vse datoteke tako, da zamenjate minuse s podčrtaji z ukazom: "rename 's/-/_/' *".</li>
+ <li>Premaknite vse datoteke /home/user/mapa/mojimenik v /home/user/novi z ukazom: "mkdir-p /home/user/novi && mv /home/user/mapa/mojimenik/* /home/user/novi"</li>
+ <li>V datoteko "mama.txt" zapišite vse navadne datoteke v trenutnem imeniku, ki vsebujejo niz "mama", v datoteko "napake.txt" pa zapišite vse morebitne napake z ukazom: "find . -type f | grep mama 1> mama.txt 2> napake.txt".</li>
+ <li>Sledite vsebini /var/log/syslog za 5 sekund in v primeru, da se v syslogu pojavi niz "zmeda", izpišite "imam ga". Poleg tega med sledenjem syslog-u odštevajte od 5 do 1 z ukazom: "for i in 5 4 3 2 1; do echo $i; echo $(sed -n "$i p" /var/log/syslog | grep zmeda > /dev/null && echo "imam ga"); sleep 1; done".</li>
+ <li>Nastavite okoljsko spremenljivko TEST, da bo imela isto vrednost kot okoljska spremenljivka USER + število okoljskih spremenljivk, ki v imenu ali vrednosti ne vsebujejo besede TEST tako, da na koncu datoteke ~/.bashrc dodate: "export TEST=$USER" + "$(env | grep -v TEST | wc -l)"</li>
</ol></h2>
+</body>
+</html>
diff --git a/kpov_judge/tasks/ldap_search/task.py b/kpov_judge/tasks/ldap_search/task.py
index eeaf8cd..75dcde2 100644
--- a/kpov_judge/tasks/ldap_search/task.py
+++ b/kpov_judge/tasks/ldap_search/task.py
@@ -84,7 +84,7 @@ computers = {
},
'SimpleArbiter': {
'disks': [
- { 'name': 'simpleArbiterDhcpGW',
+ { 'name': 'simpleArbiterDhcpGWLDAP',
# attempt automount
},
#{ 'name': 'CDROM',
diff --git a/kpov_judge/tasks/mock_entrance_exam/task.py b/kpov_judge/tasks/mock_entrance_exam/task.py
index 46fc7da..1ee2d3f 100644
--- a/kpov_judge/tasks/mock_entrance_exam/task.py
+++ b/kpov_judge/tasks/mock_entrance_exam/task.py
@@ -5,25 +5,7 @@
# - switch to a real SSH/SFTP client to properly handle filenames
instructions = {
- 'si':u"""
-Ustvari dva navidezna računalnika - simpleArbiter in Student.
-
-Poskrbi, da bosta oba na istem omrežju in da bo imel Student naslov {student_IP}. Obenem mora biti
-simpleArbiter povezan na Internet. Računajte, da se na studentGUI ob zagonu zažene program {net_prog_name},
-ki vam spreminja nastavitve mrežne kartice.
-
-V domačem imeniku uporabnika student (geslo je "vaje") obstaja datoteka {P_c} v programskem jeziku C. Z uporabo gcc ga prevedite v program z imenom {P_executable}. Izvorna koda je namenoma pokvarjena tako, da so vanjo vrinjeni nepotrebni znaki. Pred prevajanjem jo morate popraviti.
-
-Napišite skripto ali program {P_script} v domačem imeniku uporabnika student, ki:
-- požene {P_c} z argumentom {arg_c} in mu na standardni vhod pripelje vrednost spremenljivke {env_c}
-- vse, kar {P_c} izpiše na stderr, spravi v datoteko {out_stderr_c}.
-- vse vrstice, ki jih {P_c} izpiše na stdout in vsebujejo zaporedje znakov "ma", zapiše v {out_stdout_c}.
-
-
-Lastnik vseh ustvarjenih datotek mora biti uporabnik student. Gesla uporabnika student
-ne smete spreminjati.
-
-""",
+ 'si': u'Navodil ni.',
'en': u'''
''',
}
@@ -87,7 +69,7 @@ params_meta = {
},
'out_stderr_c': {
'descriptions': { 'si': 'Datoteka z napakami', 'en': 'File to store errors',
- }, 'w': True, 'public': True, 'type': 'filename', 'generated': True,
+ }, 'w': False, 'public': True, 'type': 'filename', 'generated': True,
},
'P_script': {
'descriptions': { 'si': 'Ime skripte', 'en': 'Filename of the script',
@@ -116,7 +98,7 @@ def task(student_IP, net_prog_name,
conn = pxssh.pxssh()
conn.login(student_IP, 'student', 'vaje')
results = dict()
- r = random.Random(param_gen_seed)
+ r = random.Random(int(param_gen_seed))
env_val = "".join([r.choice('ABCDEFGHIJKLMNPRSTUVZ012345') for i in xrange(11)])
arg_val = "".join([r.choice('ABCDEFGHIJKLMNPRSTUVZ012345') for i in xrange(13)])
@@ -167,23 +149,22 @@ def task_check(results, params):
arg_len = len(arg)
env_len = len(var)
for i in xrange(100):
- s_out += chr(20 + (ord(arg[i % arg_len]) ^ ord(var[i % env_len]) % 64))
+ s_out += chr(32 + ((ord(arg[i % arg_len]) ^ ord(var[i % env_len])) % 64))
r += ord(arg[i % arg_len]) + ord(var[i % env_len]) + i;
if (i % 20 == 0):
s_out += "RAUS\r\n";
if (i % 31 == 0):
s_out += 'ma'
- s_err += chr(r % 32 + ord('A'));
+ s_err += chr((r % 32) + ord('A'));
if (i % 23 == 0):
s_err += "PATACIS\r\n"
retval = r % 16
s_err += '\r\n'
s_out += '\r\n'
return(s_out, s_err, retval)
-
score = 0
hints = []
- r = random.Random(params['param_gen_seed'])
+ r = random.Random(int(params['param_gen_seed']))
env_val = "".join([r.choice('ABCDEFGHIJKLMNPRSTUVZ012345') for i in xrange(11)])
arg_val = "".join([r.choice('ABCDEFGHIJKLMNPRSTUVZ012345') for i in xrange(13)])
stdin_val = "".join([r.choice('ABCDEFGHIJKLMNPRSTUVZ012345') for i in xrange(17)])
@@ -191,6 +172,7 @@ def task_check(results, params):
params['arg_c'], env_val
)
expected_script_stderr = 'cat {}\r\n'.format(params['out_stderr_c']) + expected_script_stderr
+ # hints += [expected_script_stderr, results['script_run'], results['script_stderr'], params['arg_c'], env_val]
if expected_script_stderr != results['script_stderr']:
hints += ['wrong script stderr']
else:
@@ -239,7 +221,7 @@ int main(int argc, char **argv){
env_len = strlen(var);
r = 0;
for (i = 0; i<100; i++){
- printf("%c", 20 + (arg[i % arg_len] ^ var[i % env_len] % 64));
+ printf("%c", 32 + (arg[i % arg_len] ^ var[i % env_len]) % 64);
r += (int)arg[i % arg_len] + (int)var[i % env_len] + i;
if (i % 20 == 0){
printf("RAUS\\n");
@@ -279,7 +261,6 @@ done
destroyed_c_source += 'QX'
destroyed_c_source += c
d.write(params['P_c'], destroyed_c_source)
- print params['P_c']
d.chown(1000, 1000, params['P_c'])
sh_path ='/usr/local/bin/' + params['net_prog_name']
d.write(sh_path, evil_shell_source)
diff --git a/kpov_judge/tasks/set_motd/howtos/images/img7.png b/kpov_judge/tasks/set_motd/howtos/images/img7.png
index ef61212..40ce63d 100644
--- a/kpov_judge/tasks/set_motd/howtos/images/img7.png
+++ b/kpov_judge/tasks/set_motd/howtos/images/img7.png
Binary files differ
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 09:34:52 +0000