remove <!DOCTYPE tag in bad content types

redsift · Jan 15, 2017 · 3644cf8 · 3644cf8
1 parent 018e29f
commit 3644cf8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/part.go b/part.go
@@ -137,6 +137,12 @@ func parseMediaType(ctype string) (string, map[string]string, error) {
 		}
 	}()
 	if err != nil {
+		// check if ctype contains <!DOCTYPE tag and remove it
+		dtIdx := strings.Index(ctype, "<!DOCTYPE")
+		if dtIdx > -1 {
+			ctype = ctype[0:dtIdx]
+		}
+
 		// Small hack to remove harmless charset duplicate params
 		mctype := parseBadContentType(ctype, ";")
 		mtype, mparams, err = mime.ParseMediaType(mctype)

diff --git a/part_test.go b/part_test.go
@@ -241,6 +241,10 @@ func TestBadContentTypes(t *testing.T) {
 			"mtype":    "inline",
 			"filename": "",
 		},
+		`text/html; charset="iso-8859-1"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">`: map[string]string{
+			"mtype":   "text/html",
+			"charset": "iso-8859-1",
+		},
 	}
 
 	for ctype, m := range bctypes {