You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2014/07/15 22:35:07 UTC
svn commit: r1610840 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src:
main/java/org/apache/hadoop/nfs/NfsExports.java
test/java/org/apache/hadoop/nfs/TestNfsExports.java
Author: brandonli
Date: Tue Jul 15 20:35:07 2014
New Revision: 1610840
URL: http://svn.apache.org/r1610840
Log:
HDFS-6456. NFS should throw error for invalid entry in dfs.nfs.exports.allowed.hosts. Contributed by Abhiraj Butala
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java?rev=1610840&r1=1610839&r2=1610840&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java Tue Jul 15 20:35:07 2014
@@ -71,7 +71,16 @@ public class NfsExports {
private static final Pattern CIDR_FORMAT_LONG =
Pattern.compile(SLASH_FORMAT_LONG);
-
+
+ // Hostnames are composed of series of 'labels' concatenated with dots.
+ // Labels can be between 1-63 characters long, and can only take
+ // letters, digits & hyphens. They cannot start and end with hyphens. For
+ // more details, refer RFC-1123 & http://en.wikipedia.org/wiki/Hostname
+ private static final String LABEL_FORMAT =
+ "[a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?";
+ private static final Pattern HOSTNAME_FORMAT =
+ Pattern.compile("^(" + LABEL_FORMAT + "\\.)*" + LABEL_FORMAT + "$");
+
static class AccessCacheEntry implements LightWeightCache.Entry{
private final String hostAddr;
private AccessPrivilege access;
@@ -381,10 +390,14 @@ public class NfsExports {
LOG.debug("Using Regex match for '" + host + "' and " + privilege);
}
return new RegexMatch(privilege, host);
+ } else if (HOSTNAME_FORMAT.matcher(host).matches()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using exact match for '" + host + "' and " + privilege);
+ }
+ return new ExactMatch(privilege, host);
+ } else {
+ throw new IllegalArgumentException("Invalid hostname provided '" + host
+ + "'");
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using exact match for '" + host + "' and " + privilege);
- }
- return new ExactMatch(privilege, host);
}
-}
\ No newline at end of file
+}
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java?rev=1610840&r1=1610839&r2=1610840&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java Tue Jul 15 20:35:07 2014
@@ -194,4 +194,16 @@ public class TestNfsExports {
} while ((System.nanoTime() - startNanos) / NanosPerMillis < 5000);
Assert.assertEquals(AccessPrivilege.NONE, ap);
}
+
+ @Test(expected=IllegalArgumentException.class)
+ public void testInvalidHost() {
+ NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
+ "foo#bar");
+ }
+
+ @Test(expected=IllegalArgumentException.class)
+ public void testInvalidSeparator() {
+ NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
+ "foo ro : bar rw");
+ }
}