Update Rust crate sqlx to 0.9.0

.cargo/snapchat-dpo-mail.txt

@@ -0,0 +1,44 @@
+Dear Snap Data Protection Officer,
+
+I am writing to exercise my right to erasure under Article 17 of the GDPR in relation to two Snapchat accounts that belong to me:
+
+alexemmet
+
+alex_emmet
+
+I previously contacted Snapchat Support through X, formerly Twitter, because I was unable to identify a functioning general support email address or reach a human support representative through the available support channels.
+
+In my message through X, I explained that I am requesting deletion of both accounts and the personal data associated with them.
+
+I still have access to the login credentials for alexemmet and can verify ownership of that account through the normal account-access process.
+
+For alex_emmet, I no longer have access to the old device, email address, or phone number that may have been associated with the account. The account was created when I was under 18.
+
+Snapchat Support responded through X that it could not take action where a user does not know, or no longer has access to, the email address or phone number associated with an account.
+
+I would like to clarify that I am not requesting account recovery, a password reset, or restored access to alex_emmet. I am making a data-subject request for erasure of my personal data.
+
+I understand that Snap is entitled to verify my identity before acting on this request. Under Article 12(6) GDPR, where there are reasonable doubts concerning the identity of the person making a request, the controller may request additional information necessary to confirm the person's identity.
+
+I am therefore asking Snap to provide an alternative means of verifying that I am the data subject associated with alex_emmet, given that I no longer have access to the original device, email address, or phone number. I am willing to provide reasonable information necessary for verification through a secure channel.
+
+My request covers:
+
+deletion of the Snapchat account alexemmet;
+
+deletion of the Snapchat account alex_emmet;
+
+erasure of personal data associated with both accounts;
+
+erasure of personal data contained in previous support correspondence, support tickets, attachments, account-recovery records, and associated metadata concerning me.
+
+If Snap considers that any of this data must be retained, please identify the categories of data being retained, the legal basis for retention, and the applicable retention period.
+
+If Snap considers that it cannot comply with the erasure request for alex_emmet, please provide the specific reason for that decision and explain why no alternative method of verifying my identity is available.
+
+I would also appreciate confirmation that this request is being handled as a GDPR data-subject request rather than as an account-recovery request.
+
+I can provide screenshots of my correspondence with Snapchat Support through X if required.
+
+Kind regards,
+Alex

.gitignore

@@ -27,6 +27,7 @@ target
 # Added by cargo
 
 /target
+/certs
 
 *.mk
 *.mpkb

Cargo.lock

@@ -86,7 +86,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -217,9 +217,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
 [[package]]
 name = "cc"
-version = "1.4.3"
+version = "1.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509591b7bcd67f4ef775afad7662703b4935daaa6ec0e5605cfb1090b32a2b6d"
+checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -302,9 +302,9 @@ checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
 
 [[package]]
 name = "combine"
-version = "4.6.7"
+version = "4.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e"
 dependencies = [
  "bytes",
  "memchr",
@@ -535,7 +535,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -583,9 +583,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
+checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
 dependencies = [
  "serde",
 ]
@@ -767,7 +767,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -838,9 +838,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.16"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f37a958b41b3b19ee2707c06439c0e9e547e847223eb791ecb0cb821c65e27"
+checksum = "ef8e5e5a340588f4452631496976cf8636d4a7ecf600239fdc27615d2530bc16"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1139,9 +1139,9 @@ checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa"
 
 [[package]]
 name = "icu_provider"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92a7ed671a6aad807a8651a2e1782a6598fda9ce5185dd8158549e95a91c6428"
+checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -1279,9 +1279,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd9697dc4a9a62e2da93389f34400b77a28f0287711263cabb203b3ccb9c0e4"
+checksum = "d8f198d1db720e4940b5a493201d199d9f24f568f8f746bd13706243a2f71598"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
@@ -1332,9 +1332,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "lru-slab"
@@ -2057,9 +2057,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.14"
+version = "0.103.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0527518605e68109d875e248ea259b6758801cf165e4b2c2733ae3b51f12535a"
+checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -2159,7 +2159,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -2238,7 +2238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09057cb2149ad4cbd2da1e26b351f9a4c354219421229c69c3063e6f61947c4a"
 dependencies = [
  "digest 0.11.3",
- "keccak 0.2.1",
+ "keccak 0.2.2",
  "sponge-cursor",
 ]
 
@@ -2547,9 +2547,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2604,7 +2604,7 @@ checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -2687,7 +2687,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -2839,9 +2839,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.24.1"
+version = "1.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9"
+checksum = "b5772d71c9be8a8a6ac2117d949c5b224c1b72241bb611d9a3012edcf8af7812"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -3225,9 +3225,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.7"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b5c6b5976d66c1d703c4fd17d3f5e43c8cedaacf604961b171adc7130896d8"
+checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3236,13 +3236,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f212a141d820099d57ffafb9569be9617a6f27d3dc881fbee8fb56642f917a9"
+checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]

flake.nix

@@ -144,7 +144,7 @@
               bindAddress = lib.mkOption {
                 type = lib.types.str;
                 default = "0.0.0.0";
-                description = "IP address to bind the HTTP/API server to.";
+                description = "IP address to bind the MTP/QUIC server to.";
               };
 
               openFirewall = lib.mkOption {

mtp-type-maps

@@ -1 +1 @@
-Subproject commit a297dcce60bc6e84696c6a16f5fd510beb2ca643
+Subproject commit 486541b9483356ff49ff3ec7016f87d3ecbeaa0e

src/transport/omikron_connection.rs

@@ -15,7 +15,7 @@ use mtp::{
     webserver::{MTPWebServer, WebMtpReceiver, WebMtpSender},
 };
 use std::{
-    net::{IpAddr, Ipv4Addr},
+    net::IpAddr,
     sync::{
         Arc, Mutex as StdMutex,
         atomic::{AtomicU32, AtomicUsize, Ordering},
@@ -30,11 +30,19 @@ use tokio_util::{sync::CancellationToken, task::TaskTracker};
 
 const CLEANUP_INTERVAL: Duration = Duration::from_secs(30);
 const MAX_WAITING_AGE: Duration = Duration::from_secs(60);
+const DEFAULT_BIND_ADDRESS: &str = "0.0.0.0";
 static ACTIVE_CONNECTIONS: AtomicUsize = AtomicUsize::new(0);
 static NEXT_CORRELATION_ID: AtomicU32 = AtomicU32::new(1);
 static ACTIVE_CONNECTIONS_BY_IP: once_cell::sync::Lazy<DashMap<IpAddr, usize>> =
     once_cell::sync::Lazy::new(DashMap::new);
 
+fn parse_bind_address(value: Option<&str>) -> Result<IpAddr, std::net::AddrParseError> {
+    value
+        .unwrap_or(DEFAULT_BIND_ADDRESS)
+        .trim()
+        .parse::<IpAddr>()
+}
+
 struct ConnectionLimitGuard(Option<IpAddr>);
 impl Drop for ConnectionLimitGuard {
     fn drop(&mut self) {
@@ -666,7 +674,7 @@ pub async fn start(port: u16, state: Arc<OmegaState>) -> Result<(), Box<dyn std:
     let web_config = server::web::build_web_config(state.identity.clone())?
         .serve_tcp_https(true)
         .max_tcp_connections(256);
-    let ip = IpAddr::from(Ipv4Addr::new(0, 0, 0, 0));
+    let ip = parse_bind_address(std::env::var("BIND_ADDRESS").ok().as_deref())?;
     let host_config = HostConfig::new(ip, port, cert_pem, key_pem)
         .with_policy(Policy {
             send_mode: SendMode::SingleStreamPerMessage,

src/util/logger.rs

@@ -273,7 +273,7 @@ fn format_data_container(data: Vec<(DataTypeId, DataValue)>, version: Version) -
             let key_str = key.to_string();
 
             match value {
-                DataValue::Str(s) => format!("{}=\"{}\"", key_str, s),
+                DataValue::Str(s) => format!("{}=\"{}\"", key_str, abbreviate_string(&s)),
 
                 DataValue::Container(inner) => {
                     let inner_formatted = format_data_container(inner, version.clone());
@@ -304,7 +304,7 @@ fn format_array(arr: Vec<DataValue>, version: Version) -> String {
     let parts: Vec<String> = arr
         .into_iter()
         .map(|value| match value {
-            DataValue::Str(s) => format!("\"{}\"", s),
+            DataValue::Str(s) => format!("\"{}\"", abbreviate_string(&s)),
 
             DataValue::Container(inner) => {
                 let inner_formatted = format_data_container(inner, version.clone());
@@ -329,6 +329,32 @@ fn format_array(arr: Vec<DataValue>, version: Version) -> String {
 
     parts.join(", ")
 }
+
+fn abbreviate_string(value: &str) -> String {
+    const EDGE_LENGTH: usize = 4;
+
+    let chars: Vec<char> = value.chars().collect();
+    if chars.len() <= EDGE_LENGTH * 2 {
+        return value.to_string();
+    }
+
+    let prefix: String = chars.iter().take(EDGE_LENGTH).collect();
+    let suffix: String = chars.iter().rev().take(EDGE_LENGTH).rev().collect();
+    format!("{prefix}...{suffix}")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::abbreviate_string;
+
+    #[test]
+    fn abbreviates_only_strings_longer_than_eight_characters() {
+        assert_eq!(abbreviate_string("12345678"), "12345678");
+        assert_eq!(abbreviate_string("123456789"), "1234...6789");
+        assert_eq!(abbreviate_string("YWJjZGVmZ2hpag=="), "YWJj...ag==");
+    }
+}
+
 #[macro_export]
 macro_rules! log_cv {
     ($kind:expr, $cv:expr) => {