feat(auth): add custom user timeout (#3871)

* feat(auth): introduce new timeout constant * feat(auth): pass timeout from handler * feat(auth): add timeout selector to auth settings view * feat(settings): add user session timeout property * feat(auth): load user session timeout from settings * fix(settings): use correct time format * feat(auth): remove no-auth flag * refactor(auth): move timeout mgmt to jwt service * refactor(client): remove no-auth checks from client * refactor(cli): remove defaultNoAuth * feat(settings): create settings with default user timeout value * refactor(db): save user session timeout always * refactor(jwt): return error * feat(auth): set session timeout in jwt service on update * feat(auth): add description and time settings * feat(auth): parse duration * feat(settings): validate user timeout format * refactor(settings): remove unneccesary import
2025-08-02 20:35:25 +02:00 · 2020-06-09 12:55:36 +03:00 · 2020-06-09 12:55:36 +03:00 · b02749f877
commit b02749f877
parent b58c2facfe
73 changed files with 214 additions and 236 deletions
--- a/app/docker/components/datatables/configs-datatable/configsDatatable.html
+++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html
@ -90,7 +90,7 @@
                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'CreatedAt' && $ctrl.state.reverseOrder"></i>
                </a>
              </th>
-              <th ng-if="$ctrl.showOwnershipColumn">
+              <th>
                <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                  Ownership
                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourceControl.Ownership' && !$ctrl.state.reverseOrder"></i>
@ -112,7 +112,7 @@
                <a ui-sref="docker.configs.config({id: item.Id})">{{ item.Name }}</a>
              </td>
              <td>{{ item.CreatedAt | getisodate }}</td>
-              <td ng-if="$ctrl.showOwnershipColumn">
+              <td>
                <span>
                  <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
                  {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
--- a/app/docker/components/datatables/configs-datatable/configsDatatable.js
+++ b/app/docker/components/datatables/configs-datatable/configsDatatable.js
@ -8,7 +8,6 @@ angular.module('portainer.docker').component('configsDatatable', {
    tableKey: '@',
    orderBy: '@',
    reverseOrder: '<',
-    showOwnershipColumn: '<',
    removeAction: '<',
    refreshCallback: '<',
  },
--- a/app/docker/components/datatables/containers-datatable/containersDatatable.html
+++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html
@ -246,7 +246,7 @@
                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Ports' && $ctrl.state.reverseOrder"></i>
                </a>
              </th>
-              <th ng-if="$ctrl.showOwnershipColumn" ng-show="$ctrl.columnVisibility.columns.ownership.display">
+              <th ng-show="$ctrl.columnVisibility.columns.ownership.display">
                <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                  Ownership
                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourceControl.Ownership' && !$ctrl.state.reverseOrder"></i>
@ -319,7 +319,7 @@
                </a>
                <span ng-if="item.Ports.length == 0">-</span>
              </td>
-              <td ng-if="$ctrl.showOwnershipColumn" ng-show="$ctrl.columnVisibility.columns.ownership.display">
+              <td ng-show="$ctrl.columnVisibility.columns.ownership.display">
                <span>
                  <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
                  {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
--- a/app/docker/components/datatables/containers-datatable/containersDatatable.js
+++ b/app/docker/components/datatables/containers-datatable/containersDatatable.js
@ -8,7 +8,6 @@ angular.module('portainer.docker').component('containersDatatable', {
    tableKey: '@',
    orderBy: '@',
    reverseOrder: '<',
-    showOwnershipColumn: '<',
    showHostColumn: '<',
    showAddAction: '<',
    offlineMode: '<',
--- a/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html
+++ b/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html
@ -28,7 +28,7 @@
 <td>{{ item.IPAM.IPV6Configs[0].Subnet ? item.IPAM.IPV6Configs[0].Subnet : '-' }}</td>
 <td>{{ item.IPAM.IPV6Configs[0].Gateway ? item.IPAM.IPV6Configs[0].Gateway : '-' }}</td>
 <td ng-if="parentCtrl.showHostColumn">{{ item.NodeName ? item.NodeName : '-' }}</td>
-<td ng-if="parentCtrl.showOwnershipColumn">
+<td>
  <span>
    <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
    {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = RCO.ADMINISTRATORS }}
--- a/app/docker/components/datatables/networks-datatable/networksDatatable.html
+++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html
@ -151,7 +151,7 @@
                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'NodeName' && $ctrl.state.reverseOrder"></i>
                </a>
              </th>
-              <th ng-if="$ctrl.showOwnershipColumn">
+              <th>
                <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                  Ownership
                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourceControl.Ownership' && !$ctrl.state.reverseOrder"></i>
--- a/app/docker/components/datatables/networks-datatable/networksDatatable.js
+++ b/app/docker/components/datatables/networks-datatable/networksDatatable.js
@ -8,7 +8,6 @@ angular.module('portainer.docker').component('networksDatatable', {
    tableKey: '@',
    orderBy: '@',
    reverseOrder: '<',
-    showOwnershipColumn: '<',
    showHostColumn: '<',
    removeAction: '<',
    offlineMode: '<',
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
+++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
@ -90,7 +90,7 @@
                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'CreatedAt' && $ctrl.state.reverseOrder"></i>
                </a>
              </th>
-              <th ng-if="$ctrl.showOwnershipColumn">
+              <th>
                <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                  Ownership
                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourceControl.Ownership' && !$ctrl.state.reverseOrder"></i>
@ -112,7 +112,7 @@
                <a ui-sref="docker.secrets.secret({id: item.Id})">{{ item.Name }}</a>
              </td>
              <td>{{ item.CreatedAt | getisodate }}</td>
-              <td ng-if="$ctrl.showOwnershipColumn">
+              <td>
                <span>
                  <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
                  {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
+++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
@ -8,7 +8,6 @@ angular.module('portainer.docker').component('secretsDatatable', {
    tableKey: '@',
    orderBy: '@',
    reverseOrder: '<',
-    showOwnershipColumn: '<',
    removeAction: '<',
    refreshCallback: '<',
  },
--- a/app/docker/components/datatables/services-datatable/servicesDatatable.html
+++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html
@ -115,7 +115,7 @@
                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'UpdatedAt' && $ctrl.state.reverseOrder"></i>
                </a>
              </th>
-              <th ng-if="$ctrl.showOwnershipColumn">
+              <th>
                <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                  Ownership
                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourceControl.Ownership' && !$ctrl.state.reverseOrder"></i>
@ -180,7 +180,7 @@
                <span ng-if="!item.Ports || item.Ports.length === 0">-</span>
              </td>
              <td>{{ item.UpdatedAt | getisodate }}</td>
-              <td ng-if="$ctrl.showOwnershipColumn">
+              <td>
                <span>
                  <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
                  {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
--- a/app/docker/components/datatables/services-datatable/servicesDatatable.js
+++ b/app/docker/components/datatables/services-datatable/servicesDatatable.js
@ -10,7 +10,6 @@ angular.module('portainer.docker').component('servicesDatatable', {
    reverseOrder: '<',
    nodes: '<',
    agentProxy: '<',
-    showOwnershipColumn: '<',
    showUpdateAction: '<',
    showAddAction: '<',
    showStackColumn: '<',
--- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
@ -142,7 +142,7 @@
                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'NodeName' && $ctrl.state.reverseOrder"></i>
                </a>
              </th>
-              <th ng-if="$ctrl.showOwnershipColumn">
+              <th>
                <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                  Ownership
                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourceControl.Ownership' && !$ctrl.state.reverseOrder"></i>
@ -177,7 +177,7 @@
              <td>{{ item.Mountpoint | truncatelr }}</td>
              <td>{{ item.CreatedAt | getisodate }}</td>
              <td ng-if="$ctrl.showHostColumn">{{ item.NodeName ? item.NodeName : '-' }}</td>
-              <td ng-if="$ctrl.showOwnershipColumn">
+              <td>
                <span>
                  <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
                  {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
--- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js
+++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js
@ -8,7 +8,6 @@ angular.module('portainer.docker').component('volumesDatatable', {
    tableKey: '@',
    orderBy: '@',
    reverseOrder: '<',
-    showOwnershipColumn: '<',
    showHostColumn: '<',
    removeAction: '<',
    showBrowseAction: '<',
--- a/app/docker/components/network-macvlan-form/networkMacvlanForm.html
+++ b/app/docker/components/network-macvlan-form/networkMacvlanForm.html
@ -74,7 +74,7 @@
              state="$ctrl.data.DatatableState"
              order-by="Hostname"
              show-ip-address-column="$ctrl.applicationState.endpoint.apiVersion >= 1.25"
-              access-to-node-details="!$ctrl.applicationState.application.authentication || $ctrl.isAdmin"
+              access-to-node-details="$ctrl.isAdmin"
              name="node_selector"
              ng-model="tmp"
              ng-required="$ctrl.requiredNodeSelection()"
--- a/app/docker/components/network-macvlan-form/networkMacvlanFormController.js
+++ b/app/docker/components/network-macvlan-form/networkMacvlanFormController.js
@ -23,10 +23,9 @@ angular.module('portainer.docker').controller('NetworkMacvlanFormController', [
    };

    function initComponent() {
-      if (StateManager.getState().application.authentication) {
-        var isAdmin = Authentication.isAdmin();
-        ctrl.isAdmin = isAdmin;
-      }
+      var isAdmin = Authentication.isAdmin();
+      ctrl.isAdmin = isAdmin;
+
      var provider = ctrl.applicationState.endpoint.mode.provider;
      var apiVersion = ctrl.applicationState.endpoint.apiVersion;
      $q.all({
--- a/app/docker/views/configs/configs.html
+++ b/app/docker/views/configs/configs.html
@ -15,7 +15,6 @@
      dataset="ctrl.configs"
      table-key="configs"
      order-by="Name"
-      show-ownership-column="applicationState.application.authentication"
      remove-action="ctrl.removeAction"
      refresh-callback="ctrl.getConfigs"
    ></configs-datatable>
--- a/app/docker/views/configs/create/createconfig.html
+++ b/app/docker/views/configs/create/createconfig.html
@ -57,7 +57,7 @@
          </div>
          <!-- !labels-->
          <!-- access-control -->
-          <por-access-control-form form-data="ctrl.formValues.AccessControlData" ng-if="applicationState.application.authentication"></por-access-control-form>
+          <por-access-control-form form-data="ctrl.formValues.AccessControlData"></por-access-control-form>
          <!-- !access-control -->
          <!-- actions -->
          <div class="col-sm-12 form-section-title">
--- a/app/docker/views/configs/edit/config.html
+++ b/app/docker/views/configs/edit/config.html
@ -59,8 +59,7 @@
 </div>

 <!-- access-control-panel -->
-<por-access-control-panel ng-if="config && applicationState.application.authentication" resource-id="config.Id" resource-control="config.ResourceControl" resource-type="'config'">
-</por-access-control-panel>
+<por-access-control-panel ng-if="config" resource-id="config.Id" resource-control="config.ResourceControl" resource-type="'config'"> </por-access-control-panel>
 <!-- !access-control-panel -->

 <div class="row" ng-if="config">
--- a/app/docker/views/containers/containers.html
+++ b/app/docker/views/containers/containers.html
@ -15,7 +15,6 @@
      dataset="containers"
      table-key="containers"
      order-by="Status"
-      show-ownership-column="applicationState.application.authentication"
      show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
      show-add-action="true"
      offline-mode="offlineMode"
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@ -126,11 +126,7 @@
            <!-- !node-selection -->
          </div>
          <!-- access-control -->
-          <por-access-control-form
-            form-data="formValues.AccessControlData"
-            resource-control="fromContainer.ResourceControl"
-            ng-if="applicationState.application.authentication && fromContainer"
-          ></por-access-control-form>
+          <por-access-control-form form-data="formValues.AccessControlData" resource-control="fromContainer.ResourceControl" ng-if="fromContainer"></por-access-control-form>
          <!-- !access-control -->
          <!-- actions -->
          <div class="col-sm-12 form-section-title">
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@ -135,13 +135,7 @@
 </div>

 <!-- access-control-panel -->
-<por-access-control-panel
-  ng-if="container && applicationState.application.authentication"
-  resource-id="container.Id"
-  resource-control="container.ResourceControl"
-  resource-type="'container'"
->
-</por-access-control-panel>
+<por-access-control-panel ng-if="container" resource-id="container.Id" resource-control="container.ResourceControl" resource-type="'container'"> </por-access-control-panel>
 <!-- !access-control-panel -->

 <div ng-if="container.State.Health" class="row">
--- a/app/docker/views/networks/create/createnetwork.html
+++ b/app/docker/views/networks/create/createnetwork.html
@ -194,7 +194,7 @@
            <!-- !node-selection -->
          </div>
          <!-- access-control -->
-          <por-access-control-form form-data="formValues.AccessControlData" ng-if="applicationState.application.authentication"></por-access-control-form>
+          <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
          <!-- !access-control -->
          <!-- actions -->
          <div class="col-sm-12 form-section-title">
--- a/app/docker/views/networks/edit/network.html
+++ b/app/docker/views/networks/edit/network.html
@ -66,7 +66,7 @@

 <!-- access-control-panel -->
 <por-access-control-panel
-  ng-if="network && applicationState.application.authentication"
+  ng-if="network"
  resource-id="network.Id"
  resource-control="network.ResourceControl"
  resource-type="'network'"
--- a/app/docker/views/networks/networks.html
+++ b/app/docker/views/networks/networks.html
@ -16,7 +16,6 @@
      table-key="networks"
      order-by="Name"
      remove-action="removeAction"
-      show-ownership-column="applicationState.application.authentication"
      show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
      offline-mode="offlineMode"
      refresh-callback="getNetworks"
--- a/app/docker/views/secrets/create/createsecret.html
+++ b/app/docker/views/secrets/create/createsecret.html
@ -61,7 +61,7 @@
          </div>
          <!-- !labels-->
          <!-- access-control -->
-          <por-access-control-form form-data="formValues.AccessControlData" ng-if="applicationState.application.authentication"></por-access-control-form>
+          <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
          <!-- !access-control -->
          <!-- actions -->
          <div class="col-sm-12 form-section-title">
--- a/app/docker/views/secrets/edit/secret.html
+++ b/app/docker/views/secrets/edit/secret.html
@ -56,6 +56,5 @@
 </div>

 <!-- access-control-panel -->
-<por-access-control-panel ng-if="secret && applicationState.application.authentication" resource-id="secret.Id" resource-control="secret.ResourceControl" resource-type="'secret'">
-</por-access-control-panel>
+<por-access-control-panel ng-if="secret" resource-id="secret.Id" resource-control="secret.ResourceControl" resource-type="'secret'"> </por-access-control-panel>
 <!-- !access-control-panel -->
--- a/app/docker/views/secrets/secrets.html
+++ b/app/docker/views/secrets/secrets.html
@ -15,7 +15,6 @@
      dataset="secrets"
      table-key="secrets"
      order-by="Name"
-      show-ownership-column="applicationState.application.authentication"
      remove-action="removeAction"
      refresh-callback="getSecrets"
    ></secrets-datatable>
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@ -112,7 +112,7 @@
          </div>
          <!-- !create-webhook  -->
          <!-- access-control -->
-          <por-access-control-form form-data="formValues.AccessControlData" ng-if="applicationState.application.authentication"></por-access-control-form>
+          <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
          <!-- !access-control -->
          <!-- actions -->
          <div class="col-sm-12 form-section-title">
--- a/app/docker/views/services/edit/service.html
+++ b/app/docker/views/services/edit/service.html
@ -99,7 +99,6 @@
              <td colspan="2">
                <p class="small text-muted" authorization="DockerServiceUpdate">
                  Note: you can only rollback one level of changes. Clicking the rollback button without making a new change will undo your previous rollback </p
-
                ><p>
                  <a
                    authorization="DockerServiceLogs"
@ -199,13 +198,7 @@
 </div>

 <!-- access-control-panel -->
-<por-access-control-panel
-  ng-if="service && applicationState.application.authentication"
-  resource-id="service.Id"
-  resource-control="service.ResourceControl"
-  resource-type="'service'"
->
-</por-access-control-panel>
+<por-access-control-panel ng-if="service" resource-id="service.Id" resource-control="service.ResourceControl" resource-type="'service'"> </por-access-control-panel>
 <!-- !access-control-panel -->

 <div class="row">
--- a/app/docker/views/services/services.html
+++ b/app/docker/views/services/services.html
@ -17,7 +17,6 @@
      order-by="Name"
      nodes="nodes"
      agent-proxy="applicationState.endpoint.mode.agentProxy"
-      show-ownership-column="applicationState.application.authentication"
      show-update-action="applicationState.endpoint.apiVersion >= 1.25"
      show-task-logs-button="applicationState.endpoint.apiVersion >= 1.30"
      show-add-action="true"
--- a/app/docker/views/swarm/swarm.html
+++ b/app/docker/views/swarm/swarm.html
@ -53,7 +53,7 @@
      table-key="nodes"
      order-by="Hostname"
      show-ip-address-column="applicationState.endpoint.apiVersion >= 1.25"
-      access-to-node-details="!applicationState.application.authentication || isAdmin"
+      access-to-node-details="isAdmin"
      refresh-callback="getNodes"
    ></nodes-datatable>
  </div>
--- a/app/docker/views/swarm/swarmController.js
+++ b/app/docker/views/swarm/swarmController.js
@ -82,9 +82,7 @@ angular.module('portainer.docker').controller('SwarmController', [
    }

    function initView() {
-      if (StateManager.getState().application.authentication) {
-        $scope.isAdmin = Authentication.isAdmin();
-      }
+      $scope.isAdmin = Authentication.isAdmin();

      var provider = $scope.applicationState.endpoint.mode.provider;
      $q.all({
--- a/app/docker/views/volumes/create/createvolume.html
+++ b/app/docker/views/volumes/create/createvolume.html
@ -72,9 +72,7 @@
              <input type="checkbox" name="useNFS" ng-model="formValues.NFSData.useNFS" ng-click="formValues.CIFSData.useCIFS = false" />
              <i></i>
            </label>
-            <div ng-if="formValues.NFSData.useNFS" class="small text-muted" style="margin-top: 10px;">
-              Ensure <code>nfs-utils</code> are installed on your hosts.
-            </div>
+            <div ng-if="formValues.NFSData.useNFS" class="small text-muted" style="margin-top: 10px;"> Ensure <code>nfs-utils</code> are installed on your hosts. </div>
          </div>
          <volumes-nfs-form data="formValues.NFSData" ng-show="formValues.Driver === 'local'"></volumes-nfs-form>
          <!-- !nfs-management -->
@ -87,9 +85,7 @@
              <input type="checkbox" name="useCIFS" ng-model="formValues.CIFSData.useCIFS" ng-click="formValues.NFSData.useNFS = false" />
              <i></i>
            </label>
-            <div ng-if="formValues.CIFSData.useCIFS" class="small text-muted" style="margin-top: 10px;">
-              Ensure <code>cifs-utils</code> are installed on your hosts.
-            </div>
+            <div ng-if="formValues.CIFSData.useCIFS" class="small text-muted" style="margin-top: 10px;"> Ensure <code>cifs-utils</code> are installed on your hosts. </div>
          </div>
          <volumes-cifs-form data="formValues.CIFSData" ng-show="formValues.Driver === 'local'"></volumes-cifs-form>
          <!-- !cifs-management -->
@ -110,7 +106,7 @@
            <!-- !node-selection -->
          </div>
          <!-- access-control -->
-          <por-access-control-form form-data="formValues.AccessControlData" ng-if="applicationState.application.authentication"></por-access-control-form>
+          <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
          <!-- !access-control -->
          <!-- actions -->
          <div class="col-sm-12 form-section-title">
--- a/app/docker/views/volumes/edit/volume.html
+++ b/app/docker/views/volumes/edit/volume.html
@ -78,8 +78,7 @@
 </div>

 <!-- access-control-panel -->
-<por-access-control-panel ng-if="volume && applicationState.application.authentication" resource-id="volume.Id" resource-control="volume.ResourceControl" resource-type="'volume'">
-</por-access-control-panel>
+<por-access-control-panel ng-if="volume" resource-id="volume.Id" resource-control="volume.ResourceControl" resource-type="'volume'"> </por-access-control-panel>
 <!-- !access-control-panel -->

 <div class="row" ng-if="!(volume.Options | emptyobject)">
--- a/app/docker/views/volumes/volumes.html
+++ b/app/docker/views/volumes/volumes.html
@ -16,7 +16,6 @@
      table-key="volumes"
      order-by="Id"
      remove-action="removeAction"
-      show-ownership-column="applicationState.application.authentication"
      show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
      show-browse-action="showBrowseAction"
      offline-mode="offlineMode"