From 3bdf76df097ce1f0ca13c61d32718ae33aa46488 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 4 Dec 2023 13:17:28 +0100 Subject: [PATCH] Address remarks Signed-off-by: Anatolii Bazko --- .../authorization/KubernetesAuthorizationCheckerImpl.java | 4 ++-- .../authorization/OpenShiftAuthorizationCheckerImpl.java | 4 ++-- .../authorization/OpenShiftAuthorizationCheckerTest.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/authorization/KubernetesAuthorizationCheckerImpl.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/authorization/KubernetesAuthorizationCheckerImpl.java index b3fe0d7b82..16f9893ea5 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/authorization/KubernetesAuthorizationCheckerImpl.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/authorization/KubernetesAuthorizationCheckerImpl.java @@ -35,14 +35,14 @@ public class KubernetesAuthorizationCheckerImpl implements AuthorizationChecker } public boolean isAuthorized(String username) { - return isAllowedUser(username) && !isDisabledUser(username); + return isAllowedUser(username) && !isDeniedUser(username); } private boolean isAllowedUser(String username) { return allowUsers.isEmpty() || allowUsers.contains(username); } - private boolean isDisabledUser(String username) { + private boolean isDeniedUser(String username) { return !denyUsers.isEmpty() && denyUsers.contains(username); } } diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerImpl.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerImpl.java index f85b7d7edb..a606e4f512 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerImpl.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerImpl.java @@ -52,7 +52,7 @@ public class OpenShiftAuthorizationCheckerImpl implements AuthorizationChecker { public boolean isAuthorized(String username) throws InfrastructureException { return isAllowedUser(cheServerKubernetesClientFactory.create(), username) - && !isDisabledUser(cheServerKubernetesClientFactory.create(), username); + && !isDeniedUser(cheServerKubernetesClientFactory.create(), username); } private boolean isAllowedUser(KubernetesClient client, String username) { @@ -75,7 +75,7 @@ public class OpenShiftAuthorizationCheckerImpl implements AuthorizationChecker { return false; } - private boolean isDisabledUser(KubernetesClient client, String username) { + private boolean isDeniedUser(KubernetesClient client, String username) { // All users from all groups are allowed by default if (denyUsers.isEmpty() && denyGroups.isEmpty()) { return false; diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerTest.java index a81a9faeab..f826cf4002 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerTest.java @@ -50,14 +50,14 @@ public class OpenShiftAuthorizationCheckerTest { List groups, String allowedUsers, String allowedGroups, - String disabledUsers, - String disabledGroups, + String deniedUsers, + String deniedGroups, boolean expectedIsAuthorized) throws InfrastructureException { // give OpenShiftAuthorizationCheckerImpl authorizationChecker = new OpenShiftAuthorizationCheckerImpl( - allowedUsers, allowedGroups, disabledUsers, disabledGroups, clientFactory); + allowedUsers, allowedGroups, deniedUsers, deniedGroups, clientFactory); groups.forEach(group -> client.resources(Group.class).create(group)); // when