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

openvidu-server: Refactor method to check valid IPv4 and IPv6 parameters in OpenViduConfig.java

pull/648/head
cruizba 2021-07-06 21:31:18 +02:00
parent 879a88299d
commit 87e9fb308c
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -848,21 +848,7 @@ public class OpenviduConfig {
protected String asOptionalIPv4OrIPv6(String property) { protected String asOptionalIPv4OrIPv6(String property) {
String ip = getValue(property); String ip = getValue(property);
if (ip != null && !ip.isEmpty()) { isValidIp(property, ip);
boolean isIP;
try {
final InetAddress inet = InetAddress.getByName(ip);
isIP = inet instanceof Inet4Address || inet instanceof Inet6Address;
if (isIP) {
ip = inet.getHostAddress();
}
} catch (final UnknownHostException e) {
isIP = false;
}
if (!isIP) {
addError(property, "Is not a valid IP Address (IPv4 or IPv6)");
}
}
return ip; return ip;
} }
@ -1045,7 +1031,7 @@ public class OpenviduConfig {
return mediaNodesPublicIps; return mediaNodesPublicIps;
} }
private void isValidIp(String propertyName, String ip) { private void isValidIp(String property, String ip) {
if (ip != null && !ip.isEmpty()) { if (ip != null && !ip.isEmpty()) {
boolean isIP; boolean isIP;
try { try {
@ -1058,7 +1044,7 @@ public class OpenviduConfig {
isIP = false; isIP = false;
} }
if (!isIP) { if (!isIP) {
addError(propertyName, "Is not a valid IP Address (IPv4 or IPv6): " + ip); addError(property, "Is not a valid IP Address (IPv4 or IPv6): " + ip);
} }
} }
} }