From 87e9fb308c099ed61473b79b2c3c028741f03778 Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Tue, 6 Jul 2021 21:31:18 +0200
Subject: [PATCH] openvidu-server: Refactor method to check valid IPv4 and IPv6
 parameters in OpenViduConfig.java

---
 .../server/config/OpenviduConfig.java         | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
index 5e017af7..736e8d3d 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
@@ -848,21 +848,7 @@ public class OpenviduConfig {
 
 	protected String asOptionalIPv4OrIPv6(String property) {
 		String ip = getValue(property);
-		if (ip != null && !ip.isEmpty()) {
-			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)");
-			}
-		}
+		isValidIp(property, ip);
 		return ip;
 	}
 
@@ -1045,7 +1031,7 @@ public class OpenviduConfig {
 		return mediaNodesPublicIps;
 	}
 
-	private void isValidIp(String propertyName, String ip) {
+	private void isValidIp(String property, String ip) {
 		if (ip != null && !ip.isEmpty()) {
 			boolean isIP;
 			try {
@@ -1058,7 +1044,7 @@ public class OpenviduConfig {
 				isIP = false;
 			}
 			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);
 			}
 		}
 	}