Merge pull request #386 from saks/encrypted_xls

Detect password protected xls files
tafia · Dec 19, 2023 · a58e8a5 · a58e8a5
2 parents dd694e9 + ce55340
commit a58e8a5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/xls.rs b/src/xls.rs
@@ -280,7 +280,8 @@ impl<RS: Read + Seek> Xls<RS> {
             for record in records {
                 let mut r = record?;
                 match r.typ {
-                    0x0012 if read_u16(r.data) != 0 => return Err(XlsError::Password),
+                    // 2.4.117 FilePass
+                    0x002F if read_u16(r.data) != 0 => return Err(XlsError::Password),
                     // CodePage
                     0x0042 => {
                         if self.options.force_codepage.is_none() {

diff --git a/tests/issue_385.xls b/tests/issue_385.xls
diff --git a/tests/test.rs b/tests/test.rs
@@ -1514,3 +1514,16 @@ fn issue_374() {
 
     assert_eq!("sheetjs", cell_text);
 }
+
+#[test]
+fn issue_385() {
+    let path = format!("{}/tests/issue_385.xls", env!("CARGO_MANIFEST_DIR"));
+
+    assert!(
+        matches!(
+            open_workbook::<Xls<_>, std::string::String>(path),
+            Err(calamine::XlsError::Password)
+        ),
+        "Is expeced to return XlsError::Password error"
+    );
+}