Modular pkg and tests

.github/workflows/build.yml

@@ -9,8 +9,11 @@ on:
 name: Continuous integration
 
 jobs:
-  build-core:
-    name: Build core
+  test:
+    name: Test workspace
+    strategy:
+      matrix:
+        workspace: [core, pkg, cli]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -21,88 +24,14 @@ jobs:
           override: true
       - uses: actions-rs/cargo@v1
         with:
-          args: --manifest-path irmaseal-core/Cargo.toml --all-features
-          command: build
-
-  build-pkg:
-    name: Build pkg
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1.0.6
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          args: --manifest-path irmaseal-pkg/Cargo.toml
-          command: build
-
-  build-cli:
-    name: Build CLI
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1.0.6
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          args: --manifest-path irmaseal-cli/Cargo.toml
-          command: build
-
-  test-core:
-    name: Test core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1.0.6
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          args: --manifest-path irmaseal-core/Cargo.toml --all-features
+          args: --manifest-path irmaseal-${{ matrix.workspace }}/Cargo.toml --all-features
           command: test
 
-  fmt-core:
-    name: Format core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1.0.6
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          args: --manifest-path irmaseal-core/Cargo.toml --all -- --check
-          command: fmt
-
-  fmt-pkg:
-    name: Format pkg
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1.0.6
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          args: --manifest-path irmaseal-pkg/Cargo.toml --all -- --check
-          command: fmt
-
-  fmt-cli:
-    name: Format CLI
+  format:
+    name: Format workspace
+    strategy:
+      matrix:
+        workspace: [core, pkg, cli]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -114,42 +43,23 @@ jobs:
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
         with:
-          args: --manifest-path irmaseal-cli/Cargo.toml --all -- --check
+          args: --manifest-path irmaseal-${{ matrix.workspace }}/Cargo.toml --all -- --check
           command: fmt
 
-  test-wasm-bindings-chrome:
-    name: Run wasm tests in Google Chrome
-    runs-on: ubuntu-latest
-    env:
-      WASM_BINDGEN_TEST_TIMEOUT: 120
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-      - run: wasm-pack test --headless --chrome ./irmaseal-wasm-bindings
-
-  test-wasm-bindings-safari:
-    name: Run wasm tests in Safari
-    runs-on: macos-latest
+  test-wasm-browsers:
+    name: Run wasm tests in browsers
+    strategy:
+      matrix:
+        browser: [chrome, firefox]
+        os: [ubuntu-latest]
+        include:
+          - browser: safari
+            os: macos-latest
+    runs-on: ${{ matrix.os }} 
     env:
       WASM_BINDGEN_TEST_TIMEOUT: 120
     steps:
       - uses: actions/checkout@v2
       - name: Install
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-      - run: wasm-pack test --headless --safari ./irmaseal-wasm-bindings
-
-  test-wasm-bindings-firefox:
-    name: Run wasm tests in Mozilla Firefox
-    runs-on: ubuntu-latest
-    env:
-      WASM_BINDGEN_TEST_TIMEOUT: 120
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-      - run: sudo apt update && sudo apt install firefox
-      - run: wasm-pack test --headless --firefox ./irmaseal-wasm-bindings
+      - run: wasm-pack test --headless --${{ matrix.browser }} ./irmaseal-wasm-bindings

irmaseal-cli/src/client.rs

@@ -44,7 +44,7 @@ impl<'a> Client<'a> {
 
     pub async fn request_start(&self, kr: &KeyRequest) -> Result<irma::SessionData, ClientError> {
         self.client
-            .post(self.create_url("v2/request/start"))
+            .post(self.create_url("v2/irma/start"))
             .json(kr)
             .send()
             .await?
@@ -55,7 +55,7 @@ impl<'a> Client<'a> {
 
     pub async fn request_jwt(&self, token: &irma::SessionToken) -> Result<String, ClientError> {
         self.client
-            .get(self.create_url(&format!("v2/request/jwt/{}", token.0)))
+            .get(self.create_url(&format!("v2/irma/jwt/{}", token.0)))
             .send()
             .await?
             .error_for_status()?
@@ -73,7 +73,7 @@ impl<'a> Client<'a> {
         KeyResponse<K>: DeserializeOwned,
     {
         self.client
-            .get(self.create_url(&format!("v2/request/key/{timestamp}")))
+            .get(self.create_url(&format!("v2/irma/key/{timestamp}")))
             .bearer_auth(auth)
             .send()
             .await?

irmaseal-cli/src/decrypt.rs

@@ -102,15 +102,17 @@ pub async fn exec(dec_opts: DecOpts) {
 
     let client = Client::new(&pkg).unwrap();
     let mut sd: irma::SessionData = client.request_start(&keyrequest).await.unwrap();
-    sd.session_ptr.u = format!("https://ihub.ru.nl/irma/1/{}", sd.session_ptr.u);
+
+    if pkg.contains("ihub.ru.nl") {
+        sd.session_ptr.u = format!("https://ihub.ru.nl/irma/1/{}", sd.session_ptr.u);
+    }
 
     eprintln!("Please scan the following QR-code with IRMA:");
     print_qr(&sd.session_ptr);
 
-    let key_resp: KeyResponse<CGWKV> =
-        wait_on_session::<CGWKV>(&client, &sd, rec_info.policy.timestamp)
-            .await
-            .unwrap();
+    let key_resp: KeyResponse<CGWKV> = wait_on_session(&client, &sd, rec_info.policy.timestamp)
+        .await
+        .unwrap();
 
     let usk = key_resp.key.unwrap();
 

irmaseal-core/Cargo.toml

@@ -14,7 +14,7 @@ categories = ["cryptography"]
 
 [dependencies]
 irma = "0.2.1"
-ibe = { version = "0.2.0", features = ["cgwkv", "mr"] }
+ibe = { version = "0.2.2", features = ["cgwkv", "mkem"] }
 rand = { version = "0.8.4" }
 subtle = "2.3"
 serde = { version = "1.0.126", features = ["derive"] }

irmaseal-core/src/api.rs

@@ -29,18 +29,18 @@ pub struct KeyRequest {
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct KeyResponse<K: IBKEM> {
-    /// The current IRMA session status.
+    /// The status of the session.
     pub status: SessionStatus,
 
-    /// The current IRMA session proof status, if there is one.
+    /// The status of the IRMA proof.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub proof_status: Option<ProofStatus>,
 
-    /// The key will remain `None` until the status is `Done` and the proof is `Valid`.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    /// The user secret key (if present).
     #[serde(bound(
         serialize = "UserSecretKey<K>: Serialize",
         deserialize = "UserSecretKey<K>: Deserialize<'de>"
     ))]
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub key: Option<UserSecretKey<K>>,
 }

irmaseal-core/src/artifacts.rs

@@ -25,7 +25,7 @@ const fn b64len(raw_len: usize) -> usize {
 pub struct PublicKey<K: IBKEM>(pub K::Pk);
 
 /// An IRMAseal user private key, as generated by the Private Key Generator (PKG).
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 pub struct UserSecretKey<K: IBKEM>(pub K::Usk);
 
 // Note: We cannot make these implementations generic parameter over the scheme parameter because

irmaseal-core/src/metadata.rs

@@ -3,7 +3,7 @@ use crate::util::generate_iv;
 use crate::*;
 use crate::{Error, HiddenPolicy, IV_SIZE};
 use ibe::kem::cgw_kv::CGWKV;
-use ibe::kem::mr::{MultiRecipient, MultiRecipientCiphertext};
+use ibe::kem::mkem::{MultiRecipient, MultiRecipientCiphertext};
 use ibe::kem::{SharedSecret, IBKEM};
 use ibe::Compress;
 use rand::{CryptoRng, Rng};
@@ -70,7 +70,7 @@ impl Metadata {
         // Generate all RecipientInfo's.
         let recipient_info: BTreeMap<String, RecipientInfo> = policies
             .iter()
-            .zip(cts.iter())
+            .zip(cts)
             .map(|((rid, policy), ct)| {
                 (
                     rid.clone(),

irmaseal-pkg/Cargo.toml

@@ -1,29 +1,40 @@
 [package]
 authors = [
-  "Leon Botros <l.botros@cs.ru.nl>",
-  "Wouter Geraedts <git@woutergeraedts.nl>"
+    "Leon Botros <l.botros@cs.ru.nl>",
+    "Wouter Geraedts <git@woutergeraedts.nl>"
 ]
 edition = "2021"
 license = "MIT"
 name = "irmaseal-pkg"
 version = "0.2.0-beta.0"
 
 [dependencies]
-actix-rt = "2.7.0"
-actix-web = "4.0.1"
 actix-cors = "0.6.1"
+actix-rt = "2.7.0"
+actix-web = "4.1.0"
+actix-http = "*"
 actix-web-httpauth = "0.6.0"
 arrayref = "0.3.5"
-clap = { version = "3.0.10", features = ["derive"] }
-futures = { version = "0.3", features = ["executor"] }
+futures-util = "*"
 irma = "0.2.1"
 paste = "1.0.5"
 rand = "0.8.4"
+reqwest = "0.11.10"
 serde = "*"
 serde_json = "1.0.68"
 subtle = "2.1.1"
-reqwest = "0.11.10"
-jsonwebtoken = { version = "8.0.1", features = ["use_pem"] }
+
+[dependencies.clap]
+features = ["derive"]
+version = "3.0.10"
+
+[dependencies.futures]
+features = ["executor"]
+version = "0.3"
 
 [dependencies.irmaseal-core]
 path = "../irmaseal-core"
+
+[dependencies.jsonwebtoken]
+features = ["use_pem"]
+version = "8.0.1"