Skip to content

Commit 9364278

Browse files
vinokurigvinokurig
committed
Get rid of the redundant multiuser module
1 parent 914c72e commit 9364278

File tree

361 files changed

+187
-30434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+187
-30434
lines changed

Diff for: ‎assembly/assembly-wsmaster-war/pom.xml

-80
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
<groupId>ch.qos.logback</groupId>
3636
<artifactId>logback-classic</artifactId>
3737
</dependency>
38-
<dependency>
39-
<groupId>com.auth0</groupId>
40-
<artifactId>jwks-rsa</artifactId>
41-
</dependency>
4238
<dependency>
4339
<groupId>com.google.guava</groupId>
4440
<artifactId>guava</artifactId>
@@ -67,10 +63,6 @@
6763
<groupId>io.jaegertracing</groupId>
6864
<artifactId>jaeger-tracerresolver</artifactId>
6965
</dependency>
70-
<dependency>
71-
<groupId>io.jsonwebtoken</groupId>
72-
<artifactId>jjwt-api</artifactId>
73-
</dependency>
7466
<dependency>
7567
<groupId>io.jsonwebtoken</groupId>
7668
<artifactId>jjwt-impl</artifactId>
@@ -239,78 +231,6 @@
239231
<groupId>org.eclipse.che.infrastructure</groupId>
240232
<artifactId>infrastructure-permission</artifactId>
241233
</dependency>
242-
<dependency>
243-
<groupId>org.eclipse.che.multiuser</groupId>
244-
<artifactId>che-multiuser-api-authentication-commons</artifactId>
245-
</dependency>
246-
<dependency>
247-
<groupId>org.eclipse.che.multiuser</groupId>
248-
<artifactId>che-multiuser-api-authorization</artifactId>
249-
</dependency>
250-
<dependency>
251-
<groupId>org.eclipse.che.multiuser</groupId>
252-
<artifactId>che-multiuser-api-authorization-impl</artifactId>
253-
</dependency>
254-
<dependency>
255-
<groupId>org.eclipse.che.multiuser</groupId>
256-
<artifactId>che-multiuser-api-permission</artifactId>
257-
</dependency>
258-
<dependency>
259-
<groupId>org.eclipse.che.multiuser</groupId>
260-
<artifactId>che-multiuser-api-workspace-activity</artifactId>
261-
</dependency>
262-
<dependency>
263-
<groupId>org.eclipse.che.multiuser</groupId>
264-
<artifactId>che-multiuser-keycloak-server</artifactId>
265-
</dependency>
266-
<dependency>
267-
<groupId>org.eclipse.che.multiuser</groupId>
268-
<artifactId>che-multiuser-keycloak-token-provider</artifactId>
269-
</dependency>
270-
<dependency>
271-
<groupId>org.eclipse.che.multiuser</groupId>
272-
<artifactId>che-multiuser-machine-authentication</artifactId>
273-
</dependency>
274-
<dependency>
275-
<groupId>org.eclipse.che.multiuser</groupId>
276-
<artifactId>che-multiuser-oidc</artifactId>
277-
</dependency>
278-
<dependency>
279-
<groupId>org.eclipse.che.multiuser</groupId>
280-
<artifactId>che-multiuser-permission-devfile</artifactId>
281-
</dependency>
282-
<dependency>
283-
<groupId>org.eclipse.che.multiuser</groupId>
284-
<artifactId>che-multiuser-permission-logger</artifactId>
285-
</dependency>
286-
<dependency>
287-
<groupId>org.eclipse.che.multiuser</groupId>
288-
<artifactId>che-multiuser-permission-resource</artifactId>
289-
</dependency>
290-
<dependency>
291-
<groupId>org.eclipse.che.multiuser</groupId>
292-
<artifactId>che-multiuser-permission-system</artifactId>
293-
</dependency>
294-
<dependency>
295-
<groupId>org.eclipse.che.multiuser</groupId>
296-
<artifactId>che-multiuser-permission-user</artifactId>
297-
</dependency>
298-
<dependency>
299-
<groupId>org.eclipse.che.multiuser</groupId>
300-
<artifactId>che-multiuser-permission-workspace</artifactId>
301-
</dependency>
302-
<dependency>
303-
<groupId>org.eclipse.che.multiuser</groupId>
304-
<artifactId>che-multiuser-permission-workspace-activity</artifactId>
305-
</dependency>
306-
<dependency>
307-
<groupId>org.eclipse.che.multiuser</groupId>
308-
<artifactId>che-multiuser-personal-account</artifactId>
309-
</dependency>
310-
<dependency>
311-
<groupId>org.eclipse.che.multiuser</groupId>
312-
<artifactId>che-multiuser-sql-schema</artifactId>
313-
</dependency>
314234
<dependency>
315235
<groupId>org.eclipse.persistence</groupId>
316236
<artifactId>org.eclipse.persistence.core</artifactId>

Diff for: ‎assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java

+12-64
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@
1313

1414
import static com.google.inject.matcher.Matchers.subclassesOf;
1515
import static org.eclipse.che.inject.Matchers.names;
16-
import static org.eclipse.che.multiuser.api.permission.server.SystemDomain.SYSTEM_DOMAIN_ACTIONS;
16+
// import static org.eclipse.che.multiuser.api.permission.server.SystemDomain.SYSTEM_DOMAIN_ACTIONS;
1717

18-
import com.auth0.jwk.JwkProvider;
1918
import com.google.inject.AbstractModule;
2019
import com.google.inject.TypeLiteral;
2120
import com.google.inject.assistedinject.FactoryModuleBuilder;
2221
import com.google.inject.multibindings.MapBinder;
2322
import com.google.inject.multibindings.Multibinder;
2423
import com.google.inject.name.Names;
25-
import io.jsonwebtoken.JwtParser;
26-
import io.jsonwebtoken.SigningKeyResolver;
2724
import java.util.HashMap;
2825
import java.util.Map;
2926
import org.eclipse.che.api.core.notification.RemoteSubscriptionStorage;
@@ -67,6 +64,7 @@
6764
import org.eclipse.che.api.workspace.server.WorkspaceStatusCache;
6865
import org.eclipse.che.api.workspace.server.devfile.DevfileModule;
6966
import org.eclipse.che.api.workspace.server.hc.ServersCheckerFactory;
67+
import org.eclipse.che.api.workspace.server.jpa.WorkspaceJpaModule;
7068
import org.eclipse.che.api.workspace.server.spi.provision.InternalEnvironmentProvisioner;
7169
import org.eclipse.che.api.workspace.server.spi.provision.MachineNameProvisioner;
7270
import org.eclipse.che.api.workspace.server.spi.provision.env.AgentAuthEnableEnvVarProvider;
@@ -82,22 +80,11 @@
8280
import org.eclipse.che.api.workspace.server.spi.provision.env.WorkspaceIdEnvVarProvider;
8381
import org.eclipse.che.api.workspace.server.spi.provision.env.WorkspaceNameEnvVarProvider;
8482
import org.eclipse.che.api.workspace.server.spi.provision.env.WorkspaceNamespaceNameEnvVarProvider;
83+
import org.eclipse.che.api.workspace.server.token.MachineTokenProvider;
8584
import org.eclipse.che.api.workspace.server.wsplugins.ChePluginsApplier;
8685
import org.eclipse.che.commons.observability.deploy.ExecutorWrapperModule;
8786
import org.eclipse.che.core.tracing.metrics.TracingMetricsModule;
8887
import org.eclipse.che.inject.DynaModule;
89-
import org.eclipse.che.multiuser.api.authentication.commons.token.HeaderRequestTokenExtractor;
90-
import org.eclipse.che.multiuser.api.authentication.commons.token.RequestTokenExtractor;
91-
import org.eclipse.che.multiuser.api.permission.server.PermissionChecker;
92-
import org.eclipse.che.multiuser.api.permission.server.PermissionCheckerImpl;
93-
import org.eclipse.che.multiuser.api.workspace.activity.MultiUserWorkspaceActivityModule;
94-
import org.eclipse.che.multiuser.machine.authentication.server.MachineAuthModule;
95-
import org.eclipse.che.multiuser.oidc.OIDCInfo;
96-
import org.eclipse.che.multiuser.oidc.OIDCInfoProvider;
97-
import org.eclipse.che.multiuser.oidc.OIDCJwkProvider;
98-
import org.eclipse.che.multiuser.oidc.OIDCJwtParserProvider;
99-
import org.eclipse.che.multiuser.oidc.OIDCSigningKeyResolver;
100-
import org.eclipse.che.multiuser.permission.user.UserServicePermissionsFilter;
10188
import org.eclipse.che.security.PBKDF2PasswordEncryptor;
10289
import org.eclipse.che.security.PasswordEncryptor;
10390
import org.eclipse.che.security.oauth.EmbeddedOAuthAPI;
@@ -108,6 +95,7 @@
10895
import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfrastructure;
10996
import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment;
11097
import org.eclipse.che.workspace.infrastructure.kubernetes.multiuser.oauth.KubernetesOidcProviderConfigFactory;
98+
import org.eclipse.che.workspace.infrastructure.kubernetes.multiuser.oauth.RequestTokenExtractor;
11199
import org.eclipse.che.workspace.infrastructure.kubernetes.server.secure.SecureServerExposer;
112100
import org.eclipse.che.workspace.infrastructure.kubernetes.server.secure.SecureServerExposerFactory;
113101
import org.eclipse.che.workspace.infrastructure.kubernetes.server.secure.jwtproxy.PassThroughProxySecureServerExposer;
@@ -120,6 +108,7 @@
120108
import org.eclipse.che.workspace.infrastructure.openshift.OpenShiftInfraModule;
121109
import org.eclipse.che.workspace.infrastructure.openshift.OpenShiftInfrastructure;
122110
import org.eclipse.che.workspace.infrastructure.openshift.environment.OpenShiftEnvironment;
111+
import org.eclipse.che.workspace.infrastructure.openshift.multiuser.oauth.HeaderRequestTokenExtractor;
123112
import org.eclipse.che.workspace.infrastructure.openshift.multiuser.oauth.KeycloakProviderConfigFactory;
124113
import org.eclipse.persistence.config.PersistenceUnitProperties;
125114

@@ -349,60 +338,19 @@ private void configureMultiUserMode(
349338
PersistenceUnitProperties.EXCEPTION_HANDLER_CLASS,
350339
"org.eclipse.che.core.db.postgresql.jpa.eclipselink.PostgreSqlExceptionHandler");
351340

352-
install(
353-
new org.eclipse.che.multiuser.permission.workspace.server.WorkspaceApiPermissionsModule());
354-
install(
355-
new org.eclipse.che.multiuser.permission.workspace.server.jpa
356-
.MultiuserWorkspaceJpaModule());
357-
install(new MultiUserWorkspaceActivityModule());
358-
install(
359-
new org.eclipse.che.multiuser.permission.devfile.server.jpa
360-
.MultiuserUserDevfileJpaModule());
361-
install(
362-
new org.eclipse.che.multiuser.permission.devfile.server.UserDevfileApiPermissionsModule());
363-
364-
// Permission filters
365-
bind(org.eclipse.che.multiuser.permission.system.SystemServicePermissionsFilter.class);
366-
bind(org.eclipse.che.multiuser.permission.system.JvmServicePermissionsFilter.class);
367-
bind(
368-
org.eclipse.che.multiuser.permission.system.SystemEventsSubscriptionPermissionsCheck.class);
369-
370-
Multibinder<String> binder =
371-
Multibinder.newSetBinder(binder(), String.class, Names.named(SYSTEM_DOMAIN_ACTIONS));
372-
binder.addBinding().toInstance(UserServicePermissionsFilter.MANAGE_USERS_ACTION);
373-
bind(org.eclipse.che.multiuser.permission.user.UserProfileServicePermissionsFilter.class);
374-
bind(org.eclipse.che.multiuser.permission.user.UserServicePermissionsFilter.class);
375-
bind(org.eclipse.che.multiuser.permission.logger.LoggerServicePermissionsFilter.class);
376-
377-
bind(org.eclipse.che.multiuser.permission.workspace.activity.ActivityPermissionsFilter.class);
378-
379-
bind(
380-
org.eclipse.che.multiuser.permission.resource.filters.ResourceServicePermissionsFilter
381-
.class);
382-
bind(
383-
org.eclipse.che.multiuser.permission.resource.filters
384-
.FreeResourcesLimitServicePermissionsFilter.class);
385-
386-
if (Boolean.parseBoolean(System.getenv("CHE_AUTH_NATIVEUSER"))) {
387-
bind(RequestTokenExtractor.class).to(HeaderRequestTokenExtractor.class);
388-
if (KubernetesInfrastructure.NAME.equals(infrastructure)) {
389-
bind(OIDCInfo.class).toProvider(OIDCInfoProvider.class).asEagerSingleton();
390-
bind(SigningKeyResolver.class).to(OIDCSigningKeyResolver.class);
391-
bind(JwtParser.class).toProvider(OIDCJwtParserProvider.class);
392-
bind(JwkProvider.class).toProvider(OIDCJwkProvider.class);
393-
}
394-
bind(TokenValidator.class).to(NotImplementedTokenValidator.class);
395-
bind(ProfileDao.class).to(JpaProfileDao.class);
396-
bind(OAuthAPI.class).to(EmbeddedOAuthAPI.class).asEagerSingleton();
397-
}
341+
bind(RequestTokenExtractor.class).to(HeaderRequestTokenExtractor.class);
342+
bind(ProfileDao.class).to(JpaProfileDao.class);
343+
bind(OAuthAPI.class).to(EmbeddedOAuthAPI.class).asEagerSingleton();
398344

399-
install(new MachineAuthModule());
345+
install(new WorkspaceJpaModule());
346+
bind(TokenValidator.class).to(NotImplementedTokenValidator.class);
347+
bind(MachineTokenProvider.class).to(MachineTokenProvider.EmptyMachineTokenProvider.class);
400348

401349
// User and profile - use profile from keycloak and other stuff is JPA
402350
bind(PasswordEncryptor.class).to(PBKDF2PasswordEncryptor.class);
403351
bind(UserDao.class).to(JpaUserDao.class);
404352
bind(PreferenceDao.class).to(JpaPreferenceDao.class);
405-
bind(PermissionChecker.class).to(PermissionCheckerImpl.class);
353+
// bind(PermissionChecker.class).to(PermissionCheckerImpl.class);
406354

407355
bindConstant().annotatedWith(Names.named("che.agents.auth_enabled")).to(true);
408356
}

Diff for: ‎assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterServletModule.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2021 Red Hat, Inc.
2+
* Copyright (c) 2012-2024 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -17,10 +17,8 @@
1717
import org.eclipse.che.commons.logback.filter.RequestIdLoggerFilter;
1818
import org.eclipse.che.inject.ConfigurationException;
1919
import org.eclipse.che.inject.DynaModule;
20-
import org.eclipse.che.multiuser.keycloak.server.deploy.KeycloakServletModule;
21-
import org.eclipse.che.multiuser.machine.authentication.server.MachineLoginFilter;
22-
import org.eclipse.che.multiuser.oidc.filter.OidcTokenInitializationFilter;
2320
import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfrastructure;
21+
import org.eclipse.che.workspace.infrastructure.kubernetes.multiuser.oauth.OidcTokenInitializationFilter;
2422
import org.eclipse.che.workspace.infrastructure.openshift.OpenShiftInfrastructure;
2523
import org.eclipse.che.workspace.infrastructure.openshift.multiuser.oauth.OpenshiftTokenInitializationFilter;
2624
import org.everrest.guice.servlet.GuiceEverrestServlet;
@@ -53,7 +51,7 @@ protected void configureServlets() {
5351
configureNativeUserMode();
5452
} else {
5553
LOG.info("Running in classic multi-user mode ...");
56-
configureMultiUserMode();
54+
// configureMultiUserMode();
5755
}
5856

5957
if (Boolean.valueOf(System.getenv("CHE_METRICS_ENABLED"))) {
@@ -71,10 +69,10 @@ private boolean isCheCorsEnabled() {
7169
}
7270
}
7371

74-
private void configureMultiUserMode() {
75-
filterRegex(".*").through(MachineLoginFilter.class);
76-
install(new KeycloakServletModule());
77-
}
72+
// private void configureMultiUserMode() {
73+
// filterRegex(".*").through(MachineLoginFilter.class);
74+
// install(new KeycloakServletModule());
75+
// }
7876

7977
private void configureNativeUserMode() {
8078
final String infrastructure = System.getenv("CHE_INFRASTRUCTURE_ACTIVE");

Diff for: ‎assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/web.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2012-2021 Red Hat, Inc.
4+
Copyright (c) 2012-2024 Red Hat, Inc.
55
This program and the accompanying materials are made
66
available under the terms of the Eclipse Public License 2.0
77
which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -36,8 +36,8 @@
3636
<resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
3737
</resource-env-ref>
3838

39-
<listener>
40-
<listener-class>org.eclipse.che.multiuser.api.authentication.commons.DestroySessionListener</listener-class>
41-
</listener>
39+
<!-- <listener>-->
40+
<!-- <listener-class>org.eclipse.che.multiuser.api.authentication.commons.DestroySessionListener</listener-class>-->
41+
<!-- </listener>-->
4242

4343
</web-app>

Diff for: ‎infrastructures/infrastructure-permission/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@
3838
<groupId>org.eclipse.che.infrastructure</groupId>
3939
<artifactId>infrastructure-kubernetes</artifactId>
4040
</dependency>
41-
<dependency>
42-
<groupId>org.eclipse.che.multiuser</groupId>
43-
<artifactId>che-multiuser-api-permission</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.eclipse.che.multiuser</groupId>
47-
<artifactId>che-multiuser-permission-workspace</artifactId>
48-
</dependency>
4941
<dependency>
5042
<groupId>ch.qos.logback</groupId>
5143
<artifactId>logback-classic</artifactId>

Diff for: ‎infrastructures/infrastructure-permission/src/main/java/org/eclipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2021 Red Hat, Inc.
2+
* Copyright (c) 2012-2024 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,16 +14,14 @@
1414
import static org.eclipse.che.workspace.infrastructure.kubernetes.wsplugins.events.BrokerService.BROKER_RESULT_METHOD;
1515
import static org.eclipse.che.workspace.infrastructure.kubernetes.wsplugins.events.BrokerService.BROKER_STATUS_CHANGED_METHOD;
1616

17-
import javax.inject.Inject;
1817
import javax.inject.Singleton;
1918
import org.eclipse.che.api.core.ForbiddenException;
20-
import org.eclipse.che.api.core.jsonrpc.commons.RequestHandlerManager;
2119
import org.eclipse.che.api.workspace.shared.dto.RuntimeIdentityDto;
2220
import org.eclipse.che.api.workspace.shared.dto.event.BrokerStatusChangedEvent;
2321
import org.eclipse.che.commons.env.EnvironmentContext;
2422
import org.eclipse.che.commons.subject.Subject;
25-
import org.eclipse.che.multiuser.api.permission.server.jsonrpc.JsonRpcPermissionsFilterAdapter;
26-
import org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDomain;
23+
// import org.eclipse.che.multiuser.api.permission.server.jsonrpc.JsonRpcPermissionsFilterAdapter;
24+
// import org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDomain;
2725
import org.eclipse.che.workspace.infrastructure.kubernetes.wsplugins.events.BrokerService;
2826

2927
/**
@@ -32,14 +30,13 @@
3230
* @author Sergii Leshchenko
3331
*/
3432
@Singleton
35-
public class BrokerServicePermissionFilter extends JsonRpcPermissionsFilterAdapter {
36-
@Inject
37-
public void register(RequestHandlerManager requestHandlerManager) {
38-
requestHandlerManager.registerMethodInvokerFilter(
39-
this, BROKER_STATUS_CHANGED_METHOD, BROKER_RESULT_METHOD);
40-
}
33+
public class BrokerServicePermissionFilter {
34+
// @Inject
35+
// public void register(RequestHandlerManager requestHandlerManager) {
36+
// requestHandlerManager.registerMethodInvokerFilter(
37+
// this, BROKER_STATUS_CHANGED_METHOD, BROKER_RESULT_METHOD);
38+
// }
4139

42-
@Override
4340
public void doAccept(String method, Object... params) throws ForbiddenException {
4441
String workspaceId;
4542
switch (method) {
@@ -56,10 +53,10 @@ public void doAccept(String method, Object... params) throws ForbiddenException
5653
}
5754

5855
Subject currentSubject = EnvironmentContext.getCurrent().getSubject();
59-
if (!currentSubject.hasPermission(
60-
WorkspaceDomain.DOMAIN_ID, workspaceId, WorkspaceDomain.RUN)) {
61-
throw new ForbiddenException(
62-
"User doesn't have the required permissions to the specified workspace");
63-
}
56+
// if (!currentSubject.hasPermission(
57+
// WorkspaceDomain.DOMAIN_ID, workspaceId, WorkspaceDomain.RUN)) {
58+
// throw new ForbiddenException(
59+
// "User doesn't have the required permissions to the specified workspace");
60+
// }
6461
}
6562
}

0 commit comments

Comments
 (0)