Merge pull request #5 from Cosmian/ffi_speed_thread_safe

Ffi speed thread safe

Author: bgrieder

.gitignore

@@ -1,3 +1,5 @@
 target/
 dependency-reduced-pom.xml
-hs_err_*.log
+hs_err_*.log
+.bloop/
+project/

.vscode/settings.json

@@ -7,5 +7,8 @@
         "Kmip",
         "serializers"
     ],
-    "java.format.settings.url": ".vscode/eclipse-codestyle.xml"
+    "java.format.settings.url": ".vscode/eclipse-codestyle.xml",
+    "files.watcherExclude": {
+        "**/target": true
+    }
 }

README.md

@@ -18,7 +18,7 @@ This library is available on Maven Central
 <dependency>
     <groupId>com.cosmian</groupId>
     <artifactId>cosmian_java_lib</artifactId>
-    <version>0.6.0</version>
+    <version>0.6.1</version>
 </dependency>
 ```
 
@@ -58,7 +58,8 @@ KMS Server | Java Lib | abe_gpsw lib
 -----------|----------|--------------
 1.2.0      | 0.5.0    | 0.3.0
 1.2.1      | 0.5.2    | 0.4.0
-1.2.1      | 0.6.0    | 0.6.0
+1.2.1      | ~~0.6.0~~| ~~0.6.0~~ (yanked)
+1.2.1      | 0.6.1    | 0.6.1
 
 
 ### Quick Start ABE+AES
@@ -92,7 +93,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```sh
 git clone https://github.com/Cosmian/abe_gpsw.git && \
 cd abe_gpsw && \
-git checkout v0.6.0
+git checkout v0.6.1
 ```
 
 3. Build the native library, which will be available as `libabe_gpsw.so` (linux) or `libabe_gpsw.dylib` (macos) in the `target` directory

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cosmian</groupId>
     <artifactId>cosmian_java_lib</artifactId>
-    <version>0.6.0</version>
+    <version>0.6.1</version>
 
     <name>cosmian_java_lib</name>
     <description>The Cosmian Java Lib that provides local encryption/decyption and access to the Cosmian public platform APIs</description>

src/main/java/com/cosmian/jna/Ffi.java

@@ -1,17 +1,15 @@
 package com.cosmian.jna.abe;
 
-import com.sun.jna.Native;
 import com.sun.jna.Library;
 import com.sun.jna.ptr.IntByReference;
-import com.sun.jna.ptr.PointerByReference;
 import com.sun.jna.Pointer;
 
 /**
  * This maps the hybrid_gpsw-aes.rs functions in the abe_gpsw Rust library
  */
 public interface FfiWrapper extends Library {
 
-        FfiWrapper INSTANCE = (FfiWrapper) Native.load("abe_gpsw", FfiWrapper.class);
+
 
         int set_error(String errorMsg);
 
@@ -38,23 +36,23 @@ int h_aes_decrypt_block(byte[] clearText, IntByReference clearTextSize, Pointer
                         int symmetricKeyLength, Pointer uidPointer, int uidLen, int blockNumber,
                         Pointer clearTextPointer, int clearTextLength);
 
-        int h_aes_create_encryption_cache(PointerByReference cachePtrPtr, String policyJson, Pointer publicKeyPointer,
+        int h_aes_create_encryption_cache(IntByReference cacheHandle, String policyJson, Pointer publicKeyPointer,
                         int publicKeyLength);
 
-        int h_aes_destroy_encryption_cache(PointerByReference cachePtrPtr);
+        int h_aes_destroy_encryption_cache(int cacheHandle);
 
         int h_aes_encrypt_header_using_cache(byte[] symmetricKey, IntByReference symmetricKeySize, byte[] headerBytes,
-                        IntByReference headerBytesSize, PointerByReference cachePtrPtr,
+                        IntByReference headerBytesSize, int cacheHandle,
                         String attributesJson, Pointer uidPointer, int uidLen, Pointer additionalDataPointer,
                         int additionalDataLength);
 
-        int h_aes_create_decryption_cache(PointerByReference cachePtrPtr, Pointer userDecryptionKeyPointer,
+        int h_aes_create_decryption_cache(IntByReference cacheHandle, Pointer userDecryptionKeyPointer,
                         int userDecryptionKeyLength);
 
-        int h_aes_destroy_decryption_cache(PointerByReference cachePtrPtr);
+        int h_aes_destroy_decryption_cache(int cacheHandle);
 
         int h_aes_decrypt_header_using_cache(byte[] symmetricKey, IntByReference symmetricKeySize, byte[] uidPointer,
                         IntByReference uidLen, byte[] additionalDataPointer, IntByReference additionalDataLength,
-                        Pointer encryptedHeaderBytes, int encryptedHeaderBytesSize, PointerByReference cachePtrPtr);
+                        Pointer encryptedHeaderBytes, int encryptedHeaderBytesSize, int cacheHandle);
 
 }

src/main/java/com/cosmian/jna/LocalDecryptionCache.java

@@ -12,10 +12,11 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 import com.cosmian.jna.Ffi;
-import com.cosmian.jna.LocalDecryptionCache;
-import com.cosmian.jna.LocalEncryptionCache;
 import com.cosmian.jna.abe.DecryptedHeader;
 import com.cosmian.jna.abe.EncryptedHeader;
 import com.cosmian.rest.abe.Abe;
@@ -487,29 +488,29 @@ public void testHybridEncryptionDecryptionUsingCacheLocal() throws Exception {
 
 		String publicKeyJson = Resources.load_resource("ffi/public_master_key.json");
 		PublicKey publicKey = PublicKey.fromJson(publicKeyJson);
-		LocalEncryptionCache encryptionCachePointer = Ffi.createEncryptionCache(publicKey);
+		int encryptionCacheHandle = Ffi.createEncryptionCache(publicKey);
 		Attr[] attributes = new Attr[] { new Attr("Department", "FIN"),
 				new Attr("Security Level", "Confidential") };
 		byte[] uid = new byte[] { 1, 2, 3, 4, 5 };
 		byte[] additional_data = new byte[] { 6, 7, 8, 9, 10 };
 
-		EncryptedHeader encryptedHeader = Ffi.encryptHeaderUsingCache(encryptionCachePointer, attributes,
+		EncryptedHeader encryptedHeader = Ffi.encryptHeaderUsingCache(encryptionCacheHandle, attributes,
 				Optional.of(uid), Optional.of(additional_data));
 
-		Ffi.destroyEncryptionCache(encryptionCachePointer);
+		Ffi.destroyEncryptionCache(encryptionCacheHandle);
 
 		// decrypt
 
 		String userDecryptionKeyJson = Resources.load_resource("ffi/fin_confidential_user_key.json");
 		PrivateKey userDecryptionKey = PrivateKey.fromJson(userDecryptionKeyJson);
 
-		LocalDecryptionCache decryptionCachePointer = Ffi.createDecryptionCache(userDecryptionKey);
+		int decryptionCacheHandle = Ffi.createDecryptionCache(userDecryptionKey);
 
 		DecryptedHeader decryptedHeader = Ffi.decryptHeaderUsingCache(
-				decryptionCachePointer,
+				decryptionCacheHandle,
 				encryptedHeader.getEncryptedHeaderBytes(), 10, 10);
 
-		Ffi.destroyDecryptionCache(decryptionCachePointer);
+		Ffi.destroyDecryptionCache(decryptionCacheHandle);
 
 		// assert
 
@@ -543,4 +544,71 @@ public void testHybridEncryptionDecryptionNoCacheLocal() throws Exception {
 		assertArrayEquals(additional_data, decryptedHeader.getAdditionalData());
 	}
 
+	@Test
+	public void testHybridEncryptionCacheSerialization() throws Exception {
+
+		String publicKeyJson = Resources.load_resource("ffi/public_master_key.json");
+		PublicKey publicKey = PublicKey.fromJson(publicKeyJson);
+
+		// serialize encryption cache
+		int e_cache = Ffi.createEncryptionCache(publicKey);
+
+		Attr[] attributes = new Attr[] { new Attr("Department", "FIN"), new Attr("Security Level", "Confidential") };
+		byte[] uid = new byte[] { 1, 2, 3, 4, 5 };
+		byte[] additional_data = new byte[] { 6, 7, 8, 9, 10 };
+
+		String userDecryptionKeyJson = Resources.load_resource("ffi/fin_confidential_user_key.json");
+		PrivateKey userDecryptionKey = PrivateKey.fromJson(userDecryptionKeyJson);
+
+		// serialize decryption cache
+		int d_cache = Ffi.createDecryptionCache(userDecryptionKey);
+
+		int threads = 4;
+		ExecutorService executor = Executors.newFixedThreadPool(threads);
+		for (int i = 0; i < threads; i++) {
+
+			executor.submit(() -> {
+
+				String threadName = Thread.currentThread().getName();
+				// deserialize encryption cache
+				EncryptedHeader encryptedHeader;
+				DecryptedHeader decryptedHeader;
+				try {
+
+					encryptedHeader = Ffi.encryptHeaderUsingCache(e_cache, attributes, Optional.of(uid),
+							Optional.of(additional_data));
+					decryptedHeader = Ffi.decryptHeaderUsingCache(d_cache, encryptedHeader.getEncryptedHeaderBytes(),
+							10, 10);
+
+					assertArrayEquals(encryptedHeader.getSymmetricKey(), decryptedHeader.getSymmetricKey());
+					assertArrayEquals(uid, decryptedHeader.getUid());
+					assertArrayEquals(additional_data, decryptedHeader.getAdditionalData());
+
+					System.out.println("Thread name " + threadName + " OK");
+				} catch (Throwable e) {
+					e.printStackTrace();
+				}
+
+			});
+		}
+
+		try {
+			System.out.println("attempt to shutdown executor");
+			executor.shutdown();
+			executor.awaitTermination(5, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			System.err.println("tasks interrupted");
+		} finally {
+			if (!executor.isTerminated()) {
+				System.err.println("cancel non-finished tasks");
+			}
+			executor.shutdownNow();
+			System.out.println("shutdown finished");
+		}
+
+		Ffi.destroyEncryptionCache(e_cache);
+		Ffi.destroyDecryptionCache(d_cache);
+
+	}
+
 }