MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

feat: added VELOCITY_FORWARDING_SECRET environment variable (#582)

Browse Source
This commit is contained in:
Cubxity
2021-10-03 22:07:45 +02:00
committed by GitHub
parent 340e1b23d6
commit d619bb56fd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
View File

@@ -424,9 +424,10 @@ public class VelocityConfiguration implements ProxyConfig {
CommentedFileConfig defaultConfig = CommentedFileConfig.of(tmpFile, TomlFormat.instance());
defaultConfig.load();
// Handle any cases where the config needs to be saved again
// Retrieve the forwarding secret. First, from environment variable, then from config.
byte[] forwardingSecret;
String forwardingSecretString = config.get("forwarding-secret");
String forwardingSecretString = System.getenv()
.getOrDefault("VELOCITY_FORWARDING_SECRET", config.get("forwarding-secret"));
if (forwardingSecretString == null || forwardingSecretString.isEmpty()) {
forwardingSecretString = generateRandomString(12);
config.set("forwarding-secret", forwardingSecretString);
@@ -434,6 +435,7 @@ public class VelocityConfiguration implements ProxyConfig {
}
forwardingSecret = forwardingSecretString.getBytes(StandardCharsets.UTF_8);
// Handle any cases where the config needs to be saved again
if (mustResave) {
config.save();
}