feat(extensions): introduce RBAC extension (#2900)

app/docker/components/container-quick-actions/containerQuickActions.html

@@ -1,40 +1,46 @@
 <div class="btn-group btn-group-xs" role="group" aria-label="..." style="display:inline-flex;">
-  <a 
-    ng-if="$ctrl.state.showQuickActionLogs && $ctrl.taskId === undefined" 
-    style="margin: 0 2.5px;" 
-    ui-sref="docker.containers.container.logs({id: $ctrl.containerId, nodeName: $ctrl.nodeName})" 
+  <a
+    authorization="DockerContainerLogs"
+    ng-if="$ctrl.state.showQuickActionLogs && $ctrl.taskId === undefined"
+    style="margin: 0 2.5px;"
+    ui-sref="docker.containers.container.logs({id: $ctrl.containerId, nodeName: $ctrl.nodeName})"
     title="Logs">
     <i class="fa fa-file-alt space-right" aria-hidden="true"></i>
   </a>
-  <a 
-    ng-if="$ctrl.state.showQuickActionLogs && $ctrl.taskId !== undefined" 
-    style="margin: 0 2.5px;" 
-    ui-sref="docker.tasks.task.logs({id: $ctrl.taskId})" 
+  <a
+    authorization="DockerTaskLogs"
+    ng-if="$ctrl.state.showQuickActionLogs && $ctrl.taskId !== undefined"
+    style="margin: 0 2.5px;"
+    ui-sref="docker.tasks.task.logs({id: $ctrl.taskId})"
     title="Logs">
     <i class="fa fa-file-alt space-right" aria-hidden="true"></i>
   </a>
-  <a 
-    ng-if="$ctrl.state.showQuickActionInspect && $ctrl.taskId === undefined" 
-    style="margin: 0 2.5px;" 
-    ui-sref="docker.containers.container.inspect({id: $ctrl.containerId, nodeName: $ctrl.nodeName})" 
+  <a
+  authorization="DockerContainerInspect"
+    ng-if="$ctrl.state.showQuickActionInspect && $ctrl.taskId === undefined"
+    style="margin: 0 2.5px;"
+    ui-sref="docker.containers.container.inspect({id: $ctrl.containerId, nodeName: $ctrl.nodeName})"
     title="Inspect">
     <i class="fa fa-info-circle space-right" aria-hidden="true"></i>
   </a>
-  <a 
-    ng-if="$ctrl.state.showQuickActionInspect && $ctrl.taskId !== undefined" 
-    style="margin: 0 2.5px;" 
-    ui-sref="docker.tasks.task({id: $ctrl.taskId})" 
+  <a
+    authorization="DockerTaskInspect"
+    ng-if="$ctrl.state.showQuickActionInspect && $ctrl.taskId !== undefined"
+    style="margin: 0 2.5px;"
+    ui-sref="docker.tasks.task({id: $ctrl.taskId})"
     title="Inspect">
     <i class="fa fa-info-circle space-right" aria-hidden="true"></i>
   </a>
-  <a 
-    ng-if="$ctrl.state.showQuickActionStats && ['starting', 'running', 'healthy', 'unhealthy'].indexOf($ctrl.status) !== -1 && $ctrl.taskId === undefined" 
-    style="margin: 0 2.5px;" 
-    ui-sref="docker.containers.container.stats({id: $ctrl.containerId, nodeName: $ctrl.nodeName})" 
+  <a
+    authorization="DockerContainerStats"
+    ng-if="$ctrl.state.showQuickActionStats && ['starting', 'running', 'healthy', 'unhealthy'].indexOf($ctrl.status) !== -1 && $ctrl.taskId === undefined"
+    style="margin: 0 2.5px;"
+    ui-sref="docker.containers.container.stats({id: $ctrl.containerId, nodeName: $ctrl.nodeName})"
     title="Stats">
     <i class="fa fa-chart-area space-right" aria-hidden="true"></i>
   </a>
   <a
+    authorization="DockerExecStart"
     ng-if="$ctrl.state.showQuickActionConsole && ['starting', 'running', 'healthy', 'unhealthy'].indexOf($ctrl.status) !== -1 && $ctrl.taskId === undefined"
     style="margin: 0 2.5px;"
     ui-sref="docker.containers.container.exec({id: $ctrl.containerId, nodeName: $ctrl.nodeName})"
@@ -42,6 +48,7 @@
     <i class="fa fa-terminal space-right" aria-hidden="true"></i>
   </a>
   <a
+    authorization="DockerContainerAttach"
     ng-if="$ctrl.state.showQuickActionConsole && ['starting', 'running', 'healthy', 'unhealthy'].indexOf($ctrl.status) !== -1 && $ctrl.taskId === undefined"
     style="margin: 0 2.5px;"
     ui-sref="docker.containers.container.attach({id: $ctrl.containerId, nodeName: $ctrl.nodeName})"

app/docker/components/container-restart-policy/container-restart-policy.html

@@ -5,14 +5,14 @@
         <span>Name</span>
       </td>
       <td>
-        <select class="form-control" ng-model="$ctrl.state.editModel.name">
+        <select class="form-control" ng-model="$ctrl.state.editModel.name" disable-authorization="DockerContainerUpdate">
           <option value="no">None</option>
           <option value="on-failure">On Failure</option>
           <option value="always">Always</option>
           <option value="unless-stopped">Unless Stopped</option>
         </select>
       </td>
-      <td class="col-md-2">
+      <td class="col-md-2" authorization="DockerContainerUpdate">
         <button class="btn btn-sm btn-primary" ng-click="$ctrl.save()">Update</button>
       </td>
     </tr>

app/docker/components/datatables/configs-datatable/configsDatatable.html

@@ -6,12 +6,12 @@
           <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
       </div>
-      <div class="actionBar">
-        <button type="button" class="btn btn-sm btn-danger"
+      <div class="actionBar" authorization="DockerConfigDelete, DockerConfigCreate">
+        <button type="button" class="btn btn-sm btn-danger" authorization="DockerConfigDelete"
           ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-	<button type="button" class="btn btn-sm btn-primary" ui-sref="docker.configs.new">
+	       <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.configs.new" authorization="DockerConfigCreate">
           <i class="fa fa-plus space-right" aria-hidden="true"></i>Add config
         </button>
       </div>
@@ -24,7 +24,7 @@
           <thead>
             <tr>
               <th>
-                <span class="md-checkbox">
+                <span class="md-checkbox" authorization="DockerConfigDelete, DockerConfigCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
                 </span>
@@ -53,7 +53,7 @@
           <tbody>
             <tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
               <td>
-                <span class="md-checkbox">
+                <span class="md-checkbox" authorization="DockerConfigDelete, DockerConfigCreate">
                   <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)"/>
                   <label for="select_{{ $index }}"></label>
                 </span>

app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html

@@ -8,7 +8,7 @@
       </div>
       <div class="actionBar">
         <form class="form-horizontal">
-          <div class="row">
+          <div class="row" authorization="DockerNetworkConnect">
             <label for="container_network" class="col-sm-3 col-lg-2 control-label text-left">Join a network</label>
             <div class="col-sm-5 col-lg-4">
               <select class="form-control" ng-model="$ctrl.selectedNetwork" id="container_network">
@@ -42,7 +42,7 @@
               <td>{{ value.IPAddress || '-' }}</td>
               <td>{{ value.Gateway || '-' }}</td>
               <td>{{ value.MacAddress || '-' }}</td>
-              <td>
+              <td authorization="DockerNetworkDisconnect">
                 <button type="button" class="btn btn-xs btn-danger" ng-disabled="$ctrl.leaveNetworkActionInProgress" button-spinner="$ctrl.leaveNetworkActionInProgress" ng-click="$ctrl.leaveNetworkAction($ctrl.container, key)">
                   <span ng-hide="$ctrl.leaveNetworkActionInProgress"><i class="fa fa-trash-alt space-right" aria-hidden="true"></i> Leave network</span>
                   <span ng-show="$ctrl.leaveNetworkActionInProgress">Leaving network...</span>

app/docker/components/datatables/containers-datatable/actions/containersDatatableActions.html

@@ -1,35 +1,35 @@
-<div class="actionBar">
+<div class="actionBar" authorization="DockerContainerStart, DockerContainerStop, DockerContainerKill, DockerContainerRestart, DockerContainerPause, DockerContainerUnpause, DockerContainerDelete, DockerContainerCreate">
   <div class="btn-group" role="group" aria-label="...">
-    <button type="button" class="btn btn-sm btn-success" ng-click="$ctrl.startAction($ctrl.selectedItems)"
+    <button authorization="DockerContainerStart" type="button" class="btn btn-sm btn-success" ng-click="$ctrl.startAction($ctrl.selectedItems)"
       ng-disabled="$ctrl.selectedItemCount === 0 || $ctrl.noStoppedItemsSelected">
       <i class="fa fa-play space-right" aria-hidden="true"></i>Start
     </button>
-    <button type="button" class="btn btn-sm btn-danger" ng-click="$ctrl.stopAction($ctrl.selectedItems)"
+    <button authorization="DockerContainerStop" type="button" class="btn btn-sm btn-danger" ng-click="$ctrl.stopAction($ctrl.selectedItems)"
       ng-disabled="$ctrl.selectedItemCount === 0 || $ctrl.noRunningItemsSelected">
       <i class="fa fa-stop space-right" aria-hidden="true"></i>Stop
     </button>
-    <button type="button" class="btn btn-sm btn-danger" ng-click="$ctrl.killAction($ctrl.selectedItems)"
+    <button authorization="DockerContainerKill" type="button" class="btn btn-sm btn-danger" ng-click="$ctrl.killAction($ctrl.selectedItems)"
       ng-disabled="$ctrl.selectedItemCount === 0">
       <i class="fa fa-bomb space-right" aria-hidden="true"></i>Kill
     </button>
-    <button type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.restartAction($ctrl.selectedItems)"
+    <button authorization="DockerContainerRestart" type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.restartAction($ctrl.selectedItems)"
       ng-disabled="$ctrl.selectedItemCount === 0">
       <i class="fa fa-sync space-right" aria-hidden="true"></i>Restart
     </button>
-    <button type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.pauseAction($ctrl.selectedItems)"
+    <button authorization="DockerContainerPause" type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.pauseAction($ctrl.selectedItems)"
       ng-disabled="$ctrl.selectedItemCount === 0 || $ctrl.noRunningItemsSelected">
       <i class="fa fa-pause space-right" aria-hidden="true"></i>Pause
     </button>
-    <button type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.resumeAction($ctrl.selectedItems)"
+    <button authorization="DockerContainerUnpause" type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.resumeAction($ctrl.selectedItems)"
       ng-disabled="$ctrl.selectedItemCount === 0 || $ctrl.noPausedItemsSelected">
       <i class="fa fa-play space-right" aria-hidden="true"></i>Resume
     </button>
-    <button type="button" class="btn btn-sm btn-danger"
+    <button authorization="DockerContainerDelete" type="button" class="btn btn-sm btn-danger"
       ng-disabled="$ctrl.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.selectedItems)">
       <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
     </button>
   </div>
-  <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.containers.new" ng-if="$ctrl.showAddAction">
+  <button authorization="DockerContainerCreate" type="button" class="btn btn-sm btn-primary" ui-sref="docker.containers.new" ng-if="$ctrl.showAddAction">
     <i class="fa fa-plus space-right" aria-hidden="true"></i>Add container
   </button>
 </div>

app/docker/components/datatables/containers-datatable/containersDatatable.html

@@ -14,7 +14,7 @@
                     Show / Hide Columns
                   </div>
                   <div class="menuContent">
-                    <div class="md-checkbox">
+                    <div class="md-checkbox" >
                       <input id="col_vis_state" ng-click="$ctrl.onColumnVisibilityChange()" type="checkbox" ng-model="$ctrl.columnVisibility.columns.state.display"/>
                       <label for="col_vis_state" ng-bind="$ctrl.columnVisibility.columns.state.label"></label>
                     </div>
@@ -70,25 +70,27 @@
                     <label for="setting_container_trunc">Truncate container name</label>
                   </div>
                 </div>
-                <div class="menuHeader">
-                  Quick actions
-                </div>
-                <div class="menuContent">
-                  <div class="md-checkbox">
-                    <input id="setting_show_stats" type="checkbox" ng-model="$ctrl.settings.showQuickActionStats" ng-change="$ctrl.onSettingsQuickActionChange()"/>
-                    <label for="setting_show_stats">Stats</label>
+                <div authorization="DockerContainerStats, DockerContainerLogs, DockerExecStart, DockerContainerInspect, DockerTaskInspect, DockerTaskLogs">
+                  <div class="menuHeader">
+                    Quick actions
                   </div>
-                  <div class="md-checkbox">
-                    <input id="setting_show_logs" type="checkbox" ng-model="$ctrl.settings.showQuickActionLogs" ng-change="$ctrl.onSettingsQuickActionChange()"/>
-                    <label for="setting_show_logs">Logs</label>
-                  </div>
-                  <div class="md-checkbox">
-                    <input id="setting_show_console" type="checkbox" ng-model="$ctrl.settings.showQuickActionConsole" ng-change="$ctrl.onSettingsQuickActionChange()"/>
-                    <label for="setting_show_console">Console</label>
-                  </div>
-                  <div class="md-checkbox">
-                    <input id="setting_show_inspect" type="checkbox" ng-model="$ctrl.settings.showQuickActionInspect" ng-change="$ctrl.onSettingsQuickActionChange()"/>
-                    <label for="setting_show_inspect">Inspect</label>
+                  <div class="menuContent">
+                    <div class="md-checkbox" authorization="DockerContainerStats">
+                      <input id="setting_show_stats" type="checkbox" ng-model="$ctrl.settings.showQuickActionStats" ng-change="$ctrl.onSettingsQuickActionChange()"/>
+                      <label for="setting_show_stats">Stats</label>
+                    </div>
+                    <div class="md-checkbox" authorization="DockerContainerLogs">
+                      <input id="setting_show_logs" type="checkbox" ng-model="$ctrl.settings.showQuickActionLogs" ng-change="$ctrl.onSettingsQuickActionChange()"/>
+                      <label for="setting_show_logs">Logs</label>
+                    </div>
+                    <div class="md-checkbox" authorization="DockerExecStart">
+                      <input id="setting_show_console" type="checkbox" ng-model="$ctrl.settings.showQuickActionConsole" ng-change="$ctrl.onSettingsQuickActionChange()"/>
+                      <label for="setting_show_console">Console</label>
+                    </div>
+                    <div class="md-checkbox" authorization="DockerContainerInspect">
+                      <input id="setting_show_inspect" type="checkbox" ng-model="$ctrl.settings.showQuickActionInspect" ng-change="$ctrl.onSettingsQuickActionChange()"/>
+                      <label for="setting_show_inspect">Inspect</label>
+                    </div>
                   </div>
                 </div>
                 <div>
@@ -116,7 +118,7 @@
           <thead>
             <tr>
               <th>
-                <span class="md-checkbox" ng-if="!$ctrl.offlineMode">
+                <span class="md-checkbox" ng-if="!$ctrl.offlineMode" authorization="DockerContainerStart, DockerContainerStop, DockerContainerKill, DockerContainerRestart, DockerContainerPause, DockerContainerUnpause, DockerContainerDelete, DockerContainerCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
                 </span>
@@ -153,7 +155,7 @@
                   </div>
                 </div>
               </th>
-              <th ng-if="$ctrl.settings.showQuickActionStats || $ctrl.settings.showQuickActionLogs || $ctrl.settings.showQuickActionConsole || $ctrl.settings.showQuickActionInspect" ng-show="$ctrl.columnVisibility.columns.actions.display">
+              <th ng-if="$ctrl.settings.showQuickActionStats || $ctrl.settings.showQuickActionLogs || $ctrl.settings.showQuickActionConsole || $ctrl.settings.showQuickActionInspect" ng-show="$ctrl.columnVisibility.columns.actions.display" authorization="DockerContainerStats, DockerContainerLogs, DockerExecStart, DockerContainerInspect, DockerTaskInspect, DockerTaskLogs">
                 Quick actions
               </th>
               <th ng-show="$ctrl.columnVisibility.columns.stack.display">
@@ -210,7 +212,7 @@
           <tbody>
             <tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter: $ctrl.applyFilters | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
               <td>
-                <span class="md-checkbox" ng-if="!$ctrl.offlineMode">
+                <span class="md-checkbox" ng-if="!$ctrl.offlineMode" authorization="DockerContainerStart, DockerContainerStop, DockerContainerKill, DockerContainerRestart, DockerContainerPause, DockerContainerUnpause, DockerContainerDelete, DockerContainerCreate">
                   <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)"/>
                   <label for="select_{{ $index }}"></label>
                 </span>
@@ -221,7 +223,7 @@
                 <span ng-if="['starting','healthy','unhealthy'].indexOf(item.Status) !== -1" class="label label-{{ item.Status|containerstatusbadge }} interactive" uib-tooltip="This container has a health check">{{ item.Status }}</span>
                 <span ng-if="['starting','healthy','unhealthy'].indexOf(item.Status) === -1" class="label label-{{ item.Status|containerstatusbadge }}">{{ item.Status }}</span>
               </td>
-              <td ng-if="!$ctrl.offlineMode && ($ctrl.settings.showQuickActionStats || $ctrl.settings.showQuickActionLogs || $ctrl.settings.showQuickActionConsole || $ctrl.settings.showQuickActionInspect)" ng-show="$ctrl.columnVisibility.columns.actions.display">
+              <td ng-if="!$ctrl.offlineMode && ($ctrl.settings.showQuickActionStats || $ctrl.settings.showQuickActionLogs || $ctrl.settings.showQuickActionConsole || $ctrl.settings.showQuickActionInspect)" ng-show="$ctrl.columnVisibility.columns.actions.display" authorization="DockerContainerStats, DockerContainerLogs, DockerExecStart, DockerContainerInspect, DockerTaskInspect, DockerTaskLogs">
                 <container-quick-actions container-id="item.Id" node-name="item.NodeName" status="item.Status" state="$ctrl.settings"></container-quick-actions>
               </td>
               <td ng-if="$ctrl.offlineMode">

app/docker/components/datatables/images-datatable/imagesDatatable.html

@@ -6,8 +6,8 @@
           <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
       </div>
-      <div class="actionBar" ng-if="!$ctrl.offlineMode">
-        <div class="btn-group">
+      <div class="actionBar" ng-if="!$ctrl.offlineMode" authorization="DockerImageDelete, DockerImageBuild, DockerImageLoad, DockerImageGet">
+        <div class="btn-group" authorization="DockerImageDelete">
           <button type="button" class="btn btn-sm btn-danger"
             ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems, false)">
             <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
@@ -20,15 +20,15 @@
             <li><a ng-click="$ctrl.forceRemoveAction($ctrl.state.selectedItems, true)" ng-disabled="$ctrl.state.selectedItemCount === 0">Force Remove</a></li>
           </ul>
         </div>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.images.build">
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.images.build" authorization="DockerImageBuild">
           <i class="fa fa-plus space-right" aria-hidden="true"></i>Build a new image
         </button>
         <div class="btn-group">
-          <button type="button" class="btn btn-sm btn-primary" ng-disabled="$ctrl.exportInProgress" ui-sref="docker.images.import">
+          <button type="button" class="btn btn-sm btn-primary" ng-disabled="$ctrl.exportInProgress" ui-sref="docker.images.import" authorization="DockerImageLoad">
               <i class="fa fa-upload space-right" aria-hidden="true"></i>Import
           </button>
           <button type="button" class="btn btn-sm btn-primary" ng-disabled="$ctrl.state.selectedItemCount === 0 || $ctrl.exportInProgress"
-            ng-click="$ctrl.downloadAction($ctrl.state.selectedItems)" button-spinner="$ctrl.exportInProgress">
+            ng-click="$ctrl.downloadAction($ctrl.state.selectedItems)" button-spinner="$ctrl.exportInProgress" authorization="DockerImageGet">
               <i class="fa fa-download space-right" aria-hidden="true"></i>
               <span ng-hide="$ctrl.exportInProgress">Export</span>
               <span ng-show="$ctrl.exportInProgress">Export in progress...</span>

app/docker/components/datatables/networks-datatable/networksDatatable.html

@@ -6,12 +6,12 @@
           <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
       </div>
-      <div class="actionBar" ng-if="!$ctrl.offlineMode">
-        <button type="button" class="btn btn-sm btn-danger"
+      <div class="actionBar" ng-if="!$ctrl.offlineMode" authorization="DockerNetworkDelete, DockerNetworkCreate">
+        <button type="button" class="btn btn-sm btn-danger" authorization="DockerNetworkDelete"
           ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.networks.new">
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.networks.new" authorization="DockerNetworkCreate">
           <i class="fa fa-plus space-right" aria-hidden="true"></i>Add network
         </button>
       </div>

app/docker/components/datatables/secrets-datatable/secretsDatatable.html

@@ -6,12 +6,12 @@
           <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
       </div>
-      <div class="actionBar">
-        <button type="button" class="btn btn-sm btn-danger"
+      <div class="actionBar" authorization="DockerSecretDelete, DockerSecretCreate">
+        <button type="button" class="btn btn-sm btn-danger" authorization="DockerSecretDelete"
           ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.secrets.new">
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.secrets.new" authorization="DockerSecretCreate">
           <i class="fa fa-plus space-right" aria-hidden="true"></i>Add secret
         </button>
       </div>
@@ -24,7 +24,7 @@
           <thead>
             <tr>
               <th>
-                <span class="md-checkbox">
+                <span class="md-checkbox" authorization="DockerSecretDelete, DockerSecretCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
                 </span>
@@ -53,7 +53,7 @@
           <tbody>
             <tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
               <td>
-                <span class="md-checkbox">
+                <span class="md-checkbox" authorization="DockerSecretDelete, DockerSecretCreate">
                   <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)"/>
                   <label for="select_{{ $index }}"></label>
                 </span>

app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html

@@ -1,15 +1,15 @@
-<div class="actionBar">
+<div class="actionBar" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
   <div class="btn-group" role="group" aria-label="...">
-    <button ng-if="$ctrl.showUpdateAction" type="button" class="btn btn-sm btn-primary"
+    <button ng-if="$ctrl.showUpdateAction" type="button" class="btn btn-sm btn-primary" authorization="DockerServiceUpdate"
       ng-disabled="$ctrl.selectedItemCount === 0" ng-click="$ctrl.updateAction($ctrl.selectedItems)">
       <i class="fa fa-sync space-right" aria-hidden="true"></i>Update
     </button>
-    <button type="button" class="btn btn-sm btn-danger"
+    <button type="button" class="btn btn-sm btn-danger" authorization="DockerServiceDelete"
       ng-disabled="$ctrl.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.selectedItems)">
       <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
     </button>
   </div>
-  <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.services.new" ng-if="$ctrl.showAddAction">
+  <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.services.new" ng-if="$ctrl.showAddAction" authorization="DockerServiceCreate">
     <i class="fa fa-plus space-right" aria-hidden="true"></i>Add service
   </button>
 </div>

app/docker/components/datatables/services-datatable/servicesDatatable.html

@@ -21,7 +21,7 @@
           <thead>
             <tr>
               <th style="width:55px;">
-                <span class="md-checkbox">
+                <span class="md-checkbox" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
                 </span>
@@ -83,7 +83,7 @@
           <tbody>
             <tr ng-click="$ctrl.expandItem(item, !item.Expanded)" dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}" class="interactive">
               <td>
-                <span class="md-checkbox">
+                <span class="md-checkbox" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
                   <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)"/>
                   <label for="select_{{ $index }}"></label>
                 </span>
@@ -97,7 +97,7 @@
               <td ng-controller="ServicesDatatableActionsController as actionCtrl">
                 {{ item.Mode }}
                 <code>{{ item.Tasks | runningtaskscount }}</code> / <code>{{ item.Mode === 'replicated' ? item.Replicas : ($ctrl.nodes | availablenodecount:item) }}</code>
-                <span ng-if="item.Mode === 'replicated' && !item.Scale">
+                <span ng-if="item.Mode === 'replicated' && !item.Scale" authorization="DockerServiceUpdate">
                   <a class="interactive" ng-click="item.Scale = true; item.ReplicaCount = item.Replicas; $event.stopPropagation();">
                     <i class="fa fa-arrows-alt-v" aria-hidden="true"></i> Scale
                   </a>

app/docker/components/datatables/volumes-datatable/volumesDatatable.html

@@ -6,12 +6,12 @@
           <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
       </div>
-      <div class="actionBar" ng-if="!$ctrl.offlineMode">
-        <button type="button" class="btn btn-sm btn-danger"
+      <div class="actionBar" ng-if="!$ctrl.offlineMode" authorization="DockerVolumeDelete, DockerVolumeCreate">
+        <button type="button" class="btn btn-sm btn-danger" authorization="DockerVolumeDelete"
           ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.volumes.new">
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.volumes.new" authorization="DockerVolumeCreate">
           <i class="fa fa-plus space-right" aria-hidden="true"></i>Add volume
         </button>
       </div>
@@ -24,7 +24,7 @@
           <thead>
             <tr>
               <th uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.filters.usage.open">
-                <span class="md-checkbox" ng-if="!$ctrl.offlineMode">
+                <span class="md-checkbox" ng-if="!$ctrl.offlineMode" authorization="DockerVolumeDelete, DockerVolumeCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
                 </span>
@@ -105,13 +105,13 @@
           <tbody>
             <tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter: $ctrl.applyFilters | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
               <td>
-                <span class="md-checkbox" ng-if="!$ctrl.offlineMode">
+                <span class="md-checkbox" ng-if="!$ctrl.offlineMode" authorization="DockerVolumeDelete, DockerVolumeCreate">
                   <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)"/>
                   <label for="select_{{ $index }}"></label>
                 </span>
                 <a ng-if="!$ctrl.offlineMode" ui-sref="docker.volumes.volume({ id: item.Id, nodeName: item.NodeName })" class="monospaced" title="{{ item.Id }}">{{ item.Id | truncate:40 }}</a>
                 <span ng-if="$ctrl.offlineMode">{{ item.Id | truncate:40 }}</span>
-                <a ui-sref="docker.volumes.volume.browse({ id: item.Id, nodeName: item.NodeName })" class="btn btn-xs btn-primary space-left" ng-if="$ctrl.showBrowseAction && !$ctrl.offlineMode">
+                <a authorization="DockerAgentBrowseList" ui-sref="docker.volumes.volume.browse({ id: item.Id, nodeName: item.NodeName })" class="btn btn-xs btn-primary space-left" ng-if="$ctrl.showBrowseAction && !$ctrl.offlineMode">
                   <i class="fa fa-search"></i> browse</a>
                 </a>
                 <span style="margin-left: 10px;" class="label label-warning image-tag space-left" ng-if="item.dangling">Unused</span>

app/docker/components/dockerSidebarContent/dockerSidebarContent.html

@@ -1,7 +1,7 @@
 <li class="sidebar-list">
   <a ui-sref="docker.dashboard" ui-sref-active="active">Dashboard <span class="menu-icon fa fa-tachometer-alt fa-fw"></span></a>
 </li>
-<li class="sidebar-list" ng-if="!$ctrl.offlineMode">
+<li class="sidebar-list" ng-if="!$ctrl.offlineMode" authorization="DockerContainerCreate, PortainerStackCreate">
   <a ui-sref="portainer.templates" ui-sref-active="active">App Templates <span class="menu-icon fa fa-rocket fa-fw"></span></a>
 </li>
 <li class="sidebar-list">

app/docker/components/network-macvlan-form/networkMacvlanFormController.js

@@ -19,8 +19,7 @@ angular.module('portainer.docker')
 
       function initComponent() {
         if (StateManager.getState().application.authentication) {
-          var userDetails = Authentication.getUserDetails();
-          var isAdmin = userDetails.role === 1 ? true : false;
+          var isAdmin = Authentication.isAdmin();
           ctrl.isAdmin = isAdmin;
         }
         var provider = ctrl.applicationState.endpoint.mode.provider;