Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better Docs for CIE onboarding - Fix jwt revocation signature #33

Merged
merged 5 commits into from
Oct 10, 2024
Merged

Better Docs for CIE onboarding - Fix jwt revocation signature #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
375cf51
chore: updated dependencies
rglauco Mar 28, 2024
32b996a
test: added RSAEncKey tests
rglauco Mar 28, 2024
0992b3e
docs: added UTC hint for iat issuance in CIE onboarding
rglauco Mar 29, 2024
0f818fc
docs: better clarification for geoblocking for preproduction CIE servers
rglauco Mar 29, 2024
12d3bc4
fix: revocation signed with Core key
rglauco Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions examples/relying-party-spring-boot/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ previous chapter instructions replacing `127.0.0.1` with the right hostname

**To be onboarded into CIE Federation**:
- use always appropriate and valid TLS Certificates
- use IP from Italian networks for server [CIE Federation servers uses geoblocking]
- use IP from Italian networks for your server [CIE Federation preproduction servers are using geoblocking]
- as contact use the same institutional email address as stated into the administrative part [do not use PEC]
- when copy the federation public key please follow this pattern:
- ```
Expand All @@ -105,4 +105,5 @@ previous chapter instructions replacing `127.0.0.1` with the right hostname
}
```
- when onboarded, please retrieve the Trust Mark form TA fetch endpoint like this example for preproduction: `https://preprod.oidc.registry.servizicie.interno.gov.it/fetch?sub={your_client_id}`
- remember to (put `[` `]` around the Trust Mark when writing the appropriate file
- remember to (put `[` `]` around the Trust Mark when writing the appropriate file
- `iat` and `exp` claims must be issued according to the UTC timezone, this is an example command for the webapp: `mvn clean spring-boot:run -Dspring-boot.run.jvmArguments="-Duser.timezone=UTC"`
8 changes: 4 additions & 4 deletions starter-kit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>2.0.9</version>
</dependency>

<dependency>
Expand All @@ -28,13 +28,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.2.0</version>
<version>5.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -46,7 +46,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.35.1</version>
<version>3.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion starter-kit/src/main/java/it/spid/cie/oidc/helper/OAuth2Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void sendRevocationRequest(
.put("exp", JWTHelper.getExpiresOn())
.put("jti", UUID.randomUUID().toString());

JWKSet jwkSet = JWTHelper.getJWKSetFromJSON(clientConf.getJwksFed());
JWKSet jwkSet = JWTHelper.getJWKSetFromJSON(clientConf.getJwksCoreByUse(KeyUse.SIGNATURE));

String clientAssertion = jwtHelper.createJWS(payload, jwkSet);

Expand Down
53 changes: 40 additions & 13 deletions starter-kit/src/test/java/it/spid/cie/oidc/helper/TestJWTHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@
import java.util.HashMap;
import java.util.Map;

import com.nimbusds.jose.*;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.Test;

import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.JWSHeader;
import com.nimbusds.jose.JWSObject;
import com.nimbusds.jose.JWSSigner;
import com.nimbusds.jose.Payload;
import com.nimbusds.jose.crypto.RSASSASigner;
import com.nimbusds.jose.jwk.Curve;
import com.nimbusds.jose.jwk.ECKey;
Expand Down Expand Up @@ -65,6 +61,21 @@ public void testClass2() {
assertTrue(rsaKey.getKeyType().equals(KeyType.RSA));
}

@Test
public void testClass2enc() {
RSAKey rsaKey = null;
boolean catched = false;

try {
rsaKey = JWTHelper.createRSAEncKey(null, KeyUse.ENCRYPTION);
}
catch (Exception e) {
catched = true;
}

assertFalse(catched);
assertTrue(rsaKey.getKeyType().equals(KeyType.RSA));
}
@Test
public void testClass3() {
String test = "sample-value";
Expand Down Expand Up @@ -145,6 +156,20 @@ public void test_createRSAKey() {
assertFalse(catched);
}

@Test
public void test_createRSAEncKey() {
boolean catched = false;

try {
JWTHelper.createRSAEncKey(JWEAlgorithm.RSA_OAEP_256, KeyUse.ENCRYPTION);
}
catch(Exception e) {
catched = true;
}

assertFalse(catched);
}

@Test
public void test_fastParseHeader() {
boolean catched = false;
Expand Down Expand Up @@ -224,7 +249,7 @@ public void test_getJWKSetAsJSONArray() {

try {
RSAKey rsaKey1 = JWTHelper.createRSAKey(null, KeyUse.SIGNATURE);
RSAKey rsaKey2 = JWTHelper.createRSAKey(null, KeyUse.ENCRYPTION);
RSAKey rsaKey2 = JWTHelper.createRSAEncKey(null, KeyUse.ENCRYPTION);

JWKSet jwkSet = new JWKSet(Arrays.asList(rsaKey1, rsaKey2));

Expand All @@ -243,9 +268,10 @@ public void test_getJWKSetAsJSONArray() {

try {
RSAKey rsaKey = JWTHelper.createRSAKey(null, KeyUse.SIGNATURE);
RSAKey rsaEncKey = JWTHelper.createRSAEncKey(null, KeyUse.ENCRYPTION);
ECKey ecKey = createECKey(KeyUse.ENCRYPTION);

JWKSet jwkSet = new JWKSet(Arrays.asList(rsaKey, ecKey));
JWKSet jwkSet = new JWKSet(Arrays.asList(rsaKey, ecKey, rsaEncKey));

jsonArray = JWTHelper.getJWKSetAsJSONArray(jwkSet, false);
}
Expand All @@ -254,17 +280,18 @@ public void test_getJWKSetAsJSONArray() {
}

assertFalse(catched);
assertTrue(jsonArray.length() == 2);
assertTrue(jsonArray.length() == 3);
assertTrue(jsonArray.getJSONObject(0).has("use"));

catched = false;
jsonArray = null;

try {
RSAKey rsaKey = JWTHelper.createRSAKey(null, KeyUse.SIGNATURE);
RSAKey rsaEncKey = JWTHelper.createRSAEncKey(null, KeyUse.ENCRYPTION);
ECKey ecKey = createECKey(KeyUse.ENCRYPTION);

JWKSet jwkSet = new JWKSet(Arrays.asList(rsaKey, ecKey));
JWKSet jwkSet = new JWKSet(Arrays.asList(rsaKey, ecKey, rsaEncKey));

jsonArray = JWTHelper.getJWKSetAsJSONArray(jwkSet, true, false);
}
Expand All @@ -273,7 +300,7 @@ public void test_getJWKSetAsJSONArray() {
}

assertFalse(catched);
assertTrue(jsonArray.length() == 2);
assertTrue(jsonArray.length() == 3);
assertTrue(jsonArray.getJSONObject(0).has("use"));

catched = false;
Expand Down Expand Up @@ -312,7 +339,7 @@ public void test_getJWKSetFromJSON1() {

try {
RSAKey rsaKey1 = JWTHelper.createRSAKey(null, KeyUse.SIGNATURE);
RSAKey rsaKey2 = JWTHelper.createRSAKey(null, KeyUse.ENCRYPTION);
RSAKey rsaKey2 = JWTHelper.createRSAEncKey(null, KeyUse.ENCRYPTION);

JWKSet jwkSet = new JWKSet(Arrays.asList(rsaKey1, rsaKey2));

Expand Down Expand Up @@ -576,9 +603,9 @@ private String encode64(String value) {

private static JWKSet createJWKSet() throws Exception {
RSAKey rsaKey1 = JWTHelper.createRSAKey(JWSAlgorithm.RS256, KeyUse.SIGNATURE);
//RSAKey rsaKey2 = JWTHelper.createRSAKey(null, KeyUse.ENCRYPTION);
RSAKey rsaKey2 = JWTHelper.createRSAEncKey(JWEAlgorithm.RSA_OAEP_256, KeyUse.ENCRYPTION);

return new JWKSet(Arrays.asList(rsaKey1));
return new JWKSet(Arrays.asList(rsaKey1, rsaKey2));
}

private static String createJWS(JSONObject payload, JSONObject jwks)
Expand Down
10 changes: 6 additions & 4 deletions starter-kit/src/test/java/it/spid/cie/oidc/helper/TestOAuth2Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,13 @@ public void testClass3() {
WireMock.forbidden()
));

JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
//JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
JWKSet jwks = RPTestUtils.getJwksCoreByUse(JWTHelper.getJWKSetFromJSON(options.getJwkCore()), KeyUse.SIGNATURE);

FederationEntity clientConf = new FederationEntity();

clientConf.setSubject(RELYING_PARTY);
clientConf.setJwksFed(jwks.toString(false));
clientConf.setJwksCore(jwks.toString(false));

helper.sendRevocationRequest(null, null, SPID_PROVIDER + "test", clientConf);
}
Expand All @@ -352,12 +353,13 @@ public void testClass3() {
WireMock.ok()
));

JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
//JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
JWKSet jwks = RPTestUtils.getJwksCoreByUse(JWTHelper.getJWKSetFromJSON(options.getJwkCore()), KeyUse.SIGNATURE);

FederationEntity clientConf = new FederationEntity();

clientConf.setSubject(RELYING_PARTY);
clientConf.setJwksFed(jwks.toString(false));
clientConf.setJwksCore(jwks.toString(false));

helper.sendRevocationRequest(null, null, SPID_PROVIDER + "test", clientConf);
}
Expand Down
5 changes: 3 additions & 2 deletions starter-kit/src/test/java/it/spid/cie/oidc/model/TestTrustMark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.io.IOException;
import java.util.Arrays;

import com.nimbusds.jose.JWEAlgorithm;
import org.json.JSONObject;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -238,9 +239,9 @@ public void test_validate() {

private static JWKSet createJWKSet() throws Exception {
RSAKey rsaKey1 = JWTHelper.createRSAKey(JWSAlgorithm.RS256, KeyUse.SIGNATURE);
//RSAKey rsaKey2 = JWTHelper.createRSAKey(null, KeyUse.ENCRYPTION);
RSAKey rsaKey2 = JWTHelper.createRSAEncKey(JWEAlgorithm.RSA_OAEP_256, KeyUse.ENCRYPTION);

return new JWKSet(Arrays.asList(rsaKey1));
return new JWKSet(Arrays.asList(rsaKey1, rsaKey2));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions starter-kit/src/test/java/it/spid/cie/oidc/test/util/RPTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ public static String createJWS(JSONObject payload, JSONObject jwks)

public static JWKSet createJWKSet() throws Exception {
RSAKey rsaKey1 = JWTHelper.createRSAKey(JWSAlgorithm.RS256, KeyUse.SIGNATURE);
//RSAKey rsaKey2 = JWTHelper.createRSAKey(null, KeyUse.ENCRYPTION);
RSAKey rsaKey2 = JWTHelper.createRSAEncKey(JWEAlgorithm.RSA_OAEP_256, KeyUse.ENCRYPTION);

return new JWKSet(Arrays.asList(rsaKey1));
return new JWKSet(Arrays.asList(rsaKey1, rsaKey2));
}

public static RelyingPartyOptions getOptions() throws Exception {
Expand Down
Loading