Merge remote-tracking branch 'origin/v4' into HEAD

Author: 0xlane

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wechat-dump-rs"
-version = "1.0.29-no-phone"
+version = "1.0.31-no-phone"
 edition = "2021"
 repository = "https://github.com/0xlane/wechat-dump-rs"
 

README.md

@@ -95,6 +95,7 @@ wechat-dump-rs.exe -k xxxxxxxxxxxxxxxxx -f c:\users\xxxx\xxxx\contact.db -r --vv
 - 4.0.1.17
 - 4.0.1.21
 - 4.0.2.17
+- 4.0.3.22
 
 ## 库表结构
 

src/main.rs

@@ -4,7 +4,7 @@ fn cli() -> clap::Command {
     use clap::{arg, value_parser, Command};
 
     Command::new("wechat-dump-rs")
-        .version("1.0.25")
+        .version("1.0.31-no-phone")
         .about("A wechat db dump tool")
         .author("REinject")
         .help_template("{name} ({version}) - {author}\n{about}\n{all-args}")

wxdump/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wxdump"
-version = "1.0.29-no-phone"
+version = "1.0.31-no-phone"
 edition = "2021"
 repository = "https://github.com/0xlane/wechat-dump-rs"
 

wxdump/src/lib.rs

@@ -69,7 +69,7 @@ const RULES_V4: &str = r#"
     rule GetUserInfoOffset
     {
         strings:
-            $a = /(.{16}[\x00-\x20]\x00{7}(\x0f|\x1f)\x00{7}){2}.{16}[\x01-\x20]\x00{7}(\x0f|\x1f)\x00{7}[0-9]{11}\x00{5}\x0b\x00{7}\x0f\x00{7}.{25}\x00{7}(\x3f|\x2f|\x1f|\x0f)\x00{7}/s
+            $a = /(.{16}[\x00-\x20]\x00{7}(\x0f|\x1f)\x00{7}){2}.{16}[\x01-\x20]\x00{7}(\x0f|\x1f)\x00{7}[0-9]{11}\x00{5}\x0b\x00{7}\x0f\x00{7}.{25}\x00{7}(\x4f|\x3f|\x2f|\x1f|\x0f)\x00{7}/s
         condition:
             $a
     }
@@ -615,11 +615,11 @@ rule GetKeyAddrStub
     const PAGE_SIZE: usize = 4096;
     const ROUND_COUNT: u32 = 256000;
     let mut db_file_path = PathBuf::from(data_dir.clone());
-    db_file_path.push(r"db_storage\biz\biz.db");
+    db_file_path.push(r"db_storage\contact\contact.db");
     let mut db_file = std::fs::File::open(&db_file_path)
         .expect(format!("{} is not exsit", db_file_path.display()).as_str());
     let mut buf = [0u8; PAGE_SIZE];
-    db_file.read(&mut buf[..]).expect("read biz.db is failed");
+    db_file.read(&mut buf[..]).expect("read contact.db is failed");
 
     // HMAC_SHA512算法比较耗时，使用多线程跑
     let n_job = pre_addresses.len();