Author: omalley
Date: Fri Mar 4 03:46:25 2011
New Revision: 1077151
URL: http://svn.apache.org/viewvc?rev=1077151&view=rev
Log:
commit 5eff40bcff0c018cfae451e0abb2306d6afaf775
Author: Suresh Srinivas <[email protected]>
Date: Fri Feb 5 15:03:57 2010 -0800
HADOOP:6521 from
https://issues.apache.org/jira/secure/attachment/12434469/hadoop-6521.rel20.1.patch
+++ b/YAHOO-CHANGES.txt
+ HADOOP-6521. Fix backward compatiblity issue with umask when
applications
+ use deprecated param dfs.umask in configuration or use
+ FsPermission.setUMask(). (suresh)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/permission/FsPermission.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/security/TestPermission.java
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/permission/FsPermission.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/permission/FsPermission.java?rev=1077151&r1=1077150&r2=1077151&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/permission/FsPermission.java
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/permission/FsPermission.java
Fri Mar 4 03:46:25 2011
@@ -168,19 +168,19 @@ public class FsPermission implements Wri
public static FsPermission getUMask(Configuration conf) {
int umask = DEFAULT_UMASK;
- // Attempt to pull value from configuration, trying new key first and then
- // deprecated key, along with a warning, if not present
+ // To ensure backward compatibility first use the deprecated key.
+ // If the deprecated key is not present then check for the new key
if(conf != null) {
- String confUmask = conf.get(UMASK_LABEL);
- if(confUmask != null) { // UMASK_LABEL is set
- umask = new UmaskParser(confUmask).getUMask();
- } else { // check for deprecated key label
- int oldStyleValue = conf.getInt(DEPRECATED_UMASK_LABEL,
Integer.MIN_VALUE);
- if(oldStyleValue != Integer.MIN_VALUE) { // Property was set with old
key
- LOG.warn(DEPRECATED_UMASK_LABEL + " configuration key is deprecated.
" +
- "Convert to " + UMASK_LABEL + ", using octal or symbolic umask "
+
- "specifications.");
- umask = oldStyleValue;
+ int oldStyleValue = conf.getInt(DEPRECATED_UMASK_LABEL,
Integer.MIN_VALUE);
+ if(oldStyleValue != Integer.MIN_VALUE) { // Property was set with old key
+ LOG.warn(DEPRECATED_UMASK_LABEL + " configuration key is deprecated. "
+
+ "Convert to " + UMASK_LABEL + ", using octal or symbolic umask " +
+ "specifications.");
+ umask = oldStyleValue;
+ } else {
+ String confUmask = conf.get(UMASK_LABEL);
+ if(confUmask != null) { // UMASK_LABEL is set
+ umask = new UmaskParser(confUmask).getUMask();
}
}
}
@@ -189,7 +189,7 @@ public class FsPermission implements Wri
}
/** Set the user file creation mask (umask) */
public static void setUMask(Configuration conf, FsPermission umask) {
- conf.setInt(UMASK_LABEL, umask.toShort());
+ conf.set(UMASK_LABEL, String.format("%1$03o", umask.toShort()));
}
/** Get the default permission. */
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/security/TestPermission.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/security/TestPermission.java?rev=1077151&r1=1077150&r2=1077151&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/security/TestPermission.java
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/security/TestPermission.java
Fri Mar 4 03:46:25 2011
@@ -58,6 +58,39 @@ public class TestPermission extends Test
return s.getPermission();
}
+ /**
+ * Tests backward compatibility. Configuration can be
+ * either set with old param dfs.umask that takes decimal umasks
+ * or dfs.umaskmode that takes symbolic or octal umask.
+ */
+ public void testBackwardCompatibility() {
+ // Test 1 - old configuration key with decimal
+ // umask value should be handled when set using
+ // FSPermission.setUMask() API
+ FsPermission perm = new FsPermission((short)18);
+ Configuration conf = new Configuration();
+ FsPermission.setUMask(conf, perm);
+ assertEquals(18, FsPermission.getUMask(conf).toShort());
+
+ // Test 2 - old configuration key set with decimal
+ // umask value should be handled
+ perm = new FsPermission((short)18);
+ conf = new Configuration();
+ conf.set(FsPermission.DEPRECATED_UMASK_LABEL, "18");
+ assertEquals(18, FsPermission.getUMask(conf).toShort());
+
+ // Test 3 - old configuration key overrides the new one
+ conf = new Configuration();
+ conf.set(FsPermission.DEPRECATED_UMASK_LABEL, "18");
+ conf.set(FsPermission.UMASK_LABEL, "000");
+ assertEquals(18, FsPermission.getUMask(conf).toShort());
+
+ // Test 4 - new configuration key is handled
+ conf = new Configuration();
+ conf.set(FsPermission.UMASK_LABEL, "022");
+ assertEquals(18, FsPermission.getUMask(conf).toShort());
+ }
+
public void testCreate() throws Exception {
Configuration conf = new Configuration();
conf.setBoolean("dfs.permissions", true);
