Skip to content

Commit

Permalink
Final revision.
Browse files Browse the repository at this point in the history
  • Loading branch information
@antoniotarricone
antoniotarricone committed Jun 13, 2024
1 parent de448a8 commit dac3556
Show file tree
Hide file tree
Showing 19 changed files with 831 additions and 2,829 deletions.
2 changes: 1 addition & 1 deletion src/main/java/it/pagopa/swclient/mil/auth/AuthErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public final class AuthErrorCode {
public static final String ERROR_SIGNING_TOKEN = MODULE_ID + "000030";
public static final String ERROR_SEARCHING_FOR_USER = MODULE_ID + "000031";
public static final String USER_NOT_FOUND = MODULE_ID + "000032";

/**
*
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/it/pagopa/swclient/mil/auth/resource/JwksResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@PermitAll
public class JwksResource {
/*
*
* Skew in seconds.
*/
private static final long SKEW = 5 * 60L;

Expand Down Expand Up @@ -80,7 +80,7 @@ public Uni<Response> get() {
MDC.put("requestId", correlationId);
Log.debug("get - Input parameters: n/a");
return keyExtService.getKeys(
KeyUtils.KEY_NAME_PREFIX,
KeyUtils.KEY_DOMAIN,
List.of(JsonWebKeyOperation.SIGN, JsonWebKeyOperation.VERIFY),
List.of(JsonWebKeyType.RSA))
.map(KeyUtils::keyBundle2PublicKey)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/it/pagopa/swclient/mil/auth/service/ClaimEncryptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private Uni<String> createKey() {
private Uni<String> retrieveKey() {
Log.trace("Retrieve key");
return keysExtService.getKeyWithLongestExp(
KeyUtils.KEY_NAME_PREFIX,
KeyUtils.KEY_DOMAIN,
List.of(JsonWebKeyOperation.ENCRYPT, JsonWebKeyOperation.DECRYPT),
List.of(JsonWebKeyType.RSA))
.chain(keyBundle -> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/it/pagopa/swclient/mil/auth/service/TokenSigner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private Uni<String> createKey() {
private Uni<String> retrieveKey() {
Log.trace("Retrieve key");
return keysExtService.getKeyWithLongestExp(
KeyUtils.KEY_NAME_PREFIX,
KeyUtils.KEY_DOMAIN,
List.of(JsonWebKeyOperation.SIGN, JsonWebKeyOperation.VERIFY),
List.of(JsonWebKeyType.RSA))
.chain(keyBundle -> {
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/it/pagopa/swclient/mil/auth/util/KeyUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ public class KeyUtils {
/*
*
*/
public static final String KEY_NAME_PREFIX = "auth";
public static final String KEY_DOMAIN = "auth";

/**
*
*/
private KeyUtils() {
}

/**
*
Expand Down Expand Up @@ -64,7 +70,7 @@ public static String[] myKid2KeyNameVersion(String myKid) {
* @return
*/
public static String generateKeyName() {
return KEY_NAME_PREFIX + UUID.randomUUID().toString().replace("-", "");
return KEY_DOMAIN + UUID.randomUUID().toString().replace("-", "");
}

/**
Expand Down
160 changes: 89 additions & 71 deletions src/test/java/it/pagopa/swclient/mil/auth/resource/JwksResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
package it.pagopa.swclient.mil.auth.resource;

import static io.restassured.RestAssured.given;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.Mockito.when;

import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Map;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -22,15 +24,11 @@
import io.quarkus.test.InjectMock;
import io.quarkus.test.common.http.TestHTTPEndpoint;
import io.quarkus.test.junit.QuarkusTest;
import io.smallrye.mutiny.Uni;
import it.pagopa.swclient.mil.auth.AuthErrorCode;
import io.smallrye.mutiny.Multi;
import it.pagopa.swclient.mil.auth.bean.JsonPropertyName;
import it.pagopa.swclient.mil.auth.bean.KeyType;
import it.pagopa.swclient.mil.auth.bean.KeyUse;
import it.pagopa.swclient.mil.auth.bean.PublicKey;
import it.pagopa.swclient.mil.auth.bean.PublicKeys;
import it.pagopa.swclient.mil.auth.service.KeyFinder;
import it.pagopa.swclient.mil.auth.util.KeyUtils;
import it.pagopa.swclient.mil.azureservices.keyvault.keys.bean.JsonWebKey;
import it.pagopa.swclient.mil.azureservices.keyvault.keys.bean.JsonWebKeyOperation;
import it.pagopa.swclient.mil.azureservices.keyvault.keys.bean.JsonWebKeyType;
import it.pagopa.swclient.mil.azureservices.keyvault.keys.bean.KeyAttributes;
Expand Down Expand Up @@ -64,89 +62,102 @@ void init(TestInfo testInfo) {
System.out.println(frame);
}

/**
*
*/
@Test
void testOk() {
void given_setOfKeys_when_theEndPointIsInvoked_then_getListOfPublicKeys() {
/*
* Setup.
* Setup
*/
KeyBundle keyBundle1 = new KeyBundle()
long iat1 = Instant.now().minus(1, ChronoUnit.MINUTES).getEpochSecond();
long exp1 = Instant.now().plus(9, ChronoUnit.MINUTES).getEpochSecond();

KeyBundle keyBundle1 = new KeyBundle()
.setAttributes(new KeyAttributes()
.setCreated(iat1)
.setEnabled(true)
.setExp(exp1)
.setNbf(iat1))
.setKey(new JsonWebKey()
.setKty(JsonWebKeyType.RSA)
.setE(new byte[0])
.setN(new byte[0])
.setKeyOps(List.of(
JsonWebKeyOperation.SIGN,
JsonWebKeyOperation.VERIFY))
.setKid("https://keyvault/keys/key_name_1/key_version_1"))
.setTags(Map.of(
it.pagopa.swclient.mil.azureservices.keyvault.keys.util.KeyUtils.DOMAIN_KEY,
KeyUtils.KEY_DOMAIN));

long iat2 = Instant.now().getEpochSecond();
long exp2 = Instant.now().plus(10, ChronoUnit.MINUTES).getEpochSecond();

KeyBundle keyBundle2 = new KeyBundle()
.setAttributes(new KeyAttributes()
.set)
.setKey(null)
.setTags(null);

when(keyExtService.getKeys(KeyUtils.KEY_NAME_PREFIX,
.setCreated(iat2)
.setEnabled(true)
.setExp(exp2)
.setNbf(iat2))
.setKey(new JsonWebKey()
.setKty(JsonWebKeyType.RSA)
.setE(new byte[0])
.setN(new byte[0])
.setKeyOps(List.of(
JsonWebKeyOperation.SIGN,
JsonWebKeyOperation.VERIFY))
.setKid("https://keyvault/keys/key_name_2/key_version_2"))
.setTags(Map.of(
it.pagopa.swclient.mil.azureservices.keyvault.keys.util.KeyUtils.DOMAIN_KEY,
KeyUtils.KEY_DOMAIN));

when(keyExtService.getKeys(
KeyUtils.KEY_DOMAIN,
List.of(JsonWebKeyOperation.SIGN, JsonWebKeyOperation.VERIFY),
List.of(JsonWebKeyType.RSA)))
.thenReturn(null)


/*
* Test.
*/
PublicKeys response = given()
.when()
.get()
.then()
.log()
.everything()
.statusCode(200)
.contentType(MediaType.APPLICATION_JSON)
.header("Cache-Control", containsString("max-age"))
.extract()
.response()
.as(PublicKeys.class);

assertEquals(publicKeys, response);
}

@Test
void testWithExpirationInAWhileOk() {
/*
* Setup.
*/
long now = Instant.now().getEpochSecond();
long exp = now + 5 * 60;
PublicKey publicKey1 = new PublicKey("exp1", KeyUse.sig, "kid1", "mod1", KeyType.RSA, exp, now);

PublicKeys publicKeys = new PublicKeys(List.of(publicKey1));

when(keyFinder.findPublicKeys())
.thenReturn(Uni.createFrom().item(publicKeys));
.thenReturn(Multi.createFrom().items(keyBundle1, keyBundle2));

/*
* Test.
* Test
*/
PublicKeys response = given()
PublicKeys actual = given()
.when()
.get()
.then()
.log()
.everything()
.statusCode(200)
.contentType(MediaType.APPLICATION_JSON)
.header("Cache-Control", containsString("no-cache"))
.header("Cache-Control", containsString("max-age"))
.extract()
.response()
.as(PublicKeys.class);

assertEquals(publicKeys, response);
assertThat(actual.getKeys())
.containsExactlyInAnyOrder(
KeyUtils.keyBundle2PublicKey(keyBundle1),
KeyUtils.keyBundle2PublicKey(keyBundle2));
}

/**
*
*/
@Test
void testWithoutKeys() {
void given_noKey_when_theEndPointIsInvoked_then_getEmptyListOfPublicKeys() {
/*
* Setup.
* Setup
*/
PublicKeys publicKeys = new PublicKeys(List.of());

when(keyFinder.findPublicKeys())
.thenReturn(Uni.createFrom().item(publicKeys));
when(keyExtService.getKeys(
KeyUtils.KEY_DOMAIN,
List.of(JsonWebKeyOperation.SIGN, JsonWebKeyOperation.VERIFY),
List.of(JsonWebKeyType.RSA)))
.thenReturn(Multi.createFrom().items());

/*
* Test.
* Test
*/
PublicKeys response = given()
PublicKeys actual = given()
.when()
.get()
.then()
Expand All @@ -159,19 +170,26 @@ void testWithoutKeys() {
.response()
.as(PublicKeys.class);

assertEquals(publicKeys, response);
assertThat(actual.getKeys())
.isEmpty();
}

/**
*
*/
@Test
void testWithError() {
void given_errorSearchingKeys_when_theEndPointIsInvoked_then_getFailure() {
/*
* Setup.
* Setup
*/
when(keyFinder.findPublicKeys())
.thenReturn(Uni.createFrom().failure(new Exception("synthetic exception")));
when(keyExtService.getKeys(
KeyUtils.KEY_DOMAIN,
List.of(JsonWebKeyOperation.SIGN, JsonWebKeyOperation.VERIFY),
List.of(JsonWebKeyType.RSA)))
.thenReturn(Multi.createFrom().failure(new Exception("synthetic_exception")));

/*
* Test.
* Test
*/
given()
.when()
Expand All @@ -181,6 +199,6 @@ void testWithError() {
.everything()
.statusCode(500)
.contentType(MediaType.APPLICATION_JSON)
.body(JsonPropertyName.ERRORS, hasItem(AuthErrorCode.ERROR_SEARCHING_FOR_KEYS));
.body(JsonPropertyName.ERRORS, notNullValue());
}
}
}
Loading

0 comments on commit dac3556

Please sign in to comment.