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

Jump to bottom

[3.8.x] Fix potential UnsatisfiedLinkError for Azure extensions in native mode #5919

Merged
merged 1 commit into from
Mar 25, 2024
Merged

[3.8.x] Fix potential UnsatisfiedLinkError for Azure extensions in native mode #5919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions .../org/apache/camel/quarkus/support/reactor/netty/deployment/AzureCoreSupportProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@

import com.azure.core.annotation.ServiceInterface;
import com.azure.core.http.HttpClientProvider;
import com.microsoft.aad.msal4j.AbstractClientApplicationBaseSubstitutions.Msal4jIsPresent;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
import io.quarkus.deployment.util.ServiceUtil;
import io.quarkus.utilities.OS;
import org.jboss.jandex.DotName;

public class AzureCoreSupportProcessor {
Expand Down Expand Up @@ -93,4 +96,18 @@ void proxyDefinitions(
.forEach(proxyDefinitions::produce);
}

@BuildStep(onlyIf = Msal4jIsPresent.class)
void enableLoadingOfNativeLibraries(BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReinitializedClass) {
OS os = OS.determineOS();
if (os.equals(OS.LINUX) || os.equals(OS.MAC)) {
String iSecurityLibraryClassName = "com.microsoft.aad.msal4jextensions.persistence.%s.ISecurityLibrary"
.formatted(os.name().toLowerCase());
runtimeReinitializedClass.produce(new RuntimeReinitializedClassBuildItem(iSecurityLibraryClassName));
}

if (os.equals(OS.WINDOWS)) {
runtimeReinitializedClass.produce(new RuntimeReinitializedClassBuildItem("com.sun.jna.platform.win32.Crypt32"));
runtimeReinitializedClass.produce(new RuntimeReinitializedClassBuildItem("com.sun.jna.platform.win32.Kernel32"));
}
}
}
2 changes: 1 addition & 1 deletion ...me/src/main/java/com/microsoft/aad/msal4j/AbstractClientApplicationBaseSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private AuthenticationResultSupplier getAuthenticationResultSupplier(MsalRequest
return supplier;
}

static final class Msal4jIsPresent implements BooleanSupplier {
public static final class Msal4jIsPresent implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
try {
Expand Down
14 changes: 0 additions & 14 deletions ...ache/camel/quarkus/component/azure/storage/blob/deployment/AzureStorageBlobProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.azure.storage.blob.deployment;

import com.azure.identity.implementation.IdentityClient;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
Expand All @@ -25,7 +24,6 @@
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;

Expand Down Expand Up @@ -69,16 +67,4 @@ void nativeResources(BuildProducer<NativeImageResourceBuildItem> nativeResources
nativeResources.produce(new NativeImageResourceBuildItem(
"azure-storage-blob.properties"));
}

@BuildStep
void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
// Required by azure-identity
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("com.sun.jna.platform.win32.Crypt32"));
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("com.sun.jna.platform.win32.Kernel32"));
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(IdentityClient.class.getName()));
runtimeInitializedClass.produce(
new RuntimeInitializedClassBuildItem("com.microsoft.aad.msal4jextensions.persistence.linux.ISecurityLibrary"));
runtimeInitializedClass.produce(
new RuntimeInitializedClassBuildItem("com.microsoft.aad.msal4jextensions.persistence.mac.ISecurityLibrary"));
}
}
Loading