made filepath sanitization optional

Author: jaybeecave

fileupload.go

@@ -80,7 +80,7 @@ func getValidFileNameWithDupIndex(path string, filename string, duplicateIndex i
 
 	// path doesn't exist so we can return this path
 	if _, err := os.Stat(fullpath); os.IsNotExist(err) {
-		return strings.ToUpper(dupStr + filename)
+		return strings.ToLower(dupStr + filename)
 	}
 
 	//otherwise increase file index and
@@ -378,15 +378,16 @@ func ProcessImageWithEndpoint(endpoint string, ext string, imgData io.Reader, op
 	if err != nil {
 		return nil, fmt.Errorf("statuscode %v", err)
 	}
-	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("failed with status code: %d", res.StatusCode)
-	}
 	defer res.Body.Close()
 
 	b, err = ioutil.ReadAll(res.Body)
 	if err != nil {
 		return nil, fmt.Errorf("failed reading final bytes %v", err)
 	}
+
+	if res.StatusCode != 200 {
+		return nil, fmt.Errorf("failed with status code: %d and message %s", res.StatusCode, string(b))
+	}
 	return b, nil
 }
 
@@ -422,7 +423,6 @@ func (fs *LocalFileStorage) OpenFile(filename string) (b []byte, fileName string
 }
 
 func (fs *LocalFileStorage) SaveFile(filename string, r io.Reader) (fileName string, url string, err error) {
-	filename = getValidFileName(fs.AttachmentsFolder, filename)
 	f, err := os.OpenFile(fs.AttachmentsFolder+filename, os.O_RDWR|os.O_CREATE, 0666)
 	if err != nil {
 		return "", "", fmt.Errorf("Failed to create a file on the filesystem: %v", err)

go.mod

@@ -6,7 +6,5 @@ replace bitbucket.org/iqhive/tkt-shared => ../tkt-shared
 
 require (
 	github.com/kennygrant/sanitize v1.2.4
-	github.com/manhtai/gopngquant v0.0.0-20180310144719-578cebc80102
-	github.com/manhtai/imagequant v0.0.0-20180310104925-a76d35dcb570 // indirect
 	golang.org/x/net v0.0.0-20200421231249-e086a090c8fd // indirect
 )

go.sum

@@ -1,9 +1,5 @@
 github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o=
 github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
-github.com/manhtai/gopngquant v0.0.0-20180310144719-578cebc80102 h1:bShgP1wiKAQf05xCYAVZJ0ghMq6vnBy+ioKGPip1gEI=
-github.com/manhtai/gopngquant v0.0.0-20180310144719-578cebc80102/go.mod h1:jHu+AhKQgxLdKw7pisWUAD+BeH38FhmHDTtDBsXG1sA=
-github.com/manhtai/imagequant v0.0.0-20180310104925-a76d35dcb570 h1:RJ95GXJWSewO5Mhi+jD4sX6b5RUk3S3/OiDO0+BBxCI=
-github.com/manhtai/imagequant v0.0.0-20180310104925-a76d35dcb570/go.mod h1:LTQQU89K3IGCYY8a1nqBJVT1rH29s4nBygn/653/HBk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=