minecraft/LuckPerms
1
0
Fork 0
mirror of https://github.com/lucko/LuckPerms.git synced 2025-08-29 09:09:51 +02:00
Code Issues Releases Wiki Activity

Fix MongoDB uri showing in logs if set using system property (#3808)

Browse Source
This commit is contained in:
powercas_gamer
2024-01-06 12:31:59 +01:00
committed by GitHub
parent 0703b9856f
commit e6599a2662
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java
View File

@@ -755,4 +755,14 @@ public final class ConfigKeys {
return KEYS; return KEYS;
} }
/**
* Check if the value at the given path should be censored in console/log output
*
* @param path the path
* @return true if the value should be censored
*/
public static boolean shouldCensorValue(final String path) {
return path.contains("password") || path.contains("uri");
}
} }

4
common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java
View File

@@ -25,6 +25,7 @@
package me.lucko.luckperms.common.config.generic.adapter; package me.lucko.luckperms.common.config.generic.adapter;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@@ -50,7 +51,8 @@ public class EnvironmentVariableConfigAdapter extends StringBasedConfigurationAd
String value = System.getenv(key); String value = System.getenv(key);
if (value != null) { if (value != null) {
this.plugin.getLogger().info("Resolved configuration value from environment variable: " + key + " = " + (path.contains("password") ? "*****" : value)); String printableValue = ConfigKeys.shouldCensorValue(path) ? "*****" : value;
this.plugin.getLogger().info(String.format("Resolved configuration value from environment variable: %s = %s", key, printableValue));
} }
return value; return value;
} }

4
common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java
View File

@@ -25,6 +25,7 @@
package me.lucko.luckperms.common.config.generic.adapter; package me.lucko.luckperms.common.config.generic.adapter;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@@ -46,7 +47,8 @@ public class SystemPropertyConfigAdapter extends StringBasedConfigurationAdapter
String value = System.getProperty(key); String value = System.getProperty(key);
if (value != null) { if (value != null) {
this.plugin.getLogger().info("Resolved configuration value from system property: " + key + " = " + (path.contains("password") ? "*****" : value)); String printableValue = ConfigKeys.shouldCensorValue(path) ? "*****" : value;
this.plugin.getLogger().info(String.format("Resolved configuration value from system property: %s = %s", key, printableValue));
} }
return value; return value;
} }