From feee1e42f0c0ee3338b868d8f9a4148232c451db Mon Sep 17 00:00:00 2001
From: 0xKitsune <77890308+0xKitsune@users.noreply.github.com>
Date: Fri, 6 Oct 2023 06:04:04 -0400
Subject: [PATCH] fix: added check for reduced identity during recovery (#629)

* fix: added check for reduced identity during recovery

* added tests to assert identities are reduced during insertion and recovery

* combined reduced identity tests

* chore: comment fix
---
 src/app.rs                  |   8 +++
 tests/common/mod.rs         |   4 +-
 tests/unreduced_identity.rs | 120 ++++++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 tests/unreduced_identity.rs

diff --git a/src/app.rs b/src/app.rs
index 25951a1c..c10d2cf6 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -412,6 +412,14 @@ impl App {
             return Err(ServerError::NoProversOnIdInsert);
         }
 
+        if !self.identity_is_reduced(*new_commitment) {
+            warn!(
+                ?new_commitment,
+                "The new identity commitment is not reduced."
+            );
+            return Err(ServerError::UnreducedCommitment);
+        }
+
         // Delete the existing id and insert the commitments into the recovery table
         self.delete_identity(existing_commitment).await?;
 
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index a530a014..ae386237 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -522,7 +522,7 @@ fn construct_delete_identity_body(identity_commitment: &Hash) -> Body {
     )
 }
 
-fn construct_recover_identity_body(
+pub fn construct_recover_identity_body(
     prev_identity_commitment: &Hash,
     new_identity_commitment: &Hash,
 ) -> Body {
@@ -535,7 +535,7 @@ fn construct_recover_identity_body(
     )
 }
 
-fn construct_insert_identity_body(identity_commitment: &Field) -> Body {
+pub fn construct_insert_identity_body(identity_commitment: &Field) -> Body {
     Body::from(
         json!({
             "identityCommitment": identity_commitment,
diff --git a/tests/unreduced_identity.rs b/tests/unreduced_identity.rs
new file mode 100644
index 00000000..670c64a9
--- /dev/null
+++ b/tests/unreduced_identity.rs
@@ -0,0 +1,120 @@
+mod common;
+use common::prelude::*;
+
+#[tokio::test]
+async fn test_unreduced_identity() -> anyhow::Result<()> {
+    info!("Starting unavailable prover test");
+
+    let tree_depth: u8 = 20;
+
+    let ref_tree = PoseidonTree::new(tree_depth as usize + 1, ruint::Uint::ZERO);
+    let initial_root: U256 = ref_tree.root().into();
+    let batch_size: usize = 3;
+
+    let (mock_chain, db_container, insertion_prover_map, _, micro_oz) =
+        spawn_deps(initial_root, &[batch_size], &[], tree_depth).await?;
+    let prover_mock = &insertion_prover_map[&batch_size];
+    prover_mock.set_availability(false).await;
+
+    let port = db_container.port();
+    let db_url = format!("postgres://postgres:postgres@localhost:{port}/database");
+    let mut options = Options::try_parse_from([
+        "signup-sequencer",
+        "--identity-manager-address",
+        "0x0000000000000000000000000000000000000000", // placeholder, updated below
+        "--database",
+        &db_url,
+        "--database-max-connections",
+        "1",
+        "--tree-depth",
+        &format!("{tree_depth}"),
+        "--prover-urls",
+        &prover_mock.arg_string(),
+        "--batch-timeout-seconds",
+        "10",
+        "--dense-tree-prefix-depth",
+        "10",
+        "--tree-gc-threshold",
+        "1",
+        "--oz-api-key",
+        "",
+        "--oz-api-secret",
+        "",
+        "--oz-api-url",
+        &micro_oz.endpoint(),
+        "--oz-address",
+        &format!("{:?}", micro_oz.address()),
+        "--time-between-scans-seconds",
+        "1",
+    ])
+    .context("Failed to create options")?;
+
+    options.server.server = Url::parse("http://127.0.0.1:0/")?;
+
+    options.app.contracts.identity_manager_address = mock_chain.identity_manager.address();
+    options.app.ethereum.ethereum_provider = Url::parse(&mock_chain.anvil.endpoint())?;
+
+    let (app, local_addr) = spawn_app(options.clone())
+        .await
+        .expect("Failed to spawn app.");
+
+    let uri = "http://".to_owned() + &local_addr.to_string();
+    let client = Client::new();
+
+    // Test unreduced identity for insertion
+    let body = common::construct_insert_identity_body(&ruint::Uint::<256, 4>::MAX);
+    let req = Request::builder()
+        .method("POST")
+        .uri(uri.to_owned() + "/insertIdentity")
+        .header("Content-Type", "application/json")
+        .body(body)
+        .expect("Failed to create insert identity hyper::Body");
+
+    let response = client
+        .request(req)
+        .await
+        .expect("Failed to execute request.");
+
+    let bytes = hyper::body::to_bytes(response.into_body())
+        .await
+        .expect("Failed to read body bytes");
+    let body_str = String::from_utf8_lossy(&bytes);
+
+    assert_eq!(
+        "provided identity commitment is not in reduced form",
+        body_str
+    );
+
+    // Test unreduced identity for recovery
+    let body = common::construct_recover_identity_body(&Hash::ZERO, &ruint::Uint::<256, 4>::MAX);
+    let req = Request::builder()
+        .method("POST")
+        .uri(uri.to_owned() + "/recoverIdentity")
+        .header("Content-Type", "application/json")
+        .body(body)
+        .expect("Failed to create insert identity hyper::Body");
+
+    let response = client
+        .request(req)
+        .await
+        .expect("Failed to execute request.");
+
+    let bytes = hyper::body::to_bytes(response.into_body())
+        .await
+        .expect("Failed to read body bytes");
+    let body_str = String::from_utf8_lossy(&bytes);
+
+    assert_eq!(
+        "provided identity commitment is not in reduced form",
+        body_str
+    );
+
+    shutdown();
+    app.await?;
+    for (_, prover) in insertion_prover_map.into_iter() {
+        prover.stop();
+    }
+    reset_shutdown();
+
+    Ok(())
+}