From 54def7eaad9ee0469ca495b3661798919239384a Mon Sep 17 00:00:00 2001
From: xuri <xuri.me@gmail.com>
Date: Thu, 27 Jun 2019 21:58:14 +0800
Subject: [PATCH]  Add TIF, TIFF format images and more detailed error
 information when open the encrypted file

---
 excelize.go           |  12 +++++++++
 excelize_test.go      |   9 +++++++
 picture.go            |   2 +-
 picture_test.go       |  25 +++++++++++++------
 test/images/excel.tif | Bin 0 -> 27052 bytes
 xmlApp.go             |  55 ++++++++++++++++++++++++++++++++++++++++++
 xmlDrawing.go         |   2 +-
 7 files changed, 95 insertions(+), 10 deletions(-)
 create mode 100644 test/images/excel.tif
 create mode 100644 xmlApp.go

diff --git a/excelize.go b/excelize.go
index 6fb98c4..f636a84 100644
--- a/excelize.go
+++ b/excelize.go
@@ -14,6 +14,7 @@ import (
 	"archive/zip"
 	"bytes"
 	"encoding/xml"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -69,6 +70,17 @@ func OpenReader(r io.Reader) (*File, error) {
 
 	zr, err := zip.NewReader(bytes.NewReader(b), int64(len(b)))
 	if err != nil {
+		identifier := []byte{
+			// checking protect workbook by [MS-OFFCRYPTO] - v20181211 3.1 FeatureIdentifier
+			0x3c, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00,
+			0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00,
+			0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x44, 0x00, 0x61, 0x00,
+			0x74, 0x00, 0x61, 0x00, 0x53, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00,
+			0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+		}
+		if bytes.Contains(b, identifier) {
+			return nil, errors.New("not support encrypted file currently")
+		}
 		return nil, err
 	}
 
diff --git a/excelize_test.go b/excelize_test.go
index c7c3aec..c4a06a5 100644
--- a/excelize_test.go
+++ b/excelize_test.go
@@ -1,6 +1,7 @@
 package excelize
 
 import (
+	"bytes"
 	"fmt"
 	"image/color"
 	_ "image/gif"
@@ -185,6 +186,14 @@ func TestSaveAsWrongPath(t *testing.T) {
 func TestOpenReader(t *testing.T) {
 	_, err := OpenReader(strings.NewReader(""))
 	assert.EqualError(t, err, "zip: not a valid zip file")
+	_, err = OpenReader(bytes.NewReader([]byte{
+		0x3c, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00,
+		0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00,
+		0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x44, 0x00, 0x61, 0x00,
+		0x74, 0x00, 0x61, 0x00, 0x53, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00,
+		0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+	}))
+	assert.EqualError(t, err, "not support encrypted file currently")
 }
 
 func TestBrokenFile(t *testing.T) {
diff --git a/picture.go b/picture.go
index 7804bce..812eb5c 100644
--- a/picture.go
+++ b/picture.go
@@ -385,7 +385,7 @@ func (f *File) addMedia(file []byte, ext string) string {
 // setContentTypePartImageExtensions provides a function to set the content
 // type for relationship parts and the Main Document part.
 func (f *File) setContentTypePartImageExtensions() {
-	var imageTypes = map[string]bool{"jpeg": false, "png": false, "gif": false}
+	var imageTypes = map[string]bool{"jpeg": false, "png": false, "gif": false, "tiff": false}
 	content := f.contentTypesReader()
 	for _, v := range content.Defaults {
 		_, ok := imageTypes[v.Extension]
diff --git a/picture_test.go b/picture_test.go
index 890092e..9a2edda 100644
--- a/picture_test.go
+++ b/picture_test.go
@@ -1,8 +1,13 @@
 package excelize
 
 import (
-	"fmt"
+	_ "image/gif"
+	_ "image/jpeg"
 	_ "image/png"
+
+	_ "golang.org/x/image/tiff"
+
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -25,37 +30,41 @@ func BenchmarkAddPictureFromBytes(b *testing.B) {
 }
 
 func TestAddPicture(t *testing.T) {
-	xlsx, err := OpenFile(filepath.Join("test", "Book1.xlsx"))
+	f, err := OpenFile(filepath.Join("test", "Book1.xlsx"))
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
 
 	// Test add picture to worksheet with offset and location hyperlink.
-	err = xlsx.AddPicture("Sheet2", "I9", filepath.Join("test", "images", "excel.jpg"),
+	err = f.AddPicture("Sheet2", "I9", filepath.Join("test", "images", "excel.jpg"),
 		`{"x_offset": 140, "y_offset": 120, "hyperlink": "#Sheet2!D8", "hyperlink_type": "Location"}`)
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
 
 	// Test add picture to worksheet with offset, external hyperlink and positioning.
-	err = xlsx.AddPicture("Sheet1", "F21", filepath.Join("test", "images", "excel.jpg"),
+	err = f.AddPicture("Sheet1", "F21", filepath.Join("test", "images", "excel.jpg"),
 		`{"x_offset": 10, "y_offset": 10, "hyperlink": "https://github.com/360EntSecGroup-Skylar/excelize", "hyperlink_type": "External", "positioning": "oneCell"}`)
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
 
-	file, err := ioutil.ReadFile(filepath.Join("test", "images", "excel.jpg"))
+	file, err := ioutil.ReadFile(filepath.Join("test", "images", "excel.png"))
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
 
 	// Test add picture to worksheet from bytes.
-	assert.NoError(t, xlsx.AddPictureFromBytes("Sheet1", "Q1", "", "Excel Logo", ".jpg", file))
+	assert.NoError(t, f.AddPictureFromBytes("Sheet1", "Q1", "", "Excel Logo", ".png", file))
 	// Test add picture to worksheet from bytes with illegal cell coordinates.
-	assert.EqualError(t, xlsx.AddPictureFromBytes("Sheet1", "A", "", "Excel Logo", ".jpg", file), `cannot convert cell "A" to coordinates: invalid cell name "A"`)
+	assert.EqualError(t, f.AddPictureFromBytes("Sheet1", "A", "", "Excel Logo", ".png", file), `cannot convert cell "A" to coordinates: invalid cell name "A"`)
+
+	assert.NoError(t, f.AddPicture("Sheet1", "Q8", filepath.Join("test", "images", "excel.gif"), ""))
+	assert.NoError(t, f.AddPicture("Sheet1", "Q15", filepath.Join("test", "images", "excel.jpg"), ""))
+	assert.NoError(t, f.AddPicture("Sheet1", "Q22", filepath.Join("test", "images", "excel.tif"), ""))
 
 	// Test write file to given path.
-	assert.NoError(t, xlsx.SaveAs(filepath.Join("test", "TestAddPicture.xlsx")))
+	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddPicture.xlsx")))
 }
 
 func TestAddPictureErrors(t *testing.T) {
diff --git a/test/images/excel.tif b/test/images/excel.tif
new file mode 100644
index 0000000000000000000000000000000000000000..4ce5effc4144d7e045fd14c6f40c32185a5543ad
GIT binary patch
literal 27052
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
be=X5y;GekVE&fj;`d?PUmS{3aFP8rSy$??x

literal 0
HcmV?d00001

diff --git a/xmlApp.go b/xmlApp.go
new file mode 100644
index 0000000..ad414fa
--- /dev/null
+++ b/xmlApp.go
@@ -0,0 +1,55 @@
+// Copyright 2016 - 2019 The excelize Authors. All rights reserved. Use of
+// this source code is governed by a BSD-style license that can be found in
+// the LICENSE file.
+//
+// Package excelize providing a set of functions that allow you to write to
+// and read from XLSX files. Support reads and writes XLSX file generated by
+// Microsoft Excel™ 2007 and later. Support save file without losing original
+// charts of XLSX. This library needs Go version 1.8 or later.
+
+package excelize
+
+import "encoding/xml"
+
+type xlsxProperties struct {
+	XMLName              xml.Name `xml:"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties Properties"`
+	Template             string
+	Manager              string
+	Company              string
+	Pages                int
+	Words                int
+	Characters           int
+	PresentationFormat   string
+	Lines                int
+	Paragraphs           int
+	Slides               int
+	Notes                int
+	TotalTime            int
+	HiddenSlides         int
+	MMClips              int
+	ScaleCrop            bool
+	HeadingPairs         *xlsxVectorVariant
+	TitlesOfParts        *xlsxVectorLpstr
+	LinksUpToDate        bool
+	CharactersWithSpaces int
+	SharedDoc            bool
+	HyperlinkBase        string
+	HLinks               *xlsxVectorVariant
+	HyperlinksChanged    bool
+	DigSig               *xlsxDigSig
+	Application          string
+	AppVersion           string
+	DocSecurity          int
+}
+
+type xlsxVectorVariant struct {
+	Content string `xml:",innerxml"`
+}
+
+type xlsxVectorLpstr struct {
+	Content string `xml:",innerxml"`
+}
+
+type xlsxDigSig struct {
+	Content string `xml:",innerxml"`
+}
diff --git a/xmlDrawing.go b/xmlDrawing.go
index 13e164e..bb468bc 100644
--- a/xmlDrawing.go
+++ b/xmlDrawing.go
@@ -42,7 +42,7 @@ const (
 	NameSpaceDublinCoreMetadataIntiative = "http://purl.org/dc/dcmitype/"
 )
 
-var supportImageTypes = map[string]string{".gif": ".gif", ".jpg": ".jpeg", ".jpeg": ".jpeg", ".png": ".png"}
+var supportImageTypes = map[string]string{".gif": ".gif", ".jpg": ".jpeg", ".jpeg": ".jpeg", ".png": ".png", ".tif": ".tiff", ".tiff": ".tiff"}
 
 // xlsxCNvPr directly maps the cNvPr (Non-Visual Drawing Properties). This
 // element specifies non-visual canvas properties. This allows for additional