mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
fix(ui): check for authorization [EE-6733] (#11207)
Some checks are pending
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Some checks are pending
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
This commit is contained in:
parent
bb6f4e026a
commit
a8938779bf
16 changed files with 40 additions and 33 deletions
|
@ -49,7 +49,7 @@ function CreateForm() {
|
|||
const router = useRouter();
|
||||
const { trackEvent } = useAnalytics();
|
||||
const isAdminQuery = useIsEdgeAdmin();
|
||||
const isEnvironmentAdmin = useIsEnvironmentAdmin();
|
||||
const { authorized: isEnvironmentAdmin } = useIsEnvironmentAdmin();
|
||||
const [isDockerhubRateLimited, setIsDockerhubRateLimited] = useState(false);
|
||||
|
||||
const mutation = useCreateOrReplaceMutation();
|
||||
|
|
|
@ -41,7 +41,7 @@ export function InnerForm({
|
|||
const environmentId = useEnvironmentId();
|
||||
const [tab, setTab] = useState('commands');
|
||||
const apiVersion = useApiVersion(environmentId);
|
||||
const isEnvironmentAdmin = useIsEnvironmentAdmin();
|
||||
const isEnvironmentAdminQuery = useIsEnvironmentAdmin();
|
||||
const envQuery = useCurrentEnvironment();
|
||||
|
||||
if (!envQuery.data) {
|
||||
|
@ -102,7 +102,7 @@ export function InnerForm({
|
|||
}
|
||||
errors={errors.volumes}
|
||||
allowBindMounts={
|
||||
isEnvironmentAdmin.authorized ||
|
||||
isEnvironmentAdminQuery.authorized ||
|
||||
environment.SecuritySettings
|
||||
.allowBindMountsForRegularUsers
|
||||
}
|
||||
|
@ -166,18 +166,18 @@ export function InnerForm({
|
|||
setFieldValue(`resources.${field}`, value)
|
||||
}
|
||||
allowPrivilegedMode={
|
||||
isEnvironmentAdmin.authorized ||
|
||||
isEnvironmentAdminQuery.authorized ||
|
||||
environment.SecuritySettings
|
||||
.allowPrivilegedModeForRegularUsers
|
||||
}
|
||||
isDevicesFieldVisible={
|
||||
isEnvironmentAdmin.authorized ||
|
||||
isEnvironmentAdminQuery.authorized ||
|
||||
environment.SecuritySettings
|
||||
.allowDeviceMappingForRegularUsers
|
||||
}
|
||||
isInitFieldVisible={apiVersion >= 1.37}
|
||||
isSysctlFieldVisible={
|
||||
isEnvironmentAdmin.authorized ||
|
||||
isEnvironmentAdminQuery.authorized ||
|
||||
environment.SecuritySettings
|
||||
.allowSysctlSettingForRegularUsers
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ export function ConnectNetworkForm({
|
|||
selectedNetworks: string[];
|
||||
}) {
|
||||
const environmentId = useEnvironmentId();
|
||||
const authorized = useAuthorizations('DockerNetworkConnect');
|
||||
const { authorized } = useAuthorizations('DockerNetworkConnect');
|
||||
const connectMutation = useConnectContainerMutation(environmentId);
|
||||
const router = useRouter();
|
||||
if (!authorized) {
|
||||
|
|
|
@ -68,7 +68,7 @@ export function ContainersDatatableActions({
|
|||
].includes(item.Status)
|
||||
);
|
||||
|
||||
const isAuthorized = useAuthorizations([
|
||||
const { authorized } = useAuthorizations([
|
||||
'DockerContainerStart',
|
||||
'DockerContainerStop',
|
||||
'DockerContainerKill',
|
||||
|
@ -81,12 +81,12 @@ export function ContainersDatatableActions({
|
|||
|
||||
const router = useRouter();
|
||||
|
||||
if (!isAuthorized) {
|
||||
if (!authorized) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="flex gap-2">
|
||||
<ButtonGroup>
|
||||
<Authorized authorizations="DockerContainerStart">
|
||||
<Button
|
||||
|
@ -165,7 +165,6 @@ export function ContainersDatatableActions({
|
|||
</Button>
|
||||
</Authorized>
|
||||
</ButtonGroup>
|
||||
|
||||
{isAddActionVisible && (
|
||||
<Authorized authorizations="DockerContainerCreate">
|
||||
<Link to="docker.containers.new" className="space-left">
|
||||
|
@ -173,7 +172,7 @@ export function ContainersDatatableActions({
|
|||
</Link>
|
||||
</Authorized>
|
||||
)}
|
||||
</>
|
||||
</div>
|
||||
);
|
||||
|
||||
function onStartClick(selectedItems: DockerContainer[]) {
|
||||
|
|
|
@ -38,7 +38,7 @@ function QuickActionsCell({
|
|||
wrapperState.showQuickActionLogs ||
|
||||
wrapperState.showQuickActionStats;
|
||||
|
||||
const isAuthorized = useAuthorizations([
|
||||
const { authorized } = useAuthorizations([
|
||||
'DockerContainerStats',
|
||||
'DockerContainerLogs',
|
||||
'DockerExecStart',
|
||||
|
@ -47,7 +47,7 @@ function QuickActionsCell({
|
|||
'DockerTaskLogs',
|
||||
]);
|
||||
|
||||
if (!someOn || !isAuthorized) {
|
||||
if (!someOn || !authorized) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ export function StacksDatatable({
|
|||
const tableState = useTableState(settingsStore, tableKey);
|
||||
useRepeater(tableState.autoRefreshRate, onReload);
|
||||
const isAdminQuery = useIsEdgeAdmin();
|
||||
const canManageStacks = useAuthorizations([
|
||||
const { authorized: canManageStacks } = useAuthorizations([
|
||||
'PortainerStackCreate',
|
||||
'PortainerStackDelete',
|
||||
]);
|
||||
|
@ -58,7 +58,7 @@ export function StacksDatatable({
|
|||
columns={columns}
|
||||
dataset={dataset}
|
||||
isRowSelectable={({ original: item }) =>
|
||||
allowSelection(item, isAdminQuery.isAdmin, canManageStacks.authorized)
|
||||
allowSelection(item, isAdminQuery.isAdmin, canManageStacks)
|
||||
}
|
||||
getRowId={(item) => item.Id.toString()}
|
||||
initialTableState={{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue