chore: Merge branch 'release/v9.4.0'

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
       subcommands: |
         python3 scripts/download_wasm.py
         npm install
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       findex-cloud-version: 0.3.1
 
   lint:
@@ -33,7 +33,7 @@ jobs:
     with:
       subcommands: |
         npm test
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       kms-jwe-key: '{"kty": "OKP","d": "MPEVJwdRqGM_qhJOUb5hR0Xr9EvwMLZGnkf-eDj5fU8","use": "enc","crv": "X25519","kid": "DX3GC+Fx3etxfRJValQNbqaB0gs=","x":
         "gdF-1TtAjsFqNWr9nwhGUlFG38qrDUqYgcILgtYrpTY","alg": "ECDH-ES"}'
       findex-cloud-version: 0.3.1
@@ -50,7 +50,7 @@ jobs:
       extension: so
       destination: linux-x86-64
       os: ubuntu-20.04
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       findex-cloud-version: 0.3.1
       copy_fresh_build: false
       copy_regression_files: |
@@ -64,7 +64,7 @@ jobs:
     with:
       branch: develop
       target: x86_64-unknown-linux-gnu
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       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
@@ -95,7 +95,7 @@ jobs:
         sleep 5
         cd ../test
         node chrome.mjs http://localhost:8090 http://kms:9998
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       findex-cloud-version: 0.3.1
 
   example_reactjs:
@@ -110,7 +110,7 @@ jobs:
         sleep 5
         cd ../test
         node chrome.mjs http://localhost:8090 http://kms:9998
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       findex-cloud-version: 0.3.1
 
   example_browser:
@@ -123,7 +123,7 @@ jobs:
         python3 -m http.server &
         sleep 3
         node test.mjs
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       findex-cloud-version: 0.3.1
 
   example_webpack:
@@ -143,7 +143,7 @@ jobs:
         cd examples/nodejs
         npm install
         node test.mjs 10
-      kms-version: 4.6.0
+      kms-version: 4.7.0
       findex-cloud-version: 0.3.1
 
   example_imdb:

.github/workflows/js.yml

@@ -23,9 +23,9 @@ jobs:
             node_modules
             dist
             src/pkg
-          key: ${{ runner.os }}-node-${{ github.ref_name }}-${{ github.head_ref }}-${{ hashFiles('package.json') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('package.json') }}-${{ hashFiles('src/**', '!.git') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ github.ref_name }}-${{ github.head_ref }}-${{ hashFiles('package.json') }}
+            ${{ runner.os }}-node-${{ hashFiles('package.json') }}-${{ hashFiles('src/**', '!.git') }}
 
       - run: ${{ inputs.subcommands }}
         env:

.github/workflows/js_in_docker.yml

@@ -60,9 +60,9 @@ jobs:
             node_modules
             dist
             src/pkg
-          key: ${{ runner.os }}-docker-node-${{ github.ref_name }}-${{ github.head_ref }}-${{ hashFiles('package.json') }}
+          key: ${{ runner.os }}-docker-node-${{ hashFiles('package.json') }}-${{ hashFiles('src/**', '!.git') }}
           restore-keys: |
-            ${{ runner.os }}-docker-node-${{ github.ref_name }}-${{ github.head_ref }}-${{ hashFiles('package.json') }}
+            ${{ runner.os }}-docker-node-${{ hashFiles('package.json') }}-${{ hashFiles('src/**', '!.git') }}
 
       - name: Test
         run: ${{ inputs.subcommands }}

.pre-commit-config.yaml

@@ -7,7 +7,7 @@
 
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-exclude: dist|tests/data|tests/findex.test.ts|src/pkg|examples/full_text_search/data
+exclude: dist|tests/data|tests/findex.test.ts|src/pkg|examples/full_text_search/data/|docker-compose.yml
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
     rev: v2.3.0

CHANGELOG.md

@@ -2,27 +2,43 @@
 
 All notable changes to this project will be documented in this file.
 
+## [9.4.0] - 2023-10-03
+
+### Features
+
+- KMS support:
+  - Grant/deny access rights
+  - Add bulk encryption/decryption for Covercrypt
+  - Import key specifying the decryption key
+
+### Ci
+
+- Rebuild GitHub cache on changes ([#137])
+
 ## [9.3.0] - 2023-09-22
 
 ### Features
 
-- Support import of Certificate and PrivateKey (with tags)
-- Export object wrapped
-- Import of a wrapped key
-- Use 4.6.0 KMS version
+- KMS support:
+  - Support import of Certificate and PrivateKey (with tags)
+  - Export object wrapped
+  - Import of a wrapped key
+  - Use 4.6.0 KMS version
 
 ## [9.2.0] - 2023-08-22
 
 ### Features
 
-- Kms JWE encryption (#124)
+- KMS support:
+  - Kms JWE encryption (#124)
+  - Add KMS tags support (for creation and searching objects)
 - Upgrade to cloudproof 2.2.1
-- Add KMS tags support (for creation and searching objects)
 
 ### Testing
 
-- KMS Locate several keys with same tag
-- Locate by tags and object type
+- KMS support:
+  - Locate several keys with same tag
+  - Locate by tags and object type
 
 ## [9.1.1] - 2023-08-09
 

README.md

@@ -84,3 +84,4 @@ From the version 8.0.0, `cloudproof_js` depends on [cloudproof_rust](https://git
 | 9.1.0,9.1.1     | 2.1.0               | 4.3.0      |
 | 9.2.0           | 2.2.1               | 4.5.0      |
 | 9.3.0           | 2.2.3               | 4.6.0      |
+| 9.4.0           | 2.2.4               | 4.7.0      |

docker-compose.yml

@@ -1,20 +1,23 @@
 ---
 # docker-compose.yml
 
-version: '3'
+version: "3"
 services:
   kms:
     container_name: kms
-    image: ghcr.io/cosmian/kms:4.6.0
+    image: ghcr.io/cosmian/kms:4.7.0
     ports:
       - 9998:9998
     environment:
-      JWK_PRIVATE_KEY: '{"kty": "OKP","d": "MPEVJwdRqGM_qhJOUb5hR0Xr9EvwMLZGnkf-eDj5fU8","use": "enc","crv": "X25519","kid": "DX3GC+Fx3etxfRJValQNbqaB0gs=","x":
+      JWK_PRIVATE_KEY:
+        '{"kty": "OKP","d": "MPEVJwdRqGM_qhJOUb5hR0Xr9EvwMLZGnkf-eDj5fU8","use": "enc","crv": "X25519","kid": "DX3GC+Fx3etxfRJValQNbqaB0gs=","x":
         "gdF-1TtAjsFqNWr9nwhGUlFG38qrDUqYgcILgtYrpTY","alg": "ECDH-ES"}'
+      AUTH0_TOKEN_1: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjVVU1FrSVlULW9QMWZrcjQtNnRrciJ9.eyJuaWNrbmFtZSI6ImNsaWVudDEiLCJuYW1lIjoiY2xpZW50MUBjb3NtaWFuLmNvbSIsInBpY3R1cmUiOiJodHRwczovL3MuZ3JhdmF0YXIuY29tL2F2YXRhci84Njg5YWE1ODlmZmRkMGYzMDYzNTg3NGUzMjhhYjg3OT9zPTQ4MCZyPXBnJmQ9aHR0cHMlM0ElMkYlMkZjZG4uYXV0aDAuY29tJTJGYXZhdGFycyUyRmNsLnBuZyIsInVwZGF0ZWRfYXQiOiIyMDIzLTEwLTAyVDEyOjA4OjA1LjQwMFoiLCJlbWFpbCI6ImNsaWVudDFAY29zbWlhbi5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImlzcyI6Imh0dHBzOi8va21zLWNvc21pYW4uZXUuYXV0aDAuY29tLyIsImF1ZCI6IkszaXhldXhuVDVrM0Roa0tocWhiMXpYbjlFNjJGRXdJIiwiaWF0IjoxNjk2MjQ4NDkwLCJleHAiOjE2OTY2MDg0OTAsInN1YiI6ImF1dGgwfDY1MTU2OGY0ZjZjYzc4NzhmNzY0ZWQ0NyIsInNpZCI6Ik1zZlZMNHZqOVNBYnU4a3Q4ZEtJcFU3bjlxamlqeWM3Iiwibm9uY2UiOiJZakkzU2pWVllWVkpkRVp5U0c5cE0wRnhRVWgxVHpSVGRscHlSRkJLUlhweVJXMDVTM1JDT1cxMmJRPT0ifQ.rlX67uWmZwwI8-p2eCpvws3mvmQACEQlwM74LcuvbfT8tL7HjAd5YBWaI40Ty_RwpzAbJ5xS6oEO414xZid7TfEJcSRc_faHAuNzBtd050Alf4wf2kDqqjOJMvsRLS98Jtosiq9yE020BANoa_11HO5ji_ucsDaZmJLHoEPW1rNdrj6L-2eYS2vW49QFspg3-edSHeCZtTpCZ1gp_xd95afuKt_npQDLvyPr399FEv0gnZ0qLh9NGs77ltdBsEC4NrlBT8TLnYUHpQgaBserzI2AMhf2ui9DxaXULxuARB-mo4OR2MRrtcFKTYuNETv6DEPOyBLu40RLVVZEO_nc0g"
+      AUTH0_TOKEN_2: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjVVU1FrSVlULW9QMWZrcjQtNnRrciJ9.eyJuaWNrbmFtZSI6ImNsaWVudDIiLCJuYW1lIjoiY2xpZW50MkBjb3NtaWFuLmNvbSIsInBpY3R1cmUiOiJodHRwczovL3MuZ3JhdmF0YXIuY29tL2F2YXRhci83MjZhNDZkMDdkZjY0Y2VjMDc4ZTQzNzUyYjg5MjFmMz9zPTQ4MCZyPXBnJmQ9aHR0cHMlM0ElMkYlMkZjZG4uYXV0aDAuY29tJTJGYXZhdGFycyUyRmNsLnBuZyIsInVwZGF0ZWRfYXQiOiIyMDIzLTEwLTAyVDEyOjA4OjQ5LjY1M1oiLCJlbWFpbCI6ImNsaWVudDJAY29zbWlhbi5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImlzcyI6Imh0dHBzOi8va21zLWNvc21pYW4uZXUuYXV0aDAuY29tLyIsImF1ZCI6IkszaXhldXhuVDVrM0Roa0tocWhiMXpYbjlFNjJGRXdJIiwiaWF0IjoxNjk2MjQ4NTM1LCJleHAiOjE2OTY2MDg1MzUsInN1YiI6ImF1dGgwfDY1MDQ2YzdlNWEwYWZmYzg3MjAxZWE1ZiIsInNpZCI6IlVCS0EyS3VlUFB4TGJnQUJ6WkItQVo4dnByeXlqSlhMIiwibm9uY2UiOiJRalV4ZEg0d2VXUmZTV05JTkVkaWVHOVVhRzFJZVZaaVZFZHRkM0pMVnk1dFZuVTFPR0ZCWDBaYU9BPT0ifQ.MGgJNRvIkJ7C11KvoIKMomkfI4nXz_-5svsSmKSk7uxv1KV0shPvn7iZXOM1EZ9K0OJHlqZLMtDyCy0l5SLDN_FKTXZGnvUbPg2wSQAD6BjocrqbZvuzqvRkcielMy9pCG8O1v4wmHBP0gKHKwIWrYD0rKqI8_vg639CksKBjefJtyvr4FvMMcuB9SmmC-nLNEFJcv9bF2OsKLB-JGbbtylbDyf2leMGORPjtxaVXQE3nuCjbaP8W8EF6TPn7GlmcRMS5UUeD4vqpIz5JniOUd_keZZkKqAZUMUG6I8Po75xQpXrcxn0AWwCgsH2tO9TObAzhPGZH_8mnADF517_IQ"
   findex_cloud:
-    image: ghcr.io/cosmian/findex_cloud:0.1.0
+    image: ghcr.io/cosmian/findex_cloud:0.3.1
     ports:
-      - 8080:8080
+      - 9090:9090
   redis:
     image: redis:latest
     ports:

examples/nodejs_search_imdb/index_with_stats.mjs

@@ -1,21 +1,21 @@
-import fs from "fs"
-import readline from "readline"
+import Database from "better-sqlite3"
 import {
-  IndexedValue,
-  Location,
-  Keyword,
   Findex,
   FindexCloud,
   FindexKey,
+  IndexedValue,
+  Keyword,
   Label,
-  generateAliases,
+  Location,
   callbacksExamplesBetterSqlite3,
+  generateAliases,
 } from "cloudproof_js"
-import path from "path"
-import { fileURLToPath } from "url"
 import { randomBytes } from "crypto"
-import Database from "better-sqlite3"
+import fs from "fs"
 import fetch, { Headers, Request, Response } from "node-fetch"
+import path from "path"
+import readline from "readline"
+import { fileURLToPath } from "url"
 
 globalThis.fetch = fetch
 globalThis.Headers = Headers
@@ -50,7 +50,7 @@ const { upsert: upsertCloud, search: searchCloud } = await FindexCloud()
 const masterKey = new FindexKey(randomBytes(16))
 const label = new Label(randomBytes(10))
 const findexCloudToken = process.env.FINDEX_CLOUD_TOKEN
-const baseUrl = "http://127.0.0.1:8080"
+const baseUrl = "http://127.0.0.1:9090"
 
 // Init databases
 const dbClear = new Database(":memory:")

examples/test/chrome.mjs

@@ -5,7 +5,7 @@ const host = process.argv[2] || undefined
 const kmsHost = process.argv[3] || undefined
 
 if (!host) {
-  console.error("Please provide host: chome.mjs http://localhost:8080")
+  console.error("Please provide host: chrome.mjs http://localhost:9090")
   exit(1)
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudproof_js",
-  "version": "9.3.0",
+  "version": "9.4.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]>",
@@ -61,7 +61,7 @@
     "eslint-plugin-n": "^15.2.5",
     "eslint-plugin-promise": "^6.0.1",
     "prettier": "2.7.1",
-    "puppeteer": "^19.2.0",
+    "puppeteer": "^19.11.1",
     "redis": "^4.3.1",
     "rollup": "^3.3.0",
     "typescript": "^4.9.0",

scripts/download_wasm.py

@@ -73,6 +73,6 @@ def download_wasm(version: str) -> bool:
 
 
 if __name__ == '__main__':
-    RET = download_wasm('v2.2.3')
+    RET = download_wasm('v2.2.4')
     if RET is False and getenv('GITHUB_ACTIONS'):
         download_wasm('last_build/feature/findex_5_0_0')