浏览代码

fix s3 presign url check problem, support two versions(v2,v4) (#9093)

Co-authored-by: Yuanbo Li <ybalbert@amazon.com>
tags/0.9.2
ybalbert001 1年前
父节点
当前提交
57994e4a24
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 27 次插入9 次删除
  1. 27
    9
      api/core/file/message_file_parser.py

+ 27
- 9
api/core/file/message_file_parser.py 查看文件

@@ -198,16 +198,34 @@ class MessageFileParser:
if "amazonaws.com" not in parsed_url.netloc:
return False
query_params = parse_qs(parsed_url.query)
required_params = ["Signature", "Expires"]
for param in required_params:
if param not in query_params:

def check_presign_v2(query_params):
required_params = ["Signature", "Expires"]
for param in required_params:
if param not in query_params:
return False
if not query_params["Expires"][0].isdigit():
return False
if not query_params["Expires"][0].isdigit():
return False
signature = query_params["Signature"][0]
if not re.match(r"^[A-Za-z0-9+/]+={0,2}$", signature):
return False
return True
signature = query_params["Signature"][0]
if not re.match(r"^[A-Za-z0-9+/]+={0,2}$", signature):
return False

return True

def check_presign_v4(query_params):
required_params = ["X-Amz-Signature", "X-Amz-Expires"]
for param in required_params:
if param not in query_params:
return False
if not query_params["X-Amz-Expires"][0].isdigit():
return False
signature = query_params["X-Amz-Signature"][0]
if not re.match(r"^[A-Za-z0-9+/]+={0,2}$", signature):
return False

return True

return check_presign_v4(query_params) or check_presign_v2(query_params)
except Exception:
return False


正在加载...
取消
保存