Merge pull request #103 from fluree/feature/required-policy

Required policy support

Author: dpetran

deps.edn

@@ -1,7 +1,7 @@
 {:deps {org.clojure/clojure    {:mvn/version "1.11.3"}
         org.clojure/core.async {:mvn/version "1.6.681"}
         com.fluree/db          {:git/url "https://github.com/fluree/db.git"
-                                :git/sha "fe4842745daa2dc25199961f23eb96fa55ce14ba"}
+                                :git/sha "5b86afd02d4437c8f0e271c5fde5f1428e67515b"}
         com.fluree/json-ld     {:git/url "https://github.com/fluree/json-ld.git"
                                 :git/sha "73a990a4b803d0b4cfbbbe4dc16275b39a3add4e"}
 

src/fluree/server/handler.clj

@@ -263,9 +263,9 @@
           policy-values   (when-let [pv (get-in req [:headers "fluree-policy-values"])]
                             (try
                               (let [pv* (json/parse pv false)]
-                                (if (map? pv*)
+                                (if (sequential? pv*)
                                   pv*
-                                  (throw (ex-info "Invalid Fluree-Policy-Values header, it must be a map of variables to values."
+                                  (throw (ex-info "Invalid Fluree-Policy-Values header, it must be a valid values binding: [[\"?varA\" \"?varB\"] [[<a1> <b1>] [<a2> <b2>] ...]]"
                                                   {:status 400}))))
                               (catch Exception _
                                 (throw (ex-info "Invalid Fluree-Policy-Values header: must be JSON."

test/fluree/server/integration/policy_test.clj

@@ -45,6 +45,7 @@
                                       {"@id"          "ex:ssnRestriction"
                                        "@type"        ["f:AccessPolicy" "ex:EmployeePolicy"]
                                        "f:onProperty" [{"@id" "schema:ssn"}]
+                                       "f:required"   true
                                        "f:action"     [{"@id" "f:view"} {"@id" "f:modify"}]
                                        "f:query"      {"@type"  "@json"
                                                        "@value" {"@context" {"ex" "http://example.org/ns/"}
@@ -272,6 +273,7 @@
                                        "@type"        ["f:AccessPolicy" "ex:EmployeePolicy"]
                                        "f:onProperty" [{"@id" "schema:ssn"}]
                                        "f:action"     [{"@id" "f:view"} {"@id" "f:modify"}]
+                                       "f:required"   true
                                        "f:query"      {"@type"  "@json"
                                                        "@value" {"@context" {"ex" "http://example.org/ns/"}
                                                                  "where"    {"@id"     "?$identity"
@@ -295,7 +297,7 @@
                         (json/write-value-as-string
                          (assoc secret-query
                                 "opts" {"policyClass"  "ex:EmployeePolicy"
-                                        "policyValues" {"?$identity" alice-did}}))
+                                        "policyValues" ["?$identity" [alice-did]]}))
                         :headers json-headers}
           query-res    (api-post :query query-req)]
 
@@ -315,7 +317,7 @@
                                                    schema:ssn ?ssn.}")
                          :headers (assoc sparql-headers
                                          "Fluree-Policy-Class" "ex:EmployeePolicy"
-                                         "Fluree-Policy-Values" (json/write-value-as-string {"?$identity" alice-did}))}
+                                         "Fluree-Policy-Values" (json/write-value-as-string ["?$identity" [alice-did]]))}
               query-res (api-post :query query-req)]
 
           (is (= [["ex:alice" "111-11-1111"]]
@@ -369,6 +371,7 @@
                                       "@type"        ["f:AccessPolicy" "ex:EmployeePolicy"]
                                       "f:onProperty" [{"@id" "schema:ssn"}]
                                       "f:action"     [{"@id" "f:view"} {"@id" "f:modify"}]
+                                      "f:required"   true
                                       "f:query"      {"@type"  "@json"
                                                       "@value" {"@context" {"ex" "http://example.org/ns/"}
                                                                 "where"    {"@id"     "?$identity"
@@ -378,7 +381,7 @@
                                       "f:action" {"@id" "f:view"}
                                       "f:query"  {"@type"  "@json"
                                                   "@value" {}}}]}
-          policy-values {"?$identity" alice-did}
+          policy-values ["?$identity" [alice-did]]
           query-req     {:body
                          (json/write-value-as-string
                           (assoc secret-query
@@ -408,4 +411,4 @@
 
           (is (= [["ex:alice" "111-11-1111"]]
                  (-> query-res :body json/read-value))
-              "query policy opts should prevent seeing john's ssn"))))))
+              "query policy opts should prevent seeing john's ssn"))))))