Skip to content

fix: encode OpenShift group names in advanced authorization #1071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
svor merged 2 commits into from
Sep 28, 2026
+51 −2
Merged

fix: encode OpenShift group names in advanced authorization #1071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8a8e6
fix: encode OpenShift group names in advanced authorization
nikitapal-12 Sep 21, 2026
281a879
fix: apply google-java-format to authorization changes
nikitapal-12 Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ...e/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import static org.eclipse.che.commons.lang.StringUtils.strToSet;

import com.google.common.net.UrlEscapers;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.openshift.api.model.Group;
import java.util.List;
Expand Down Expand Up @@ -70,7 +71,7 @@ private boolean isAllowedUser(KubernetesClient client, String username) {
}

for (String groupName : allowGroups) {
Group group = client.resources(Group.class).withName(groupName).get();
Group group = getGroup(client, groupName);
if (group != null) {
List<String> users = group.getUsers();
if (users != null && users.contains(username)) {
Expand All @@ -93,7 +94,7 @@ private boolean isDeniedUser(KubernetesClient client, String username) {
}

for (String groupName : denyGroups) {
Group group = client.resources(Group.class).withName(groupName).get();
Group group = getGroup(client, groupName);
if (group != null) {
List<String> users = group.getUsers();
if (users != null && users.contains(username)) {
Expand All @@ -104,4 +105,17 @@ private boolean isDeniedUser(KubernetesClient client, String username) {

return false;
}

/**
* Looks up an OpenShift Group by name. Group names are path-segment encoded so names containing
* spaces or other reserved URI characters (common for Active Directory groups) can be requested
* without triggering {@link java.net.URISyntaxException}.
*/
private static Group getGroup(KubernetesClient client, String groupName) {
return client.resources(Group.class).withName(encodeGroupName(groupName)).get();
}

static String encodeGroupName(String groupName) {
return UrlEscapers.urlPathSegmentEscaper().escape(groupName);
}
}
35 changes: 35 additions & 0 deletions ...e/workspace/infrastructure/openshift/authorization/OpenShiftAuthorizationCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.Context;
Expand Down Expand Up @@ -143,4 +145,37 @@ public static Object[][] advancedAuthorizationData() {
},
};
}

@Test
public void encodeGroupNamePercentEncodesSpaces() {
Assert.assertEquals(
OpenShiftAuthorizationCheckerImpl.encodeGroupName("LD EIDP PTEC 3P40"),
"LD%20EIDP%20PTEC%203P40");
Assert.assertEquals(
OpenShiftAuthorizationCheckerImpl.encodeGroupName("groupWithUser1"), "groupWithUser1");
}

@Test
@SuppressWarnings("unchecked")
public void shouldAuthorizeUserWhenAllowGroupNameContainsSpaces() throws InfrastructureException {
Group groupWithSpaces =
new Group(
"v1",
"Group",
new ObjectMetaBuilder().withName("LD EIDP PTEC 3P40").build(),
List.of("user1"));
KubernetesClient mockClient = mock(KubernetesClient.class);
MixedOperation resources = mock(MixedOperation.class);
Resource resource = mock(Resource.class);
when(clientFactory.create()).thenReturn(mockClient);
when(mockClient.resources(Group.class)).thenReturn(resources);
when(resources.withName("LD%20EIDP%20PTEC%203P40")).thenReturn(resource);
when(resource.get()).thenReturn(groupWithSpaces);

OpenShiftAuthorizationCheckerImpl authorizationChecker =
new OpenShiftAuthorizationCheckerImpl("", "LD EIDP PTEC 3P40", "", "", ",", clientFactory);

Assert.assertTrue(authorizationChecker.isAuthorized(user1));
Assert.assertFalse(authorizationChecker.isAuthorized(user2));
}
}
Loading