Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-26 12:35:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up signature fixes

Browse Source
This commit is contained in:
FlorianMichael 2023-04-25 22:58:14 +02:00
parent 858cf17d54
commit 1abe14cdc2
4 changed files with 86 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/florianmichael/viafabricplus/definition/v1_19_0/storage/ChatSession1_19_0.java
View File

@ -34,11 +34,8 @@ import java.util.UUID;
public class ChatSession1_19_0 extends AbstractChatSession { public class ChatSession1_19_0 extends AbstractChatSession {
private final byte[] legacyKey; public ChatSession1_19_0(UserConnection user, ProfileKey profileKey, PrivateKey privateKey) {
public ChatSession1_19_0(UserConnection user, ProfileKey profileKey, PrivateKey privateKey, byte[] legacyKey) {
super(user, profileKey, privateKey); super(user, profileKey, privateKey);
this.legacyKey = legacyKey;
} }
public byte[] sign(final UUID sender, final MessageMetadataModel messageMetadata) { public byte[] sign(final UUID sender, final MessageMetadataModel messageMetadata) {
@ -54,8 +51,4 @@ public class ChatSession1_19_0 extends AbstractChatSession {
updater.update(JsonHelper.toSortedString(TextComponentSerializer.V1_18.serializeJson(new StringComponent(messageMetadata.plain()))).getBytes(StandardCharsets.UTF_8)); updater.update(JsonHelper.toSortedString(TextComponentSerializer.V1_18.serializeJson(new StringComponent(messageMetadata.plain()))).getBytes(StandardCharsets.UTF_8));
}); });
} }
public byte[] getLegacyKey() {
return legacyKey;
}
} }

6
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
View File

@ -97,7 +97,6 @@ public class MixinConnectScreen_1 {
final UserConnection userConnection = connection.channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); final UserConnection userConnection = connection.channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get();
if (userConnection == null) { if (userConnection == null) {
ViaFabricPlus.LOGGER.warn("ViaVersion userConnection is null");
return; return;
} }
final ComparableProtocolVersion targetVersion = ProtocolHack.getTargetVersion(connection.channel); final ComparableProtocolVersion targetVersion = ProtocolHack.getTargetVersion(connection.channel);
@ -120,14 +119,13 @@ public class MixinConnectScreen_1 {
final PlayerKeyPair playerKeyPair = MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().get().orElse(null); final PlayerKeyPair playerKeyPair = MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().get().orElse(null);
if (playerKeyPair != null) { if (playerKeyPair != null) {
final PlayerPublicKey.PublicKeyData publicKeyData = playerKeyPair.publicKey().data(); final PlayerPublicKey.PublicKeyData publicKeyData = playerKeyPair.publicKey().data();
final ProfileKey profileKey = new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), publicKeyData.keySignature());
userConnection.put(new ChatSession1_19_2(userConnection, profileKey, playerKeyPair.privateKey())); userConnection.put(new ChatSession1_19_2(userConnection, new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), publicKeyData.keySignature()), playerKeyPair.privateKey()));
if (targetVersion.isEqualTo(ProtocolVersion.v1_19)) { if (targetVersion.isEqualTo(ProtocolVersion.v1_19)) {
final byte[] legacyKey = ((IPublicKeyData) (Object) publicKeyData).viafabricplus_getV1Key().array(); final byte[] legacyKey = ((IPublicKeyData) (Object) publicKeyData).viafabricplus_getV1Key().array();
if (legacyKey != null) { if (legacyKey != null) {
userConnection.put(new ChatSession1_19_0(userConnection, profileKey, playerKeyPair.privateKey(), legacyKey)); userConnection.put(new ChatSession1_19_0(userConnection, new ProfileKey(publicKeyData.expiresAt().toEpochMilli(), publicKeyData.key().getEncoded(), legacyKey), playerKeyPair.privateKey()));
} else { } else {
ViaFabricPlus.LOGGER.warn("Mojang removed the legacy key"); ViaFabricPlus.LOGGER.warn("Mojang removed the legacy key");
} }

72
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_19_1to1_19/MixinProtocol1_19_1To1_19.java
View File

@ -49,22 +49,14 @@ public class MixinProtocol1_19_1To1_19 extends AbstractProtocol<ClientboundPacke
public void injectRegisterPackets(CallbackInfo ci) { public void injectRegisterPackets(CallbackInfo ci) {
this.registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketHandlers() { this.registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketHandlers() {
public void register() { public void register() {
this.map(Type.STRING); map(Type.STRING);
this.map(Type.OPTIONAL_PROFILE_KEY); read(Type.OPTIONAL_PROFILE_KEY);
handler(wrapper -> { handler(wrapper -> {
final ChatSession1_19_0 chatSession1190 = wrapper.user().get(ChatSession1_19_0.class); final ChatSession1_19_0 chatSession1190 = wrapper.user().get(ChatSession1_19_0.class);
if (chatSession1190 != null) {
final ProfileKey profileKey = wrapper.get(Type.OPTIONAL_PROFILE_KEY, 0); wrapper.write(Type.OPTIONAL_PROFILE_KEY, chatSession1190 == null ? null : chatSession1190.getProfileKey());
if (profileKey != null) {
wrapper.set(Type.OPTIONAL_PROFILE_KEY, 0, new ProfileKey(
profileKey.expiresAt(),
profileKey.publicKey(),
chatSession1190.getLegacyKey()
));
}
}
}); });
this.read(Type.OPTIONAL_UUID); read(Type.OPTIONAL_UUID);
} }
}, true); }, true);
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() { this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() {
@ -90,18 +82,7 @@ public class MixinProtocol1_19_1To1_19 extends AbstractProtocol<ClientboundPacke
final ChatSession1_19_0 chatSession1190 = wrapper.user().get(ChatSession1_19_0.class); final ChatSession1_19_0 chatSession1190 = wrapper.user().get(ChatSession1_19_0.class);
if (chatSession1190 != null) { if (chatSession1190 != null) {
if (sender == null) { wrapper.set(Type.BYTE_ARRAY_PRIMITIVE, 0, chatSession1190.sign(sender, new MessageMetadataModel(message, timestamp, salt)));
throw new IllegalStateException("ViaVersion didn't track the connected UUID correctly, please check your BaseProtocol1_7");
}
wrapper.set(Type.BYTE_ARRAY_PRIMITIVE, 0, chatSession1190.sign(
sender,
new MessageMetadataModel(
message,
timestamp,
salt
)
));
} }
}); });
map(Type.BOOLEAN); // Signed preview map(Type.BOOLEAN); // Signed preview
@ -125,42 +106,21 @@ public class MixinProtocol1_19_1To1_19 extends AbstractProtocol<ClientboundPacke
final long salt = wrapper.get(Type.LONG, 1); final long salt = wrapper.get(Type.LONG, 1);
final ChatSession1_19_0 chatSession1190 = wrapper.user().get(ChatSession1_19_0.class); final ChatSession1_19_0 chatSession1190 = wrapper.user().get(ChatSession1_19_0.class);
if (chatSession1190 != null) { final CommandArgumentsProvider commandArgumentsProvider = Via.getManager().getProviders().get(CommandArgumentsProvider.class);
if (sender == null) {
throw new IllegalStateException("ViaVersion didn't track the connected UUID correctly, please check your BaseProtocol1_7");
}
// Make sure we implemented the command signing if (chatSession1190 != null) {
final CommandArgumentsProvider commandArgumentsProvider = Via.getManager().getProviders().get(CommandArgumentsProvider.class);
if (commandArgumentsProvider != null) { if (commandArgumentsProvider != null) {
// Removing new signatures final int signatures = wrapper.get(Type.VAR_INT, 0);
{ for (int i = 0; i < signatures; i++) {
final int signatures = wrapper.get(Type.VAR_INT, 0); wrapper.read(Type.STRING); // Argument name
for (int i = 0; i < signatures; i++) { wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
wrapper.read(Type.STRING); // Argument name
wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
}
} }
// Signing arguments for (Pair<String, String> argument : commandArgumentsProvider.getSignedArguments(command)) {
{ final byte[] signature = chatSession1190.sign(sender, new MessageMetadataModel(argument.value(), timestamp, salt));
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (messagesStorage != null) {
for (Pair<String, String> argument : commandArgumentsProvider.getSignedArguments(command)) {
final byte[] signature = chatSession1190.sign(
sender,
new MessageMetadataModel(
argument.value(),
timestamp,
salt
)
);
wrapper.write(Type.STRING, argument.key());
wrapper.write(Type.STRING, argument.key()); wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
}
}
} }
} }
} }

272
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_19_3to1_19_1/MixinProtocol1_19_3To1_19_1.java
View File

@ -20,17 +20,12 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protoco
import com.google.common.primitives.Longs; import com.google.common.primitives.Longs;
import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.storage.NonceStorage; import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.storage.NonceStorage;
import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.AbstractProtocol;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.BitSetType; import com.viaversion.viaversion.api.type.types.BitSetType;
import com.viaversion.viaversion.api.type.types.ByteArrayType; import com.viaversion.viaversion.api.type.types.ByteArrayType;
import com.viaversion.viaversion.libs.gson.JsonElement;
import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1; import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
@ -63,9 +58,6 @@ public class MixinProtocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPac
@Unique @Unique
private final static BitSetType ACKNOWLEDGED_BIT_SET_TYPE = new BitSetType(20); private final static BitSetType ACKNOWLEDGED_BIT_SET_TYPE = new BitSetType(20);
@Unique
private final static UUID ZERO_UUID = new UUID(0, 0);
@Inject(method = "registerPackets", at = @At("RETURN")) @Inject(method = "registerPackets", at = @At("RETURN"))
public void fixKeys(CallbackInfo ci) { public void fixKeys(CallbackInfo ci) {
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() { this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() {
@ -80,106 +72,38 @@ public class MixinProtocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPac
this.registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketHandlers() { this.registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketHandlers() {
@Override @Override
public void register() { public void register() {
map(Type.STRING); map(Type.STRING); // Name
handler(wrapper -> { handler(wrapper -> {
final UUID uuid = wrapper.read(Type.OPTIONAL_UUID);
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class); final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
wrapper.write(Type.OPTIONAL_PROFILE_KEY, chatSession1192 != null ? chatSession1192.getProfileKey() : null); wrapper.write(Type.OPTIONAL_PROFILE_KEY, chatSession1192 != null ? chatSession1192.getProfileKey() : null); // Profile Key
wrapper.write(Type.OPTIONAL_UUID, uuid);
}); });
map(Type.OPTIONAL_UUID); // UUID
} }
}, true); }, true);
this.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketHandlers() { this.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketHandlers() {
@Override @Override
public void register() { public void register() {
map(Type.BYTE_ARRAY_PRIMITIVE); // Keys map(Type.BYTE_ARRAY_PRIMITIVE); // Keys
create(Type.BOOLEAN, true); // Is nonce
// Removing new nonce if chat session is connected
handler(wrapper -> { handler(wrapper -> {
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class); final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
final byte[] encryptedNonce = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
wrapper.write(Type.BOOLEAN, chatSession1192 == null);
if (chatSession1192 != null) { if (chatSession1192 != null) {
wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Encrypted Nonce final long salt = ChatSession1_19_2.SECURE_RANDOM.nextLong();
final byte[] signedNonce = chatSession1192.getSigner().sign(updater -> {
updater.update(wrapper.user().get(NonceStorage.class).nonce());
updater.update(Longs.toByteArray(salt));
});
wrapper.write(Type.LONG, salt);
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signedNonce);
} else {
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, encryptedNonce);
} }
}); });
// Writing original packet data if chat session is connected
handler(wrapper -> {
final NonceStorage nonceStorage = wrapper.user().get(NonceStorage.class);
if (nonceStorage != null) {
final byte[] nonce = nonceStorage.nonce();
if (nonce == null) {
throw new IllegalStateException("Didn't tracked the packet nonce???");
}
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
if (chatSession1192 != null) {
wrapper.set(Type.BOOLEAN, 0, false); // Now it's a nonce
final long salt = ChatSession1_19_2.SECURE_RANDOM.nextLong();
final byte[] signedNonce = chatSession1192.getSigner().sign(updater -> {
if (updater != null) {
updater.update(nonce);
updater.update(Longs.toByteArray(salt));
}
});
wrapper.write(Type.LONG, salt);
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signedNonce);
}
}
});
}
}, true);
this.registerClientbound(ClientboundPackets1_19_1.PLAYER_CHAT, ClientboundPackets1_19_3.DISGUISED_CHAT, new PacketHandlers() {
@Override
public void register() {
read(Type.OPTIONAL_BYTE_ARRAY_PRIMITIVE); // Previous signature
handler(wrapper -> {
final PlayerMessageSignature signature = wrapper.read(Type.PLAYER_MESSAGE_SIGNATURE);
// Store message signature for last seen
if (!signature.uuid().equals(ZERO_UUID) && signature.signatureBytes().length != 0) {
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (messagesStorage != null) {
messagesStorage.add(signature);
if (messagesStorage.tickUnacknowledged() > 64) {
messagesStorage.resetUnacknowledgedCount();
// Send chat acknowledgement
final PacketWrapper chatAckPacket = wrapper.create(ServerboundPackets1_19_1.CHAT_ACK);
chatAckPacket.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null);
chatAckPacket.sendToServer(Protocol1_19_3To1_19_1.class);
}
}
}
final String plainMessage = wrapper.read(Type.STRING);
JsonElement decoratedMessage = wrapper.read(Type.OPTIONAL_COMPONENT);
wrapper.read(Type.LONG); // Timestamp
wrapper.read(Type.LONG); // Salt
wrapper.read(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY); // Last seen
final JsonElement unsignedMessage = wrapper.read(Type.OPTIONAL_COMPONENT);
if (unsignedMessage != null) {
decoratedMessage = unsignedMessage;
}
if (decoratedMessage == null) {
decoratedMessage = GsonComponentSerializer.gson().serializeToTree(Component.text(plainMessage));
}
final int filterMaskType = wrapper.read(Type.VAR_INT);
if (filterMaskType == 2) { // Partially filtered
wrapper.read(Type.LONG_ARRAY_PRIMITIVE); // Mask
}
wrapper.write(Type.COMPONENT, decoratedMessage);
// Keep chat type at the end
});
} }
}, true); }, true);
@ -190,87 +114,53 @@ public class MixinProtocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPac
map(Type.LONG); // Timestamp map(Type.LONG); // Timestamp
map(Type.LONG); // Salt map(Type.LONG); // Salt
map(Type.VAR_INT); // Signatures map(Type.VAR_INT); // Signatures
// Signature removing if we have a chat session
handler(wrapper -> { handler(wrapper -> {
final int signatures = wrapper.get(Type.VAR_INT, 0); final int signatures = wrapper.get(Type.VAR_INT, 0);
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class); final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
if (chatSession1192 != null) { final CommandArgumentsProvider commandArgumentsProvider = Via.getManager().getProviders().get(CommandArgumentsProvider.class);
final CommandArgumentsProvider commandArgumentsProvider = Via.getManager().getProviders().get(CommandArgumentsProvider.class);
if (commandArgumentsProvider != null) { final boolean signingEnabled = chatSession1192 != null && commandArgumentsProvider != null;
for (int i = 0; i < signatures; i++) {
wrapper.read(Type.STRING); // Argument name
wrapper.read(MESSAGE_SIGNATURE_BYTES_TYPE); // Signature
}
return;
}
}
for (int i = 0; i < signatures; i++) { for (int i = 0; i < signatures; i++) {
wrapper.passthrough(Type.STRING); // Argument name if (signingEnabled) {
wrapper.read(Type.STRING); // Argument name
wrapper.read(MESSAGE_SIGNATURE_BYTES_TYPE); // Signature
} else {
wrapper.passthrough(Type.STRING); // Argument name
// Signature // Signature
wrapper.read(MESSAGE_SIGNATURE_BYTES_TYPE); wrapper.read(MESSAGE_SIGNATURE_BYTES_TYPE);
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, new byte[0]); wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, new byte[0]);
}
} }
});
// Removing new acknowledgement
handler(wrapper -> {
wrapper.read(Type.VAR_INT); // Offset
wrapper.read(ACKNOWLEDGED_BIT_SET_TYPE); // Acknowledged
});
// Signing all arguments
handler(wrapper -> {
final UUID sender = wrapper.user().getProtocolInfo().getUuid();
final String command = wrapper.get(Type.STRING, 0);
final long timestamp = wrapper.get(Type.LONG, 0);
final long salt = wrapper.get(Type.LONG, 1);
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
if (chatSession1192 != null) { if (chatSession1192 != null) {
if (sender == null) { final UUID sender = wrapper.user().getProtocolInfo().getUuid();
throw new IllegalStateException("ViaVersion didn't track the connected UUID correctly, please check your BaseProtocol1_7"); final String command = wrapper.get(Type.STRING, 0);
} final long timestamp = wrapper.get(Type.LONG, 0);
final CommandArgumentsProvider commandArgumentsProvider = Via.getManager().getProviders().get(CommandArgumentsProvider.class); final long salt = wrapper.get(Type.LONG, 1);
if (commandArgumentsProvider != null) {
// Signing arguments
{
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (messagesStorage != null) {
for (Pair<String, String> argument : commandArgumentsProvider.getSignedArguments(command)) {
final byte[] signature = chatSession1192.sign(
sender,
new MessageMetadataModel(
argument.value(),
timestamp,
salt
),
messagesStorage.lastSignatures()
);
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
wrapper.write(Type.STRING, argument.key()); for (Pair<String, String> argument : commandArgumentsProvider.getSignedArguments(command)) {
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature); final byte[] signature = chatSession1192.sign(sender, new MessageMetadataModel(argument.value(), timestamp, salt), messagesStorage.lastSignatures());
}
} wrapper.write(Type.STRING, argument.key());
} wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
} }
} }
wrapper.write(Type.BOOLEAN, false); // No signed preview wrapper.write(Type.BOOLEAN, false); // No signed preview
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
messagesStorage.resetUnacknowledgedCount();
wrapper.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null);
}); });
// Adding old acknowledgement read(Type.VAR_INT); // Offset
handler(wrapper -> { read(ACKNOWLEDGED_BIT_SET_TYPE); // Acknowledged
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (messagesStorage != null) {
messagesStorage.resetUnacknowledgedCount();
wrapper.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null);
}
});
} }
}, true); }, true);
registerServerbound(ServerboundPackets1_19_3.CHAT_MESSAGE, ServerboundPackets1_19_1.CHAT_MESSAGE, new PacketHandlers() { registerServerbound(ServerboundPackets1_19_3.CHAT_MESSAGE, ServerboundPackets1_19_1.CHAT_MESSAGE, new PacketHandlers() {
@ -279,61 +169,33 @@ public class MixinProtocol1_19_3To1_19_1 extends AbstractProtocol<ClientboundPac
map(Type.STRING); // Command map(Type.STRING); // Command
map(Type.LONG); // Timestamp map(Type.LONG); // Timestamp
map(Type.LONG); // Salt map(Type.LONG); // Salt
read(OPTIONAL_MESSAGE_SIGNATURE_BYTES_TYPE); // Signature
handler(wrapper -> { handler(wrapper -> {
wrapper.read(OPTIONAL_MESSAGE_SIGNATURE_BYTES_TYPE); // Signature
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class); final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
if (chatSession1192 == null) { final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (chatSession1192 != null) {
final UUID sender = wrapper.user().getProtocolInfo().getUuid();
final String message = wrapper.get(Type.STRING, 0);
final long timestamp = wrapper.get(Type.LONG, 0);
final long salt = wrapper.get(Type.LONG, 1);
final byte[] signature = chatSession1192.sign(sender, new MessageMetadataModel(message, +timestamp, salt), messagesStorage.lastSignatures());
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
wrapper.write(Type.BOOLEAN, false); // Signed Preview - not implemented yet, but I could do it
} else {
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, new byte[0]); // Signature wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, new byte[0]); // Signature
wrapper.write(Type.BOOLEAN, false); // No signed preview wrapper.write(Type.BOOLEAN, false); // No signed preview
} }
messagesStorage.resetUnacknowledgedCount();
wrapper.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null);
}); });
// Emulate old Message chain read(Type.VAR_INT); // Offset
handler(wrapper -> { read(ACKNOWLEDGED_BIT_SET_TYPE); // Acknowledged
final UUID sender = wrapper.user().getProtocolInfo().getUuid();
final String message = wrapper.get(Type.STRING, 0);
final long timestamp = wrapper.get(Type.LONG, 0);
final long salt = wrapper.get(Type.LONG, 1);
final ChatSession1_19_2 chatSession1192 = wrapper.user().get(ChatSession1_19_2.class);
if (chatSession1192 != null) {
if (sender == null) {
throw new IllegalStateException("ViaVersion didn't track the connected UUID correctly, please check your BaseProtocol1_7");
}
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (messagesStorage != null) {
final byte[] signature = chatSession1192.sign(
sender,
new MessageMetadataModel(
message,
timestamp,
salt
),
messagesStorage.lastSignatures()
);
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
wrapper.write(Type.BOOLEAN, false); // Signed Preview - not implemented yet, but I could do it
}
}
});
// Removing new acknowledgement
handler(wrapper -> {
wrapper.read(Type.VAR_INT); // Offset
wrapper.read(ACKNOWLEDGED_BIT_SET_TYPE); // Acknowledged
});
// Adding old acknowledgement
handler(wrapper -> {
final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
if (messagesStorage != null) {
messagesStorage.resetUnacknowledgedCount();
wrapper.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null);
}
});
} }
}, true); }, true);
} }