You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/09/02 17:59:14 UTC
[nifi] 04/16: NIFI-7760 Remove invalid permission check
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.12.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 6db63dea5a1dc175a9b42ed9737f0fa979b68ba2
Author: Tamás Bunth <bt...@gmail.com>
AuthorDate: Tue Aug 25 13:31:58 2020 +0200
NIFI-7760 Remove invalid permission check
Because even though permissions are only the 7 least significant bits of the file
mode but the file mode can be wider and can contain further info (like the
sticky bit).
Extend unit test for converting file mode with sticky bit into 'rwx' style
permission string.
Remove old test cases
This closes #4490.
Signed-off-by: Peter Turcsanyi <tu...@apache.org>
---
.../org/apache/nifi/processors/standard/util/FileInfo.java | 4 ----
.../apache/nifi/processors/standard/util/TestFileInfo.java | 14 ++++----------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
index 763ad07..20efdf5 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
@@ -220,10 +220,6 @@ public class FileInfo implements Comparable<FileInfo>, Serializable, ListableEnt
}
public static String permissionToString(int fileModeOctal) {
- if (fileModeOctal > 0777 || fileModeOctal < 00) {
- throw new IllegalArgumentException("Invalid permission numerals");
- }
-
StringBuilder sb = new StringBuilder();
for (char p : PERMISSION_MODIFIER_CHARS) {
sb.append((fileModeOctal & 1) == 1 ? p : '-');
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestFileInfo.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestFileInfo.java
index 1ff9bd3..afaf108 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestFileInfo.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestFileInfo.java
@@ -27,19 +27,13 @@ public class TestFileInfo {
String rwxPerm = FileInfo.permissionToString(0567);
assertEquals("r-xrw-rwx", rwxPerm);
+ // Test with sticky bit
+ rwxPerm = FileInfo.permissionToString(01567);
+ assertEquals("r-xrw-rwx", rwxPerm);
+
rwxPerm = FileInfo.permissionToString(03);
assertEquals("-------wx", rwxPerm);
}
- @Test(expected = IllegalArgumentException.class)
- public void testPermissionModeToStringInvalidFourDigits() {
- FileInfo.permissionToString(01000);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testPermissionModeToStringInvalidNegative() {
- FileInfo.permissionToString(-1);
- }
-
}