feat: Add access control improvements and constraints

ethpandaops · Oct 21, 2024 · 1c8ee72 · 1c8ee72
1 parent 23a6a56
commit 1c8ee72
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/...y/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml b/...y/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml
@@ -55,4 +55,7 @@
         <shard>01</shard>
         <replica>01</replica>
     </macros>
+    <access_control_improvements>
+        <settings_constraints_replace_previous>true</settings_constraints_replace_previous>
+    </access_control_improvements>
 </clickhouse>
diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/users.d/users.xml b/deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/users.d/users.xml
@@ -11,8 +11,15 @@
             <max_memory_usage>10000000000</max_memory_usage>
             <use_uncompressed_cache>0</use_uncompressed_cache>
             <load_balancing>in_order</load_balancing>
-            <readonly>1</readonly>
+            <readonly>2</readonly>
             <log_queries>1</log_queries>
+            <constraints>
+                <max_execution_time>
+                <changeable_in_readonly/>
+                <min>0</min>
+                <max>180</max>
+                </max_execution_time>
+            </constraints>
         </readonly>
     </profiles>
     <users>

diff --git a/...y/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml b/...y/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml
@@ -55,4 +55,7 @@
         <shard>02</shard>
         <replica>01</replica>
     </macros>
+    <access_control_improvements>
+        <settings_constraints_replace_previous>true</settings_constraints_replace_previous>
+    </access_control_improvements>
 </clickhouse>
diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/users.d/users.xml b/deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/users.d/users.xml
@@ -11,8 +11,15 @@
             <max_memory_usage>10000000000</max_memory_usage>
             <use_uncompressed_cache>0</use_uncompressed_cache>
             <load_balancing>in_order</load_balancing>
-            <readonly>1</readonly>
+            <readonly>2</readonly>
             <log_queries>1</log_queries>
+            <constraints>
+                <max_execution_time>
+                <changeable_in_readonly/>
+                <min>0</min>
+                <max>180</max>
+                </max_execution_time>
+            </constraints>
         </readonly>
     </profiles>
     <users>