Merge pull request #596 from NethServer/fix-bud

Fix bind-user-domains with empty domain list
NethServer · Mar 4, 2024 · 7e4b361 · 7e4b361
2 parents fce7b1c + d374787
commit 7e4b361
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/core/imageroot/var/lib/nethserver/cluster/actions/bind-user-domains/50bind_user_domains b/core/imageroot/var/lib/nethserver/cluster/actions/bind-user-domains/50bind_user_domains
@@ -39,7 +39,10 @@ if not is_included:
     print(agent.SD_WARNING + f"Error: the domain_list {domain_list} is not included in the list of domains {domains}", file=sys.stderr)
     sys.exit(3)
 
-rdb.hset(f'cluster/module_domains', module_id, " ".join(domain_list))
+if domain_list:
+    rdb.hset(f'cluster/module_domains', module_id, " ".join(domain_list))
+else:
+    rdb.hdel(f'cluster/module_domains', module_id)
 
 union_domains = set(domain_list) | set(previous_domains.split())
 

diff --git a/core/imageroot/var/lib/nethserver/cluster/actions/bind-user-domains/validate-input.json b/core/imageroot/var/lib/nethserver/cluster/actions/bind-user-domains/validate-input.json
@@ -18,7 +18,6 @@
     "domains": {
       "description": "One or more domains to bind with the module calling this action",
       "type": "array",
-      "minItems": 1,
       "items": {
         "description": "A user domain name",
         "type": "string",

diff --git a/core/imageroot/var/lib/nethserver/cluster/update-core-pre-modules.d/50update_grants b/core/imageroot/var/lib/nethserver/cluster/update-core-pre-modules.d/50update_grants
@@ -13,9 +13,10 @@ import cluster.grants
 rdb = agent.redis_connect(privileged=True)
 
 #
-# Update existing grants for features #6814, #6825
+# Update existing grants for features #6814, #6825, #6852
 #
 cluster.grants.grant(rdb, action_clause="bind-user-domains",  to_clause="accountconsumer", on_clause='cluster')
+cluster.grants.grant(rdb, action_clause="bind-user-domains",  to_clause="accountprovider", on_clause='cluster')
 cluster.grants.grant(rdb, action_clause="list-modules",  to_clause="accountprovider", on_clause='cluster')
 
 #

diff --git a/core/imageroot/var/lib/nethserver/node/install-finalize.sh b/core/imageroot/var/lib/nethserver/node/install-finalize.sh
@@ -134,6 +134,7 @@ cluster.grants.grant(rdb, action_clause="remove-custom-zone",  to_clause="tunadm
 
 cluster.grants.grant(rdb, action_clause="update-routes", to_clause="accountprovider", on_clause='cluster')
 cluster.grants.grant(rdb, action_clause="bind-user-domains",  to_clause="accountconsumer", on_clause='cluster')
+cluster.grants.grant(rdb, action_clause="bind-user-domains",  to_clause="accountprovider", on_clause='cluster')
 cluster.grants.grant(rdb, action_clause="list-modules",  to_clause="accountprovider", on_clause='cluster')
 EOF