GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Initial changes

This commit is contained in:
Tim203 2021-11-30 00:33:53 +01:00
parent eb7d71017c
commit c0d605dd77
No known key found for this signature in database
GPG Key ID: 064EE9F5BF7C3EE8
3 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/geysermc/floodgate/crypto/AesCipher.java
View File

@ -91,7 +91,7 @@ public final class AesCipher implements FloodgateCipher {
if (topping != null) {
int mark = buffer.position();
// we need the first index, the second is for the optional RawSkin
// we need the first index, the second is for the actual data
boolean found = false;
while (buffer.hasRemaining() && !found) {
if (buffer.get() == 0x21) {

19
common/src/main/java/org/geysermc/floodgate/crypto/FloodgateCipher.java
View File

@ -130,25 +130,18 @@ public interface FloodgateCipher {
final int identifierLength = IDENTIFIER.length;
if (data.length <= HEADER_LENGTH) {
throw new InvalidFormatException("Data length is smaller then header." +
"Needed " + HEADER_LENGTH + ", got " + data.length,
true
throw new InvalidFormatException(
"Data length is smaller then header." +
"Needed " + HEADER_LENGTH + ", got " + data.length
);
}
for (int i = 0; i < identifierLength; i++) {
if (IDENTIFIER[i] != data[i]) {
StringBuilder receivedIdentifier = new StringBuilder();
for (byte b : IDENTIFIER) {
receivedIdentifier.append(b);
}
String identifier = new String(IDENTIFIER, StandardCharsets.UTF_8);
String received = new String(data, 0, IDENTIFIER.length, StandardCharsets.UTF_8);
throw new InvalidFormatException(
String.format("Expected identifier %s, got %s",
new String(IDENTIFIER, StandardCharsets.UTF_8),
receivedIdentifier.toString()
),
true
"Expected identifier " + identifier + ", got " + received
);
}
}

18
common/src/main/java/org/geysermc/floodgate/util/InvalidFormatException.java
View File

@ -26,26 +26,8 @@
package org.geysermc.floodgate.util;
import lombok.Getter;
@Getter
public class InvalidFormatException extends Exception {
private boolean header = false;
public InvalidFormatException() {
super();
}
public InvalidFormatException(String message) {
super(message);
}
public InvalidFormatException(String message, boolean header) {
super(message);
this.header = header;
}
public InvalidFormatException(String message, Throwable cause) {
super(message, cause);
}
}