diff --git a/src/handlers/manage/pro.py b/src/handlers/manage/pro.py index 5844d44d..5b1b1540 100644 --- a/src/handlers/manage/pro.py +++ b/src/handlers/manage/pro.py @@ -50,6 +50,9 @@ async def get(self, page=None): elif page == "filemanager": pro_id = int(self.get_argument('proid')) err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return testm_conf = pro['testm_conf'] dirs = [] @@ -116,6 +119,10 @@ async def get(self, page=None): err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + files = sorted(set(map(lambda file: file.replace('.in', '').replace('.out', ''), filter(lambda file: file.endswith('.in') or file.endswith('.out'), os.listdir(f'problem/{pro_id}/res/testdata'))))) @@ -143,7 +150,7 @@ async def post(self, page=None): err, pro_id = await ProService.inst.add_pro(name, status, pack_token) await LogService.inst.add_log( - f"{self.acct.name} had been send a request to add the problem #{pro_id}", 'manage.pro.add.pro' + f"{self.acct.name} has sent a request to add the problem #{pro_id}", 'manage.pro.add.pro' ) if err: self.error(err) @@ -165,7 +172,7 @@ async def post(self, page=None): basepath = f'problem/{pro_id}/res/testdata' if not self._is_file_access_safe(basepath, filename): await LogService.inst.add_log( - f'{self.acct.name} tried to preview file:{filename} of the problem #{pro_id}, but it was suspicious', + f'{self.acct.name} tried to preview file:{filename} for problem #{pro_id}, but it was suspicious', 'manage.pro.update.tests.preview.failed' ) self.error('Eacces') @@ -175,13 +182,13 @@ async def post(self, page=None): if not os.path.exists(filepath): await LogService.inst.add_log( - f'{self.acct.name} tried to preview file:{filename} of the problem #{pro_id} but not found', + f'{self.acct.name} tried to preview file:{filename} for problem #{pro_id} but not found', 'manage.pro.update.tests.preview.failed' ) self.error('Enoext') return - await LogService.inst.add_log(f'{self.acct.name} preview file:{filename} of the problem #{pro_id}', + await LogService.inst.add_log(f'{self.acct.name} preview file:{filename} for problem #{pro_id}', 'manage.pro.update.tests.preview') with open(filepath, 'r') as testcase_f: content = testcase_f.readlines() @@ -197,6 +204,10 @@ async def post(self, page=None): weight = int(self.get_argument('weight')) err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + test_group = pro['testm_conf']['test_group'] if group not in test_group: @@ -206,7 +217,7 @@ async def post(self, page=None): test_group[group]['weight'] = weight await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to update weight of subtask#{group} of the problem #{pro_id}', + f'{self.acct.name} has sent a request to update weight of subtask#{group} for problem #{pro_id}', 'manage.pro.update.tests.updateweight', { 'weight': weight, @@ -219,6 +230,10 @@ async def post(self, page=None): weight = int(self.get_argument('weight')) err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + test_group = pro['testm_conf']['test_group'] test_group[len(test_group)] = { @@ -228,7 +243,7 @@ async def post(self, page=None): await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to add a new subtask of the problem #{pro_id}', + f'{self.acct.name} has sent a request to add a new subtask for problem #{pro_id}', 'manage.pro.update.tests.addtaskgroup', { 'weight': weight, @@ -242,6 +257,10 @@ async def post(self, page=None): group = int(self.get_argument('group')) err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + test_group = pro['testm_conf']['test_group'] if group not in test_group: self.error('Enoext') @@ -256,7 +275,7 @@ async def post(self, page=None): await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to delete a subtask of the problem #{pro_id}', + f'{self.acct.name} has sent a request to delete a subtask for problem #{pro_id}', 'manage.pro.update.tests.deletetaskgroup', ) self.finish('S') @@ -266,12 +285,16 @@ async def post(self, page=None): group = int(self.get_argument('group')) testcase = self.get_argument('testcase') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + basepath = f'problem/{pro_id}/res/testdata' if not os.path.exists(f'{basepath}/{testcase}.in') or not os.path.exists(f'{basepath}/{testcase}.out'): self.error('Enoext') return - err, pro = await ProService.inst.get_pro(pro_id, self.acct) test_group = pro['testm_conf']['test_group'] if group not in test_group: self.error('Enoext') @@ -289,7 +312,7 @@ async def post(self, page=None): test_group[group]['metadata']['data'].append(testcase) await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to add a testcase:{testcase} to group#{group} of the problem #{pro_id}', + f'{self.acct.name} has sent a request to add a testcase:{testcase} to group#{group} for problem #{pro_id}', 'manage.pro.update.tests.addsingletestcase', ) self.finish('S') @@ -300,6 +323,10 @@ async def post(self, page=None): testcase = self.get_argument('testcase') err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + test_group = pro['testm_conf']['test_group'] if group not in test_group: self.error('Enoext') @@ -313,7 +340,7 @@ async def post(self, page=None): await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to delete a testcase:{testcase} to group#{group} for problem #{pro_id}', + f'{self.acct.name} has sent a request to delete a testcase:{testcase} to group#{group} for problem #{pro_id}', 'manage.pro.update.tests.deletesingletestcase', ) self.finish('S') @@ -323,6 +350,11 @@ async def post(self, page=None): old_filename = self.get_argument('old_filename') new_filename = self.get_argument('new_filename') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + # check filename basepath = f'problem/{pro_id}/res/testdata' old_inputfile_path = f'{basepath}/{old_filename}.in' @@ -356,7 +388,6 @@ async def post(self, page=None): os.rename(old_inputfile_path, new_inputfile_path) os.rename(old_outputfile_path, new_outputfile_path) - err, pro = await ProService.inst.get_pro(pro_id, self.acct) is_modified = False for test_group in pro['testm_conf']['test_group'].values(): test = test_group['metadata']['data'] @@ -369,7 +400,7 @@ async def post(self, page=None): if is_modified: await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to rename {old_filename} to {new_filename} for problem #{pro_id}', + f'{self.acct.name} has sent a request to rename {old_filename} to {new_filename} for problem #{pro_id}', 'manage.pro.update.tests.renamesinglefile', ) self.finish('S') @@ -380,6 +411,11 @@ async def post(self, page=None): test_type = self.get_argument('type') pack_token = self.get_argument('pack_token') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + if test_type not in ['output', 'input']: PackService.inst.clear(pack_token) self.error('Eparam') @@ -391,7 +427,7 @@ async def post(self, page=None): if not self._is_file_access_safe(basepath, f"{filename}.{test_type[0:-3]}"): PackService.inst.clear(pack_token) await LogService.inst.add_log( - f'{self.acct.name} tried to update {filename} of the problem #{pro_id}, but it was suspicious', + f'{self.acct.name} tried to update {filename} for problem #{pro_id}, but it was suspicious', 'manage.pro.update.tests.updatesinglefile.failed' ) self.error('Eacces') @@ -407,8 +443,10 @@ async def post(self, page=None): return _ = await PackService.inst.direct_copy(pack_token, filepath) + + await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to update a single file:{filename} of the problem #{pro_id}', + f'{self.acct.name} has sent a request to update a single file:{filename} for problem #{pro_id}', 'manage.pro.update.tests.updatesinglefile', ) @@ -420,6 +458,11 @@ async def post(self, page=None): input_pack_token = self.get_argument('input_pack_token') output_pack_token = self.get_argument('output_pack_token') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + basepath = f'problem/{pro_id}/res/testdata' inputfile_path = f'{basepath}/{filename}.in' outputfile_path = f'{basepath}/{filename}.out' @@ -450,7 +493,7 @@ async def post(self, page=None): _ = await PackService.inst.direct_copy(output_pack_token, outputfile_path) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to add a single file:{filename} for problem #{pro_id}', + f'{self.acct.name} has sent a request to add a single file:{filename} for problem #{pro_id}', 'manage.pro.update.tests.addsinglefile', ) @@ -460,6 +503,11 @@ async def post(self, page=None): pro_id = int(self.get_argument('pro_id')) filename = self.get_argument('filename') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + basepath = f'problem/{pro_id}/res/testdata' if not self._is_file_access_safe(basepath, f'{filename}.in'): await LogService.inst.add_log( @@ -480,7 +528,6 @@ async def post(self, page=None): os.remove(f'{basepath}/{filename}.in') os.remove(f'{basepath}/{filename}.out') - err, pro = await ProService.inst.get_pro(pro_id, self.acct) for test_group in pro['testm_conf']['test_group'].values(): test = test_group['metadata']['data'] @@ -491,7 +538,7 @@ async def post(self, page=None): await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to delete a single file:{filename} of the problem #{pro_id}', + f'{self.acct.name} has sent a request to delete a single file:{filename} for problem #{pro_id}', 'manage.pro.update.tests.deletesinglefile', ) @@ -503,6 +550,11 @@ async def post(self, page=None): filename = self.get_argument('filename') basepath = self.get_argument('path') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + if basepath not in ['http', 'res/check', 'res/make']: self.error('Eparam') return @@ -543,6 +595,11 @@ async def post(self, page=None): new_filename = self.get_argument('new_filename') basepath = self.get_argument('path') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + if basepath not in ['http', 'res/check', 'res/make']: self.error('Eparam') return @@ -576,7 +633,7 @@ async def post(self, page=None): os.rename(old_filepath, new_filepath) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to rename {old_filename} to {new_filename} for problem #{pro_id}', + f'{self.acct.name} has sent a request to rename {old_filename} to {new_filename} for problem #{pro_id}', 'manage.pro.update.filemanager.renamesinglefile', ) self.finish('S') @@ -587,6 +644,11 @@ async def post(self, page=None): pack_token = self.get_argument('pack_token') basepath = self.get_argument('path') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + if basepath not in ['http', 'res/check', 'res/make']: self.error('Eparam') return @@ -614,7 +676,7 @@ async def post(self, page=None): _ = await PackService.inst.direct_copy(pack_token, filepath) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to update {filename} for problem #{pro_id}', + f'{self.acct.name} has sent a request to update {filename} for problem #{pro_id}', 'manage.pro.update.filemanager.updatesinglefile', ) @@ -626,6 +688,11 @@ async def post(self, page=None): pack_token = self.get_argument('pack_token') basepath = self.get_argument('path') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + if basepath not in ['http', 'res/check', 'res/make']: self.error('Eparam') return @@ -653,7 +720,7 @@ async def post(self, page=None): _ = await PackService.inst.direct_copy(pack_token, filepath) await LogService.inst.add_log( - f'{self.acct.name} had been send a request to add {filename} for problem #{pro_id}', + f'{self.acct.name} has sent a request to add {filename} for problem #{pro_id}', 'manage.pro.update.filemanager.addsinglefile', ) @@ -664,6 +731,11 @@ async def post(self, page=None): filename = self.get_argument('filename') basepath = self.get_argument('path') + err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + if basepath not in ['http', 'res/check', 'res/make']: self.error('Eparam') return @@ -689,7 +761,7 @@ async def post(self, page=None): os.remove(f'{basepath}/{filename}') await LogService.inst.add_log( - f'{self.acct.name} had been send a request to delete {filename} for problem #{pro_id}', + f'{self.acct.name} has sent a request to delete {filename} for problem #{pro_id}', 'manage.pro.update.filemanager.deletesinglefile', ) @@ -702,6 +774,7 @@ async def post(self, page=None): status = int(self.get_argument('status')) tags = self.get_argument('tags') allow_submit = self.get_argument('allow_submit') == "true" + # NOTE: test config is_makefile = self.get_argument('is_makefile') == "true" check_type = int(self.get_argument('check_type')) @@ -718,6 +791,10 @@ async def post(self, page=None): pro_id, name, status, None, None, tags, allow_submit ) err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + old_is_makefile = pro['testm_conf']['is_makefile'] old_check_type = pro['testm_conf']['check_type'] custom_check_type = [ProConst.CHECKER_IOREDIR, ProConst.CHECKER_CMS] @@ -736,7 +813,7 @@ async def post(self, page=None): await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f"{self.acct.name} had been send a request to update the problem #{pro_id}", 'manage.pro.update.pro', + f"{self.acct.name} has sent a request to update the problem #{pro_id}", 'manage.pro.update.pro', { 'name': name, 'status': status, @@ -759,6 +836,10 @@ async def post(self, page=None): pack_token = self.get_argument('pack_token') err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return + err, _ = await ProService.inst.update_pro( pro_id, pro['name'], pro['status'], ProService.PACKTYPE_FULL, pack_token, pro['tags'], pro['allow_submit'] ) @@ -787,7 +868,7 @@ async def post(self, page=None): }) await LogService.inst.add_log( - f"{self.acct.name} had been send a request to update the problem #{pro_id} by uploading problem package", + f"{self.acct.name} has sent a request to update the problem #{pro_id} by uploading problem package", 'manage.pro.update.pro.package', ) @@ -798,6 +879,9 @@ async def post(self, page=None): limits = json.loads(self.get_argument('limits')) err, pro = await ProService.inst.get_pro(pro_id, self.acct) + if err: + self.error(err) + return ALLOW_COMPILERS = ChalConst.ALLOW_COMPILERS if pro['testm_conf']['is_makefile']: @@ -843,7 +927,7 @@ def _check(comp_type, limit): await ProService.inst.update_test_config(pro_id, pro['testm_conf']) await LogService.inst.add_log( - f"{self.acct.name} had been send a request to update the problem #{pro_id}", + f"{self.acct.name} has sent a request to update the problem #{pro_id}", 'manage.pro.update.limit', { 'limits': limits @@ -912,7 +996,7 @@ def _check(comp_type, limit): if is_all_chal: sql = "" else: - sql = '''AND "challenge_state"."state" IS NULL''' + sql = '''AND "challenge_state"."chal_id" IS NULL''' result = await con.fetch( f''' SELECT "challenge"."chal_id", "challenge"."compiler_type" FROM "challenge" diff --git a/src/handlers/pro.py b/src/handlers/pro.py index f7941cd8..fe2e52bb 100644 --- a/src/handlers/pro.py +++ b/src/handlers/pro.py @@ -164,12 +164,16 @@ async def post(self): if reqtype == "listproclass": _, accts = await UserService.inst.list_acct(UserConst.ACCTTYPE_KERNEL) accts = {acct.acct_id: acct.name for acct in accts} + _, proclass_list = await ProClassService.inst.get_proclass_list() - proclass_list = list(map(dict, proclass_list)) - for proclass in proclass_list: + def _set_creator_name(proclass): + proclass = dict(proclass) if proclass['acct_id']: proclass['creator_name'] = accts[proclass['acct_id']] + return proclass + proclass_list = list(map(_set_creator_name, proclass_list)) + proclass_cata = { "official": list(filter(lambda proclass: proclass['type'] == ProClassConst.OFFICIAL_PUBLIC, proclass_list)), "shared": list(filter(lambda proclass: proclass['type'] == ProClassConst.USER_PUBLIC, proclass_list)), diff --git a/src/services/chal.py b/src/services/chal.py index 9c58368a..d9f4951f 100644 --- a/src/services/chal.py +++ b/src/services/chal.py @@ -7,6 +7,7 @@ from services.pro import ProService from services.user import Account +TZ = datetime.timezone(datetime.timedelta(hours=+8)) class ChalConst: STATE_AC = 1 @@ -108,12 +109,12 @@ def get_sql_query_str(self): query += f' AND "challenge_state"."state" = {self.state} ' if self.compiler != 'all': - query += f' AND \"challenge\".\"compiler_type\"=\'{self.compiler}\' ' + query += f' AND "challenge"."compiler_type"=\'{self.compiler}\' ' if self.contest != 0: query += f' AND "challenge"."contest_id"={self.contest} ' else: - query += ' AND "challenge"."contest_id"=0 ' + query += f' AND "challenge"."contest_id"=0 ' return query @@ -270,10 +271,6 @@ async def get_chal(self, chal_id): } ) - owner = await self.rs.get(f'{pro_id}_owner') - unlock = [1] - - tz = datetime.timezone(datetime.timedelta(hours=+8)) return ( None, @@ -283,7 +280,7 @@ async def get_chal(self, chal_id): 'acct_id': acct_id, 'contest_id': contest_id, 'acct_name': acct_name, - 'timestamp': timestamp.astimezone(tz), + 'timestamp': timestamp.astimezone(TZ), 'testl': testl, 'response': final_response, 'comp_type': comp_type, @@ -309,13 +306,8 @@ async def emit_chal(self, chal_id, pro_id, testm_conf, comp_type, pri: int): acct_id, contest_id, timestamp = int(result['acct_id']), int(result['contest_id']), result['timestamp'] limit = testm_conf['limit'] - - if comp_type in limit: - timelimit = limit[comp_type]['timelimit'] - memlimit = limit[comp_type]['memlimit'] - else: - timelimit = limit['default']['timelimit'] - memlimit = limit['default']['memlimit'] + timelimit = limit.get(comp_type, limit['default'])['timelimit'] + memlimit = limit.get(comp_type, limit['default'])['memlimit'] async with self.db.acquire() as con: testl = [] diff --git a/src/services/pro.py b/src/services/pro.py index 2d3622b6..5614d7e0 100644 --- a/src/services/pro.py +++ b/src/services/pro.py @@ -129,7 +129,7 @@ async def get_pro(self, pro_id, acct: Account | None = None, is_contest: bool = }, ) - async def list_pro(self, acct: Account = None, is_contest=False): + async def list_pro(self, acct: Account | None = None, is_contest=False): if acct is None: max_status = ProService.STATUS_ONLINE @@ -424,10 +424,10 @@ def __init__(self, db, rs): self.rs = rs ProClassService.inst = self - async def get_proclass(self, proclass_id): + async def get_proclass(self, proclass_id: int): async with self.db.acquire() as con: res = await con.fetch( - 'SELECT "proclass_id", "name", "desc", "list", "acct_id", "type" FROM "proclass" WHERE "proclass_id" = $1 ORDER BY "proclass_id" ASC;', + 'SELECT "proclass_id", "name", "desc", "list", "acct_id", "type" FROM "proclass" WHERE "proclass_id" = $1;', int(proclass_id), ) @@ -438,11 +438,11 @@ async def get_proclass(self, proclass_id): async def get_proclass_list(self): async with self.db.acquire() as con: - res = await con.fetch('SELECT "proclass_id", "name", "acct_id", "type" FROM "proclass";') + res = await con.fetch('SELECT "proclass_id", "name", "acct_id", "type" FROM "proclass" ORDER BY "proclass_id" ASC;') return None, res - async def add_proclass(self, name, p_list, desc, acct_id, proclass_type): + async def add_proclass(self, name: str, p_list: list[int], desc: str, acct_id: int, proclass_type: int): async with self.db.acquire() as con: res = await con.fetchrow( """ @@ -458,7 +458,7 @@ async def add_proclass(self, name, p_list, desc, acct_id, proclass_type): return None, res[0] - async def remove_proclass(self, proclass_id): + async def remove_proclass(self, proclass_id: int): async with self.db.acquire() as con: await con.execute('DELETE FROM "proclass" WHERE "proclass_id" = $1', int(proclass_id)) diff --git a/src/static/index.js b/src/static/index.js index 102c2207..3e693113 100644 --- a/src/static/index.js +++ b/src/static/index.js @@ -125,11 +125,12 @@ var index = new function() { $(document).on('click', 'a', function(e) { let cur_href = location.href; + let href = $(this).attr('href'); + let target = $(this).attr('target'); if (href == undefined || href.length == 0) return; - if ($(this).attr('target') !== "") { - return; - } + if (target) return + window.history.pushState(null, document.title, $(this).attr('href')); if (href.startsWith('?')) { diff --git a/src/static/templ/acct/acct-config.html b/src/static/templ/acct/acct-config.html index c0e6ce08..3be2f330 100644 --- a/src/static/templ/acct/acct-config.html +++ b/src/static/templ/acct/acct-config.html @@ -1,4 +1,4 @@ -{{ set_page_title("Edit Account") }} +{% raw set_page_title("Edit Account") %} {% if acct.acct_id != user.acct_id and not user.is_kernel() %} You don't have permission. diff --git a/src/static/templ/proset.html b/src/static/templ/proset.html index 7fb8a01c..75f1e6ec 100644 --- a/src/static/templ/proset.html +++ b/src/static/templ/proset.html @@ -66,6 +66,12 @@ $("#infoProClass").on('click', function(e) { let body = info_dialog.querySelector('.modal-body'); body.innerHTML = DOMPurify.sanitize(marked.parse(cur_proclass_desc)); + + // NOTE: close info dialog before navigating to another page. + info_dialog.querySelectorAll('a').forEach(el => { + el.addEventListener('click', _ => info_dialog_modal.dispose()); + }) + MathJax.Hub.Queue(["Typeset", MathJax.Hub, body]); info_dialog_modal.show(); }); @@ -262,7 +268,9 @@

Created By: Official

{% end %}
- + {% if cur_proclass %} + + {% end %} Manage
diff --git a/src/tests/e2e/manage/pro/filemanager.py b/src/tests/e2e/manage/pro/filemanager.py index 1e1da0ff..ea3adb06 100644 --- a/src/tests/e2e/manage/pro/filemanager.py +++ b/src/tests/e2e/manage/pro/filemanager.py @@ -1,4 +1,5 @@ import os +import copy import json import tornado.escape @@ -20,6 +21,17 @@ async def _upload_file(self, filepath, session): return pack_token + def assertTable(self, default_data: dict, assert_tables: list[dict], session): + for table in assert_tables: + equal_value = table.pop("equal_value") + + d = copy.copy(default_data) + for key, val in table.items(): + d[key] = val + + res = session.post('http://localhost:5501/manage/pro/filemanager', data=d) + self.assertEqual(res.text, equal_value) + async def main(self): with AccountContext("admin@test", "testtest") as admin_session: # NOTE: preview @@ -32,29 +44,21 @@ async def main(self): self.assertEqual(tornado.escape.xhtml_unescape(json.loads(res.text)), open('tests/static_file/toj3/http/cont.html').read()) - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=1', data={ - 'reqtype': 'preview', - 'pro_id': 1, - 'filename': '../conf.json', - 'path': 'http' - }) - self.assertEqual(res.text, 'Eacces') - - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=1', data={ - 'reqtype': 'preview', - 'pro_id': 1, - 'filename': 'cont.cont.html', - 'path': 'http' - }) - self.assertEqual(res.text, 'Enoext') - - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=1', data={ - 'reqtype': 'preview', - 'pro_id': 1, - 'filename': 'cont.html', - 'path': '/etc' - }) - self.assertEqual(res.text, 'Eparam') + self.assertTable( + { + 'reqtype': 'preview', + 'pro_id': 1, + 'filename': 'cont.html', + 'path': 'http' + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found + {'filename': '../conf.json', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': 'cont.html.html', 'equal_value': 'Enoext'}, # file not found + {'path': '/etc/', 'filename': 'passwd-', 'equal_value': 'Eparam'}, # path in ['http', 'res/check', 'res/make'] + ], + admin_session + ) # NOTE: addsinglefile pack_token = await self._upload_file('tests/static_file/toj3/3.in', admin_session) @@ -70,30 +74,22 @@ async def main(self): self.assertTrue(os.path.exists(f'{config.WEB_PROBLEM_STATIC_FILE_DIRECTORY}/1/test')) self.assertEqual(open('tests/static_file/toj3/3.in').read(), open('problem/1/http/test').read()) - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=1', data={ - 'reqtype': 'addsinglefile', - 'pro_id': 1, - 'filename': 'test2', - 'path': 'httpx', - 'pack_token': pack_token, - }) - self.assertEqual(res.text, 'Eparam') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=1', data={ - 'reqtype': 'addsinglefile', - 'pro_id': 1, - 'filename': '../etc', - 'path': 'http', - 'pack_token': pack_token, - }) - self.assertEqual(res.text, 'Eacces') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=1', data={ - 'reqtype': 'addsinglefile', - 'pro_id': 1, - 'filename': 'test', - 'path': 'http', - 'pack_token': pack_token, - }) - self.assertEqual(res.text, 'Eexist') + self.assertTable( + { + 'reqtype': 'addsinglefile', + 'pro_id': 1, + 'filename': 'test', + 'path': 'http', + 'pack_token': pack_token, + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found + {'filename': '../conf.json', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': 'test', 'equal_value': 'Eexist'}, # file already exists + {'path': '/etc/', 'filename': 'passwd-', 'equal_value': 'Eparam'}, # path in ['http', 'res/check', 'res/make'] + ], + admin_session + ) # NOTE: upload checker problem await self.upload_problem('float_checker.tar.xz', 'float checker', ProConst.STATUS_ONLINE, 4, admin_session) @@ -126,30 +122,23 @@ def callback(): await self.wait_for_judge_finish(callback) chal_states_result = self.get_chal_state(chal_id=12, session=admin_session) self.assertEqual(chal_states_result, [ChalConst.STATE_AC]) - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'updatesinglefile', - 'pro_id': 4, - 'filename': '../check.cpp', - 'pack_token': pack_token, - 'path': 'res/check', - }) - self.assertEqual(res.text, 'Eacces') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'updatesinglefile', - 'pro_id': 4, - 'filename': 'abc.cpp', - 'pack_token': pack_token, - 'path': 'res/check', - }) - self.assertEqual(res.text, 'Enoext') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'updatesinglefile', - 'pro_id': 4, - 'filename': 'abc.cpp', - 'pack_token': pack_token, - 'path': '/etc/', - }) - self.assertEqual(res.text, 'Eparam') + + self.assertTable( + { + 'reqtype': 'updatesinglefile', + 'pro_id': 4, + 'filename': 'check.cpp', + 'pack_token': pack_token, + 'path': 'res/check', + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found + {'filename': '../check.cpp', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': 'abc.cpp', 'equal_value': 'Enoext'}, # file not found + {'path': '/etc/', 'filename': 'group-', 'equal_value': 'Eparam'}, # path in ['http', 'res/check', 'res/make'] + ], + admin_session + ) # NOTE: renamesinglefile res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ @@ -190,38 +179,24 @@ def callback(): await self.wait_for_judge_finish(callback) chal_states_result = self.get_chal_state(chal_id=12, session=admin_session) self.assertEqual(chal_states_result, [ChalConst.STATE_ERR]) - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'renamesinglefile', - 'pro_id': 4, - 'old_filename': 'check.cpp', - 'new_filename': 'check.cpp.cpp', - 'path': 'res/check' - }) - self.assertEqual(res.text, 'Enoext') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'renamesinglefile', - 'pro_id': 4, - 'old_filename': 'check.cpp.cpp', - 'new_filename': 'check.cpp.cpp', - 'path': 'res/check' - }) - self.assertEqual(res.text, 'Eexist') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'renamesinglefile', - 'pro_id': 4, - 'old_filename': 'check.cpp.cpp', - 'new_filename': 'check.cpp.cpp', - 'path': '/etc' - }) - self.assertEqual(res.text, 'Eparam') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'renamesinglefile', - 'pro_id': 4, - 'old_filename': '../../conf.json', - 'new_filename': '../../conf.sss', - 'path': 'res/check' - }) - self.assertEqual(res.text, 'Eacces') + + self.assertTable( + { + 'reqtype': 'renamesinglefile', + 'pro_id': 4, + 'old_filename': 'check.cpp', + 'new_filename': 'check.cpp.cpp', + 'path': 'res/check' + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found + {'old_filename': '../../conf.json', 'new_filename': '../../conf.js', 'equal_value': 'Eacces'}, # illegal filepath access + {'old_filename': 'check.cpp', 'new_filename': 'check.cpp.cpp', 'equal_value': 'Enoext'}, # file not found + {'old_filename': 'check.cpp.cpp', 'new_filename': 'check.cpp.cpp', 'equal_value': 'Eexist'}, # file already exists + {'path': '/etc/', 'old_filename': 'hostname', 'new_filename': 'chi', 'equal_value': 'Eparam'}, # path in ['http', 'res/check', 'res/make'] + ], + admin_session + ) # NOTE: deletesinglefile res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ @@ -241,27 +216,21 @@ def callback(): self.assertEqual(res.text, 'S') self.assertFalse(os.path.exists('problem/2/res/make/stub.cpp.cpp')) - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'deletesinglefile', - 'pro_id': 4, - 'filename': 'check.cpp', - 'path': 'res/check' - }) - self.assertEqual(res.text, 'Enoext') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'deletesinglefile', - 'pro_id': 4, - 'filename': 'hostname', - 'path': '/etc' - }) - self.assertEqual(res.text, 'Eparam') - res = admin_session.post('http://localhost:5501/manage/pro/filemanager?proid=4', data={ - 'reqtype': 'deletesinglefile', - 'pro_id': 4, - 'filename': '../../conf.json', - 'path': 'res/check' - }) - self.assertEqual(res.text, 'Eacces') + self.assertTable( + { + 'reqtype': 'deletesinglefile', + 'pro_id': 4, + 'filename': 'check.cpp.cpp', + 'path': 'res/check' + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found + {'filename': 'check.cpp', 'equal_value': 'Enoext'}, # file not found, check.cpp was renamed to check.cpp.cpp in the previous code + {'filename': '../../conf.json', 'equal_value': 'Eacces'}, # file not found, check.cpp was renamed to check.cpp.cpp in the previous code + {'path': '/etc/', 'filename': 'hostname', 'equal_value': 'Eparam'}, # path in ['http', 'res/check', 'res/make'] + ], + admin_session + ) # TODO: 檢查 pro_id=1只有http, pro_id=2有http與make，pro_id=4有http與check html = self.get_html('http://localhost:5501/manage/pro/filemanager?proid=1', admin_session) diff --git a/src/tests/e2e/manage/pro/updatetests.py b/src/tests/e2e/manage/pro/updatetests.py index d4d9a2b1..df33a03a 100644 --- a/src/tests/e2e/manage/pro/updatetests.py +++ b/src/tests/e2e/manage/pro/updatetests.py @@ -1,4 +1,5 @@ import os +import copy import json from services.chal import ChalConst @@ -13,6 +14,17 @@ async def _upload_file(self, filepath, session): return pack_token + def assertTable(self, default_data: dict, assert_tables: list[dict], session): + for table in assert_tables: + equal_value = table.pop("equal_value") + + d = copy.copy(default_data) + for key, val in table.items(): + d[key] = val + + res = session.post('http://localhost:5501/manage/pro/updatetests', data=d) + self.assertEqual(res.text, equal_value) + async def main(self): with AccountContext("admin@test", "testtest") as admin_session: # NOTE: preview @@ -24,29 +36,21 @@ async def main(self): }) self.assertEqual(json.loads(res.text), open('tests/static_file/toj3/res/testdata/1.out').read()) - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'preview', - 'pro_id': 1, - 'filename': '2', - 'type': 'out', - }) - self.assertEqual(res.text, 'Efile') - - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'preview', - 'pro_id': 1, - 'filename': '../conf.json', - 'type': 'out', - }) - self.assertEqual(res.text, 'Eacces') - - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'preview', - 'pro_id': 1, - 'filename': '5', - 'type': 'out', - }) - self.assertEqual(res.text, 'Enoext') + self.assertTable( + { + 'reqtype': 'preview', + 'pro_id': 1, + 'filename': '1', + 'type': 'out', + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found + {'filename': '2', 'equal_value': 'Efile'}, # file has more than 25 lines or cannot be decoded as UTF-8. + {'filename': '../conf.json', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': '5', 'equal_value': 'Enoext'} # file not found + ], + admin_session + ) # NOTE: updateweight res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ @@ -96,22 +100,22 @@ async def main(self): self.assertTrue(os.path.exists('problem/1/res/testdata/3.out')) self.assertEqual(open('tests/static_file/toj3/3.in').read(), open('problem/1/res/testdata/3.in').read()) self.assertEqual(open('tests/static_file/toj3/3.out').read(), open('problem/1/res/testdata/3.out').read()) - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'addsinglefile', - 'pro_id': 1, - 'filename': '../etc', - 'input_pack_token': inputfile_token, - 'output_pack_token': outputfile_token, - }) - self.assertEqual(res.text, 'Eacces') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'addsinglefile', - 'pro_id': 1, - 'filename': '3', - 'input_pack_token': inputfile_token, - 'output_pack_token': outputfile_token, - }) - self.assertEqual(res.text, 'Eexist') + + self.assertTable( + { + 'reqtype': 'addsinglefile', + 'pro_id': 1, + 'filename': '3', + 'input_pack_token': inputfile_token, + 'output_pack_token': outputfile_token, + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found, + {'filename': '../etc', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': '3', 'equal_value': 'Eexist'} # file already exists + ], + admin_session + ) # NOTE: addsingletestcase res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ @@ -126,27 +130,23 @@ async def main(self): testcase_trs = groups[2].select('tbody > tr') self.assertEqual(testcase_trs[0].select('td')[0].text.strip(), '3') self.assertEqual(testcase_trs[0].attrs.get('testcase'), '3') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'addsingletestcase', - 'pro_id': 1, - 'testcase': '300', - 'group': 2, - }) - self.assertEqual(res.text, 'Enoext') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'addsingletestcase', - 'pro_id': 1, - 'testcase': '3', - 'group': 300, - }) - self.assertEqual(res.text, 'Enoext') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'addsingletestcase', - 'pro_id': 1, - 'testcase': '3', - 'group': 2, - }) - self.assertEqual(res.text, 'Eexist') + + self.assertTable( + { + 'reqtype': 'addsingletestcase', + 'pro_id': 1, + 'testcase': '3', + 'group': 2, + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found, + {'testcase': '300', 'equal_value': 'Enoext'}, # testcase not found + {'group': '300', 'equal_value': 'Enoext'}, # group not found + {'testcase': '3', 'equal_value': 'Eexist'}, # testcase already exists + ], + admin_session + ) + def callback(): res = admin_session.post('http://localhost:5501/submit', data={ 'reqtype': 'rechal', @@ -175,21 +175,21 @@ def callback(): self.assertEqual(testcase_trs[0].select('td')[0].text.strip(), '4') self.assertEqual(testcase_trs[0].attrs.get('testcase'), '4') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'renamesinglefile', - 'pro_id': 1, - 'old_filename': '4', - 'new_filename': '4', - }) - self.assertEqual(res.text, 'Eexist') - - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'renamesinglefile', - 'pro_id': 1, - 'old_filename': '5', - 'new_filename': '4', - }) - self.assertEqual(res.text, 'Enoext') + self.assertTable( + { + 'reqtype': 'renamesinglefile', + 'pro_id': 1, + 'old_filename': '3', + 'new_filename': '4', + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found, + {'old_filename': '../conf.json', 'new_filename': '../tw87.json', 'equal_value': 'Eacces'}, # illegal filepath access + {'old_filename': '4', 'new_filename': '4', 'equal_value': 'Eexist'}, # new file already exists + {'old_filename': '5', 'equal_value': 'Enoext'}, # old file not found + ], + admin_session + ) # NOTE: updatesinglefile pack_token = await self._upload_file('tests/static_file/toj3/3.out.incorrect', admin_session) @@ -202,32 +202,23 @@ def callback(): }) self.assertEqual(res.text, 'S') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'updatesinglefile', - 'pro_id': 1, - 'filename': '4', - 'type': '../../', - 'pack_token': pack_token, - }) - self.assertEqual(res.text, 'Eparam') + self.assertTable( + { + 'reqtype': 'updatesinglefile', + 'pro_id': 1, + 'filename': '4', + 'type': 'output', + 'pack_token': pack_token, + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found, + {'type': '../../', 'equal_value': 'Eparam'}, # type in ['output', 'input'] + {'filename': '../conf.json', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': '5', 'equal_value': 'Enoext'}, # file not found + ], + admin_session + ) - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'updatesinglefile', - 'pro_id': 1, - 'filename': '../conf.json', - 'type': 'output', - 'pack_token': pack_token, - }) - self.assertEqual(res.text, 'Eacces') - - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'updatesinglefile', - 'pro_id': 1, - 'filename': '5', - 'type': 'output', - 'pack_token': pack_token, - }) - self.assertEqual(res.text, 'Enoext') def callback(): res = admin_session.post('http://localhost:5501/submit', data={ 'reqtype': 'rechal', @@ -282,18 +273,20 @@ def callback(): self.assertEqual(res.text, 'S') self.assertFalse(os.path.exists('problem/1/res/testdata/4.in')) self.assertFalse(os.path.exists('problem/1/res/testdata/4.out')) - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'deletesinglefile', - 'pro_id': 1, - 'filename': '5', - }) - self.assertEqual(res.text, 'Enoext') - res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ - 'reqtype': 'deletesinglefile', - 'pro_id': 1, - 'filename': '../conf.json', - }) - self.assertEqual(res.text, 'Eacces') + + self.assertTable( + { + 'reqtype': 'deletesinglefile', + 'pro_id': 1, + 'filename': '4', + }, + [ + {'pro_id': '100', 'equal_value': 'Enoext'}, # problem not found, + {'filename': '../conf.json', 'equal_value': 'Eacces'}, # illegal filepath access + {'filename': '5', 'equal_value': 'Enoext'}, # file not found + ], + admin_session + ) # NOTE: deletetaskgroup res = admin_session.post('http://localhost:5501/manage/pro/updatetests?proid=1', data={ diff --git a/src/tests/e2e/proclass.py b/src/tests/e2e/proclass.py index d0564226..583f3e25 100644 --- a/src/tests/e2e/proclass.py +++ b/src/tests/e2e/proclass.py @@ -86,6 +86,13 @@ async def main(self): res = admin_session.get('http://localhost:5501/proset?proclass_id=1') self.assertEqual(re.findall(r'let cur_proclass_desc = `(.*)`;', res.text, re.I)[0], 'desc desc') + # NOTE: info button + html = self.get_html('http://localhost:5501/proset?proclass_id=1', admin_session) + self.assertIsNotNone(html.select_one('button#infoProClass')) + + html = self.get_html('http://localhost:5501/proset', admin_session) + self.assertIsNone(html.select_one('button#infoProClass')) + with AccountContext('test1@test', 'test') as user_session: res = user_session.get('http://localhost:5501/proset?proclass_id=1') self.assertNotEqual(res.text, 'Eacces')