EPA-111: EntityStatement tweaks for compatibility #76
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+82
to
+88
| var cert = | ||
| X509CertificateUtils.generateSelfSigned( | ||
| new Issuer(issuer), | ||
| Date.from(nbf), | ||
| Date.from(exp), | ||
| key.toPublicKey(), | ||
| key.toPrivateKey()); |
There was a problem hiding this comment.
That's the important bit to have an mTLS client cert.
| @@ -109,7 +111,13 @@ public void start() throws ExecutionException, InterruptedException { | |||
| var tokenIssuer = new TokenIssuerImpl(config.baseUri(), keyStore, codeRepo); | |||
| var sessionRepo = buildSessionRepo(config.sessionStore(), meterRegistry); | |||
|
|
|||
| var httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5)).build(); | |||
| var sslContext = TlsContext.fromClientCertificate(config.federation().entitySigningKey()); | |||
There was a problem hiding this comment.
This adds the client certificate to the list of certificates to use for authentication.
|
|
||
| // according to the federation spec this is not required here, some | ||
| // sectoral IdPs require it though | ||
| .defaultAcrValues(List.of("gematik-ehealth-loa-high")) |
There was a problem hiding this comment.
see also #74
| import org.bouncycastle.operator.OperatorCreationException; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class TlsContextTest { |
There was a problem hiding this comment.
TODO :D
thomasrichner-oviva
force-pushed
the
feature/epa-111
branch
3 times, most recently
from
84e525f
to
6ba3933
Compare
michelealbanese-oviva
approved these changes
May 6, 2024
ehealthid-cli/src/main/java/com/oviva/ehealthid/cli/KeyGeneratorCommand.java
Show resolved
Hide resolved
| private JWKSet generateJwks(KeyUse keyUse) throws JOSEException { | ||
| var key = new ECKeyGenerator(Curve.P_256).keyUse(keyUse).keyIDFromThumbprint(true).generate(); | ||
| return new JWKSet(key); | ||
| private String deriveName(URI issuer) { |
There was a problem hiding this comment.
can you provide a clearer name? maybe deriveFdpNameFromHost or something similar?
| return new JWKSet(key); | ||
| private String deriveName(URI issuer) { | ||
| var s = issuer.toString(); | ||
| s = s.replaceAll("^https://", ""); |
There was a problem hiding this comment.
hopefully nobody is using plain http 😄
There was a problem hiding this comment.
If they do, it won't work with the federation 🤷
thomasrichner-oviva
force-pushed
the
feature/epa-111
branch
from
9eeae2e
to
3052e4f
Compare
thomasrichner-oviva
force-pushed
the
feature/epa-111
branch
from
8cd4048
to
bedf143
Compare
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also fixes #74
now the following sectoral IdPs somewhat work:
RISE is still somehow broken