Merge branch 'main' into 36-build-matrix

Author: LDiazN

ooniauth-core/src/submit.rs

@@ -10,6 +10,7 @@ use sha2::{Digest, Sha256, Sha512};
 use tracing::{debug, instrument, trace};
 
 const SESSION_ID: &[u8] = b"submit";
+const PROBE_ID_SALT: &[u8] = b"ooni.org/userauth/v1";
 
 muCMZProtocol!(submit<min_age_today, max_age, min_measurement_count,
         max_measurement_count, @DOMAIN, @NYM>,
@@ -46,21 +47,21 @@ impl SubmitRequest {
 }
 
 fn digest_point(point: RistrettoPoint) -> [u8; 32] {
-    let digest = Sha256::digest(point.compress().as_bytes());
+    let mut hasher = Sha256::new();
+    hasher.update(PROBE_ID_SALT);
+    hasher.update(point.compress().as_bytes());
+    let digest = hasher.finalize();
     let mut out = [0u8; 32];
     out.copy_from_slice(&digest);
     out
 }
 
+fn inclusive_upper_bound(range: &std::ops::Range<u32>) -> u32 {
+    range.end.saturating_sub(1)
+}
+
 impl UserState {
-    #[instrument(skip(
-        self,
-        rng,
-        probe_cc,
-        probe_asn,
-        age_range,
-        measurement_count_range
-    ))]
+    #[instrument(skip(self, rng, probe_cc, probe_asn, age_range, measurement_count_range))]
     pub fn submit_request(
         &self,
         rng: &mut (impl RngCore + CryptoRng),
@@ -148,9 +149,9 @@ impl UserState {
         New.measurement_count = Some((measurement_count + 1).into());
         let params = submit::Params {
             min_age_today: age_range.start.into(),
-            max_age: age_range.end.into(),
+            max_age: inclusive_upper_bound(&age_range).into(),
             min_measurement_count: measurement_count_range.start.into(),
-            max_measurement_count: measurement_count_range.end.into(),
+            max_measurement_count: inclusive_upper_bound(&measurement_count_range).into(),
             DOMAIN,
             NYM,
         };
@@ -221,7 +222,7 @@ impl ServerState {
         let domain_str = format!("ooni.org/{}/{}", probe_cc, probe_asn);
         let DOMAIN = G::hash_from_bytes::<Sha512>(domain_str.as_bytes());
 
-        // The probe id is the same as the nym point.
+        // The probe id must be the salted hash of the nym point.
         // Otherwise, return an error.
         // We do not really care about the server returning early here,
         // a malicious probe should already have computed the probe ID from the
@@ -232,9 +233,9 @@ impl ServerState {
 
         let params = submit::Params {
             min_age_today: age_range.start.into(),
-            max_age: age_range.end.into(),
+            max_age: inclusive_upper_bound(&age_range).into(),
             min_measurement_count: measurement_count_range.start.into(),
-            max_measurement_count: measurement_count_range.end.into(),
+            max_measurement_count: inclusive_upper_bound(&measurement_count_range).into(),
             DOMAIN,
             NYM: nym_point,
         };
@@ -303,6 +304,12 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_inclusive_upper_bound() {
+        assert_eq!(inclusive_upper_bound(&(10..11)), 10);
+        assert_eq!(inclusive_upper_bound(&(0..1)), 0);
+    }
+
     #[test]
     fn test_submit_request() {
         let rng = &mut rand::thread_rng();

ooniauth-py/src/protocol.rs

@@ -4,10 +4,7 @@ use ooniauth_core::submit::submit;
 use ooniauth_core::update::*;
 use ooniauth_core::{self as ooni, PublicParameters, SecretKey};
 
-use pyo3::{
-    prelude::*,
-    types::PyString,
-};
+use pyo3::{prelude::*, types::PyString};
 use pyo3_stub_gen::derive::{gen_stub_pyclass, gen_stub_pyfunction, gen_stub_pymethods};
 
 use crate::utils::{from_pystring, to_pystring};
@@ -549,13 +546,7 @@ mod tests {
         let age_tuple = (today - 30, today + 1);
         let min_msm = 0u32;
         let submit = client
-            .make_submit_request(
-                py,
-                cc.clone_ref(py),
-                asn.clone_ref(py),
-                age_tuple,
-                min_msm,
-            )
+            .make_submit_request(py, cc.clone_ref(py), asn.clone_ref(py), age_tuple, min_msm)
             .unwrap();
         (server, submit, cc, asn, age_tuple, min_msm)
     }