Skip to content

Commit

Permalink
chore: refactor and fix new tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreibogus
andreibogus committed Feb 29, 2024
1 parent 7e51877 commit ffce5ba
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 181 deletions.
37 changes: 12 additions & 25 deletions ...va/org/eclipse/tractusx/managedidentitywallets/service/STSTokenValidationServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,18 @@

import java.util.Date;

import static com.nimbusds.jose.jwk.Curve.Ed25519;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.BPN_1;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.BPN_2;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.BPN_CREDENTIAL_READ;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.DID_BPN_1;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.DID_BPN_2;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.DID_JSON_STRING_1;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.DID_JSON_STRING_2;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.EXP_VALID_DATE;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.IAT_VALID_DATE;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.JWK_INNER;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.JWK_OUTER;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.NONCE;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestConstants.READ_SCOPE;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestUtils.addAccessTokenToClaimsSet;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestUtils.buildClaimsSet;
import static org.eclipse.tractusx.managedidentitywallets.utils.TestUtils.buildJWTToken;
Expand All @@ -63,24 +66,8 @@
@ContextConfiguration(initializers = { TestContextInitializer.class })
class STSTokenValidationServiceTest {

private static final OctetKeyPair JWK_OUTER = new OctetKeyPair
.Builder(Ed25519, new Base64URL("4Q5HCXPyutfcj7gLmbAKlYttlJPkykIkRjh7DH2NtZ0"))
.d(new Base64URL("Ktp0sv9dKr_gnzRxpH5V9qpiTgZ1WbkMSv8WtWodewg"))
.keyID("58cb4b32-c2e4-46f0-a3ad-3286e34765ed")
.build();

private static final OctetKeyPair JWK_INNER = new OctetKeyPair
.Builder(Ed25519, new Base64URL("Z-8DEkN6pw2E01niDWqrp1kROLF-syIPIpFgmyrVUOU"))
.d(new Base64URL("MLYxSai_oFzuqEfnB2diA3oDuixLg3kQzZKMyW31-2o"))
.keyID("58cb4b32-c2e4-46f0-a3ad-3286e34765ty")
.build();

private static final Date EXP_VALID_DATE = new Date(Long.parseLong("2559397136000"));

private static final Date ALREADY_EXP_DATE = new Date(Long.parseLong("1707582883000"));

private static final Date IAT_VALID_DATE = new Date(Long.parseLong("1707496483000"));

@Autowired
private STSTokenValidationService stsTokenValidationService;

Expand Down Expand Up @@ -117,7 +104,7 @@ public void cleanWallets() {

@Test
void validateTokenFailureAccessTokenMissingTest() throws JOSEException {
JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_1, DID_BPN_1, NONCE, READ_SCOPE, EXP_VALID_DATE, IAT_VALID_DATE);
JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_1, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, EXP_VALID_DATE, IAT_VALID_DATE);
String siToken = buildJWTToken(JWK_OUTER, outerSet);

ValidationResult result = stsTokenValidationService.validateToken(siToken);
Expand All @@ -133,10 +120,10 @@ void validateTokenFailureWrongSignatureInnerTokenTest() throws JOSEException {
.keyID("58cb4b32-c2e4-46f0-a3ad-3286e34765ty")
.generate();

JWTClaimsSet innerSet = buildClaimsSet(DID_BPN_2, DID_BPN_1, DID_BPN_1, NONCE, READ_SCOPE, EXP_VALID_DATE, IAT_VALID_DATE);
JWTClaimsSet innerSet = buildClaimsSet(DID_BPN_2, DID_BPN_1, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, EXP_VALID_DATE, IAT_VALID_DATE);
String accessToken = buildJWTToken(jwkRandom, innerSet);

JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_1, DID_BPN_1, NONCE, READ_SCOPE, EXP_VALID_DATE, ALREADY_EXP_DATE);
JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_1, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, EXP_VALID_DATE, ALREADY_EXP_DATE);
JWTClaimsSet outerSetFull = addAccessTokenToClaimsSet(accessToken, outerSet);
String siToken = buildJWTToken(JWK_OUTER, outerSetFull);

Expand All @@ -148,10 +135,10 @@ void validateTokenFailureWrongSignatureInnerTokenTest() throws JOSEException {

@Test
void validateTokenFailureExpiredTokenIssNotEqualsSubTest() throws JOSEException {
JWTClaimsSet innerSet = buildClaimsSet(DID_BPN_2, DID_BPN_1, DID_BPN_1, NONCE, READ_SCOPE, EXP_VALID_DATE, IAT_VALID_DATE);
JWTClaimsSet innerSet = buildClaimsSet(DID_BPN_2, DID_BPN_1, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, EXP_VALID_DATE, IAT_VALID_DATE);
String accessToken = buildJWTToken(JWK_INNER, innerSet);

JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_2, DID_BPN_1, NONCE, READ_SCOPE, ALREADY_EXP_DATE, IAT_VALID_DATE);
JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_2, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, ALREADY_EXP_DATE, IAT_VALID_DATE);
JWTClaimsSet outerSetFull = addAccessTokenToClaimsSet(accessToken, outerSet);
String siToken = buildJWTToken(JWK_OUTER, outerSetFull);

Expand All @@ -164,10 +151,10 @@ void validateTokenFailureExpiredTokenIssNotEqualsSubTest() throws JOSEException

@Test
void validateTokenSuccessTest() throws JOSEException {
JWTClaimsSet innerSet = buildClaimsSet(DID_BPN_2, DID_BPN_1, DID_BPN_1, NONCE, READ_SCOPE, EXP_VALID_DATE, IAT_VALID_DATE);
JWTClaimsSet innerSet = buildClaimsSet(DID_BPN_2, DID_BPN_1, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, EXP_VALID_DATE, IAT_VALID_DATE);
String accessToken = buildJWTToken(JWK_INNER, innerSet);

JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_1, DID_BPN_1, NONCE, READ_SCOPE, EXP_VALID_DATE, IAT_VALID_DATE);
JWTClaimsSet outerSet = buildClaimsSet(DID_BPN_1, DID_BPN_1, DID_BPN_1, NONCE, BPN_CREDENTIAL_READ, EXP_VALID_DATE, IAT_VALID_DATE);
JWTClaimsSet outerSetFull = addAccessTokenToClaimsSet(accessToken, outerSet);
String siToken = buildJWTToken(JWK_OUTER, outerSetFull);

Expand Down
25 changes: 23 additions & 2 deletions src/test/java/org/eclipse/tractusx/managedidentitywallets/utils/TestConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,37 @@

package org.eclipse.tractusx.managedidentitywallets.utils;

import com.nimbusds.jose.jwk.OctetKeyPair;
import com.nimbusds.jose.util.Base64URL;

import java.util.Date;

import static com.nimbusds.jose.jwk.Curve.Ed25519;

public class TestConstants {

public static final String DID_BPN_1 = "did:web:localhost:BPNL000000000001";
public static final String DID_BPN_2 = "did:web:localhost:BPNL000000000002";
public static final String BPN_1 = "BPNL000000000001";
public static final String BPN_2 = "BPNL000000000002";
public static final String READ_SCOPE = "org.eclipse.tractusx.vc.type:BpnCredential:read";
public static final String WRITE_SCOPE = "org.eclipse.tractusx.vc.type:BpnCredential:write";
public static final String BPN_CREDENTIAL_READ = "org.eclipse.tractusx.vc.type:BpnCredential:read";
public static final String INVALID_CREDENTIAL_READ = "org.eclipse.tractusx.vc.type:InvalidCredential:read";
public static final String BPN_CREDENTIAL_WRITE = "org.eclipse.tractusx.vc.type:BpnCredential:write";
public static final String VERIFIABLE_PRESENTATION = "vp";
public static final String NONCE = "123456";
public static final OctetKeyPair JWK_OUTER = new OctetKeyPair
.Builder(Ed25519, new Base64URL("4Q5HCXPyutfcj7gLmbAKlYttlJPkykIkRjh7DH2NtZ0"))
.d(new Base64URL("Ktp0sv9dKr_gnzRxpH5V9qpiTgZ1WbkMSv8WtWodewg"))
.keyID("58cb4b32-c2e4-46f0-a3ad-3286e34765ed")
.build();

public static final OctetKeyPair JWK_INNER = new OctetKeyPair
.Builder(Ed25519, new Base64URL("Z-8DEkN6pw2E01niDWqrp1kROLF-syIPIpFgmyrVUOU"))
.d(new Base64URL("MLYxSai_oFzuqEfnB2diA3oDuixLg3kQzZKMyW31-2o"))
.keyID("58cb4b32-c2e4-46f0-a3ad-3286e34765ty")
.build();
public static final Date EXP_VALID_DATE = new Date(Long.parseLong("2559397136000"));
public static final Date IAT_VALID_DATE = new Date(Long.parseLong("1707496483000"));
public static final String DID_JSON_STRING_1 = """
{
"@context": [
Expand Down
Loading

0 comments on commit ffce5ba

Please sign in to comment.