Skip to content

v1.5.1 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KO1231 merged 1 commit into from
Dec 21, 2025
Merged

v1.5.1 #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions lambda/redirect_request/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,19 @@ def lambda_handler(event: APIGatewayProxyEvent, context: LambdaContext):
return error_response(HTTPStatus.INTERNAL_SERVER_ERROR)
try:
## (nonceとchallengeがあったら、) まずnonceを取り出してDBと突合(存在確認・期限内・未使用・nonceの対象リクエストか)
nonce: str = parse_query(event.resolved_query_string_parameters, NONCE_QUERY_KEY, expected_single_value=True)
nonce_model = DelibirdNonceTableModel.get(nonce)
if not nonce_model.is_active():
# nonceが使用済 or 期限切れ
nonce: str = parse_query(event.resolved_query_string_parameters, NONCE_QUERY_KEY, expected_single_value=True, allow_notfound=True)
if not nonce:
return protected_response(domain, request_path, "認証に失敗しました。もう一度お試しください。")
if nonce_model.domain != domain or nonce_model.slug != request_path:
nonce_model = DelibirdNonceTableModel.get(nonce)
if (not nonce_model.is_active()) or (nonce_model.domain != domain) or (nonce_model.slug != request_path):
# nonceが無効 or 使用済 or 期限切れ or ドメインやslugが不一致
return protected_response(domain, request_path, "認証に失敗しました。もう一度お試しください。")

## 問題ないnonceの場合、challengeの確認
challenge = parse_query(event.resolved_query_string_parameters, CHALLENGE_QUERY_KEY, expected_single_value=True)
challenge = parse_query(event.resolved_query_string_parameters, CHALLENGE_QUERY_KEY, expected_single_value=True, allow_notfound=True)
if not challenge:
# challengeが無効
return protected_response(domain, request_path, "認証に失敗しました。もう一度お試しください。")
if not link.validate_challenge(nonce, challenge):
logger.info(f"Invalid challenge for domain: {domain}, slug: {request_path}")
nonce_model.mark_used() # not successでもok
Expand Down