You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/08/23 20:46:28 UTC
[1/2] storm git commit: [STORM-2700] Should not check Blobstore ACL
if the validation is disabled
Repository: storm
Updated Branches:
refs/heads/master 986e4e160 -> ec05019da
[STORM-2700] Should not check Blobstore ACL if the validation is disabled
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2be883c1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2be883c1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2be883c1
Branch: refs/heads/master
Commit: 2be883c1eb899568fb7e285da4b46dcbf1a1581b
Parents: b87dcc0
Author: Ethan Li <et...@gmail.com>
Authored: Mon Aug 21 14:08:29 2017 -0500
Committer: Ethan Li <et...@gmail.com>
Committed: Tue Aug 22 08:22:29 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/localizer/Localizer.java | 2 +-
.../src/main/java/org/apache/storm/utils/ServerUtils.java | 7 ++++++-
.../test/java/org/apache/storm/localizer/LocalizerTest.java | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2be883c1/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java b/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
index 73db899..353ab56 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
@@ -523,7 +523,7 @@ public class Localizer {
out = new FileOutputStream(downloadFile);
numTries++;
try {
- if (!ServerUtils.canUserReadBlob(blobstore.getBlobMeta(key), user)) {
+ if (!ServerUtils.canUserReadBlob(blobstore.getBlobMeta(key), user, conf)) {
throw new AuthorizationException(user + " does not have READ access to " + key);
}
InputStreamWithMeta in = blobstore.getBlob(key);
http://git-wip-us.apache.org/repos/asf/storm/blob/2be883c1/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
index 3498aa8..9c5bb51 100644
--- a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
@@ -377,7 +377,12 @@ public class ServerUtils {
return nimbusBlobVersion;
}
- public static boolean canUserReadBlob(ReadableBlobMeta meta, String user) {
+ public static boolean canUserReadBlob(ReadableBlobMeta meta, String user, Map<String, Object> conf) {
+
+ if (!ObjectReader.getBoolean(conf.get(Config.STORM_BLOBSTORE_ACL_VALIDATION_ENABLED), false)) {
+ return true;
+ }
+
SettableBlobMeta settable = meta.get_settable();
for (AccessControl acl : settable.get_acl()) {
if (acl.get_type().equals(AccessControlType.OTHER) && (acl.get_access() & BlobStoreAclHandler.READ) > 0) {
http://git-wip-us.apache.org/repos/asf/storm/blob/2be883c1/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java b/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
index dd64069..70e8e9d 100644
--- a/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
+++ b/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
@@ -508,6 +508,8 @@ public class LocalizerTest {
Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60 * 60 * 1000);
+ // enable blobstore acl validation
+ conf.put(Config.STORM_BLOBSTORE_ACL_VALIDATION_ENABLED, true);
String topo1 = "topo1";
String key1 = "key1";
[2/2] storm git commit: Merge branch 'STORM-2700' of
https://github.com/Ethanlm/storm into STORM-2700
Posted by bo...@apache.org.
Merge branch 'STORM-2700' of https://github.com/Ethanlm/storm into STORM-2700
STORM-2700: Should not check Blobstore ACL if the validation is disabled
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ec05019d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ec05019d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ec05019d
Branch: refs/heads/master
Commit: ec05019da42d492724ab3e2c3be3e1b1c6bbf299
Parents: 986e4e1 2be883c
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Aug 23 15:19:52 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Aug 23 15:19:52 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/localizer/Localizer.java | 2 +-
.../src/main/java/org/apache/storm/utils/ServerUtils.java | 7 ++++++-
.../test/java/org/apache/storm/localizer/LocalizerTest.java | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------