Merge pull request #2475 from glasserc/simplify-postgresql

Simplify Postgres get_object_permissions implementation
Kinto · Mar 31, 2020 · 36fc042 · 36fc042
2 parents 673a707 + 59e182a
commit 36fc042
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/kinto/core/permission/postgresql/__init__.py b/kinto/core/permission/postgresql/__init__.py
@@ -358,28 +358,19 @@ def check_permission(self, principals, bound_permissions):
         return total["matched"] > 0
 
     def get_objects_permissions(self, objects_ids, permissions=None):
-        object_ids_values = []
-        placeholders = {}
-        for i, obj_id in enumerate(objects_ids):
-            object_ids_values.append("({0}, :obj_id_{0})".format(i))
-            placeholders[f"obj_id_{i}"] = obj_id
-
+        placeholders = {"object_ids": tuple(objects_ids)}
         query = """
-        WITH required_object_ids AS (
-          VALUES {objects_ids}
-        )
         SELECT object_id, permission, principal
-            FROM required_object_ids JOIN access_control_entries
-              ON (object_id = column2)
-              {permissions_condition}
-        ORDER BY column1 ASC;
+            FROM access_control_entries
+           WHERE object_id IN :object_ids
+              {permissions_condition};
         """
-        safeholders = {"objects_ids": ",".join(object_ids_values), "permissions_condition": ""}
+        safeholders = {"permissions_condition": ""}
         if permissions is not None:
             safeholders[
                 "permissions_condition"
             ] = """
-              WHERE permission IN :permissions"""
+              AND permission IN :permissions"""
             placeholders["permissions"] = tuple(permissions)
 
         with self.client.connect(readonly=True) as conn: