mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
* feat(api): decorate Docker resource creation response with resource control * fix(api): fix a potential resource control conflict between stacks/volumes * feat(api): generate a default private resource control instead of admin only * fix(api): fix default RC value * fix(api): update RC authorizations check to support admin only flag * refactor(api): relocate access control related methods * fix(api): fix a potential conflict when fetching RC from database * refactor(api): refactor access control logic * refactor(api): remove the concept of DecoratedStack * feat(api): automatically remove RC when removing a Docker resource * refactor(api): update filter resource methods documentation * refactor(api): update proxy package structure * refactor(api): renamed proxy/misc package * feat(api): re-introduce ResourceControlDelete operation as admin restricted * refactor(api): relocate default endpoint authorizations * feat(api): migrate RBAC data * feat(app): ResourceControl management refactor * fix(api): fix access control issue on stack deletion and automatically delete RC * fix(api): fix stack filtering * fix(api): fix UpdateResourceControl operation checks * refactor(api): introduce a NewTransport builder method * refactor(api): inject endpoint in Docker transport * refactor(api): introduce Docker client into Docker transport * refactor(api): refactor http/proxy package * feat(api): inspect a Docker resource labels during access control validation * fix(api): only apply automatic resource control creation on success response * fix(api): fix stack access control check * fix(api): use StatusCreated instead of StatusOK for automatic resource control creation * fix(app): resource control fixes * fix(api): fix an issue preventing administrator to inspect a resource with a RC * refactor(api): remove useless error return * refactor(api): document DecorateStacks function * fix(api): fix invalid resource control type for container deletion * feat(api): support Docker system networks * feat(api): update Swagger docs * refactor(api): rename transport variable * refactor(api): rename transport variable * feat(networks): add system tag for system networks * feat(api): add support for resource control labels * feat(api): upgrade to DBVersion 22 * refactor(api): refactor access control management in Docker proxy * refactor(api): re-implement docker proxy taskListOperation * refactor(api): review parameters declaration * refactor(api): remove extra blank line * refactor(api): review method comments * fix(api): fix invalid ServerAddress property and review method visibility * feat(api): update error message * feat(api): update restrictedVolumeBrowserOperation method * refactor(api): refactor method parameters * refactor(api): minor refactor * refactor(api): change Azure transport visibility * refactor(api): update struct documentation * refactor(api): update struct documentation * feat(api): review restrictedResourceOperation method * refactor(api): remove unused authorization methods * feat(api): apply RBAC when enabled on stack operations * fix(api): fix invalid data migration procedure for DBVersion = 22 * fix(app): RC duplicate on private resource * feat(api): change Docker API version logic for libcompose/client factory * fix(api): update access denied error message to be Docker API compliant * fix(api): update volume browsing authorizations data migration * fix(api): fix an issue with access control in multi-node agent Swarm cluster
114 lines
3.9 KiB
JavaScript
114 lines
3.9 KiB
JavaScript
import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel';
|
|
import { VolumesNFSFormData } from '../../../components/volumesNFSForm/volumesNFSFormModel';
|
|
|
|
angular.module('portainer.docker')
|
|
.controller('CreateVolumeController', ['$q', '$scope', '$state', 'VolumeService', 'PluginService', 'ResourceControlService', 'Authentication', 'Notifications', 'FormValidator', 'HttpRequestHelper',
|
|
function ($q, $scope, $state, VolumeService, PluginService, ResourceControlService, Authentication, Notifications, FormValidator, HttpRequestHelper) {
|
|
|
|
$scope.formValues = {
|
|
Driver: 'local',
|
|
DriverOptions: [],
|
|
AccessControlData: new AccessControlFormData(),
|
|
NodeName: null,
|
|
NFSData: new VolumesNFSFormData()
|
|
};
|
|
|
|
$scope.state = {
|
|
formValidationError: '',
|
|
actionInProgress: false
|
|
};
|
|
|
|
$scope.availableVolumeDrivers = [];
|
|
|
|
$scope.addDriverOption = function() {
|
|
$scope.formValues.DriverOptions.push({ name: '', value: '' });
|
|
};
|
|
|
|
$scope.removeDriverOption = function(index) {
|
|
$scope.formValues.DriverOptions.splice(index, 1);
|
|
};
|
|
|
|
function validateForm(accessControlData, isAdmin) {
|
|
$scope.state.formValidationError = '';
|
|
var error = '';
|
|
error = FormValidator.validateAccessControl(accessControlData, isAdmin);
|
|
|
|
if (error) {
|
|
$scope.state.formValidationError = error;
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
function prepareNFSConfiguration(driverOptions) {
|
|
var data = $scope.formValues.NFSData;
|
|
|
|
driverOptions.push({ name: 'type', value: data.version.toLowerCase() });
|
|
|
|
var options = 'addr=' + data.serverAddress + ',' + data.options;
|
|
driverOptions.push({ name: 'o', value: options });
|
|
|
|
var mountPoint = data.mountPoint[0] === ':' ? data.mountPoint : ':' + data.mountPoint;
|
|
driverOptions.push({ name: 'device', value: mountPoint });
|
|
}
|
|
|
|
$scope.create = function () {
|
|
var name = $scope.formValues.Name;
|
|
var driver = $scope.formValues.Driver;
|
|
var driverOptions = $scope.formValues.DriverOptions;
|
|
var storidgeProfile = $scope.formValues.StoridgeProfile;
|
|
|
|
if (driver === 'cio:latest' && storidgeProfile) {
|
|
driverOptions.push({ name: 'profile', value: storidgeProfile.Name });
|
|
}
|
|
|
|
if ($scope.formValues.NFSData.useNFS) {
|
|
prepareNFSConfiguration(driverOptions);
|
|
}
|
|
|
|
var volumeConfiguration = VolumeService.createVolumeConfiguration(name, driver, driverOptions);
|
|
var accessControlData = $scope.formValues.AccessControlData;
|
|
var userDetails = Authentication.getUserDetails();
|
|
var isAdmin = Authentication.isAdmin();
|
|
|
|
if (!validateForm(accessControlData, isAdmin)) {
|
|
return;
|
|
}
|
|
|
|
var nodeName = $scope.formValues.NodeName;
|
|
HttpRequestHelper.setPortainerAgentTargetHeader(nodeName);
|
|
|
|
$scope.state.actionInProgress = true;
|
|
VolumeService.createVolume(volumeConfiguration)
|
|
.then(function success(data) {
|
|
const userId = userDetails.ID;
|
|
const resourceControl = data.ResourceControl;
|
|
return ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
|
|
})
|
|
.then(function success() {
|
|
Notifications.success('Volume successfully created');
|
|
$state.go('docker.volumes', {}, {reload: true});
|
|
})
|
|
.catch(function error(err) {
|
|
Notifications.error('Failure', err, 'An error occured during volume creation');
|
|
})
|
|
.finally(function final() {
|
|
$scope.state.actionInProgress = false;
|
|
});
|
|
};
|
|
|
|
function initView() {
|
|
var apiVersion = $scope.applicationState.endpoint.apiVersion;
|
|
var endpointProvider = $scope.applicationState.endpoint.mode.provider;
|
|
|
|
PluginService.volumePlugins(apiVersion < 1.25 || endpointProvider === 'VMWARE_VIC')
|
|
.then(function success(data) {
|
|
$scope.availableVolumeDrivers = data;
|
|
})
|
|
.catch(function error(err) {
|
|
Notifications.error('Failure', err, 'Unable to retrieve volume drivers');
|
|
});
|
|
}
|
|
|
|
initView();
|
|
}]);
|