From 32d102dbc90e0e1e989b9f2d15ad0bc8b4d52fd6 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 24 Mar 2024 13:40:47 +0100 Subject: [PATCH] Native Libraries: added API version to: - test whether native library matches the JAR (bad builds could e.g. ship a newer JAR with an older incompatible native library) - invoke a method (to get API version) to check whether native library works correctly if API version do not match, or method could not invoked correctly, disable usage of FlatLaf native library Windows and macOS binaries built and signed locally in clean workspace Linux binary built by GitHub Actions --- CHANGELOG.md | 5 +++ .../formdev/flatlaf/ui/FlatNativeLibrary.java | 41 +++++++++++++----- .../flatlaf/ui/FlatNativeLinuxLibrary.java | 4 +- .../flatlaf/ui/FlatNativeMacLibrary.java | 4 +- .../flatlaf/ui/FlatNativeWindowsLibrary.java | 4 +- .../ui/FlatWindowsNativeWindowBorder.java | 2 +- .../flatlaf/natives/flatlaf-windows-arm64.dll | Bin 23272 -> 23272 bytes .../flatlaf/natives/flatlaf-windows-x86.dll | Bin 21224 -> 21224 bytes .../natives/flatlaf-windows-x86_64.dll | Bin 23272 -> 23784 bytes .../natives/libflatlaf-linux-x86_64.so | Bin 17064 -> 16552 bytes .../flatlaf-natives-linux/build.gradle.kts | 5 ++- .../src/main/cpp/ApiVersion.cpp | 37 ++++++++++++++++ ...com_formdev_flatlaf_ui_FlatNativeLibrary.h | 21 +++++++++ .../flatlaf-natives-macos/build.gradle.kts | 5 ++- ...com_formdev_flatlaf_ui_FlatNativeLibrary.h | 21 +++++++++ .../src/main/objcpp/ApiVersion.mm | 37 ++++++++++++++++ .../flatlaf-natives-windows/build.gradle.kts | 1 + .../src/main/cpp/ApiVersion.cpp | 37 ++++++++++++++++ ...com_formdev_flatlaf_ui_FlatNativeLibrary.h | 21 +++++++++ 19 files changed, 229 insertions(+), 16 deletions(-) create mode 100644 flatlaf-natives/flatlaf-natives-linux/src/main/cpp/ApiVersion.cpp create mode 100644 flatlaf-natives/flatlaf-natives-linux/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h create mode 100644 flatlaf-natives/flatlaf-natives-macos/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h create mode 100644 flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/ApiVersion.mm create mode 100644 flatlaf-natives/flatlaf-natives-windows/src/main/cpp/ApiVersion.cpp create mode 100644 flatlaf-natives/flatlaf-natives-windows/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h diff --git a/CHANGELOG.md b/CHANGELOG.md index fda3fec2..b1714e11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ FlatLaf Change Log - `FlatSVGIcon` color filters now support linear gradients. (PR #817) - Added support for `JSplitPane.expandableSide` client property to `FlatSplitPane`. +- Native libraries: Added API version check to test whether native library + matches the JAR (bad builds could e.g. ship a newer JAR with an older + incompatible native library) and to test whether native methods can be invoked + (some security software allows loading native library but blocks method + invocation). ## 3.4 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java index 5ffc2a6a..3c169c28 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java @@ -37,16 +37,18 @@ class FlatNativeLibrary private static boolean initialized; private static NativeLibrary nativeLibrary; + private native static int getApiVersion(); + /** * Loads native library (if available) and returns whether loaded successfully. * Returns {@code false} if no native library is available. */ - static synchronized boolean isLoaded() { - initialize(); + static synchronized boolean isLoaded( int apiVersion ) { + initialize( apiVersion ); return (nativeLibrary != null) ? nativeLibrary.isLoaded() : false; } - private static void initialize() { + private static void initialize( int apiVersion ) { if( initialized ) return; initialized = true; @@ -104,7 +106,26 @@ class FlatNativeLibrary return; // no native library available for current OS or CPU architecture // load native library - nativeLibrary = createNativeLibrary( classifier, ext ); + NativeLibrary nativeLibrary = createNativeLibrary( classifier, ext ); + if( !nativeLibrary.isLoaded() ) + return; + + // check API version (and check whether library works) + try { + int actualApiVersion = getApiVersion(); + if( actualApiVersion != apiVersion ) { + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Wrong API version in native library (expected " + + apiVersion + ", actual " + actualApiVersion + "). Ignoring native library.", null ); + return; + } + } catch( Throwable ex ) { + // could be a UnsatisfiedLinkError in case that loading native library + // from temp directory was blocked by some OS security mechanism + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to get API version of native library. Ignoring native library.", ex ); + return; + } + + FlatNativeLibrary.nativeLibrary = nativeLibrary; } private static NativeLibrary createNativeLibrary( String classifier, String ext ) { @@ -118,9 +139,9 @@ class FlatNativeLibrary if( library.isLoaded() ) return library; - LoggingFacade.INSTANCE.logSevere( "Did not find library '" + System.mapLibraryName( libraryName ) - + "' in java.library.path '" + System.getProperty( "java.library.path" ) - + "', using extracted library instead", null ); + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Native library '" + System.mapLibraryName( libraryName ) + + "' not found in java.library.path '" + System.getProperty( "java.library.path" ) + + "'. Using extracted native library instead.", null ); } else { // try standard library naming scheme // (same as in flatlaf.jar in package 'com/formdev/flatlaf/natives') @@ -139,11 +160,11 @@ class FlatNativeLibrary return new NativeLibrary( libraryFile2, true ); } - LoggingFacade.INSTANCE.logSevere( "Did not find library '" + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Native library '" + libraryFile.getName() + (libraryName2 != null ? ("' or '" + libraryName2) : "") - + "' in '" + libraryFile.getParentFile().getAbsolutePath() - + "', using extracted library instead", null ); + + "' not found in '" + libraryFile.getParentFile().getAbsolutePath() + + "'. Using extracted native library instead.", null ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java index b60922ec..8f0ee8b3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java @@ -35,6 +35,8 @@ import com.formdev.flatlaf.util.SystemInfo; */ class FlatNativeLinuxLibrary { + private static int API_VERSION_LINUX = 3001; + /** * Checks whether native library is loaded/available. *

@@ -42,7 +44,7 @@ class FlatNativeLinuxLibrary * method of this class. Otherwise, the native library may not be loaded. */ static boolean isLoaded() { - return SystemInfo.isLinux && FlatNativeLibrary.isLoaded(); + return SystemInfo.isLinux && FlatNativeLibrary.isLoaded( API_VERSION_LINUX ); } // direction for _NET_WM_MOVERESIZE message diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeMacLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeMacLibrary.java index 0ef75f50..7d08376a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeMacLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeMacLibrary.java @@ -44,6 +44,8 @@ import com.formdev.flatlaf.util.SystemInfo; */ public class FlatNativeMacLibrary { + private static int API_VERSION_MACOS = 2001; + /** * Checks whether native library is loaded/available. *

@@ -51,7 +53,7 @@ public class FlatNativeMacLibrary * method of this class. Otherwise, the native library may not be loaded. */ public static boolean isLoaded() { - return SystemInfo.isMacOS && FlatNativeLibrary.isLoaded(); + return SystemInfo.isMacOS && FlatNativeLibrary.isLoaded( API_VERSION_MACOS ); } public native static boolean setWindowRoundedBorder( Window window, float radius, float borderWidth, int borderColor ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java index 669271e6..8a4ce3cf 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java @@ -30,6 +30,8 @@ import com.formdev.flatlaf.util.SystemInfo; */ public class FlatNativeWindowsLibrary { + private static int API_VERSION_WINDOWS = 1001; + private static long osBuildNumber = Long.MIN_VALUE; /** @@ -39,7 +41,7 @@ public class FlatNativeWindowsLibrary * method of this class. Otherwise, the native library may not be loaded. */ public static boolean isLoaded() { - return SystemInfo.isWindows && FlatNativeLibrary.isLoaded(); + return SystemInfo.isWindows && FlatNativeLibrary.isLoaded( API_VERSION_WINDOWS ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java index dda40c28..a4014001 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java @@ -89,7 +89,7 @@ class FlatWindowsNativeWindowBorder return null; // check whether native library was successfully loaded - if( !FlatNativeLibrary.isLoaded() ) + if( !FlatNativeWindowsLibrary.isLoaded() ) return null; // create new instance diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-arm64.dll b/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-arm64.dll index b9c9aaa81df2c9a26326b3bc9a72d32db846cb7c..ea7d69bd5a221923010365dc32bf0b9402c7422b 100644 GIT binary patch delta 2655 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 diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll b/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll index 1afddbf938b5d9e7f2b6c75c4ef74c2fd05c2594..d3ccf1b66ea24151f825df7d7451480c3568741d 100644 GIT binary patch delta 2716 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 an=g#lCbF0TExtv@;<|*CM`3T>%>MyJTH6c& diff --git a/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts b/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts index 4fcb9838..a81d6643 100644 --- a/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-linux/build.gradle.kts @@ -21,7 +21,10 @@ plugins { } flatlafJniHeaders { - headers = listOf( "com_formdev_flatlaf_ui_FlatNativeLinuxLibrary.h" ) + headers = listOf( + "com_formdev_flatlaf_ui_FlatNativeLibrary.h", + "com_formdev_flatlaf_ui_FlatNativeLinuxLibrary.h" + ) } library { diff --git a/flatlaf-natives/flatlaf-natives-linux/src/main/cpp/ApiVersion.cpp b/flatlaf-natives/flatlaf-natives-linux/src/main/cpp/ApiVersion.cpp new file mode 100644 index 00000000..02454fb3 --- /dev/null +++ b/flatlaf-natives/flatlaf-natives-linux/src/main/cpp/ApiVersion.cpp @@ -0,0 +1,37 @@ +/* + * Copyright 2024 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "com_formdev_flatlaf_ui_FlatNativeLibrary.h" + +/** + * @author Karl Tauber + */ + + +// increase this version if changing API or functionality of native library +// also update version in Java class com.formdev.flatlaf.ui.FlatNativeLinuxLibrary +#define API_VERSION_LINUX 3001 + + +//---- JNI methods ------------------------------------------------------------ + +extern "C" +JNIEXPORT jint JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLibrary_getApiVersion + ( JNIEnv* env, jclass cls ) +{ + return API_VERSION_LINUX; +} diff --git a/flatlaf-natives/flatlaf-natives-linux/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h b/flatlaf-natives/flatlaf-natives-linux/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h new file mode 100644 index 00000000..35ba342b --- /dev/null +++ b/flatlaf-natives/flatlaf-natives-linux/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h @@ -0,0 +1,21 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_formdev_flatlaf_ui_FlatNativeLibrary */ + +#ifndef _Included_com_formdev_flatlaf_ui_FlatNativeLibrary +#define _Included_com_formdev_flatlaf_ui_FlatNativeLibrary +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_formdev_flatlaf_ui_FlatNativeLibrary + * Method: getApiVersion + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLibrary_getApiVersion + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts b/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts index cf650d74..5b542d3a 100644 --- a/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-macos/build.gradle.kts @@ -26,7 +26,10 @@ plugins { } flatlafJniHeaders { - headers = listOf( "com_formdev_flatlaf_ui_FlatNativeMacLibrary.h" ) + headers = listOf( + "com_formdev_flatlaf_ui_FlatNativeLibrary.h", + "com_formdev_flatlaf_ui_FlatNativeMacLibrary.h" + ) } library { diff --git a/flatlaf-natives/flatlaf-natives-macos/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h b/flatlaf-natives/flatlaf-natives-macos/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h new file mode 100644 index 00000000..35ba342b --- /dev/null +++ b/flatlaf-natives/flatlaf-natives-macos/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h @@ -0,0 +1,21 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_formdev_flatlaf_ui_FlatNativeLibrary */ + +#ifndef _Included_com_formdev_flatlaf_ui_FlatNativeLibrary +#define _Included_com_formdev_flatlaf_ui_FlatNativeLibrary +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_formdev_flatlaf_ui_FlatNativeLibrary + * Method: getApiVersion + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLibrary_getApiVersion + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/ApiVersion.mm b/flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/ApiVersion.mm new file mode 100644 index 00000000..ef0ff0f3 --- /dev/null +++ b/flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/ApiVersion.mm @@ -0,0 +1,37 @@ +/* + * Copyright 2024 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "com_formdev_flatlaf_ui_FlatNativeLibrary.h" + +/** + * @author Karl Tauber + */ + + +// increase this version if changing API or functionality of native library +// also update version in Java class com.formdev.flatlaf.ui.FlatNativeMacLibrary +#define API_VERSION_MACOS 2001 + + +//---- JNI methods ------------------------------------------------------------ + +extern "C" +JNIEXPORT jint JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLibrary_getApiVersion + ( JNIEnv* env, jclass cls ) +{ + return API_VERSION_MACOS; +} diff --git a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts index b7e8ff3e..e297703e 100644 --- a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts @@ -22,6 +22,7 @@ plugins { flatlafJniHeaders { headers = listOf( + "com_formdev_flatlaf_ui_FlatNativeLibrary.h", "com_formdev_flatlaf_ui_FlatNativeWindowsLibrary.h", "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder.h", "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_WndProc.h" diff --git a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/ApiVersion.cpp b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/ApiVersion.cpp new file mode 100644 index 00000000..a32f0d6d --- /dev/null +++ b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/ApiVersion.cpp @@ -0,0 +1,37 @@ +/* + * Copyright 2024 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "com_formdev_flatlaf_ui_FlatNativeLibrary.h" + +/** + * @author Karl Tauber + */ + + +// increase this version if changing API or functionality of native library +// also update version in Java class com.formdev.flatlaf.ui.FlatNativeWindowsLibrary +#define API_VERSION_WINDOWS 1001 + + +//---- JNI methods ------------------------------------------------------------ + +extern "C" +JNIEXPORT jint JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLibrary_getApiVersion + ( JNIEnv* env, jclass cls ) +{ + return API_VERSION_WINDOWS; +} diff --git a/flatlaf-natives/flatlaf-natives-windows/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h b/flatlaf-natives/flatlaf-natives-windows/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h new file mode 100644 index 00000000..35ba342b --- /dev/null +++ b/flatlaf-natives/flatlaf-natives-windows/src/main/headers/com_formdev_flatlaf_ui_FlatNativeLibrary.h @@ -0,0 +1,21 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_formdev_flatlaf_ui_FlatNativeLibrary */ + +#ifndef _Included_com_formdev_flatlaf_ui_FlatNativeLibrary +#define _Included_com_formdev_flatlaf_ui_FlatNativeLibrary +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_formdev_flatlaf_ui_FlatNativeLibrary + * Method: getApiVersion + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLibrary_getApiVersion + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif