Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-10 21:00:36 +01:00
Code Issues Projects Releases Wiki Activity

Move signatures to different record to be used in command context

Browse Source
This commit is contained in:
Noel Németh 2022-06-12 15:33:10 +02:00
parent 0a68dacccc
commit e77050936f
2 changed files with 78 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/net/minestom/server/command/ArgumentsSignature.java Normal file
View File

@ -0,0 +1,73 @@
package net.minestom.server.command;
import net.minestom.server.command.builder.arguments.Argument;
import net.minestom.server.command.builder.arguments.minecraft.SignableArgument;
import net.minestom.server.crypto.MessageSignature;
import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter;
import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.time.Instant;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public record ArgumentsSignature(long timestamp, long salt, Map<String, byte[]> signatures, boolean signedPreview)
implements Writeable {
public ArgumentsSignature(long timestamp, long salt, Map<String, byte[]> signatures, boolean signedPreview) {
this.timestamp = timestamp;
this.salt = salt;
this.signatures = Map.copyOf(signatures);
this.signedPreview = signedPreview;
}
public ArgumentsSignature(BinaryReader reader) {
this(reader.readLong(), reader.readLong(), readSignature(reader), reader.readBoolean());
}
/**
* Constructs a new {@link MessageSignature} to use in validation
*
* @param signer player's uuid who sent this packet
* @return null if the client didn't sign the parameter
*/
@Contract("_, _ -> new")
public @Nullable MessageSignature signatureOf(String parameterName, UUID signer) {
final byte[] signature = signatures.get(parameterName);
return signature == null ? null : new MessageSignature(signer, Instant.ofEpochMilli(timestamp), salt, signature);
}
/**
* @see #signatureOf(String, UUID)
*/
@SuppressWarnings("ConstantConditions")
@Contract("_, _ -> new")
public <T extends Argument<?> & SignableArgument> @Nullable MessageSignature signatureOf(T argument, UUID signer) {
return signatureOf(argument.getId(), signer);
}
private static Map<String, byte[]> readSignature(BinaryReader reader) {
final int length = reader.readVarInt();
Map<String, byte[]> signatures = new HashMap<>();
for (int i = 0; i < length; i++) {
final String s = reader.readSizedString(256);
final byte[] bytes = reader.readByteArray();
signatures.put(s, bytes);
}
return Map.copyOf(signatures);
}
@Override
public void write(@NotNull BinaryWriter writer) {
writer.writeLong(timestamp);
writer.writeLong(salt);
this.signatures.forEach((s, bytes) -> {
writer.writeSizedString(s);
writer.writeByteArray(bytes);
});
writer.writeBoolean(signedPreview);
}
}

62
src/main/java/net/minestom/server/network/packet/client/play/ClientCommandChatPacket.java
View File

@ -1,73 +1,21 @@
package net.minestom.server.network.packet.client.play;
import net.minestom.server.command.builder.arguments.Argument;
import net.minestom.server.command.builder.arguments.minecraft.SignableArgument;
import net.minestom.server.crypto.MessageSignature;
import net.minestom.server.command.ArgumentsSignature;
import net.minestom.server.network.packet.client.ClientPacket;
import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.time.Instant;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public record ClientCommandChatPacket(@NotNull String message, long timestamp,
long salt, Map<String, byte[]> signatures,
boolean signedPreview) implements ClientPacket {
public ClientCommandChatPacket {
signatures = Map.copyOf(signatures);
}
public record ClientCommandChatPacket(@NotNull String message, @NotNull ArgumentsSignature argumentsSignature)
implements ClientPacket {
public ClientCommandChatPacket(BinaryReader reader) {
this(reader.readSizedString(256), reader.readLong(),
reader.readLong(), readSignature(reader), reader.readBoolean());
}
/**
* Constructs a new {@link MessageSignature} to use in validation
*
* @param signer player's uuid who sent this packet
* @return null if the client didn't sign the parameter
*/
@Contract("_, _ -> new")
public @Nullable MessageSignature signatureOf(String parameterName, UUID signer) {
final byte[] signature = signatures.get(parameterName);
return signature == null ? null : new MessageSignature(signer, Instant.ofEpochMilli(timestamp), salt, signature);
}
/**
* @see #signatureOf(String, UUID)
*/
@SuppressWarnings("ConstantConditions")
@Contract("_, _ -> new")
public <T extends Argument<?> & SignableArgument> @Nullable MessageSignature signatureOf(T argument, UUID signer) {
return signatureOf(argument.getId(), signer);
this(reader.readSizedString(256), new ArgumentsSignature(reader));
}
@Override
public void write(@NotNull BinaryWriter writer) {
writer.writeSizedString(message);
writer.writeLong(timestamp);
writer.writeLong(salt);
this.signatures.forEach((s, bytes) -> {
writer.writeSizedString(s);
writer.writeByteArray(bytes);
});
writer.writeBoolean(signedPreview);
writer.write(argumentsSignature);
}
private static Map<String, byte[]> readSignature(BinaryReader reader) {
final int length = reader.readVarInt();
Map<String, byte[]> signatures = new HashMap<>();
for (int i = 0; i < length; i++) {
final String s = reader.readSizedString(256);
final byte[] bytes = reader.readByteArray();
signatures.put(s, bytes);
}
return Map.copyOf(signatures);
}
}