Skip to content

Store iat in AuthData for later retrieval #5884

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
onebeastchris merged 1 commit into from
Oct 8, 2025
Merged

Store iat in AuthData for later retrieval #5884

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: 9 additions & 1 deletion core/src/main/java/org/geysermc/geyser/session/auth/AuthData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,13 @@

import java.util.UUID;

public record AuthData(String name, UUID uuid, String xuid) {
/**
* A class holding some basic information of the connected user.
*
* @param name The gamertag of the user
* @param uuid Also known as identity
* @param xuid The xuid of the user
* @param issuedAt The unix time (in seconds) that the JWT was issued
*/
public record AuthData(String name, UUID uuid, String xuid, long issuedAt) {
}
6 changes: 5 additions & 1 deletion core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,13 @@ private static void encryptConnectionWithCert(GeyserSession session, AuthPayload
return;
}

// Should always be present, but hey, why not make it safe :D
Long rawIssuedAt = (Long) result.rawIdentityClaims().get("iat");
long issuedAt = rawIssuedAt != null ? rawIssuedAt : -1;

IdentityData extraData = result.identityClaims().extraData;
// TODO!!! identity won't persist
session.setAuthData(new AuthData(extraData.displayName, extraData.identity, extraData.xuid));
session.setAuthData(new AuthData(extraData.displayName, extraData.identity, extraData.xuid, issuedAt));
if (authPayload instanceof CertificateChainPayload certificateChainPayload) {
session.setCertChainData(certificateChainPayload.getChain());
} else {
Expand Down