puffinparse 0.1.3__tar.gz → 0.1.4__tar.gz

{puffinparse-0.1.3 → puffinparse-0.1.4}/Cargo.lock

@@ -1395,7 +1395,7 @@ dependencies = [
 
 [[package]]
 name = "puffinparse-cli"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1415,7 +1415,7 @@ dependencies = [
 
 [[package]]
 name = "puffinparse-core"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "async-trait",
  "bytes",
@@ -1439,7 +1439,7 @@ dependencies = [
 
 [[package]]
 name = "puffinparse-node"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "bytes",
  "napi",
@@ -1453,7 +1453,7 @@ dependencies = [
 
 [[package]]
 name = "puffinparse-python"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "bytes",
  "puffinparse-core",
@@ -1468,7 +1468,7 @@ dependencies = [
 
 [[package]]
 name = "puffinparse-server"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "axum",
  "bytes",

{puffinparse-0.1.3 → puffinparse-0.1.4}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/puffinparse-core", "crates/puffinparse-python"]
 
 [workspace.package]
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 rust-version = "1.80"
 license = "MIT"
@@ -15,7 +15,7 @@ keywords = ["ocr", "document-parsing", "pdf", "api", "benchmark"]
 categories = ["api-bindings", "text-processing"]
 
 [workspace.dependencies]
-puffinparse-core = { path = "crates/puffinparse-core", version = "0.1.3" }
+puffinparse-core = { path = "crates/puffinparse-core", version = "0.1.4" }
 reqwest = { version = "0.13", default-features = false, features = ["json", "multipart", "rustls", "stream", "gzip"] }
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "fs", "time", "sync"] }
 serde = { version = "1", features = ["derive"] }

{puffinparse-0.1.3 → puffinparse-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: puffinparse
-Version: 0.1.3
+Version: 0.1.4
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{puffinparse-0.1.3 → puffinparse-0.1.4}/crates/puffinparse-core/src/provider.rs

@@ -86,6 +86,25 @@ pub fn resolve_api_key(request: &DocumentRequest, env_var: &str, provider: &str)
     })
 }
 
+/// Check that a value spliced into a provider hostname (an AWS region, a Google location) is a
+/// single DNS label. Without this, `provider_options.region = "evil.example/"` would turn
+/// `https://textract.{region}.amazonaws.com` into a request — credentials attached — to another host.
+pub(crate) fn host_label(provider: &str, what: &str, value: &str) -> crate::error::Result<()> {
+    let ok = !value.is_empty()
+        && value.len() <= 63
+        && value.bytes().all(|b| b.is_ascii_lowercase() || b.is_ascii_digit() || b == b'-')
+        && !value.starts_with('-')
+        && !value.ends_with('-');
+    if ok {
+        Ok(())
+    } else {
+        Err(crate::error::Error::input(format!(
+            "{provider}: invalid {what} '{value}' (expected lowercase letters, digits and '-', e.g. us-east-1)"
+        ))
+        .with_provider(provider))
+    }
+}
+
 /// Resolve base URL: request override, then `<PREFIX>_BASE_URL` env, then default.
 pub fn resolve_base_url(request: &DocumentRequest, env_var: &str, default: &str) -> String {
     request
@@ -139,3 +158,20 @@ pub fn file_part(data: bytes::Bytes, input: &crate::types::DocumentInput) -> req
             .expect("static mime is valid"),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::host_label;
+
+    #[test]
+    fn host_label_accepts_regions_and_rejects_host_injection() {
+        for ok in ["us-east-1", "eu", "us-gov-west-1", "ap-southeast-2"] {
+            assert!(host_label("p", "region", ok).is_ok(), "{ok}");
+        }
+        for bad in ["", "evil.example/", "evil.example#", "a.b", "x:443", "us@evil", "-us", "us-", "US-EAST-1", "eu/x"]
+        {
+            let e = host_label("p", "region", bad).unwrap_err();
+            assert_eq!(e.kind, crate::error::ErrorKind::Input, "{bad}");
+        }
+    }
+}

{puffinparse-0.1.3 → puffinparse-0.1.4}/crates/puffinparse-core/src/providers/google_documentai.rs

@@ -153,13 +153,16 @@ impl Config {
                     .with_provider(NAME)
             })
         };
+        let location = opt("location")
+            .or_else(|| env(ENV_LOCATION))
+            .filter(|v| !v.trim().is_empty())
+            .unwrap_or_else(|| DEFAULT_LOCATION.to_string())
+            .to_ascii_lowercase();
+        // `location` becomes part of the hostname the access token is sent to.
+        provider::host_label(NAME, "location", &location)?;
         Ok(Self {
             project: need(opt("project").or_else(|| env(ENV_PROJECT)), "project", ENV_PROJECT)?,
-            location: opt("location")
-                .or_else(|| env(ENV_LOCATION))
-                .filter(|v| !v.trim().is_empty())
-                .unwrap_or_else(|| DEFAULT_LOCATION.to_string())
-                .to_ascii_lowercase(),
+            location,
             processor_id: need(opt("processor_id").or_else(|| env(ENV_PROCESSOR)), "processor_id", ENV_PROCESSOR)?,
             processor_version: opt("processor_version"),
         })
@@ -1162,6 +1165,13 @@ mod tests {
         let e = Config::resolve(&req).unwrap_err();
         assert_eq!(e.kind, crate::error::ErrorKind::Input);
         assert!(e.message.contains(ENV_PROCESSOR), "{e}");
+        // The location is spliced into the hostname that receives the token: one DNS label only.
+        for bad in ["evil.example/", "evil.example#", "eu.evil", "us@evil.example"] {
+            let req = DocumentRequest::from_path("a.pdf")
+                .provider_options(json!({"project": "p", "processor_id": "x", "location": bad}));
+            let e = Config::resolve(&req).unwrap_err();
+            assert_eq!(e.kind, crate::error::ErrorKind::Input, "{bad}");
+        }
     }
 
     #[test]

{puffinparse-0.1.3 → puffinparse-0.1.4}/crates/puffinparse-core/src/providers/textract.rs

@@ -176,6 +176,9 @@ impl Ctx {
     fn new(request: &DocumentRequest) -> Result<Self> {
         let creds = resolve_credentials(request)?;
         let region = resolve_region(request);
+        // The region is spliced into the hostname the signed request (access key id, session
+        // token) goes to, so it must be a single DNS label.
+        provider::host_label(NAME, "region", &region)?;
         let default_base = format!("https://{SERVICE}.{region}.amazonaws.com");
         let endpoint = provider::resolve_base_url(request, ENV_BASE, &default_base);
         let parsed = url::Url::parse(&endpoint)

{puffinparse-0.1.3 → puffinparse-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "puffinparse"
-version = "0.1.3"
+version = "0.1.4"
 description = "One API for every OCR / document-parsing provider (Reducto, Extend, LlamaParse, ...). Rust core, Python SDK, open benchmark."
 readme = "README.md"
 license = { text = "MIT" }