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

fix fetching cert from v2 endpoint #1063

Merged
merged 3 commits into from
Jan 30, 2025
Merged

fix fetching cert from v2 endpoint #1063

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b4ca79
fix fetching cert from v2 endpoint
n0tl3ss Jan 30, 2025
012351b
add test
n0tl3ss Jan 30, 2025
56b2d90
add v2 check
n0tl3ss Jan 30, 2025
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
10 changes: 7 additions & 3 deletions oraclecloud-common/src/main/java/io/micronaut/oraclecloud/core/OracleCloudCoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
import java.util.Optional;

/**
Expand Down Expand Up @@ -229,9 +230,12 @@ protected TenancyIdProvider tenantIdProvider(@Nullable BasicAuthenticationDetail
try {
String baseMetadataUrl = cfg.getBaseUrl();
urlBasedX509CertificateSupplier = new URLBasedX509CertificateSupplier(
new URL(baseMetadataUrl + "identity/cert.pem"),
new URL(baseMetadataUrl + "identity/key.pem"),
(char[]) null
URLBasedX509CertificateSupplier.ResourceDetails.builder().url(
new URL(baseMetadataUrl + "identity/cert.pem"))
.headers(Map.of("Authorization", "Bearer Oracle")).build(),
URLBasedX509CertificateSupplier.ResourceDetails.builder().url(
new URL(baseMetadataUrl + "identity/key.pem")).headers(Map.of("Authorization", "Bearer Oracle")).build()
,(char[]) null
);
tenantId = AuthUtils.getTenantIdFromCertificate(
urlBasedX509CertificateSupplier.getCertificateAndKeyPair().getCertificate()
Expand Down
Loading