Skip to content

fix(core): scope Bedrock principal admission to Bedrock #138

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
minekube-ai-engineer merged 1 commit into from
Aug 9, 2026
Merged

fix(core): scope Bedrock principal admission to Bedrock #138

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
6 changes: 6 additions & 0 deletions core/src/main/java/com/minekube/connect/bedrock/BedrockPrincipalConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public Optional<VerifiedBedrockPrincipal> verify(Session session) {
if (hasInjectedProperty(session)) {
throw new BedrockPrincipalAdmissionException(PrincipalError.BINDING_MISMATCH);
}
// Bedrock v2 enforcement is protocol-scoped. Java and legacy unmarked sessions do not
// carry a Bedrock principal envelope and must continue through ordinary admission.
if (session.getProtocol() != SessionProtocol.SESSION_PROTOCOL_BEDROCK
&& session.getSignedBedrockPrincipalV2().isEmpty()) {
return Optional.empty();
}
ConnectConfig currentConfig;
BedrockPrincipalConfiguration principalConfiguration;
try {
Expand Down
59 changes: 58 additions & 1 deletion core/src/test/java/com/minekube/connect/bedrock/BedrockPrincipalConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.protobuf.ByteString;
import com.minekube.connect.api.player.bedrock.BedrockIdentityProfiles;
import com.minekube.connect.api.player.principal.PrincipalError;
import com.minekube.connect.config.ConnectConfig;
import java.io.InputStreamReader;
Expand All @@ -21,6 +22,7 @@
import java.util.UUID;
import minekube.connect.v1alpha1.WatchServiceOuterClass.Authentication;
import minekube.connect.v1alpha1.WatchServiceOuterClass.GameProfile;
import minekube.connect.v1alpha1.WatchServiceOuterClass.GameProfileProperty;
import minekube.connect.v1alpha1.WatchServiceOuterClass.Player;
import minekube.connect.v1alpha1.WatchServiceOuterClass.Session;
import minekube.connect.v1alpha1.WatchServiceOuterClass.SessionProtocol;
Expand Down Expand Up @@ -72,7 +74,7 @@ void malformedCompanionBindingFailsBeforeProfileApplication() throws Exception {
}

@Test
void requireModeRejectsSessionsMissingV2Principal() throws Exception {
void requireModeRejectsBedrockSessionsMissingV2Principal() throws Exception {
JsonObject vector = vector("valid-unlinked");
BedrockPrincipalAdmissionException error = assertThrows(
BedrockPrincipalAdmissionException.class,
Expand All @@ -81,6 +83,61 @@ void requireModeRejectsSessionsMissingV2Principal() throws Exception {
assertEquals(PrincipalError.READINESS, error.error());
}

@Test
void requireModeAllowsJavaSessionsWithoutV2Principal() throws Exception {
JsonObject vector = vector("valid-unlinked");
Session javaSession = session(vector).toBuilder()
.setProtocol(SessionProtocol.SESSION_PROTOCOL_JAVA)
.clearSignedBedrockPrincipalV2()
.build();

assertTrue(consumer(vector).verify(javaSession).isEmpty());
}

@Test
void requireModeAllowsLegacyUnmarkedSessionsWithoutV2Principal() throws Exception {
JsonObject vector = vector("valid-unlinked");
Session legacySession = session(vector).toBuilder()
.setProtocol(SessionProtocol.SESSION_PROTOCOL_UNSPECIFIED)
.clearSignedBedrockPrincipalV2()
.build();

assertTrue(consumer(vector).verify(legacySession).isEmpty());
}

@Test
void javaSessionsCannotCarryV2PrincipalEnvelopes() throws Exception {
JsonObject vector = vector("valid-unlinked");
Session javaSession = session(vector).toBuilder()
.setProtocol(SessionProtocol.SESSION_PROTOCOL_JAVA)
.build();

BedrockPrincipalAdmissionException error = assertThrows(
BedrockPrincipalAdmissionException.class,
() -> consumer(vector).verify(javaSession));
assertEquals(PrincipalError.BINDING_MISMATCH, error.error());
}

@Test
void javaSessionsCannotInjectReservedV2PrincipalProperties() throws Exception {
JsonObject vector = vector("valid-unlinked");
Session source = session(vector);
Session javaSession = source.toBuilder()
.setProtocol(SessionProtocol.SESSION_PROTOCOL_JAVA)
.clearSignedBedrockPrincipalV2()
.setPlayer(source.getPlayer().toBuilder()
.setProfile(source.getPlayer().getProfile().toBuilder()
.addProperties(GameProfileProperty.newBuilder()
.setName(BedrockIdentityProfiles.PRINCIPAL_V2_PROPERTY_NAME)
.setValue("forged"))))
.build();

BedrockPrincipalAdmissionException error = assertThrows(
BedrockPrincipalAdmissionException.class,
() -> consumer(vector).verify(javaSession));
assertEquals(PrincipalError.BINDING_MISMATCH, error.error());
}

@Test
void oversizedV2EnvelopeIsRejected() throws Exception {
JsonObject vector = vector("valid-unlinked");
Expand Down
Loading