gCubeSystem
/
keycloak-d4science-spi-parent
17
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: gCubeSystem:c4f2631fd5f3182a150bc89e3ca78b0f89c630df
Branches Tags
gCubeSystem:master
gCubeSystem:r5.16.0
gCubeSystem:v2.1.0
gCubeSystem:r5.14.0
gCubeSystem:v2.0.0
gCubeSystem:r5.4.0
gCubeSystem:v1.1.0
gCubeSystem:r5.0.0
gCubeSystem:v1.0.1
..
compare: gCubeSystem:abe8df688bcb22f2b0ef81eaca119884d29e88fc
Branches Tags
gCubeSystem:master
gCubeSystem:r5.16.0
gCubeSystem:v2.1.0
gCubeSystem:r5.14.0
gCubeSystem:v2.0.0
gCubeSystem:r5.4.0
gCubeSystem:v1.1.0
gCubeSystem:r5.0.0
gCubeSystem:v1.0.1

No commits in common. "c4f2631fd5f3182a150bc89e3ca78b0f89c630df" and "abe8df688bcb22f2b0ef81eaca119884d29e88fc" have entirely different histories.
c4f2631fd5 ... abe8df688b

7 changed files with 21 additions and 47 deletions
Show Stats Expand all files Collapse all files

8
avatar-importer/pom.xml
View File

@ -43,14 +43,6 @@
<artifactId>commons-codec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>

4
avatar-realm-resource/pom.xml
View File

@ -33,10 +33,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>

10
avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/AvatarAdminResource.java
View File

@ -1,11 +1,10 @@
package org.gcube.keycloak.avatar;
import java.nio.file.Files;
import java.io.InputStream;
import org.gcube.keycloak.avatar.storage.AvatarStorageProvider;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.reactive.RestForm;
import org.jboss.resteasy.reactive.multipart.FileUpload;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
import org.keycloak.common.ClientConnection;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
@ -63,7 +62,7 @@ public class AvatarAdminResource extends AbstractAvatarResource {
@NoCache
@Path("/{user_id}")
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response uploadUserAvatarImage(@PathParam("user_id") String userId, @RestForm(AVATAR_IMAGE_PARAMETER) FileUpload image) {
public Response uploadUserAvatarImage(@PathParam("user_id") String userId, MultipartFormDataInput input) {
try {
if (auth == null) {
return Response.status(Response.Status.UNAUTHORIZED).build();
@ -72,7 +71,8 @@ public class AvatarAdminResource extends AbstractAvatarResource {
RealmModel realm = session.getContext().getRealm();
UserModel user = session.users().getUserById(session.getContext().getRealm(), userId);
saveUserImage(realm, user, Files.newInputStream(image.uploadedFile()));
InputStream imageInputStream = input.getFormDataPart(AVATAR_IMAGE_PARAMETER, InputStream.class, null);
saveUserImage(realm, user, imageInputStream);
} catch (ForbiddenException e) {
return Response.status(Response.Status.FORBIDDEN).entity(e.getMessage()).build();
} catch (Exception e) {

13
avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/AvatarResource.java
View File

@ -1,15 +1,14 @@
package org.gcube.keycloak.avatar;
import java.nio.file.Files;
import java.io.InputStream;
import java.util.List;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.reactive.RestForm;
import org.jboss.resteasy.reactive.multipart.FileUpload;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.http.HttpRequest;
import org.keycloak.models.KeycloakSession;
import org.keycloak.services.cors.Cors;
import org.keycloak.services.resources.Cors;
import org.keycloak.services.resources.RealmsResource;
import jakarta.ws.rs.Consumes;
@ -75,7 +74,7 @@ public class AvatarResource extends AbstractAvatarResource {
@POST
@NoCache
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response uploadCurrentUserAvatarImage(@RestForm(AVATAR_IMAGE_PARAMETER) FileUpload image, @Context UriInfo uriInfo) {
public Response uploadCurrentUserAvatarImage(MultipartFormDataInput input, @Context UriInfo uriInfo) {
if (auth == null) {
throw new NotAuthorizedException("Bearer");
}
@ -87,7 +86,9 @@ public class AvatarResource extends AbstractAvatarResource {
logger.debugf("Uploading new avatar for user %s in realm %s", auth.getUser(), auth.getSession().getRealm());
Response response = null;
try {
saveUserImage(auth.getSession().getRealm(), auth.getUser(), Files.newInputStream(image.uploadedFile()));
InputStream imageInputStream = input.getFormDataPart(AVATAR_IMAGE_PARAMETER, InputStream.class, null);
saveUserImage(auth.getSession().getRealm(), auth.getUser(), imageInputStream);
if (uriInfo.getQueryParameters().containsKey("account")) {
UriBuilder uriBuilder = RealmsResource.accountUrl(session.getContext().getUri().getBaseUriBuilder());

12
event-listener-provider/src/main/java/org/gcube/keycloak/event/NoOpEventPublisherProvider.java
View File

@ -51,18 +51,6 @@ public class NoOpEventPublisherProvider extends OrchestratorEventPublisherProvid
// Nothing to do
return null;
}
@Override
public int getLastSendHTTPResponseCode() {
// Nothing to do
return 0;
}
@Override
public int getLastRetrieveHTTPResponseCode() {
// Nothing to do
return 0;
}
};
}

6
pom.xml
View File

@ -46,7 +46,7 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
<version>24.0.2</version>
<version>23.0.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -107,13 +107,13 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp3.version}</version>
<!-- <version>${okhttp3.version}</version>-->
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
<!-- <version>${okio.version}</version>-->
<scope>compile</scope>
</dependency>
<dependency>

15
protocol-mapper/src/test/java/org/gcube/keycloak/protocol/oidc/mapper/D4ScienceContextMapperTest.java
View File

@ -60,8 +60,7 @@ public class D4ScienceContextMapperTest {
.map(ProviderConfigProperty::getName)
.collect(Collectors.toList());
assertThat(configPropertyNames).containsExactlyInAnyOrder(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME,
OIDCAttributeMapperHelper.INCLUDE_IN_LIGHTWEIGHT_ACCESS_TOKEN,
assertThat(configPropertyNames).containsExactly(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME,
OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, D4ScienceContextMapper.HTTP_REQUEST_HEADER_NAME,
D4ScienceContextMapper.NARROW_RESOURCE_ACCESS);
}
@ -110,11 +109,8 @@ public class D4ScienceContextMapperTest {
}
private KeycloakSession givenKeycloakSession(boolean withHeader) {
ClientModel clientModel = Mockito.mock(ClientModel.class);
when(clientModel.getName()).thenReturn("test-client-id");
KeycloakContext context = Mockito.mock(KeycloakContext.class);
when(context.getClient()).thenReturn(clientModel);
KeycloakSession keycloakSession = Mockito.mock(KeycloakSession.class);
KeycloakContext context = Mockito.mock(KeycloakContext.class);
when(keycloakSession.getContext()).thenReturn(context);
HttpHeaders headers = Mockito.mock(HttpHeaders.class);
when(context.getRequestHeaders()).thenReturn(headers);
@ -139,12 +135,13 @@ public class D4ScienceContextMapperTest {
}
return new D4ScienceContextMapper().transformAccessToken(at, mappingModel, keycloakSession,
userSessionModel, givenClientSessionContext(keycloakSession));
userSessionModel, givenClientSessionContext());
}
private ClientSessionContext givenClientSessionContext(KeycloakSession keycloakSession) {
private ClientSessionContext givenClientSessionContext() {
ClientModel clientModel = Mockito.mock(ClientModel.class);
when(clientModel.getName()).thenReturn("test-client-id");
AuthenticatedClientSessionModel acsm = Mockito.mock(AuthenticatedClientSessionModel.class);
ClientModel clientModel = keycloakSession.getContext().getClient();
when(acsm.getClient()).thenReturn(clientModel);
ClientSessionContext csc = Mockito.mock(ClientSessionContext.class);
when(csc.getClientSession()).thenReturn(acsm);