ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: hide secret properties on log

pull/761/head
pabloFuente 2022-11-11 13:37:45 +01:00
parent 286891c6fc
commit 8aad8948bf
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
View File

@ -340,6 +340,9 @@ public class OpenViduServer implements JsonRpcConfigurer {
for (String property : configPropNames) { for (String property : configPropNames) {
String value = CONFIG_PROPS.get(property); String value = CONFIG_PROPS.get(property);
if (config.getSecretProperties().contains(property)) {
value = config.hideSecret(value, "*", 0);
}
msg += " * " + config.getPropertyName(property) + "=" + (value == null ? "" : value) + "\n"; msg += " * " + config.getPropertyName(property) + "=" + (value == null ? "" : value) + "\n";
} }
msg += "\n\n"; msg += "\n\n";

13
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -115,6 +115,8 @@ public class OpenviduConfig {
private List<String> userConfigProps; private List<String> userConfigProps;
protected final Set<String> secretProps = new HashSet<>(Arrays.asList("OPENVIDU_SECRET"));
protected Map<String, ?> propertiesSource; protected Map<String, ?> propertiesSource;
public static final String DEFAULT_RECORDING_IMAGE_REPO = "openvidu/openvidu-recording"; public static final String DEFAULT_RECORDING_IMAGE_REPO = "openvidu/openvidu-recording";
@ -487,6 +489,10 @@ public class OpenviduConfig {
public Map<String, String> getConfigProps() { public Map<String, String> getConfigProps() {
return configProps; return configProps;
} }
public Set<String> getSecretProperties() {
return secretProps;
}
public List<String> getUserProperties() { public List<String> getUserProperties() {
return userConfigProps; return userConfigProps;
@ -1255,4 +1261,11 @@ public class OpenviduConfig {
return builder; return builder;
} }
public String hideSecret(final String originalString, String charToReplace, int numberOfVisibleChars) {
String hiddenString = originalString.substring(originalString.length() - numberOfVisibleChars,
originalString.length());
hiddenString = charToReplace.repeat(originalString.length() - numberOfVisibleChars) + hiddenString;
return hiddenString;
}
} }

7
openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java
View File

@ -152,11 +152,4 @@ public class ConfigRestController {
return new ResponseEntity<>(json.toString(), RestUtils.getResponseHeaders(), HttpStatus.OK); return new ResponseEntity<>(json.toString(), RestUtils.getResponseHeaders(), HttpStatus.OK);
} }
protected String hideSecret(final String originalString, String charToReplace, int numberOfVisibleChars) {
String hiddenString = originalString.substring(originalString.length() - numberOfVisibleChars,
originalString.length());
hiddenString = charToReplace.repeat(originalString.length() - numberOfVisibleChars) + hiddenString;
return hiddenString;
}
} }

29
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java
View File

@ -742,10 +742,10 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
} }
@Test @Test
@DisplayName("Speech To Text disabled test") @DisplayName("Service disabled STT test")
void speechToTextDisabledTest() throws Exception { void serviceDisabledSttTest() throws Exception {
log.info("Speech To Text disabled test"); log.info("Service disabled STT test");
restartOpenViduServerIfNecessary(false, null, "disabled"); restartOpenViduServerIfNecessary(false, null, "disabled");
@ -776,10 +776,10 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
} }
@Test @Test
@DisplayName("Speech To Text simple transcription test") @DisplayName("Simple transcription STT test")
void speechToTextSimpleTranscriptionTest() throws Exception { void simpleTranscriptionSttTest() throws Exception {
log.info("Speech To Text simple transcription test"); log.info("Simple transcription STT test");
restartOpenViduServerIfNecessary(false, null, "vosk"); restartOpenViduServerIfNecessary(false, null, "vosk");
@ -852,10 +852,10 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
} }
@Test @Test
@DisplayName("Speech To Text close session test") @DisplayName("Close session STT test")
void speechToTextCloseSessionTest() throws Exception { void closeSessionSttTest() throws Exception {
log.info("Speech To Text close session"); log.info("Close session STT test");
restartOpenViduServerIfNecessary(false, null, "vosk"); restartOpenViduServerIfNecessary(false, null, "vosk");
@ -907,10 +907,10 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
} }
@Test @Test
@DisplayName("Speech To Text expected errors test") @DisplayName("Expected errors STT test")
void speechToTextExpectedErrorsTest() throws Exception { void expectedErrorsSttTest() throws Exception {
log.info("Speech To Text expected errors"); log.info("Expected errors STT test");
restartOpenViduServerIfNecessary(false, null, "vosk"); restartOpenViduServerIfNecessary(false, null, "vosk");
@ -1541,7 +1541,10 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
protected void restartOpenViduServerIfNecessary(Boolean wantedNetworkQuality, Integer wantedNetworkQualityInterval, protected void restartOpenViduServerIfNecessary(Boolean wantedNetworkQuality, Integer wantedNetworkQualityInterval,
String wantedSpeechToText) { String wantedSpeechToText) {
try {
wantedSpeechToText = "azure";
try {
CustomHttpClient restClient = new CustomHttpClient(OPENVIDU_URL, "OPENVIDUAPP", OPENVIDU_SECRET); CustomHttpClient restClient = new CustomHttpClient(OPENVIDU_URL, "OPENVIDUAPP", OPENVIDU_SECRET);
JsonObject config = restClient.rest(HttpMethod.GET, "/openvidu/api/config", 200); JsonObject config = restClient.rest(HttpMethod.GET, "/openvidu/api/config", 200);