GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Make the identifier more unique

Browse source
This commit is contained in:
Tim203 2021-01-24 01:29:47 +01:00
parent ce2734d3b9
commit ad7ffabb6d
No known key found for this signature in database
GPG key ID: 064EE9F5BF7C3EE8
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
common/src/main/java/org/geysermc/floodgate/crypto/FloodgateCipher.java
View file

@ -37,9 +37,24 @@ import java.security.Key;
* Responsible for both encrypting and decrypting data * Responsible for both encrypting and decrypting data
*/ */
public interface FloodgateCipher { public interface FloodgateCipher {
byte[] IDENTIFIER = "Floodgate".getBytes(StandardCharsets.UTF_8); // use invalid username characters at the beginning and the end of the identifier,
// to make sure that it doesn't get messed up with usernames
byte[] IDENTIFIER = "^Floodgate^".getBytes(StandardCharsets.UTF_8);
int HEADER_LENGTH = IDENTIFIER.length; int HEADER_LENGTH = IDENTIFIER.length;
static boolean hasHeader(String data) {
if (data.length() < IDENTIFIER.length) {
return false;
}
for (int i = 0; i < IDENTIFIER.length; i++) {
if (IDENTIFIER[i] != data.charAt(i)) {
return false;
}
}
return true;
}
/** /**
* Initializes the instance by giving it the key it needs to encrypt or decrypt data * Initializes the instance by giving it the key it needs to encrypt or decrypt data
* *
@ -57,8 +72,7 @@ public interface FloodgateCipher {
byte[] encrypt(byte[] data) throws Exception; byte[] encrypt(byte[] data) throws Exception;
/** /**
* Encrypts data from a String.<br> * Encrypts data from a String.<br> This method internally calls {@link #encrypt(byte[])}
* This method internally calls {@link #encrypt(byte[])}
* *
* @param data the data to encrypt * @param data the data to encrypt
* @return the encrypted data * @return the encrypted data
@ -78,9 +92,8 @@ public interface FloodgateCipher {
byte[] decrypt(byte[] data) throws Exception; byte[] decrypt(byte[] data) throws Exception;
/** /**
* Decrypts a byte[] and turn it into a String.<br> * Decrypts a byte[] and turn it into a String.<br> This method internally calls {@link
* This method internally calls {@link #decrypt(byte[])} * #decrypt(byte[])} and converts the returned byte[] into a String.
* and converts the returned byte[] into a String.
* *
* @param data the data to encrypt * @param data the data to encrypt
* @return the decrypted data in a UTF-8 String * @return the decrypted data in a UTF-8 String
@ -95,9 +108,8 @@ public interface FloodgateCipher {
} }
/** /**
* Decrypts a String.<br> * Decrypts a String.<br> This method internally calls {@link #decrypt(byte[])} by converting
* This method internally calls {@link #decrypt(byte[])} * the UTF-8 String into a byte[]
* by converting the UTF-8 String into a byte[]
* *
* @param data the data to decrypt * @param data the data to decrypt
* @return the decrypted data in a byte[] * @return the decrypted data in a byte[]
@ -108,8 +120,8 @@ public interface FloodgateCipher {
} }
/** /**
* Checks if the header is valid. * Checks if the header is valid. This method will throw an InvalidFormatException when the
* This method will throw an InvalidFormatException when the header is invalid. * header is invalid.
* *
* @param data the data to check * @param data the data to check
* @throws InvalidFormatException when the header is invalid * @throws InvalidFormatException when the header is invalid
@ -142,19 +154,6 @@ public interface FloodgateCipher {
} }
} }
static boolean hasHeader(String data) {
if (data.length() < IDENTIFIER.length) {
return false;
}
for (int i = 0; i < IDENTIFIER.length; i++) {
if (IDENTIFIER[i] != data.charAt(i)) {
return false;
}
}
return true;
}
@Data @Data
@AllArgsConstructor @AllArgsConstructor
class HeaderResult { class HeaderResult {