Skip to content
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

Jump to bottom

Fix module for Keycloak 22 #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix module for Keycloak 22 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions api-key-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<keyclock.version>9.0.3</keyclock.version>
<keyclock.version>22.0.2</keyclock.version>
</properties>


Expand All @@ -48,10 +48,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<version>1.0.0.Final</version>
<scope>provided</scope>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.1.2</version>
</dependency>
</dependencies>
</project>
10 changes: 5 additions & 5 deletions api-key-module/src/main/java/com/gwidgets/providers/RegisterEventListenerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import java.util.Objects;
import java.util.UUID;
import javax.persistence.EntityManager;
import org.keycloak.common.util.RandomString;
import jakarta.persistence.EntityManager;
import org.keycloak.common.util.SecretGenerator;
import org.keycloak.connections.jpa.JpaConnectionProvider;
import org.keycloak.events.Event;
import org.keycloak.events.EventListenerProvider;
Expand All @@ -21,12 +21,12 @@ public class RegisterEventListenerProvider implements EventListenerProvider {
private static final Logger logger = Logger.getLogger(RegisterEventListenerProvider.class);

//keycloak utility to generate random strings, anything can be used e.g UUID,..
private RandomString randomString;
private SecretGenerator secretGenerator;
private EntityManager entityManager;

public RegisterEventListenerProvider(KeycloakSession session) {
this.entityManager = session.getProvider(JpaConnectionProvider.class).getEntityManager();
this.randomString = new RandomString(50);
this.secretGenerator = SecretGenerator.getInstance();
}

public void onEvent(Event event) {
Expand Down Expand Up @@ -54,7 +54,7 @@ public void onEvent(AdminEvent adminEvent, boolean includeRepresentation) {

public void addApiKeyAttribute(String userId) {

String apiKey = randomString.nextString();
String apiKey = secretGenerator.randomString(50);
UserEntity userEntity = entityManager.find(UserEntity.class, userId);
UserAttributeEntity attributeEntity = new UserAttributeEntity();
attributeEntity.setName("api-key");
Expand Down
17 changes: 9 additions & 8 deletions api-key-module/src/main/java/com/gwidgets/resources/ApiKeyResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.gwidgets.resources;

import java.util.List;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.MediaType;
import java.util.stream.Stream;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.MediaType;

import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
Expand All @@ -30,18 +31,18 @@ public Response checkApiKey(@QueryParam("apiKey") String apiKey) {
RealmModel realm = session.getContext().getRealm();

logger.info("Trying to validate apiKey: " + apiKey + " at realm " + realm.getName());
List<UserModel> result = session.userStorageManager().searchForUserByUserAttribute("api-key", apiKey, realm);
Stream<UserModel> result = session.users().searchForUserByUserAttributeStream(realm, "apiKey", apiKey);
UserModel user = result.findFirst().orElse(null);

EventBuilder event = new EventBuilder(realm, session, session.getContext().getConnection());
event.detail("api-key", apiKey);
Response response;

if (result.isEmpty()) {
if (user == null) {
event.event(EventType.LOGIN_ERROR);
event.error("Invalid attempt for login using api-key (no user found for this apiKey)");
response = Response.status(401).build();
} else {
UserModel user = result.get(0);
event.user(user.getId());
if (user.isEnabled()) {
event.event(EventType.LOGIN);
Expand Down
Loading