Skip to content

[DO NOT MERGE] fix: Handle "NULL" string as unconfigured OAuth identity provider #995

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

Open
ibuziuk wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[DO NOT MERGE] fix: Handle "NULL" string as unconfigured OAuth identity provider #995

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
bc4f0b2
fix: Handle "NULL" string as unconfigured OAuth identity provider
ibuziuk Apr 7, 2026
26babb4
fixup! formatting
ibuziuk Apr 7, 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
9 changes: 8 additions & 1 deletion ...a/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,16 @@ public OpenShiftProject getOrCreate(RuntimeIdentity identity) throws Infrastruct
Map<String, String> namespaceAnnotationsEvaluated =
evaluateAnnotationPlaceholders(resolutionCtx);

// Use Che server SA when initWithCheServerSa is true and OAuth is configured.
Copy link
Copy Markdown
Member Author

@ibuziuk ibuziuk Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Use Che server SA when initWithCheServerSa is true and OAuth is configured.
// Use Che server SA when initWithCheServerSa is true and OAuth is not configured.

Copy link
Copy Markdown
Member Author

@ibuziuk ibuziuk Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tolusha ptal, do I get it right?

// The string "NULL" is treated as "not configured" to handle property placeholder defaults.
boolean useServerSa =
initWithCheServerSa
&& !isNullOrEmpty(oAuthIdentityProvider)
&& !"NULL".equals(oAuthIdentityProvider);

osProject.prepare(
canCreateNamespace(),
initWithCheServerSa && !isNullOrEmpty(oAuthIdentityProvider),
useServerSa,
labelNamespaces ? namespaceLabels : emptyMap(),
annotateNamespaces ? namespaceAnnotationsEvaluated : emptyMap());

Expand Down
41 changes: 41 additions & 0 deletions ...g/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public class OpenShiftProjectFactoryTest {
private static final String USER_ID = "2342-2559-234";
private static final String USER_NAME = "johndoe";
private static final String NO_OAUTH_IDENTITY_PROVIDER = null;
private static final String NULL_STRING_OAUTH_IDENTITY_PROVIDER = "NULL";
private static final String OAUTH_IDENTITY_PROVIDER = "openshift-v4";
private static final String NAMESPACE_LABEL_NAME = "component";
private static final String NAMESPACE_LABELS = NAMESPACE_LABEL_NAME + "=workspace";
Expand Down Expand Up @@ -546,6 +547,7 @@ public void shouldRequireNamespacePriorExistenceIfDifferentFromDefaultAndUserDef

// then
assertEquals(toReturnProject, project);
// When OAuth is NOT configured (null), don't use Che server SA (false)
verify(toReturnProject).prepare(eq(true), eq(false), any(), any());
}

Expand Down Expand Up @@ -676,6 +678,45 @@ public void shouldCallStopWorkspaceRoleProvisionWhenIdentityProviderIsDefined()

// then
verify(serviceAccount).prepare();
// When OAuth IS configured, use Che server SA (true) to create projects
verify(toReturnProject).prepare(eq(true), eq(true), any(), any());
}

@Test
public void shouldUseCheServerSAWhenOAuthIdentityProviderIsNullString() throws Exception {
// given - when oAuthIdentityProvider is the string "NULL" (property placeholder default),
// it should be treated as if OAuth is not configured (same as null)
projectFactory =
spy(
new OpenShiftProjectFactory(
"<userid>-che",
true,
true,
true,
NAMESPACE_LABELS,
NAMESPACE_ANNOTATIONS,
true,
emptySet(),
openShiftClientFactory,
cheServerKubernetesClientFactory,
cheServerOpenshiftClientFactory,
preferenceManager,
pool,
authorizationChecker,
permissionsCleaner,
NULL_STRING_OAUTH_IDENTITY_PROVIDER));
OpenShiftProject toReturnProject = mock(OpenShiftProject.class);
prepareProject(toReturnProject);
doReturn(toReturnProject).when(projectFactory).doCreateProjectAccess(any(), any());

// when
RuntimeIdentity identity =
new RuntimeIdentityImpl("workspace123", null, USER_ID, "workspace123");
projectFactory.getOrCreate(identity);

// then - should NOT use Che server SA (false) when oAuthIdentityProvider="NULL"
// because "NULL" is treated the same as null (unconfigured)
verify(toReturnProject).prepare(eq(true), eq(false), any(), any());
}

@Ignore
Expand Down
Loading