Skip to content

Fixed a preauth validation issue #640

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
coheigea merged 1 commit into from
Mar 20, 2026
+15 −16
Merged

Fixed a preauth validation issue #640

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
4 changes: 2 additions & 2 deletions ...erb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public void provideEdata(KdcRequest kdcRequest, PaData outPaData) throws KrbExce
preauth.provideEdata(kdcRequest, requestContext, outPaData);
}

public void verify(KdcRequest kdcRequest, PaDataEntry paData) throws KrbException {
preauth.verify(kdcRequest, requestContext, paData);
public boolean verify(KdcRequest kdcRequest, PaDataEntry paData) throws KrbException {
return preauth.verify(kdcRequest, requestContext, paData);
}

public void providePaData(KdcRequest kdcRequest, PaData paData) {
Expand Down
7 changes: 4 additions & 3 deletions ...rb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,14 @@ public void provideEdata(KdcRequest kdcRequest, PaData outPaData) throws KrbExce
}
}

public void verify(KdcRequest kdcRequest, PaData paData) throws KrbException {
public boolean verify(KdcRequest kdcRequest, PaData paData) throws KrbException {
for (PaDataEntry paEntry : paData.getElements()) {
PreauthHandle handle = findHandle(kdcRequest, paEntry.getPaDataType());
if (handle != null) {
handle.verify(kdcRequest, paEntry);
if (handle != null && handle.verify(kdcRequest, paEntry)) {
return true;
}
}
return false;
}

public void providePaData(KdcRequest kdcRequest, PaData paData) {
Expand Down
20 changes: 9 additions & 11 deletions ...b/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,18 +678,16 @@ protected void preauth() throws KrbException {
}

PaData preAuthData = request.getPaData();
if (preAuthData == null || preAuthData.isEmpty()) {
if (isPreauthRequired()) {
LOG.info("The preauth data is empty.");
KrbError krbError = makePreAuthenticationError(kdcContext, request,
KrbErrorCode.KDC_ERR_PREAUTH_REQUIRED, false);
throw new KdcRecoverableException(krbError);
}
} else {
getPreauthHandler().verify(this, preAuthData);
if (preAuthData != null && !preAuthData.isEmpty()) {
boolean preAuthenticated = getPreauthHandler().verify(this, preAuthData);
setPreAuthenticated(preAuthenticated);
}
if (isPreauthRequired() && !isPreAuthenticated()) {
LOG.info("The preauth verification failed.");
KrbError krbError = makePreAuthenticationError(kdcContext, request,
KrbErrorCode.KDC_ERR_PREAUTH_REQUIRED, false);
throw new KdcRecoverableException(krbError);
}

setPreAuthenticated(true);
}

/**
Expand Down
Loading