Skip to content

Commit

Permalink
Upgrade to Dropwizard 2.1.0 and JUnit 5
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier Chédru committed May 9, 2022
1 parent cea0420 commit 8f78ece
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 124 deletions.
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dropwizard.version>2.0.29</dropwizard.version>
<dropwizard.version>2.1.0</dropwizard.version>
<jjwt.version>0.11.5</jjwt.version>
<enforcer.fail>false</enforcer.fail>
</properties>
Expand Down Expand Up @@ -83,9 +83,9 @@
<version>${jjwt.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
54 changes: 28 additions & 26 deletions ...est/java/org/dhatim/dropwizard/jwt/cookie/authentication/JwtCookieAuthenticationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
*/
package org.dhatim.dropwizard.jwt.cookie.authentication;

import io.dropwizard.Configuration;
import io.dropwizard.testing.junit5.DropwizardAppExtension;
import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
import io.jsonwebtoken.lang.Strings;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
Expand All @@ -35,25 +38,26 @@
import java.util.Date;
import java.util.UUID;

@ExtendWith(DropwizardExtensionsSupport.class)
public class JwtCookieAuthenticationTest {

@ClassRule
public static final TestApplicationRule applicationRule = new TestApplicationRule();

private final WebTarget target = ClientBuilder.newClient().target(applicationRule.baseUri()).path("principal");
private static final DropwizardAppExtension<Configuration> EXT = new DropwizardAppExtension<Configuration>(TestApplication.class);

private WebTarget getTarget() {
return EXT.client().target("http://localhost:" + EXT.getLocalPort() + "/application").path("principal");
}
@Test
public void testUnauthorized() {
//calls to APIs with the @Auth annotation without prior authentication should result in HTTP 401
Response response = target.request(MediaType.APPLICATION_JSON).get();
Response response = getTarget().request(MediaType.APPLICATION_JSON).get();
Assert.assertEquals(401, response.getStatus());
}

@Test
public void testCookieSetting() throws IOException {
String principalName = UUID.randomUUID().toString();
//a POST will set the principal
Response response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(principalName)));
Response response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(principalName)));
Assert.assertEquals(200, response.getStatus());
DefaultJwtCookiePrincipal principal = getPrincipal(response);
Assert.assertEquals(principalName, principal.getName());
Expand All @@ -65,7 +69,7 @@ public void testCookieSetting() throws IOException {
Assert.assertTrue(cookie1.isHttpOnly());

//a GET with this cookie should return the Principal and refresh the cookie
response = target.request(MediaType.APPLICATION_JSON).cookie(cookie1).get();
response = getTarget().request(MediaType.APPLICATION_JSON).cookie(cookie1).get();
Assert.assertEquals(200, response.getStatus());
principal = getPrincipal(response);
Assert.assertEquals(principalName, principal.getName());
Expand All @@ -79,10 +83,10 @@ public void testCookieSetting() throws IOException {
public void testDontRefreshSession() throws IOException {
//requests made to methods annotated with @DontRefreshSession should not modify the cookie
String principalName = UUID.randomUUID().toString();
Response response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(principalName)));
Response response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(principalName)));
NewCookie cookie = response.getCookies().get("sessionToken");

response = target.path("idempotent").request(MediaType.APPLICATION_JSON).cookie(cookie).get();
response = getTarget().path("idempotent").request(MediaType.APPLICATION_JSON).cookie(cookie).get();
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(principalName, getPrincipal(response).getName());
Assert.assertNull(response.getCookies().get("sessionToken"));
Expand All @@ -91,11 +95,11 @@ public void testDontRefreshSession() throws IOException {
@Test
public void testPublicEndpoint() {
//public endpoints (i.e. not with @Auth, @RolesAllowed etc.) should not modify the cookie
Response response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(UUID.randomUUID().toString())));
Response response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(UUID.randomUUID().toString())));
NewCookie cookie = response.getCookies().get("sessionToken");

//request made to public methods should not refresh the cookie
response = target.path("public").request(MediaType.APPLICATION_JSON).cookie(cookie).get();
response = getTarget().path("public").request(MediaType.APPLICATION_JSON).cookie(cookie).get();
Assert.assertEquals(200, response.getStatus());
Assert.assertNull(response.getCookies().get("sessionToken"));
}
Expand All @@ -104,14 +108,14 @@ public void testPublicEndpoint() {
public void testRememberMe() {
//a volatile principal should set a volatile cookie
DefaultJwtCookiePrincipal principal = new DefaultJwtCookiePrincipal(UUID.randomUUID().toString());
Response response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
Response response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
NewCookie cookie = response.getCookies().get("sessionToken");
Assert.assertNotNull(cookie);
Assert.assertEquals(-1, cookie.getMaxAge());

//a long term principal should set a persistent cookie
principal.setPersistent(true);
response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
cookie = response.getCookies().get("sessionToken");
//default maxAge is 604800s (7 days)
Assert.assertNotNull(cookie);
Expand All @@ -120,22 +124,22 @@ public void testRememberMe() {

@Test
public void testRoles() {
WebTarget restrictedTarget = target.path("restricted");
WebTarget restrictedTarget = getTarget().path("restricted");
//try to access the resource without cookie (-> 401 UNAUTHORIZED)
Response response = restrictedTarget.request().get();
Assert.assertEquals(401, response.getStatus());

//set a principal without the admin role (-> 403 FORBIDDEN)
DefaultJwtCookiePrincipal principal = new DefaultJwtCookiePrincipal(UUID.randomUUID().toString());
response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
NewCookie cookie = response.getCookies().get("sessionToken");
Assert.assertNotNull(cookie);
response = restrictedTarget.request().cookie(cookie).get();
Assert.assertEquals(403, response.getStatus());

//set a principal with the admin role (-> 200 OK)
principal.setRoles(Collections.singleton("admin"));
response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(principal));
cookie = response.getCookies().get("sessionToken");
Assert.assertNotNull(cookie);
response = restrictedTarget.request().cookie(cookie).get();
Expand All @@ -144,12 +148,12 @@ public void testRoles() {

@Test
public void testDeleteCookie() {
Response response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(UUID.randomUUID().toString())));
Response response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(UUID.randomUUID().toString())));
NewCookie cookie = response.getCookies().get("sessionToken");
Assert.assertNotNull(cookie);

//removing the principal should produce a cookie with empty contenant and a past expiration date
response = target.path("unset").request().cookie(cookie).get();
response = getTarget().path("unset").request().cookie(cookie).get();
Assert.assertEquals(204, response.getStatus());
cookie = response.getCookies().get("sessionToken");
Assert.assertNotNull(cookie);
Expand All @@ -161,19 +165,17 @@ public void testDeleteCookie() {
public void testGetCurrentPrincipal() throws IOException {
//test to get principal from CurrentPrincipal.get() instead of @Auth
String principalName = UUID.randomUUID().toString();
Response response = target.request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(principalName)));
Response response = getTarget().request(MediaType.APPLICATION_JSON).post(Entity.json(new DefaultJwtCookiePrincipal(principalName)));
NewCookie cookie = response.getCookies().get("sessionToken");
Assert.assertNotNull(cookie);

response = target.path("current").request(MediaType.APPLICATION_JSON).cookie(cookie).get();
response = getTarget().path("current").request(MediaType.APPLICATION_JSON).cookie(cookie).get();
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(principalName, getPrincipal(response).getName());
}

private DefaultJwtCookiePrincipal getPrincipal(Response response) throws IOException {
return applicationRule
.getSupport()
.getObjectMapper()
return EXT.getObjectMapper()
.reader()
.forType(DefaultJwtCookiePrincipal.class)
.readValue(new InputStreamReader((InputStream) response.getEntity(), StandardCharsets.UTF_8));
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/org/dhatim/dropwizard/jwt/cookie/authentication/TestApplication.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package org.dhatim.dropwizard.jwt.cookie.authentication;

import com.codahale.metrics.health.HealthCheck;
import io.dropwizard.Application;
import io.dropwizard.Configuration;
import io.dropwizard.jetty.HttpConnectorFactory;
import io.dropwizard.logging.DefaultLoggingFactory;
import io.dropwizard.server.SimpleServerFactory;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;

public class TestApplication extends Application<Configuration> {

@Override
public void initialize(Bootstrap<Configuration> bootstrap) {
bootstrap.addBundle(JwtCookieAuthBundle.getDefault());
}

@Override
public void run(Configuration configuration, Environment environment) {
((DefaultLoggingFactory)configuration.getLoggingFactory()).setLevel("DEBUG");

//choose a random port
SimpleServerFactory serverConfig = new SimpleServerFactory();
configuration.setServerFactory(serverConfig);
HttpConnectorFactory connectorConfig = (HttpConnectorFactory) serverConfig.getConnector();
connectorConfig.setPort(0);

//Dummy health check to suppress the startup warning.
environment.healthChecks().register("dummy", new HealthCheck() {
@Override
protected HealthCheck.Result check() {
return HealthCheck.Result.healthy();
}
});

environment.jersey().register(new TestResource());
System.out.println("*** started");
}

}
94 changes: 0 additions & 94 deletions src/test/java/org/dhatim/dropwizard/jwt/cookie/authentication/TestApplicationRule.java
View file

This file was deleted.

0 comments on commit 8f78ece

Please sign in to comment.