CMR-9266 refactors permission acl filtering

access-control-app/src/cmr/access_control/services/acl_service.clj

@@ -237,51 +237,71 @@
   [acl]
   (-> acl :provider-identity :target (= schema/ingest-management-acl-target)))
 
-(defn- concept-permissions-granted-by-acls
+(defn-timed concept-permissions-granted-by-acls
   "Returns the set of permission keywords (:read, :order, and :update) granted on concept
    to the seq of group guids by seq of acls."
   [concept sids acls]
-  (let [provider-acls (filter #(provider-acl? (:provider-id concept) %) acls)
+  (let [[catalog-item-acls ingest-management-acls] acls
+        provider-id (:provider-id concept)
         ;; When a user has UPDATE on the provider's INGEST_MANAGEMENT_ACL target, then they have UPDATE and
         ;; DELETE permission on all of the provider's catalog items.
         ingest-management-permissions (when (some #(acl/acl-matches-sids-and-permission? sids "update" %)
-                                                  (filter ingest-management-acl? provider-acls))
+                                                  (get ingest-management-acls provider-id))
                                         [:update :delete])
         ;; The remaining catalog item ACLs can only grant READ or ORDER permission.
-        catalog-item-acls (filter :catalog-item-identity provider-acls)
         catalog-item-permissions (for [permission [:read :order]
                                        :when (some #(grants-concept-permission? % permission concept sids)
-                                                   catalog-item-acls)]
+                                                   (get catalog-item-acls provider-id))]
                                    permission)]
     (set
      (concat catalog-item-permissions
              ingest-management-permissions))))
 
-(defn- add-acl-enforcement-fields
+(defn-timed add-acl-enforcement-fields
   "Adds all fields necessary for comparing concept map against ACLs."
   [context concept]
   (let [concept (acl-matchers/add-acl-enforcement-fields-to-concept context concept)]
     (if-let [parent-collection (:parent-collection concept)]
-      (assoc concept :parent-collection
-                     (acl-matchers/add-acl-enforcement-fields-to-concept
-                       context parent-collection))
-      concept)))
-
-(defn add-parent-collection-to-concept
+      (-> concept
+          (assoc :parent-collection
+                 (acl-matchers/add-acl-enforcement-fields-to-concept
+                  context parent-collection))
+          (dissoc :metadata))
+      (dissoc concept :metadata))))
+
+(defn-timed add-parent-collection-to-concept
   [concept parent-concepts]
   (let [parent-id (get-in concept [:extra-fields :parent-collection-id])
         parent (first (filter #(= parent-id (:concept-id %)) parent-concepts))]
     (assoc concept :parent-collection parent)))
 
+(defn- prepare-permission-acls
+  [acls]
+  (let [provider-acls (group-by (fn [acl]
+                                  (or (get-in acl [:catalog-item-identity :provider-id])
+                                      (get-in acl [:provider-identity :provider-id])))
+                                acls)
+        catalog-item-acls (reduce
+                           (fn [provider-map provider]
+                             (assoc provider-map provider (filter :catalog-item-identity (get provider-map provider))))
+                           provider-acls
+                           (keys provider-acls))
+        ingest-management-acls (reduce
+                                (fn [provider-map provider]
+                                  (assoc provider-map provider (filter ingest-management-acl? (get provider-map provider))))
+                                provider-acls
+                                (keys provider-acls))]
+    [catalog-item-acls ingest-management-acls]))
+
 (defn-timed get-catalog-item-permissions
   "Returns a map of concept ids to seqs of permissions granted on that concept for the given username."
   [context username-or-type concept-ids]
   (let [sids (auth-util/get-sids context username-or-type)
-        acls (concat
-               (acl-util/get-acl-concepts-by-identity-type-and-target
-                context index/provider-identity-type-name schema/ingest-management-acl-target)
-               (acl-util/get-acl-concepts-by-identity-type-and-target
-                context index/catalog-item-identity-type-name nil))
+        acls (prepare-permission-acls (concat
+                                       (acl-util/get-acl-concepts-by-identity-type-and-target
+                                        context index/provider-identity-type-name schema/ingest-management-acl-target)
+                                       (acl-util/get-acl-concepts-by-identity-type-and-target
+                                        context index/catalog-item-identity-type-name nil)))
         concepts (mdb1/get-latest-concepts context (distinct concept-ids))
         parent-concepts (mdb1/get-latest-concepts context (distinct (remove nil? (map #(get-in % [:extra-fields :parent-collection-id]) concepts))))
         concepts-with-parents (map #(add-parent-collection-to-concept % parent-concepts) concepts)]

elastic-utils-lib/src/cmr/elastic_utils/embedded_elastic_server.clj

@@ -103,7 +103,8 @@
     (let [containers (:containers this)
           ^FixedHostPortGenericContainer node (:elasticsearch containers)
           ^FixedHostPortGenericContainer kibana (:kibana containers)]
-      (.stop node)
+      (when node
+        (.stop node))
       (when-let [data-dir (get-in this [:opts :data-dir])]
         (util/delete-recursively (:data-dir this)))
       (when kibana

redis-utils-lib/src/cmr/redis_utils/embedded_redis_server.clj

@@ -41,7 +41,7 @@
 
   (stop
     [this system]
-    (let [redis (:redis this)]
+    (when-let [redis (:redis this)]
       (.stop redis))))
 
 (defn create-redis-server

umm-spec-lib/src/cmr/umm_spec/acl_matchers.clj

@@ -7,8 +7,9 @@
    [clojure.string :as str]
    [cmr.acl.core :as acl-core]
    [cmr.common.cache :as cache]
-   [cmr.common.cache.in-memory-cache :as mem-cache]
    [cmr.common.cache.cache-spec :as cache-spec]
+   [cmr.common.cache.in-memory-cache :as mem-cache]
+   [cmr.common.log :refer [info debug warn error]]
    [cmr.common.services.errors :as errors]
    [cmr.common.time-keeper :as tk]
    [cmr.common.util :as u :refer [update-in-each]]
@@ -181,10 +182,15 @@
 
 (defmethod add-acl-enforcement-fields-to-concept :granule
   [context concept]
-  (-> concept
-      (u/lazy-assoc :access-value (legacy/parse-concept-access-value concept))
-      (u/lazy-assoc :temporal (legacy/parse-concept-temporal concept))
-      (assoc :collection-concept-id (get-in concept [:extra-fields :parent-collection-id]))))
+  (let [deleted? (:deleted concept)]
+    (as-> concept concept
+          (if-not deleted?
+            (u/lazy-assoc concept :access-value (legacy/parse-concept-access-value concept))
+            concept)
+          (if-not deleted?
+            (u/lazy-assoc concept :temporal (legacy/parse-concept-temporal concept))
+            concept)
+          (assoc concept :collection-concept-id (get-in concept [:extra-fields :parent-collection-id])))))
 
 (defn add-acl-enforcement-fields
   "Adds the fields necessary to enforce ACLs to the concepts."