Volume property page - access control update

3 files changed, 70 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index baa3edb9..daa96cd4 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -49,7 +49,7 @@ public class Volume extends Entity {
 		GLUSTERFS, NFS
 	};
 
-	private static final String OPTION_AUTH_ALLOW = "auth.allow:";
+	private static final String OPTION_AUTH_ALLOW = "auth.allow";
 
 	private static final String[] VOLUME_TYPE_STR = new String[] { "Plain Distribute", "Distributed Mirror",
 			"Distributed Stripe" };
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java
index d1533f25..fb7261ed 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java
@@ -324,7 +324,7 @@ public class GlusterUtil {
 			String volumeName = extractToken(line, VOLUME_NAME_PFX);
 			if (volumeName != null) {
 				if (volume != null) {
-					// add the previously read volume to volume list
+					
 					volumes.add(volume);
 				}
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
new file mode 100644
index 00000000..76dc748e
--- /dev/null
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
@@ -0,0 +1,68 @@
+package com.gluster.storage.management.core.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ValidationUtil {
+
+	// Access control may contains IP with wild card(*), hostname and/or multiple ip/hostnames
+	public static boolean isValidAccessControl(String ac) {
+		String access[] = ac.split(",");
+		boolean isValidAccessControl = true;
+		for (int i = 0; i < access.length && isValidAccessControl; i++) {
+			isValidAccessControl = (isValidIpWithWC(access[i]) || isValidHostName(access[i]));
+		}
+		return isValidAccessControl;
+	}
+
+	public static boolean isValidIpWithWC(String ip) {
+		String ipAddress[] = ip.split("\\.");
+		boolean isValid = true;
+
+		if (ip.equals("0.0.0.0") || ip.equals("255.255.255.255")) { // Invalidate the special ip's
+			isValid = false;
+		}
+
+		for (int i = 0; i < ipAddress.length && isValid; i++) {
+			if (ipAddress[i].equals("*")) {
+				isValid = (i == ipAddress.length - 1) ? isValid : false;
+			} else {
+				isValid = isValidIpQuad(ipAddress[i]);
+			}
+		}
+		return isValid;
+	}
+
+	public static boolean isValidIp(String ip) {
+		String ipAddress[] = ip.split("\\.");
+		boolean isValid = true;
+
+		if (ip.equals("0.0.0.0") || ip.equals("255.255.255.255")) { // Invalidate the special ip's
+			isValid = false;
+		}
+
+		for (int i = 0; i < ipAddress.length && isValid; i++) {
+			isValid = isValidIpQuad(ipAddress[i]);
+		}
+		return isValid;
+	}
+
+	public static boolean isValidIpQuad(String ipQuad) {
+		Pattern pattern = Pattern.compile("([01]?\\d\\d?|2[0-4]\\d|25[0-5])");
+		return pattern.matcher(ipQuad).matches();
+	}
+
+	public static boolean isValidHostName(String hostName) {
+		Pattern pattern = Pattern
+				.compile("^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])$");
+		return pattern.matcher(hostName).matches();
+	}
+
+	public static void main(String[] argv) {
+		String ip = "0.0.0.0";
+		System.out.println("Is valid ip (" + ip + ")? " + isValidIp(ip));
+		String hostName = "Selvam-sd.com";
+		System.out.println(isValidHostName(hostName));
+	}
+
+}