chore: merge branch 'release/v8.0.0'

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
       subcommands: |
         python3 scripts/download_wasm.py
         npm install
-      kms-version: 4.2.0
+      kms-version: 4.3.3
 
   lint:
     needs: build
@@ -32,7 +32,7 @@ jobs:
     with:
       subcommands: |
         npm test
-      kms-version: 4.2.0
+      kms-version: 4.3.3
       regression_files: |
         ./node_modules/non_regression_vector.json
         ./node_modules/sqlite.db
@@ -46,7 +46,7 @@ jobs:
       extension: so
       destination: linux-x86-64
       os: ubuntu-20.04
-      kms-version: 4.2.0
+      kms-version: 4.3.3
       copy_fresh_build: false
       copy_regression_files: |
         cp ./cloudproof_js/non_regression_vector.json src/test/resources/cover_crypt/non_regression/js_non_regression_vector.json
@@ -59,7 +59,7 @@ jobs:
     with:
       branch: develop
       target: x86_64-unknown-linux-gnu
-      kms-version: 4.2.0
+      kms-version: 4.3.3
       copy_fresh_build: false
       copy_regression_files: |
         cp ./cloudproof_js/non_regression_vector.json tests/data/cover_crypt/non_regression/js_non_regression_vector.json
@@ -90,7 +90,7 @@ jobs:
         sleep 5
         cd ../test
         node chrome.mjs http://localhost:8090 http://kms:9998
-      kms-version: 4.2.0
+      kms-version: 4.3.3
 
   example_reactjs:
     needs: build_in_docker
@@ -104,7 +104,7 @@ jobs:
         sleep 5
         cd ../test
         node chrome.mjs http://localhost:8090 http://kms:9998
-      kms-version: 4.2.0
+      kms-version: 4.3.3
 
   example_webpack:
     needs: build
@@ -123,7 +123,7 @@ jobs:
         cd examples/nodejs
         npm install
         node test.mjs 10
-      kms-version: 4.2.0
+      kms-version: 4.3.3
 
   example_imdb:
     needs: build
@@ -168,7 +168,7 @@ jobs:
     needs:
       - publish-dry-run
     uses: ./.github/workflows/js.yml
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/')
     with:
       subcommands: |
         echo "//registry.npmjs.org/:_authToken=$NPM_ACCESS_TOKEN" > ~/.npmrc
@@ -183,7 +183,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Release
-        if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1
 
   cleanup:

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [8.0.0] - 2023-03-08
+
+### Features
+
+- Support of CoverCrypt 11.0 and Findex 3.0 (#106)
+
 ## [7.1.0] - 2023-03-01
 
 ### Features

README.md

@@ -69,4 +69,9 @@ This table shows the minimum version correspondence between the various componen
 | 6.0.0           | 8.0.0          | 1.0.0  | 4.0.0      |
 | 6.0.1           | 8.0.0          | 2.0.0  | 4.0.0      |
 | 7.0.0, 7.0.1    | 10.0.0         | 2.0.1  | 4.2.0      |
-| 7.1.0           | 10.0.0         | 2.1.0  | 4.2.0      |
+
+From the version 8.0.0, `cloudproof_js` depends on [cloudproof_rust](https://github.com/Cosmian/cloudproof_rust) which wraps the interfaces of `CoverCrypt` and `Findex`.
+
+| `cloudproof_js` | Cloudproof Rust lib |
+|-----------------|---------------------|
+| 8.0.0           | 1.0.0               |

docker-compose.yml

@@ -5,7 +5,7 @@ version: '3'
 services:
   kms:
     container_name: kms
-    image: cosmian/kms:4.2.0
+    image: cosmian/kms:4.3.3
     environment:
       - KMS_HOSTNAME=0.0.0.0
       - KMS_PUBLIC_PATH=/tmp

examples/vuejs/vite.config.ts

@@ -13,7 +13,7 @@ export default defineConfig({
     },
   },
   optimizeDeps: {
-    exclude: ["cosmian_findex", "cosmian_cover_crypt"],
+    exclude: ["cloudproof_findex", "cloudproof_cover_crypt"],
   },
   server: {
     fs: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudproof_js",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "license": "MIT",
   "description": "Cosmian Cloudproof javascript client library",
   "author": "Bruno Grieder<[email protected]>, Pauline Hochard<[email protected]>, Emmanuel Coste<[email protected]>, Thibaud Dauce<[email protected]>",

scripts/download_wasm.py

@@ -7,57 +7,61 @@
 from os import path, remove, getenv
 
 
-def download_wasm(name: str, version: str, destination: str) -> bool:
+def files_to_be_copied(name: str):
+    """List of files to be copied"""
+    source_dir = f'tmp/wasm32-unknown-unknown/{name}'
+    return {
+        f'{source_dir}/cloudproof_{name}.d.ts': f'src/pkg/{name}/cloudproof_{name}.d.ts',
+        f'{source_dir}/cloudproof_{name}_bg.wasm': f'src/pkg/{name}/cloudproof_{name}_bg.wasm',
+        f'{source_dir}/cloudproof_{name}.js': f'src/pkg/{name}/cloudproof_{name}.js',
+        f'{source_dir}/cloudproof_{name}_bg.wasm.d.ts': f'src/pkg/{name}/cloudproof_{name}_bg.wasm.d.ts',
+    }
+
+
+def download_wasm(version: str) -> bool:
+    """Download and extract wasm"""
     ssl._create_default_https_context = ssl._create_unverified_context
 
-    to_be_copied = {
-        f'tmp/wasm32-unknown-unknown/cosmian_{name}.d.ts': f'{destination}/{name}/cosmian_{name}.d.ts',
-        f'tmp/wasm32-unknown-unknown/cosmian_{name}_bg.wasm': f'{destination}/{name}/cosmian_{name}_bg.wasm',
-        'tmp/wasm32-unknown-unknown/LICENSE.md': f'{destination}/{name}/LICENSE.md',
-        'tmp/wasm32-unknown-unknown/README.md': f'{destination}/{name}/README.md',
-        f'tmp/wasm32-unknown-unknown/cosmian_{name}.js': f'{destination}/{name}/cosmian_{name}.js',
-        f'tmp/wasm32-unknown-unknown/cosmian_{name}_bg.wasm.d.ts': f'{destination}/{name}/cosmian_{name}_bg.wasm.d.ts',
-    }
+    to_be_copied = files_to_be_copied('findex')
+    cover_crypt_files = files_to_be_copied('cover_crypt')
+    to_be_copied.update(cover_crypt_files)
 
     missing_files = False
-    for key in to_be_copied:
-        if not path.exists(to_be_copied[key]):
+    for key, value in to_be_copied.items():
+        if not path.exists(value):
             missing_files = True
             break
 
     if missing_files:
-        print(f'Missing {name} WASM. Copy {name} {version} to {destination}...')
-
-        url = f'https://package.cosmian.com/{name}/{version}/all.zip'
+        url = f'https://package.cosmian.com/cloudproof_rust/{version}/wasm.zip'
         try:
             r = urllib.request.urlopen(url)
             if r.getcode() != 200:
-                print(f'Cannot get {name} {version} ({r.getcode()})')
+                print(f'Cannot get cloudproof_rust {version} ({r.getcode()})')
             else:
                 if path.exists('tmp'):
                     shutil.rmtree('tmp')
-                if path.exists('all.zip'):
-                    remove('all.zip')
+                if path.exists('wasm.zip'):
+                    remove('wasm.zip')
 
-                open('all.zip', 'wb').write(r.read())
-                with zipfile.ZipFile('all.zip', 'r') as zip_ref:
+                open('wasm.zip', 'wb').write(r.read())
+                with zipfile.ZipFile('wasm.zip', 'r') as zip_ref:
                     zip_ref.extractall('tmp')
-                    for key in to_be_copied:
-                        shutil.copyfile(key, to_be_copied[key])
+                    for key, value in to_be_copied.items():
+                        print(f'OK: copy {key} to {value}...')
+
+                        shutil.copyfile(key, value)
 
                     shutil.rmtree('tmp')
-                remove('all.zip')
-        except Exception as e:
-            print(f'Cannot get {name} {version} ({e})')
+                remove('wasm.zip')
+        # pylint: disable=broad-except
+        except Exception as exception:
+            print(f'Cannot get cloudproof_rust {version} ({exception})')
             return False
     return True
 
 
 if __name__ == '__main__':
-    ret = download_wasm('findex', 'v2.1.0', 'src/pkg')
-    if ret is False and getenv('GITHUB_ACTIONS'):
-        download_wasm('findex', 'last_build', 'src/pkg')
-
-    ret = download_wasm('cover_crypt', 'v10.0.0', 'src/pkg')
+    ret = download_wasm('v1.0.0')
     if ret is False and getenv('GITHUB_ACTIONS'):
-        download_wasm('cover_crypt', 'last_build', 'src/pkg')
+        download_wasm('last_build/feature/add_findex')

src/cover_crypt/cover_crypt.ts

@@ -1,4 +1,4 @@
-import init from "../pkg/cover_crypt/cosmian_cover_crypt"
+import init from "../pkg/cover_crypt/cloudproof_cover_crypt"
 import { Policy, PolicyAxis } from "./interfaces/policy"
 import { CoverCryptHybridDecryption, decrypt } from "./decryption"
 import { CoverCryptHybridEncryption, encrypt } from "./encryption"

src/cover_crypt/decryption.ts

@@ -3,7 +3,7 @@ import {
   webassembly_decrypt_hybrid_header,
   webassembly_decrypt_symmetric_block,
   webassembly_hybrid_decrypt,
-} from "../pkg/cover_crypt/cosmian_cover_crypt"
+} from "../pkg/cover_crypt/cloudproof_cover_crypt"
 import { PrivateKey } from "../kms/structs/objects"
 import { PlaintextHeader } from "./interfaces/plaintext_header"
 import { decode } from "../utils/leb128"

src/cover_crypt/encryption.ts

@@ -2,7 +2,7 @@ import {
   webassembly_encrypt_symmetric_block,
   webassembly_encrypt_hybrid_header,
   webassembly_hybrid_encrypt,
-} from "../pkg/cover_crypt/cosmian_cover_crypt"
+} from "../pkg/cover_crypt/cloudproof_cover_crypt"
 import { Policy } from "./interfaces/policy"
 import { PublicKey } from "../kms/structs/objects"
 import { logger } from "../utils/logger"

src/cover_crypt/interfaces/policy.ts

@@ -7,7 +7,7 @@ import {
   webassembly_policy,
   webassembly_add_axis,
   webassembly_policy_axis,
-} from "../../pkg/cover_crypt/cosmian_cover_crypt"
+} from "../../pkg/cover_crypt/cloudproof_cover_crypt"
 
 /* tslint:disable:max-classes-per-file */
 export class PolicyAxis {

src/cover_crypt/key_generation.ts

@@ -3,7 +3,7 @@ import {
   webassembly_generate_master_keys,
   webassembly_generate_user_secret_key,
   webassembly_rotate_attributes,
-} from "../pkg/cover_crypt/cosmian_cover_crypt"
+} from "../pkg/cover_crypt/cloudproof_cover_crypt"
 import { fromBeBytes } from "../utils/utils"
 import { Policy } from "./interfaces/policy"
 

src/findex/findex.ts

@@ -1,7 +1,7 @@
 import init, {
   webassembly_search,
   webassembly_upsert,
-} from "../pkg/findex/cosmian_findex"
+} from "../pkg/findex/cloudproof_findex"
 
 import { SymmetricKey } from "../kms/structs/objects"
 import { parse as parseUuid, stringify as stringifyUuid } from "uuid"

src/findex/findex_cloud.ts

@@ -13,7 +13,7 @@ import {
   webassembly_upsert_cloud,
   webassembly_derive_new_token,
   webassembly_generate_new_token,
-} from "../pkg/findex/cosmian_findex"
+} from "../pkg/findex/cloudproof_findex"
 
 /**
  */

src/index.ts

@@ -1,7 +1,7 @@
-import cover_crypt_wasm from "./pkg/cover_crypt/cosmian_cover_crypt_bg.wasm"
+import cover_crypt_wasm from "./pkg/cover_crypt/cloudproof_cover_crypt_bg.wasm"
 import { setCoverCryptInit } from "./cover_crypt/cover_crypt"
 
-import findex_wasm from "./pkg/findex/cosmian_findex_bg.wasm"
+import findex_wasm from "./pkg/findex/cloudproof_findex_bg.wasm"
 import { setFindexInit } from "./findex/findex"
 
 export * from "./findex/findex"