Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-03 04:45:21 +02:00
Code Issues Releases Activity

fix(stacks): enforce stack permissions for non admin users EE-3683 (#7399)

Browse source 
* fix(stacks): hide stacks in sidebar EE-3683

* fix(stacks): for unauth, take the user to the dashboard

* fix(stacks): block the user from stack details EE-3683

* fix(stacks): disable stack managment for non admins
This commit is contained in:
Ali 2022-08-03 22:19:27 +12:00 • committed by GitHub
parent d8db8718bd
commit 628f822025
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 150 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
View file

@ -1,6 +1,6 @@
<div class="datatable">
<rd-widget>
<rd-widget-body classes="no-padding">
<rd-widget-body classes="no-padding" ng-if="$ctrl.createEnabled">
<div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap">
<div class="toolBarTitle vertical-center">
<pr-icon icon="'layers'" feather="true" class-name="'icon-nested-blue vertical-center'" mode="'primary'"></pr-icon>
@ -21,6 +21,7 @@
</div>
<div class="actionBar !gap-3" ng-if="!$ctrl.offlineMode" authorization="PortainerStackCreate, PortainerStackDelete">
<button
ng-disabled="!$ctrl.createEnabled"
type="button"
class="btn btn-sm btn-dangerlight h-fit vertical-center !ml-0"
authorization="PortainerStackDelete"
@ -178,7 +179,7 @@
<label for="select_{{ $index }}"></label>
</span>
<a
ng-if="!$ctrl.offlineMode"
ng-if="!$ctrl.offlineMode && $ctrl.createEnabled"
ui-sref="docker.stacks.stack({ name: item.Name, id: item.Id, type: item.Type, regular: item.Regular, external: item.External, orphaned: item.Orphaned, orphanedRunning: item.OrphanedRunning })"
>{{ item.Name }}</a
>

2
app/portainer/hooks/useUser.tsx
View file

@ -70,7 +70,7 @@ export function useAuthorizations(
export function isEnvironmentAdmin(
user: User,
environmentId: EnvironmentId,
adminOnlyCE = false
adminOnlyCE = true
) {
return hasAuthorizations(
user,

10
app/portainer/views/stacks/edit/stackController.js
View file

@ -477,7 +477,17 @@ angular.module('portainer.app').controller('StackController', [
}
};
async function canManageStacks() {
return endpoint.SecuritySettings.allowStackManagementForRegularUsers || Authentication.isAdmin();
}
async function initView() {
// if the user is not an admin, and stack management is disabled for non admins, then take the user to the dashboard
$scope.createEnabled = await canManageStacks();
if (!$scope.createEnabled) {
$state.go('docker.dashboard');
}
var stackName = $transition$.params().name;
$scope.stackName = stackName;

8
app/portainer/views/stacks/stacksController.js
View file

@ -56,13 +56,17 @@ function StacksController($scope, $state, Notifications, StackService, ModalServ
});
}
async function loadCreateEnabled() {
async function canManageStacks() {
return endpoint.SecuritySettings.allowStackManagementForRegularUsers || Authentication.isAdmin();
}
async function initView() {
// if the user is not an admin, and stack management is disabled for non admins, then take the user to the dashboard
$scope.createEnabled = await canManageStacks();
if (!$scope.createEnabled) {
$state.go('docker.dashboard');
}
getStacks();
$scope.createEnabled = await loadCreateEnabled();
}
initView();