Merge pull request h2non#72 from turn88/master

add matchers for office 2003
baptistapedro · Mar 5, 2020 · dbd2467 · dbd2467
2 parents 8241aa2 + b7d8325
commit dbd2467
Showing 1 changed file with 28 additions and 15 deletions.
diff --git a/matchers/document.go b/matchers/document.go
@@ -35,12 +35,17 @@ const (
 	TYPE_OOXML
 )
 
+//reference: https://bz.apache.org/ooo/show_bug.cgi?id=111457
 func Doc(buf []byte) bool {
-	return len(buf) > 7 &&
-		buf[0] == 0xD0 && buf[1] == 0xCF &&
-		buf[2] == 0x11 && buf[3] == 0xE0 &&
-		buf[4] == 0xA1 && buf[5] == 0xB1 &&
-		buf[6] == 0x1A && buf[7] == 0xE1
+	if len(buf) > 513 {
+		return buf[0] == 0xD0 && buf[1] == 0xCF &&
+			buf[2] == 0x11 && buf[3] == 0xE0 &&
+			buf[512] == 0xEC && buf[513] == 0xA5
+	} else {
+		return len(buf) > 3 &&
+			buf[0] == 0xD0 && buf[1] == 0xCF &&
+			buf[2] == 0x11 && buf[3] == 0xE0
+	}
 }
 
 func Docx(buf []byte) bool {
@@ -49,11 +54,15 @@ func Docx(buf []byte) bool {
 }
 
 func Xls(buf []byte) bool {
-	return len(buf) > 7 &&
-		buf[0] == 0xD0 && buf[1] == 0xCF &&
-		buf[2] == 0x11 && buf[3] == 0xE0 &&
-		buf[4] == 0xA1 && buf[5] == 0xB1 &&
-		buf[6] == 0x1A && buf[7] == 0xE1
+	if len(buf) > 513 {
+		return buf[0] == 0xD0 && buf[1] == 0xCF &&
+			buf[2] == 0x11 && buf[3] == 0xE0 &&
+			buf[512] == 0x09 && buf[513] == 0x08
+	} else {
+		return len(buf) > 3 &&
+			buf[0] == 0xD0 && buf[1] == 0xCF &&
+			buf[2] == 0x11 && buf[3] == 0xE0
+	}
 }
 
 func Xlsx(buf []byte) bool {
@@ -62,11 +71,15 @@ func Xlsx(buf []byte) bool {
 }
 
 func Ppt(buf []byte) bool {
-	return len(buf) > 7 &&
-		buf[0] == 0xD0 && buf[1] == 0xCF &&
-		buf[2] == 0x11 && buf[3] == 0xE0 &&
-		buf[4] == 0xA1 && buf[5] == 0xB1 &&
-		buf[6] == 0x1A && buf[7] == 0xE1
+	if len(buf) > 513 {
+		return buf[0] == 0xD0 && buf[1] == 0xCF &&
+			buf[2] == 0x11 && buf[3] == 0xE0 &&
+			buf[512] == 0xA0 && buf[513] == 0x46
+	} else {
+		return len(buf) > 3 &&
+			buf[0] == 0xD0 && buf[1] == 0xCF &&
+			buf[2] == 0x11 && buf[3] == 0xE0
+	}
 }
 
 func Pptx(buf []byte) bool {