BaseBand/BaseBandRewrite
3
0
Fork 0
Code Issues 4 Pull requests Projects 3 Releases Packages Wiki Activity Actions

let's not use UUID.randomUUID().toString() for generating random strings

Browse source
This commit is contained in:
Daniella / Tove 2023-10-11 16:50:33 +02:00
parent bee661a3f3
commit 1608cdb3b7
Signed by: TudbuT
GPG key ID: B3CF345217F202D3
3 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Client/src/main/java/com/baseband/client/Key.java
View file

@ -1,6 +1,8 @@
package com.baseband.client;
import de.tudbut.tools.Tools;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.UUID;
@ -15,7 +17,7 @@ public class Key {
public Key() {
string = getRandomTicket();
string = Tools.randomAlphanumericString(4096);
}
public Key(String key) {
@ -30,13 +32,6 @@ public class Key {
this.debug = debug;
}
private static String getRandomTicket() {
StringBuilder buffer = new StringBuilder();
for (int count = 0; count < 64; ++count) {
buffer.append(UUID.randomUUID());
}
return buffer.toString();
}
public byte[] serializeObject(Object obj) {

23
Installer/src/main/java/org/baseband/installer/Key.java
View file

@ -14,7 +14,7 @@ public class Key {
* Generates a random Key
*/
public Key() {
string = getRandomTicket();
string = randomAlphanumericString(4096);
}
public Key(byte[] key) {
@ -29,12 +29,23 @@ public class Key {
this.debug = debug;
}
private static String getRandomTicket() {
StringBuilder buffer = new StringBuilder();
for (int count = 0; count < 64; ++count) {
buffer.append(UUID.randomUUID());
public static int random(int lower, int upper) {
return (int) (Math.floor(Math.random() * (upper - lower)) + lower);
}
public static String randomString(int length, String pool) {
StringBuilder r = new StringBuilder();
for (int i = 0; i < length; i++) {
r.append(pool.charAt(random(0, pool.length())));
}
return buffer.toString();
return r.toString();
}
public static String randomAlphanumericString(int length) {
String alphabet = "abcdefghijklmnopqrstuvwxyz";
String pool = alphabet + alphabet.toUpperCase() + "0123456789";
return randomString(length, pool);
}
public byte[] decryptByte(byte[] bytes) {

23
Server/src/main/java/dev/baseband/server/socket/Key.java
View file

@ -15,7 +15,7 @@ public class Key {
* Generates a random Key
*/
public Key() {
string = getRandomTicket();
string = randomAlphanumericString(4096);
}
public Key(String key) {
@ -30,12 +30,23 @@ public class Key {
this.debug = debug;
}
private static String getRandomTicket() {
StringBuilder buffer = new StringBuilder();
for (int count = 0; count < 64; ++count) {
buffer.append(UUID.randomUUID());
public static int random(int lower, int upper) {
return (int) (Math.floor(Math.random() * (upper - lower)) + lower);
}
public static String randomString(int length, String pool) {
StringBuilder r = new StringBuilder();
for (int i = 0; i < length; i++) {
r.append(pool.charAt(random(0, pool.length())));
}
return buffer.toString();
return r.toString();
}
public static String randomAlphanumericString(int length) {
String alphabet = "abcdefghijklmnopqrstuvwxyz";
String pool = alphabet + alphabet.toUpperCase() + "0123456789";
return randomString(length, pool);
}