Skip to content

Commit

Permalink
Remove Keycloak Server Overlay from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosthe19916
carlosthe19916 committed Aug 1, 2022
1 parent 35f99fc commit fc2b7ac
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 241 deletions.
26 changes: 4 additions & 22 deletions services/src/test/java/org/jboss/windup/web/services/ServiceTestUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
package org.jboss.windup.web.services;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;

import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.MultivaluedMap;

import org.apache.commons.codec.digest.DigestUtils;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.windup.web.tests.authentication.KeycloakAuthenticationHelper;
import org.junit.Assert;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;

/**
* @author <a href="mailto:jesse.sightler@gmail.com">Jesse Sightler</a>
*/
Expand All @@ -23,7 +18,6 @@ public class ServiceTestUtil
public static ResteasyClient getResteasyClient()
{
return new ResteasyClientBuilder()
.register(new Authenticator())
.build();
}

Expand All @@ -46,16 +40,4 @@ public static void assertFileContentsAreEqual(InputStream expected, InputStream

Assert.assertEquals("File contents differ!", expectedMd5, actualMd5);
}

private static class Authenticator implements ClientRequestFilter
{
@Override
public void filter(ClientRequestContext requestContext) throws IOException
{
String token = KeycloakAuthenticationHelper.getAccessToken();

MultivaluedMap<String, Object> headers = requestContext.getHeaders();
headers.add("Authorization", "Bearer " + token);
}
}
}
4 changes: 1 addition & 3 deletions services/src/test/java/org/jboss/windup/web/services/servlet/FileDefaultServletTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.windup.web.furnaceserviceprovider.FromFurnace;
import org.jboss.windup.web.services.AbstractTest;
import org.jboss.windup.web.tests.authentication.KeycloakAuthenticationHelper;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -52,11 +51,10 @@ public void testFileServlet() throws Exception

HttpClient httpClient = HttpClients.createDefault();
final String testFileUrl = baseURL.toURI().toString() + "static-report/" + tempFile.getFileName();
String token = KeycloakAuthenticationHelper.getAccessToken();


HttpGet get = new HttpGet(testFileUrl);
get.removeHeaders("Authorization");
get.addHeader("Authorization", "Bearer " + token);
HttpResponse response = httpClient.execute(get);

int exec = response.getStatusLine().getStatusCode();
Expand Down
1 change: 0 additions & 1 deletion tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<modules>
<module>wildfly-dist</module>
<module>test-authentication-client</module>
</modules>

</project>
22 changes: 0 additions & 22 deletions tests/test-authentication-client/pom.xml
View file

This file was deleted.

29 changes: 0 additions & 29 deletions ...src/main/java/org/jboss/windup/web/tests/authentication/KeycloakAuthenticationHelper.java
View file

This file was deleted.

12 changes: 0 additions & 12 deletions tests/test-authentication-client/src/main/resources/keycloak.json
View file

This file was deleted.

17 changes: 0 additions & 17 deletions tests/wildfly-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,6 @@
</resources>
</configuration>
</execution>
<execution>
<id>copy-keycloak-db</id>
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${wildfly.outputdirectory}standalone/data/</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>src/main/resources/keycloak_database</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
138 changes: 3 additions & 135 deletions tests/wildfly-dist/src/main/resources/keycloak_config/standalone-full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<extension module="org.jboss.as.webservices"/>
<extension module="org.jboss.as.weld"/>
<extension module="org.keycloak.keycloak-adapter-subsystem"/>
<extension module="org.keycloak.keycloak-server-subsystem"/>
<extension module="org.wildfly.extension.batch.jberet"/>
<extension module="org.wildfly.extension.bean-validation"/>
<extension module="org.wildfly.extension.clustering.web"/>
Expand All @@ -45,8 +44,7 @@
<extension module="org.wildfly.iiop-openjdk"/>
</extensions>
<system-properties>
<property name="keycloak.realm.public.key" value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhzGkMexMJ/stKe4ApsQM725i5pqnNlc5M8CB2uj8Lc77juFRKIjYwCJ7Zc1Zy2w0uaOHYBWuRnJ+9uQX6WtYmq4+FH09LyAH2rN4pi/nvdP8f9rU/vEKLpeMwcSbPgp2xKY+G2Ow5Uxh+CEZ5+3ZkNnwn99b9MP2Wad/l1UN7ObepRCy7zZNxxbB6qV4uqCbE02ZV8AXzgVia22D4yo6qpTVzULsNCdXuMwDkMvqPYylZlxq6L6pXxDyNJSwPZ9mDQW5adpS+CC4Rs1A32rU432IWw45qloIMAzJbpjdAD8aNmfXw0V89qj2SKbRisrDDKAWblyxewlmj3DqNPfBWQIDAQAB"/>
<property name="keycloak.server.url" value="http://localhost:8180/auth"/>
<property name="windup.secured.url" value="none"/>
</system-properties>
<management>
<security-realms>
Expand Down Expand Up @@ -168,14 +166,6 @@
<password>sa</password>
</security>
</datasource>
<datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
<password>sa</password>
</security>
</datasource>
<drivers>
<driver name="h2" module="com.h2database.h2">
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
Expand All @@ -195,7 +185,7 @@
<local-routing/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:6.0">
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
<spec-descriptor-property-replacement>true</spec-descriptor-property-replacement>
<concurrent>
<context-services>
<context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
Expand Down Expand Up @@ -417,32 +407,6 @@
<expiration max-idle="60000"/>
</local-cache>
</cache-container>
<cache-container name="keycloak">
<local-cache name="realms">
<heap-memory size="10000"/>
</local-cache>
<local-cache name="users">
<heap-memory size="10000"/>
</local-cache>
<local-cache name="sessions"/>
<local-cache name="authenticationSessions"/>
<local-cache name="offlineSessions"/>
<local-cache name="clientSessions"/>
<local-cache name="offlineClientSessions"/>
<local-cache name="loginFailures"/>
<local-cache name="work"/>
<local-cache name="authorization">
<heap-memory size="10000"/>
</local-cache>
<local-cache name="keys">
<heap-memory size="1000"/>
<expiration max-idle="3600000"/>
</local-cache>
<local-cache name="actionTokens">
<heap-memory size="-1"/>
<expiration interval="300000" max-idle="-1"/>
</local-cache>
</cache-container>
</subsystem>
<subsystem xmlns="urn:jboss:domain:io:3.0">
<worker name="default"/>
Expand Down Expand Up @@ -479,103 +443,7 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
<subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
<subsystem xmlns="urn:jboss:domain:keycloak:1.2">
<secure-deployment name="windup-web.war">
<realm>windup</realm>
<resource>windup-web</resource>
<public-client>true</public-client>
<realm-public-key>${keycloak.realm.public.key}</realm-public-key>
<auth-server-url>${keycloak.server.url}</auth-server-url>
<ssl-required>EXTERNAL</ssl-required>
</secure-deployment>
<secure-deployment name="windup-ui.war">
<realm>windup</realm>
<resource>windup-web</resource>
<public-client>true</public-client>
<realm-public-key>${keycloak.realm.public.key}</realm-public-key>
<auth-server-url>${keycloak.server.url}</auth-server-url>
<ssl-required>EXTERNAL</ssl-required>
</secure-deployment>
<secure-deployment name="api.war">
<realm>windup</realm>
<resource>windup-web</resource>
<public-client>true</public-client>
<realm-public-key>${keycloak.realm.public.key}</realm-public-key>
<auth-server-url>${keycloak.server.url}</auth-server-url>
<ssl-required>NONE</ssl-required>
</secure-deployment>
</subsystem>
<subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
<web-context>auth</web-context>
<master-realm-name>master</master-realm-name>
<scheduled-task-interval>900</scheduled-task-interval>
<theme>
<staticMaxAge>2592000</staticMaxAge>
<cacheThemes>true</cacheThemes>
<cacheTemplates>true</cacheTemplates>
<dir>${jboss.home.dir}/themes</dir>
</theme>
<spi name="hostname">
<default-provider>default</default-provider>
<provider name="default" enabled="true">
<properties>
<property name="frontendUrl" value="${keycloak.frontendUrl:}"/>
<property name="forceBackendUrlToFrontendUrl" value="false"/>
</properties>
</provider>
</spi>
<spi name="eventsStore">
<provider name="jpa" enabled="true">
<properties>
<property name="exclude-events" value="[&quot;REFRESH_TOKEN&quot;]"/>
</properties>
</provider>
</spi>
<spi name="userCache">
<provider name="default" enabled="true"/>
</spi>
<spi name="userSessionPersister">
<default-provider>jpa</default-provider>
</spi>
<spi name="timer">
<default-provider>basic</default-provider>
</spi>
<spi name="connectionsHttpClient">
<provider name="default" enabled="true"/>
</spi>
<spi name="connectionsJpa">
<provider name="default" enabled="true">
<properties>
<property name="dataSource" value="java:jboss/datasources/KeycloakDS"/>
<property name="initializeEmpty" value="true"/>
<property name="migrationStrategy" value="update"/>
<property name="migrationExport" value="${jboss.home.dir}/keycloak-database-update.sql"/>
</properties>
</provider>
</spi>
<spi name="realmCache">
<provider name="default" enabled="true"/>
</spi>
<spi name="connectionsInfinispan">
<default-provider>default</default-provider>
<provider name="default" enabled="true">
<properties>
<property name="cacheContainer" value="java:jboss/infinispan/container/keycloak"/>
</properties>
</provider>
</spi>
<spi name="jta-lookup">
<default-provider>${keycloak.jta.lookup.provider:jboss}</default-provider>
<provider name="jboss" enabled="true"/>
</spi>
<spi name="publicKeyStorage">
<provider name="infinispan" enabled="true">
<properties>
<property name="minTimeBetweenRequests" value="10"/>
</properties>
</provider>
</spi>
</subsystem>
<subsystem xmlns="urn:jboss:domain:keycloak:1.2"/>
<subsystem xmlns="urn:jboss:domain:mail:4.0">
<mail-session name="default" jndi-name="java:jboss/mail/Default">
<smtp-server outbound-socket-binding-ref="mail-smtp"/>
Expand Down
Binary file removed tests/wildfly-dist/src/main/resources/keycloak_database/keycloak.mv.db
View file
Binary file not shown.

0 comments on commit fc2b7ac

Please sign in to comment.