Skip to content

Extend password-set token TTL to 60 days #100

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
Alexanderamiri merged 1 commit into from
Mar 26, 2026
Merged

Extend password-set token TTL to 60 days #100

Show file tree
Hide file tree
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
10 changes: 3 additions & 7 deletions terraform/lambda-src/password_set/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
TEAM_PROVISIONER_FUNCTION = os.environ.get(
"TEAM_PROVISIONER_FUNCTION", "javabin-team-provisioner"
)
PASSWORD_TOKEN_TTL = 48 * 3600 # 48 hours
PASSWORD_TOKEN_TTL = 60 * 86400 # 60 days — single-use via DynamoDB

_secret_cache = {}

Expand Down Expand Up @@ -106,11 +106,7 @@ def _validate_token(token):
except Exception:
return None, "Invalid token payload"

# Check expiry
if time.time() > payload.get("exp", 0):
return None, "Token has expired"

# Check single-use via DynamoDB
# Check single-use via DynamoDB (no time-based expiry — tokens are one-time use only)
jti = payload.get("jti", "")
dedup_key = f"pwset:{jti}"
try:
Expand All @@ -129,7 +125,7 @@ def _mark_token_used(jti):
_dedup_table().put_item(Item={
"finding_key": f"pwset:{jti}",
"used_at": int(time.time()),
"expires_at": int(time.time()) + (30 * 86400),
"expires_at": int(time.time()) + (60 * 86400), # Match token lifetime
})
except Exception as e:
logger.warning("Failed to mark token used: %s", e)
Expand Down
4 changes: 2 additions & 2 deletions terraform/lambda-src/team_provisioner/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def _send_welcome_email(access_token, javabin_email, personal_email, firstname,
if password_set_url:
password_section = f"""\
<p style="color:#333;font-size:16px;line-height:1.6;">
Klikk p\u00e5 knappen under for \u00e5 sette passordet ditt. Lenken er gyldig i 48 timer.
Klikk p\u00e5 knappen under for \u00e5 sette passordet ditt. Lenken kan kun brukes \u00e9n gang.
</p>
<table cellpadding="0" cellspacing="0" style="margin:24px 0;">
<tr><td align="center" style="background-color:#f05350;border-radius:6px;">
Expand Down Expand Up @@ -1516,7 +1516,7 @@ def _generate_password_set_url(email):
signing_key = _get_ssm_param(SIGNING_KEY_PARAM)
payload = json.dumps({
"email": email,
"exp": int(time.time()) + 48 * 3600, # 48 hours
"exp": int(time.time()) + 60 * 86400, # 60 days — single-use
"jti": str(uuid.uuid4()),
})
payload_b64 = _b64url(payload)
Expand Down