update ossutil 1.6.11 (#269)

Author: night556

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Master
 
+- update: ossutil 1.6.11
 - fix: Skip https certificate verification
 
 ### 3.0.37

go.mod

@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect
 	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20191112024640-6523ede38591
-	github.com/aliyun/aliyun-oss-go-sdk v2.0.3+incompatible
+	github.com/aliyun/aliyun-oss-go-sdk v2.0.8+incompatible
 	github.com/aliyun/credentials-go v0.0.0-20190906110604-c03d72db9395
 	github.com/alyu/configparser v0.0.0-20191103060215-744e9a66e7bc
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
@@ -20,7 +20,7 @@ require (
 	github.com/onsi/ginkgo v1.10.3
 	github.com/onsi/gomega v1.7.1
 	github.com/posener/complete v1.2.2
-	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
+	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
 	github.com/smartystreets/assertions v1.0.1 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/stretchr/testify v1.4.0

go.sum

@@ -4,6 +4,8 @@ github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20191112024640-6523ede38591 h1:rbX
 github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20191112024640-6523ede38591/go.mod h1:mNZkuqaeM5UCiAdkV4r+lrheu8Q5fe/487bRFrGYZ8A=
 github.com/aliyun/aliyun-oss-go-sdk v2.0.3+incompatible h1:724q2AmQ3m1mrdD9kYqK5+1+Zr77vS21jdQ9iF9t4b8=
 github.com/aliyun/aliyun-oss-go-sdk v2.0.3+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
+github.com/aliyun/aliyun-oss-go-sdk v2.0.8+incompatible h1:WaOAKiuezSaRKAYeSf5IjxuAy/0Gx7ts6qWhKWPZf7s=
+github.com/aliyun/aliyun-oss-go-sdk v2.0.8+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/aliyun/credentials-go v0.0.0-20190906110604-c03d72db9395 h1:ey3Xbk1uAgNOlWZAH7KDBxmoa0IcOt+snhA0vN8EA7s=
 github.com/aliyun/credentials-go v0.0.0-20190906110604-c03d72db9395/go.mod h1:AJeNV4JgJLF+XrTuSe0EPfSs702qFXKNJVOqloWotqs=
 github.com/alyu/configparser v0.0.0-20191103060215-744e9a66e7bc h1:eN2FUvn4J1A31pICABioDYukoh1Tmlei6L3ImZUin/I=

oss/lib/bucket_encryption.go

@@ -173,9 +173,10 @@ func (bec *BucketEncryptionCommand) PutBucketEncryption() error {
 	strAlgorithm, _ := GetString(OptionSSEAlgorithm, bec.command.options)
 	strKeyId, _ := GetString(OptionKMSMasterKeyID, bec.command.options)
 
-	if strAlgorithm != string(oss.KMSAlgorithm) && strAlgorithm != string(oss.AESAlgorithm) {
-		return fmt.Errorf("value of option --sse-algorithm must be KMS or AES256")
-	}
+	// support sm4 algorithm
+	//if strAlgorithm != string(oss.KMSAlgorithm) && strAlgorithm != string(oss.AESAlgorithm) {
+	//	return fmt.Errorf("value of option --sse-algorithm must be KMS or AES256")
+	//}
 
 	if strAlgorithm == string(oss.AESAlgorithm) && len(strKeyId) > 0 {
 		return fmt.Errorf("value of option --kms-masterkey-id must be empty if value of option --sse-algorithm is AES256")

oss/lib/bucket_website.go

@@ -6,8 +6,6 @@ import (
 	"io/ioutil"
 	"os"
 	"strings"
-
-	oss "github.com/aliyun/aliyun-oss-go-sdk/oss"
 )
 
 var specChineseBucketWebSite = SpecText{
@@ -321,19 +319,13 @@ func (bwc *BucketWebSiteCommand) PutBucketWebsite() error {
 		return err
 	}
 
-	websiteConfig := oss.WebsiteXML{}
-	err = xml.Unmarshal(text, &websiteConfig)
-	if err != nil {
-		return err
-	}
-
 	// put bucket website
 	client, err := bwc.command.ossClient(bwc.bwOption.bucketName)
 	if err != nil {
 		return err
 	}
 
-	return client.SetBucketWebsiteDetail(bwc.bwOption.bucketName, websiteConfig)
+	return client.SetBucketWebsiteXml(bwc.bwOption.bucketName, string(text))
 }
 
 func (bwc *BucketWebSiteCommand) confirm(str string) bool {

oss/lib/command.go

@@ -2,8 +2,10 @@ package lib
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -288,6 +290,7 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) {
 	proxyUser, _ := GetString(OptionProxyUser, cmd.options)
 	proxyPwd, _ := GetString(OptionProxyPwd, cmd.options)
 	ecsUrl, _ := cmd.getEcsRamAkService()
+	localHost, _ := GetString(OptionLocalHost, cmd.options)
 
 	if accessKeyID == "" && ecsUrl == "" {
 		return nil, fmt.Errorf("accessKeyID and ecsUrl are both empty")
@@ -314,6 +317,15 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) {
 		}
 	}
 
+	if localHost != "" {
+		ipAddr, err := net.ResolveIPAddr("ip", localHost)
+		if err != nil {
+			return nil, fmt.Errorf("net.ResolveIPAddr error,%s", err.Error())
+		}
+		localTCPAddr := &(net.TCPAddr{IP: ipAddr.IP})
+		options = append(options, oss.SetLocalAddr(localTCPAddr))
+	}
+
 	if logLevel > oss.LogOff {
 		options = append(options, oss.SetLogLevel(logLevel))
 		options = append(options, oss.SetLogger(utilLogger))
@@ -590,6 +602,11 @@ func (cmd *Command) filterError(err error, option *batchOptionType) bool {
 		return false
 	}
 
+	errorTypeName := reflect.TypeOf(err).String()
+	if !strings.Contains(errorTypeName, "ObjectError") {
+		return false
+	}
+
 	err = err.(ObjectError).err
 
 	switch err.(type) {
@@ -619,6 +636,28 @@ func (cmd *Command) getOSSOptions(hopMap map[string]interface{}, headers map[str
 	return options, nil
 }
 
+func (cmd *Command) getOSSTagging(strTagging string) ([]oss.Tag, error) {
+	tags := []oss.Tag{}
+	strKeys := strings.Split(strTagging, "&")
+	for _, v := range strKeys {
+		if v == "" {
+			return tags, fmt.Errorf("tagging value is empty,maybe exist &&")
+		}
+		tagNode := strings.Split(v, "=")
+		if len(tagNode) >= 3 {
+			return tags, fmt.Errorf("tagging value error %s", v)
+		}
+
+		// value maybe empty
+		tagNode = append(tagNode, "")
+		tags = append(tags, oss.Tag{
+			Key:   tagNode[0],
+			Value: tagNode[1],
+		})
+	}
+	return tags, nil
+}
+
 // GetAllCommands returns all commands list
 func GetAllCommands() []interface{} {
 	return []interface{}{

oss/lib/command_test.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"math/rand"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -173,17 +172,6 @@ func (s *OssutilCommandSuite) TearDownTest(c *C) {
 	fmt.Printf("tear down test:%s,cost:%d(ms)\n", c.TestName(), cost)
 }
 
-var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
-func randStr(n int) string {
-	b := make([]rune, n)
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	for i := range b {
-		b[i] = letters[r.Intn(len(letters))]
-	}
-	return string(b)
-}
-
 func randLowStr(n int) string {
 	return strings.ToLower(randStr(n))
 }

oss/lib/config.go

@@ -393,16 +393,16 @@ func (cc *ConfigCommand) runCommandInteractive(configFile, language string) erro
 
 	if configFile == "" {
 		if llanguage == LEnglishLanguage {
-			fmt.Printf("\nPlease enter the config file path(default " + DecideConfigFile("") + ", carriage return will use the default path. If you specified this option to other path, you should specify --config-file option to the path when you use other commands):")
+			fmt.Printf("\nPlease enter the config file name,the file name can include path(default " + DecideConfigFile("") + ", carriage return will use the default file. If you specified this option to other file, you should specify --config-file option to the file when you use other commands):")
 		} else {
-			fmt.Printf("\n请输入配置文件路径（默认为：" + DecideConfigFile("") + "，回车将使用默认路径。如果用户设置为其它路径，在使用命令时需要将--config-file选项设置为该路径）：")
+			fmt.Printf("\n请输入配置文件名,文件名可以带路径(默认为：" + DecideConfigFile("") + "，回车将使用默认配置文件。如果用户设置为其它文件，在使用命令时需要将--config-file选项设置为该文件）：")
 		}
 
 		if _, err := fmt.Scanln(&configFile); err != nil {
 			if llanguage == LEnglishLanguage {
 				fmt.Println("No config file entered, will use the default config file " + DecideConfigFile("") + "\n")
 			} else {
-				fmt.Println("未输入配置文件路径，将使用默认配置文件：" + DecideConfigFile("") + "。\n")
+				fmt.Println("未输入配置文件，将使用默认配置文件：" + DecideConfigFile("") + "。\n")
 			}
 		}
 	}

oss/lib/config_test.go

@@ -255,12 +255,12 @@ func (s *OssutilConfigSuite) TestConfigNotConfigFile(c *C) {
 	configCommand.runCommandInteractive("", LEnglishLanguage)
 	contents, _ := ioutil.ReadFile(logPath)
 	LogContent := string(contents)
-	c.Assert(strings.Contains(LogContent, "Please enter the config file path"), Equals, true)
+	c.Assert(strings.Contains(LogContent, "Please enter the config file name"), Equals, true)
 
 	configCommand.runCommandInteractive("", ChineseLanguage)
 	contents, _ = ioutil.ReadFile(logPath)
 	LogContent = string(contents)
-	c.Assert(strings.Contains(LogContent, "请输入配置文件路径"), Equals, true)
+	c.Assert(strings.Contains(LogContent, "请输入配置文件名"), Equals, true)
 }
 
 func (s *OssutilConfigSuite) TestConfigConfigInteractive(c *C) {

oss/lib/const.go

@@ -71,6 +71,16 @@ const (
 	OptionProxyHost                  = "proxyHost"
 	OptionProxyUser                  = "proxyUser"
 	OptionProxyPwd                   = "proxyPwd"
+	OptionLocalHost                  = "localHost"
+	OptionEnableSymlinkDir           = "enableSymlinkDir"
+	OptionOnlyCurrentDir             = "onlyCurrentDir"
+	OptionProbeItem                  = "probeItem"
+	OptionDisableEncodeSlash         = "disableEncodeSlash"
+	OptionDisableDirObject           = "disableDirObject"
+	OptionRedundancyType             = "redundancyType"
+	OptionDisableAllSymlink          = "disableAllSymlink"
+	OptionDisableIgnoreError         = "disableIgnoreError"
+	OptionTagging                    = "tagging"
 )
 
 // the elements show in stat object
@@ -88,6 +98,7 @@ const (
 	StatStorageClass            = "StorageClass"
 	StatSSEAlgorithm            = "SSEAlgorithm"
 	StatKMSMasterKeyID          = "KMSMasterKeyID"
+	StatRedundancyType          = "RedundancyType"
 )
 
 // the elements show in hash file
@@ -114,7 +125,7 @@ const (
 const (
 	Package                 string = "ossutil"
 	ChannelBuf              int    = 1000
-	Version                 string = "v1.6.6"
+	Version                 string = "v1.6.11"
 	DefaultEndpoint         string = "oss.aliyuncs.com"
 	ChineseLanguage                = "CH"
 	EnglishLanguage                = "EN"