You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/06/20 09:46:48 UTC

[12/21] mesos git commit: Adjusted the authorizer to the new resource format [12/20].

Adjusted the authorizer to the new resource format [12/20].

Review: https://reviews.apache.org/r/60068


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6be854ad
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6be854ad
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6be854ad

Branch: refs/heads/master
Commit: 6be854ada23dc2da21c11516f0ec51e24090001a
Parents: 0d5792d
Author: Michael Park <mc...@gmail.com>
Authored: Wed May 31 18:39:06 2017 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Tue Jun 20 02:35:06 2017 -0700

----------------------------------------------------------------------
 src/authorizer/local/authorizer.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/6be854ad/src/authorizer/local/authorizer.cpp
----------------------------------------------------------------------
diff --git a/src/authorizer/local/authorizer.cpp b/src/authorizer/local/authorizer.cpp
index 810566a..82ae846 100644
--- a/src/authorizer/local/authorizer.cpp
+++ b/src/authorizer/local/authorizer.cpp
@@ -233,7 +233,15 @@ public:
         case authorization::UNRESERVE_RESOURCES:
           aclObject.set_type(mesos::ACL::Entity::SOME);
           if (object->resource) {
-            aclObject.add_values(object->resource->reservation().principal());
+            if (object->resource->reservations_size() > 0) {
+              // Check for principal in "post-reservation-refinement" format.
+              aclObject.add_values(
+                  object->resource->reservations().rbegin()->principal());
+            } else {
+              // Check for principal in "pre-reservation-refinement" format.
+              aclObject.add_values(
+                  object->resource->reservation().principal());
+            }
           } else if (object->value) {
             aclObject.add_values(*(object->value));
           } else {
@@ -557,7 +565,14 @@ public:
         case authorization::RESERVE_RESOURCES: {
           entityObject.set_type(ACL::Entity::SOME);
           if (object->resource) {
-            entityObject.add_values(object->resource->role());
+            if (object->resource->reservations_size() > 0) {
+              // Check for role in "post-reservation-refinement" format.
+              entityObject.add_values(
+                  object->resource->reservations().rbegin()->role());
+            } else {
+              // Check for role in "pre-reservation-refinement" format.
+              entityObject.add_values(object->resource->role());
+            }
           } else if (object->value) {
             entityObject.add_values(*(object->value));
           } else {