diff options
| author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
| commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
| tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /utils | |
| parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
| parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
| download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/api.go | 23 | ||||
| -rw-r--r-- | utils/file_backend_s3.go | 28 |
2 files changed, 25 insertions, 26 deletions
diff --git a/utils/api.go b/utils/api.go index 48382d1fe..005c3284b 100644 --- a/utils/api.go +++ b/utils/api.go @@ -4,6 +4,8 @@ package utils import ( + "fmt" + "html/template" "net/http" "net/url" "strings" @@ -31,18 +33,21 @@ func OriginChecker(allowedOrigins string) func(*http.Request) bool { } func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) { - message := err.Message - details := err.DetailedError - status := http.StatusTemporaryRedirect if err.StatusCode != http.StatusInternalServerError { status = err.StatusCode } - http.Redirect( - w, - r, - "/error?message="+url.QueryEscape(message)+ - "&details="+url.QueryEscape(details), - status) + destination := strings.TrimRight(GetSiteURL(), "/") + "/error?message=" + url.QueryEscape(err.Message) + if status >= 300 && status < 400 { + http.Redirect(w, r, destination, status) + return + } + + w.WriteHeader(status) + fmt.Fprintln(w, `<!DOCTYPE html><html><head></head>`) + fmt.Fprintln(w, `<body onload="window.location = '`+template.HTMLEscapeString(template.JSEscapeString(destination))+`'">`) + fmt.Fprintln(w, `<noscript><meta http-equiv="refresh" content="0; url=`+template.HTMLEscapeString(destination)+`"></noscript>`) + fmt.Fprintln(w, `<a href="`+template.HTMLEscapeString(destination)+`" style="color: #c0c0c0;">...</a>`) + fmt.Fprintln(w, `</body></html>`) } diff --git a/utils/file_backend_s3.go b/utils/file_backend_s3.go index 5512b64dc..7ef150851 100644 --- a/utils/file_backend_s3.go +++ b/utils/file_backend_s3.go @@ -83,7 +83,7 @@ func (b *S3FileBackend) ReadFile(path string) ([]byte, *model.AppError) { if err != nil { return nil, model.NewAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } - minioObject, err := s3Clnt.GetObject(b.bucket, path) + minioObject, err := s3Clnt.GetObject(b.bucket, path, s3.GetObjectOptions{}) if err != nil { return nil, model.NewAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } @@ -138,13 +138,18 @@ func (b *S3FileBackend) WriteFile(f []byte, path string) *model.AppError { return model.NewAppError("WriteFile", "api.file.write_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } - ext := filepath.Ext(path) - metaData := s3Metadata(b.encrypt, "binary/octet-stream") - if model.IsFileExtImage(ext) { - metaData = s3Metadata(b.encrypt, model.GetImageMimeType(ext)) + options := s3.PutObjectOptions{} + if b.encrypt { + options.UserMetadata["x-amz-server-side-encryption"] = "AES256" } - if _, err = s3Clnt.PutObjectWithMetadata(b.bucket, path, bytes.NewReader(f), metaData, nil); err != nil { + if ext := filepath.Ext(path); model.IsFileExtImage(ext) { + options.ContentType = model.GetImageMimeType(ext) + } else { + options.ContentType = "binary/octet-stream" + } + + if _, err = s3Clnt.PutObject(b.bucket, path, bytes.NewReader(f), -1, options); err != nil { return model.NewAppError("WriteFile", "api.file.write_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } @@ -225,17 +230,6 @@ func (b *S3FileBackend) RemoveDirectory(path string) *model.AppError { return nil } -func s3Metadata(encrypt bool, contentType string) map[string][]string { - metaData := make(map[string][]string) - if contentType != "" { - metaData["Content-Type"] = []string{"contentType"} - } - if encrypt { - metaData["x-amz-server-side-encryption"] = []string{"AES256"} - } - return metaData -} - func s3CopyMetadata(encrypt bool) map[string]string { metaData := make(map[string]string) metaData["x-amz-server-side-encryption"] = "AES256" |