patch

Author: lbr38

documentation/docs/usage/hosts.md

@@ -76,7 +76,7 @@ From the **HOSTS** tab:
 
 [![Select host](https://assets.repomanager.net/repomanager/usage/hosts/select-host.png)](https://assets.repomanager.net/repomanager/usage/hosts/select-host.png)
 
-**Step 2:** Use the `Request packages information` button.
+**Step 2:** Use the `Request package information` button.
 
 It can take some minutes to be sent depending on the number of packages installed on the host.
 

www/controllers/Group/Group.php

@@ -95,10 +95,6 @@ public function exists(string $name = '')
      */
     public function new(string $name) : void
     {
-        if (!IS_ADMIN) {
-            throw new Exception('You are not allowed to perform this action');
-        }
-
         $name = Validate::string($name);
 
         /**
@@ -141,10 +137,6 @@ public function new(string $name) : void
      */
     public function edit(int $id, string $name, array $data) : void
     {
-        if (!IS_ADMIN) {
-            throw new Exception('You are not allowed to perform this action');
-        }
-
         /**
          *  Check if group exists
          */
@@ -197,10 +189,6 @@ public function edit(int $id, string $name, array $data) : void
      */
     public function delete(array $groups) : void
     {
-        if (!IS_ADMIN) {
-            throw new Exception('You are not allowed to perform this action');
-        }
-
         foreach ($groups as $id) {
             // Check if group exists
             if (!$this->existsId($id)) {

www/controllers/Host.php

@@ -2,6 +2,7 @@
 
 namespace Controllers;
 
+use Controllers\User\Permission\Host as HostPermission;
 use Controllers\Host\Package\Package as HostPackage;
 use Controllers\Host\Request as HostRequest;
 use Controllers\Group\Host as HostGroup;
@@ -102,8 +103,12 @@ public function getHostWithProfile(string $profile) : array
     /**
      *  Edit the display settings on the hosts page
      */
-    public function setSettings(string $packagesConsideredOutdated, string $packagesConsideredCritical) : void
+    public function setSettings(int $packagesConsideredOutdated, int $packagesConsideredCritical) : void
     {
+        if (!HostPermission::allowedAction('edit-settings')) {
+            throw new Exception('You are not allowed to perform this action');
+        }
+
         if (!is_numeric($packagesConsideredOutdated) or !is_numeric($packagesConsideredCritical)) {
             throw new Exception('Parameters must be numeric');
         }

www/controllers/Layout/Panel/vars/hosts/groups/list.vars.inc.php

@@ -1,5 +1,8 @@
 <?php
-if (!IS_ADMIN) {
+use Controllers\User\Permission\Host as HostPermission;
+
+// If the user does not have permission to edit host groups, prevent access to this panel
+if (!HostPermission::allowedAction('edit-groups')) {
     throw new Exception('You are not allowed to access this panel');
 }
 

www/controllers/Layout/Panel/vars/hosts/settings.vars.inc.php

@@ -1,5 +1,7 @@
 <?php
-if (!IS_ADMIN) {
+use \Controllers\User\Permission\Host as HostPermission;
+
+if (!HostPermission::allowedAction('edit-settings')) {
     throw new Exception('You are not allowed to access this panel');
 }
 

www/controllers/Layout/Panel/vars/repos/groups/list.vars.inc.php

@@ -1,5 +1,8 @@
 <?php
-if (!IS_ADMIN) {
+use Controllers\User\Permission\Repo as RepoPermission;
+
+// If the user does not have permission to edit repository groups, prevent access to this panel
+if (!RepoPermission::allowedAction('edit-groups')) {
     throw new Exception('You are not allowed to access this panel');
 }
 

www/controllers/Layout/Panel/vars/repos/sources/list.vars.inc.php

@@ -0,0 +1,7 @@
+<?php
+use Controllers\User\Permission\Repo as RepoPermission;
+
+// If the user does not have permission to edit source repositories, prevent access to this panel.
+if (!RepoPermission::allowedAction('edit-source')) {
+    throw new Exception('You are not allowed to access this panel');
+}

www/controllers/Profile.php

@@ -3,6 +3,7 @@
 namespace Controllers;
 
 use Exception;
+use Controllers\User\Permission\Host as HostPermission;
 use Controllers\History\Save as History;
 use Controllers\Utils\Validate;
 
@@ -202,7 +203,7 @@ public function countHosts(string $profile)
      */
     public function new(string $name)
     {
-        if (!IS_ADMIN) {
+        if (!HostPermission::allowedAction('edit-profiles')) {
             throw new Exception('You are not allowed to perform this action');
         }
 
@@ -232,7 +233,7 @@ public function new(string $name)
      */
     public function duplicate(string $id)
     {
-        if (!IS_ADMIN) {
+        if (!HostPermission::allowedAction('edit-profiles')) {
             throw new Exception('You are not allowed to perform this action');
         }
 
@@ -303,7 +304,7 @@ public function duplicate(string $id)
      */
     public function delete(array $profilesId) : void
     {
-        if (!IS_ADMIN) {
+        if (!HostPermission::allowedAction('edit-profiles')) {
             throw new Exception('You are not allowed to perform this action');
         }
 
@@ -328,7 +329,7 @@ public function delete(array $profilesId) : void
      */
     public function configure(int $id, string $name, array $reposIds, array $packagesExcluded, array $packagesMajorExcluded, array $serviceNeedReload, array $serviceNeedRestart, string $notes)
     {
-        if (!IS_ADMIN) {
+        if (!HostPermission::allowedAction('edit-profiles')) {
             throw new Exception('You are not allowed to perform this action');
         }
 

www/controllers/User/Permission.php

@@ -137,7 +137,7 @@ public function set(int $id, array $reposView, array $reposActions, array $tasks
         if (!empty($reposActions)) {
             foreach (array_filter($reposActions) as $action) {
                 // Check that action is valid
-                if (!in_array($action, ['create', 'update', 'duplicate', 'rebuild', 'rename', 'edit', 'delete', 'env', 'removeEnv', 'browse', 'upload-package', 'delete-package', 'view-stats'])) {
+                if (!in_array($action, ['create', 'update', 'duplicate', 'rebuild', 'rename', 'edit', 'delete', 'env', 'removeEnv', 'browse', 'edit-source', 'edit-groups', 'upload-package', 'delete-package', 'view-stats'])) {
                     throw new Exception('Invalid action: ' . $action);
                 }
 
@@ -167,7 +167,7 @@ public function set(int $id, array $reposView, array $reposActions, array $tasks
         if (!empty($hostsActions)) {
             foreach (array_filter($hostsActions) as $action) {
                 // Check that action is valid
-                if (!in_array($action, ['request-general-infos', 'request-packages-infos', 'update-packages', 'reset', 'delete'])) {
+                if (!in_array($action, ['request-general-infos', 'request-packages-infos', 'update-packages', 'reset', 'delete', 'edit-profiles', 'edit-groups', 'edit-settings'])) {
                     throw new Exception('Invalid action: ' . $action);
                 }
 

www/public/resources/js/classes/Host.js

@@ -61,7 +61,7 @@ class Host
         if (allowedActions.includes('request-packages-infos')) {
             buttons.push(
                 {
-                    'text': 'Request packages information',
+                    'text': 'Request package information',
                     'color': 'blue-alt',
                     'callback': function () {
                         executeAction('request-packages-infos', hosts);