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:  Add TIF, TIFF format images and more detailed error information when
 open the encrypted file

---
 excelize.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'excelize.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
 	}
 
-- 
cgit v1.2.1