Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(access/team): team member cannot change ownership to its own team [EE-4423] (#8052)

pull/8210/head
Oscar Zhou 2022-12-15 21:27:18 +13:00 committed by GitHub
parent 37896661d6
commit b22cdb3559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/docker/views/containers/create/createContainerController.js
View File

@ -742,9 +742,17 @@ angular.module('portainer.docker').controller('CreateContainerController', [
Container.get({ id: $transition$.params().from }) Container.get({ id: $transition$.params().from })
.$promise.then(function success(d) { .$promise.then(function success(d) {
var fromContainer = new ContainerDetailsViewModel(d); var fromContainer = new ContainerDetailsViewModel(d);
if (fromContainer.ResourceControl && fromContainer.ResourceControl.Public) { if (fromContainer.ResourceControl) {
$scope.formValues.AccessControlData.AccessControlEnabled = false; if (fromContainer.ResourceControl.Public) {
$scope.formValues.AccessControlData.AccessControlEnabled = false;
}
// When the container is create by duplicate/edit, the access permission
// shouldn't be copied
fromContainer.ResourceControl.UserAccesses = [];
fromContainer.ResourceControl.TeamAccesses = [];
} }
$scope.fromContainer = fromContainer; $scope.fromContainer = fromContainer;
$scope.state.mode = 'duplicate'; $scope.state.mode = 'duplicate';
$scope.config = ContainerHelper.configFromContainer(fromContainer.Model); $scope.config = ContainerHelper.configFromContainer(fromContainer.Model);

6
app/react/portainer/access-control/EditDetails/EditDetails.tsx
View File

@ -109,6 +109,12 @@ export function EditDetails({
if (ownership === ResourceControlOwnership.RESTRICTED) { if (ownership === ResourceControlOwnership.RESTRICTED) {
authorizedUsers = []; authorizedUsers = [];
authorizedTeams = []; authorizedTeams = [];
// Non admin team leaders/members under only one team can
// automatically grant the resource access to all members
// under the team
if (!isAdmin && teams && teams.length === 1) {
authorizedTeams = teams.map((team) => team.Id);
}
} }
handleChange({ ownership, authorizedTeams, authorizedUsers }); handleChange({ ownership, authorizedTeams, authorizedUsers });