From 73d1a46f3e35dde68c20d305f054998d078ae0ee Mon Sep 17 00:00:00 2001
From: Anis Elleuch <vadmeste@gmail.com>
Date: Thu, 18 Aug 2016 20:00:01 +0100
Subject: [PATCH] Allow asterisk character in key names (#2487)

---
 api-errors.go                | 6 +++---
 bucket-notification-utils.go | 3 +--
 object-utils.go              | 2 +-
 object-utils_test.go         | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api-errors.go b/api-errors.go
index 06cfe4dd6..6ff94d26d 100644
--- a/api-errors.go
+++ b/api-errors.go
@@ -118,7 +118,7 @@ const (
 	ErrFilterNameInvalid
 	ErrFilterNamePrefix
 	ErrFilterNameSuffix
-	ErrFilterPrefixValueInvalid
+	ErrFilterValueInvalid
 
 	// S3 extended errors.
 	ErrContentSHA256Mismatch
@@ -500,9 +500,9 @@ var errorCodeResponse = map[APIErrorCode]APIError{
 		Description:    "Cannot specify more than one suffix rule in a filter.",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
-	ErrFilterPrefixValueInvalid: {
+	ErrFilterValueInvalid: {
 		Code:           "InvalidArgument",
-		Description:    "prefix rule value cannot exceed 1024 characters",
+		Description:    "Size of filter rule value cannot exceed 1024 bytes in UTF-8 representation",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
 
diff --git a/bucket-notification-utils.go b/bucket-notification-utils.go
index 8b3cdb9bb..ce7c2a5b8 100644
--- a/bucket-notification-utils.go
+++ b/bucket-notification-utils.go
@@ -88,9 +88,8 @@ func checkFilterRules(filterRules []filterRule) APIErrorCode {
 			}
 		}
 
-		// Maximum prefix length can be up to 1,024 characters, validate.
 		if !IsValidObjectPrefix(filterRule.Value) {
-			return ErrFilterPrefixValueInvalid
+			return ErrFilterValueInvalid
 		}
 
 		// Set the new rule name to keep track of duplicates.
diff --git a/object-utils.go b/object-utils.go
index 7c5a4c62f..2421e81de 100644
--- a/object-utils.go
+++ b/object-utils.go
@@ -103,7 +103,7 @@ func IsValidObjectPrefix(object string) bool {
 		return false
 	}
 	// Reject unsupported characters in object name.
-	if strings.ContainsAny(object, "`^*|\\\"") {
+	if strings.ContainsAny(object, "`^|\\\"") {
 		return false
 	}
 	return true
diff --git a/object-utils_test.go b/object-utils_test.go
index 799e24985..a9919f7e1 100644
--- a/object-utils_test.go
+++ b/object-utils_test.go
@@ -88,6 +88,7 @@ func TestIsValidObjectName(t *testing.T) {
 		{"Cost Benefit Analysis (2009-2010).pptx", true},
 		{"117Gn8rfHL2ACARPAhaFd0AGzic9pUbIA/5OCn5A", true},
 		{"SHØRT", true},
+		{"f*le", true},
 		{"There are far too many object names, and far too few bucket names!", true},
 		// cases for which test should fail.
 		// passing invalid object names.