Skip to content

Fix issue for checking if app is running in an OCI instance which causes Instance Principal auth to fail #8197

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.

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

Merged
Merged
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates.
* Copyright (c) 2023, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,13 +28,16 @@
import com.oracle.bmc.Region;
import jakarta.inject.Singleton;

import static com.oracle.bmc.auth.AbstractFederationClientAuthenticationDetailsProviderBuilder.METADATA_SERVICE_BASE_URL;

/**
* This (overridable) implementation will check the {@link OciConfig} for {@code IMDS} availability. And if it is found to be
* available, will also perform a secondary check on {@link Region#getRegionFromImds()} to ensure it returns a non-null value.
*/
@Singleton
@Weight(ServiceInfoBasics.DEFAULT_INJECT_WEIGHT)
class OciAvailabilityDefault implements OciAvailability {
private static final String OPC_PATH = getOpcPath();

@Override
public boolean isRunningOnOci(OciConfig ociConfig) {
Expand All @@ -46,7 +49,7 @@ static boolean runningOnOci(OciConfig ociConfig) {
return false;
}

return (Region.getRegionFromImds() != null);
return (Region.getRegionFromImds("http://" + ociConfig.imdsHostName() + OPC_PATH) != null);
}

static boolean canReach(String address,
Expand All @@ -71,4 +74,15 @@ static boolean canReach(String address,
}
}

private static String getOpcPath() {
String input = METADATA_SERVICE_BASE_URL;
int index = -1;
for (int nth = 3; nth > 0; nth--) {
index = input.indexOf("/", index + 1);
if (index == -1) {
return null;
}
}
return METADATA_SERVICE_BASE_URL.substring(index);
}
}