真实 PP 登录正常,目录接口将 Java Long 总数序列化为十进制字符串;新客户端的纯整数判断误报不兼容。 接受规范的非负十进制字符串,并保留对负数、布尔、小数和非规范字符串的拒绝。 验证:新增用例先复现 invalid_response,再完成 9 项 PP 回归;make verify 退出 0。 候选代码在测试站 API 和 worker 容器中均真实登录并读取目录成功,确认消费同一配置。
This commit is contained in:
@@ -137,11 +137,16 @@ class Client:
|
||||
def page(self, token, current=1, size=200):
|
||||
query = urllib.parse.urlencode({"current": current, "size": size})
|
||||
data = self.request("/potal/file/back/page?" + query, token=token)
|
||||
total = data.get("total") if isinstance(data, dict) else None
|
||||
# PP serializes Java Long counts as canonical decimal strings.
|
||||
if (isinstance(total, str) and len(total) <= 19 and total.isascii() and total.isdecimal()
|
||||
and (total == "0" or not total.startswith("0"))):
|
||||
total = int(total)
|
||||
if (not isinstance(data, dict) or not isinstance(data.get("list"), list)
|
||||
or not isinstance(data.get("total"), int) or isinstance(data.get("total"), bool)
|
||||
or data["total"] < 0 or not isinstance(data.get("hasNextPage"), bool)):
|
||||
or not isinstance(total, int) or isinstance(total, bool)
|
||||
or total < 0 or not isinstance(data.get("hasNextPage"), bool)):
|
||||
raise PPError("invalid_response")
|
||||
return data
|
||||
return {**data, "total": total}
|
||||
|
||||
def check(self):
|
||||
try:
|
||||
|
||||
@@ -13,7 +13,7 @@ import pp_client
|
||||
|
||||
class PPClientTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.calls=[];self.login_code=0;self.list_status=200;self.items=[]
|
||||
self.calls=[];self.login_code=0;self.list_status=200;self.items=[];self.total=None
|
||||
owner=self
|
||||
class Handler(BaseHTTPRequestHandler):
|
||||
def log_message(self,*args):pass
|
||||
@@ -24,12 +24,23 @@ class PPClientTests(unittest.TestCase):
|
||||
owner.calls.append((self.command,self.path))
|
||||
if self.path=='/file.pdf':
|
||||
content=b'%PDF-1.4\nExample PP download\n';self.send_response(200);self.send_header('Content-Length',str(len(content)));self.end_headers();self.wfile.write(content);return
|
||||
self.send_response(owner.list_status);self.end_headers();self.wfile.write(json.dumps({'code':0,'data':{'list':owner.items,'total':len(owner.items),'hasNextPage':False}}).encode())
|
||||
self.send_response(owner.list_status);self.end_headers();self.wfile.write(json.dumps({'code':0,'data':{'list':owner.items,'total':len(owner.items) if owner.total is None else owner.total,'hasNextPage':False}}).encode())
|
||||
self.server=HTTPServer(('127.0.0.1',0),Handler);self.thread=threading.Thread(target=self.server.serve_forever,daemon=True);self.thread.start()
|
||||
self.client=pp_client.Client({'base_url':'http://127.0.0.1:'+str(self.server.server_port),'username':'example','password':'example-password'},allow_http=True)
|
||||
def tearDown(self):self.server.shutdown();self.server.server_close();self.thread.join()
|
||||
def test_check_really_logs_in_and_reads_empty_directory(self):
|
||||
result=self.client.check();self.assertEqual(result['state'],'valid');self.assertEqual([x[0] for x in self.calls],['POST','GET']);self.assertTrue(self.calls[0][1].endswith('/admin/login/token'));self.assertTrue(self.calls[1][1].startswith('/potal/file/back/page?'))
|
||||
def test_real_vendor_decimal_string_total_is_readable(self):
|
||||
for count,items in [('0',[]),('1',[{'id':'example'}])]:
|
||||
with self.subTest(count=count):
|
||||
self.total=count;self.items=items
|
||||
self.assertEqual(self.client.check()['state'],'valid')
|
||||
inventory=self.client.inventory(self.client.login())
|
||||
self.assertEqual(inventory['reported_total'],int(count));self.assertEqual(inventory['items'],items)
|
||||
def test_malformed_vendor_counts_are_not_normalized(self):
|
||||
for value in ['01',' 1','+1','1.0','-1','١','9'*20,True,1.5,-1]:
|
||||
with self.subTest(value=value):
|
||||
self.total=value;self.assertEqual(self.client.check()['state'],'invalid_response')
|
||||
def test_explicit_rejection_never_reads_catalog(self):
|
||||
self.login_code=401;result=self.client.check();self.assertEqual(result['state'],'auth_failed');self.assertEqual(len(self.calls),1)
|
||||
def test_permission_failure_and_transient_remain_distinct(self):
|
||||
|
||||
Reference in New Issue
Block a user