libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

[KEYCLOAK-16245] - Update Quarkus 1.10.0.CR1

Browse source
This commit is contained in:
Pedro Igor 2020-11-12 10:42:51 -03:00
parent 244a1b2382
commit 7ad1c350a3
9 changed files with 62 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View file

@ -320,9 +320,9 @@ jobs:
- name: Run Quarkus tests
run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
mvn clean install -nsu -B -Pauth-server-quarkus -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest='!org.keycloak.testsuite.adapter.**,!**.crossdc.**,!**.cluster.**' | misc/log/trimmer.sh
mvn clean install -nsu -B -Pauth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest='!org.keycloak.testsuite.adapter.**,!**.crossdc.**,!**.cluster.**' | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-base-unit-tests.zip -@
exit $TEST_RESULT
@ -365,9 +365,9 @@ jobs:
- name: Run Quarkus adapter tests
run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
mvn clean install -nsu -B -Pauth-server-quarkus -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest=org.keycloak.testsuite.adapter.** | misc/log/trimmer.sh
mvn clean install -nsu -B -Pauth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest=org.keycloak.testsuite.adapter.** | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-adapter-tests.zip -@
exit $TEST_RESULT
@ -410,7 +410,7 @@ jobs:
- name: Run Quarkus cluster tests
run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
mvn clean install -nsu -B -Pauth-server-quarkus -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pauth-server-cluster-quarkus -Dsession.cache.owners=2 -Dtest=**.cluster.** -f testsuite/integration-arquillian/pom.xml | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]}

5
quarkus/deployment/pom.xml
View file

@ -108,6 +108,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

8
quarkus/pom.xml
View file

@ -31,13 +31,13 @@
<packaging>pom</packaging>
<properties>
<quarkus.version>1.9.1.Final</quarkus.version>
<quarkus.version>1.10.0.CR1</quarkus.version>
<resteasy.version>4.5.8.Final</resteasy.version>
<jackson.version>2.11.3</jackson.version>
<jackson.databind.version>${jackson.version}</jackson.databind.version>
<hibernate.version>5.4.22.Final</hibernate.version>
<mysql-connector-java.version>8.0.21</mysql-connector-java.version>
<picocli.version>4.5.1</picocli.version>
<hibernate.version>5.4.23.Final</hibernate.version>
<mysql-connector-java.version>8.0.22</mysql-connector-java.version>
<picocli.version>4.5.2</picocli.version>
<snakeyaml.version>1.27</snakeyaml.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<wildfly.common.format.version>1.5.4.Final-format-001</wildfly.common.format.version>

46
quarkus/runtime/src/main/java/org/keycloak/cli/MainCommand.java
View file

@ -20,8 +20,6 @@ package org.keycloak.cli;
import static org.keycloak.cli.Picocli.error;
import static org.keycloak.cli.Picocli.println;
import io.quarkus.bootstrap.runner.ClassLoadingResource;
import io.quarkus.bootstrap.runner.JarResource;
import io.quarkus.bootstrap.runner.RunnerClassLoader;
import org.keycloak.configuration.KeycloakConfigSourceProvider;
@ -93,48 +91,14 @@ public class MainCommand {
private void beforeReaugmentationOnWindows() throws Exception {
// On Windows, files generated during re-augmentation are locked and can't be re-created.
// To workaround this behavior, we close these files as they are not needed during re-augmentation,
// but when actually running the application.
// To workaround this behavior, we reset the internal cache of the runner classloader and force files
// to be closed prior to re-augmenting the application
// See KEYCLOAK-16218
if (Environment.isWindows()) {
Field resourcesMapField = null;
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try {
RunnerClassLoader cl = (RunnerClassLoader) Thread.currentThread().getContextClassLoader();
resourcesMapField = cl.getClass().getDeclaredField("resourceDirectoryMap");
resourcesMapField.setAccessible(true);
Map<String, ClassLoadingResource[]> resourcesMap = (Map<String, ClassLoadingResource[]>) resourcesMapField.get(cl);
for (ClassLoadingResource[] resources : resourcesMap.values()) {
for (ClassLoadingResource resource : resources) {
if (resource instanceof JarResource) {
Field jarPath = null;
try {
JarResource jr = (JarResource) resource;
jarPath = jr.getClass().getDeclaredField("jarPath");
jarPath.setAccessible(true);
Path path = (Path) jarPath.get(jr);
if (path.getFileName().endsWith("generated-bytecode.jar")) {
jr.close();
}
} finally {
if (jarPath != null) {
jarPath.setAccessible(false);
}
}
}
}
}
} finally {
if (resourcesMapField != null) {
resourcesMapField.setAccessible(false);
}
if (classLoader instanceof RunnerClassLoader) {
RunnerClassLoader.class.cast(classLoader).resetInternalCaches();
}
}
}

3
services/src/main/java/org/keycloak/services/resources/LoginActionsService.java
View file

@ -855,7 +855,8 @@ public class LoginActionsService {
@Path("consent")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response processConsent(final MultivaluedMap<String, String> formData) {
public Response processConsent() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
event.event(EventType.LOGIN);
String code = formData.getFirst(SESSION_CODE);
String clientId = session.getContext().getUri().getQueryParameters().getFirst(Constants.CLIENT_ID);

36
services/src/main/java/org/keycloak/services/resources/account/AccountFormService.java
View file

@ -348,7 +348,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("/")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response processAccountUpdate(final MultivaluedMap<String, String> formData) {
public Response processAccountUpdate() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login(null);
}
@ -409,7 +411,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("sessions")
@POST
public Response processSessionsLogout(final MultivaluedMap<String, String> formData) {
public Response processSessionsLogout() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("sessions");
}
@ -441,7 +445,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("applications")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response processRevokeGrant(final MultivaluedMap<String, String> formData) {
public Response processRevokeGrant() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("applications");
}
@ -495,7 +501,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("totp")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response processTotpUpdate(final MultivaluedMap<String, String> formData) {
public Response processTotpUpdate() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("totp");
}
@ -565,7 +573,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("password")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response processPasswordUpdate(final MultivaluedMap<String, String> formData) {
public Response processPasswordUpdate() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("password");
}
@ -647,7 +657,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("identity")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response processFederatedIdentityUpdate(final MultivaluedMap<String, String> formData) {
public Response processFederatedIdentityUpdate() {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("identity");
}
@ -753,7 +765,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("resource/{resource_id}/grant")
@POST
public Response grantPermission(@PathParam("resource_id") String resourceId, @FormParam("action") String action, @FormParam("permission_id") String[] permissionId, @FormParam("requester") String requester, MultivaluedMap<String, String> formData) {
public Response grantPermission(@PathParam("resource_id") String resourceId, @FormParam("action") String action, @FormParam("permission_id") String[] permissionId, @FormParam("requester") String requester) {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("resource");
}
@ -875,7 +889,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("resource/{resource_id}/share")
@POST
public Response shareResource(@PathParam("resource_id") String resourceId, @FormParam("user_id") String[] userIds, @FormParam("scope_id") String[] scopes, MultivaluedMap<String, String> formData) {
public Response shareResource(@PathParam("resource_id") String resourceId, @FormParam("user_id") String[] userIds, @FormParam("scope_id") String[] scopes) {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("resource");
}
@ -962,7 +978,9 @@ public class AccountFormService extends AbstractSecuredLocalService {
@Path("resource")
@POST
public Response processResourceActions(@FormParam("resource_id") String[] resourceIds, @FormParam("action") String action, MultivaluedMap<String, String> formData) {
public Response processResourceActions(@FormParam("resource_id") String[] resourceIds, @FormParam("action") String action) {
MultivaluedMap<String, String> formData = request.getDecodedFormParameters();
if (auth == null) {
return login("resource");
}

6
services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java
View file

@ -88,8 +88,7 @@ public class JtaTransactionWrapper implements KeycloakTransaction {
@Override
public void commit() {
try {
if (Status.STATUS_NO_TRANSACTION == tm.getStatus() ||
Status.STATUS_ACTIVE != tm.getStatus()) {
if (Status.STATUS_NO_TRANSACTION == tm.getStatus()) {
return;
}
logger.debug("JtaTransactionWrapper commit");
@ -104,8 +103,7 @@ public class JtaTransactionWrapper implements KeycloakTransaction {
@Override
public void rollback() {
try {
if (Status.STATUS_NO_TRANSACTION == tm.getStatus() ||
Status.STATUS_ACTIVE != tm.getStatus()) {
if (Status.STATUS_NO_TRANSACTION == tm.getStatus()) {
return;
}
logger.debug("JtaTransactionWrapper rollback");

7
testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java
View file

@ -39,6 +39,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
@ -58,6 +59,9 @@ public class TestApplicationResourceProvider implements RealmResourceProvider {
private final BlockingQueue<TestAvailabilityAction> adminTestAvailabilityAction;
private final TestApplicationResourceProviderFactory.OIDCClientData oidcClientData;
@Context
HttpRequest request;
public TestApplicationResourceProvider(KeycloakSession session, BlockingQueue<LogoutAction> adminLogoutActions,
BlockingQueue<PushNotBeforeAction> adminPushNotBeforeActions,
BlockingQueue<TestAvailabilityAction> adminTestAvailabilityAction, TestApplicationResourceProviderFactory.OIDCClientData oidcClientData) {
@ -122,7 +126,8 @@ public class TestApplicationResourceProvider implements RealmResourceProvider {
@Consumes(javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED)
@Produces(MediaType.TEXT_HTML_UTF_8)
@Path("/{action}")
public String post(@PathParam("action") String action, MultivaluedMap<String, String> formParams) {
public String post(@PathParam("action") String action) {
MultivaluedMap<String, String> formParams = request.getDecodedFormParameters();
String title = "APP_REQUEST";
if (action.equals("auth")) {
title = "AUTH_RESPONSE";

7
testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProviderFactory.java
View file

@ -17,6 +17,7 @@
package org.keycloak.testsuite.rest;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.Config.Scope;
import org.keycloak.crypto.Algorithm;
import org.keycloak.crypto.KeyType;
@ -47,7 +48,11 @@ public class TestApplicationResourceProviderFactory implements RealmResourceProv
@Override
public RealmResourceProvider create(KeycloakSession session) {
return new TestApplicationResourceProvider(session, adminLogoutActions, pushNotBeforeActions, testAvailabilityActions, oidcClientData);
TestApplicationResourceProvider provider = new TestApplicationResourceProvider(session, adminLogoutActions, pushNotBeforeActions, testAvailabilityActions, oidcClientData);
ResteasyProviderFactory.getInstance().injectProperties(provider);
return provider;
}
@Override