summaryrefslogtreecommitdiffstats
path: root/api/file.go
diff options
context:
space:
mode:
Diffstat (limited to 'api/file.go')
-rw-r--r--api/file.go54
1 files changed, 26 insertions, 28 deletions
diff --git a/api/file.go b/api/file.go
index 4339e610b..67ebc14b7 100644
--- a/api/file.go
+++ b/api/file.go
@@ -23,7 +23,6 @@ import (
"image/jpeg"
"io"
"io/ioutil"
- "mime"
"net/http"
"net/url"
"os"
@@ -323,25 +322,22 @@ func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) {
cchan := Srv.Store.Channel().CheckPermissionsTo(c.Session.TeamId, channelId, c.Session.UserId)
path := "teams/" + c.Session.TeamId + "/channels/" + channelId + "/users/" + userId + "/" + filename
- size := ""
+ var info *model.FileInfo
- if s, ok := fileInfoCache.Get(path); ok {
- size = s.(string)
+ if cached, ok := fileInfoCache.Get(path); ok {
+ info = cached.(*model.FileInfo)
} else {
-
fileData := make(chan []byte)
getFileAndForget(path, fileData)
- f := <-fileData
-
- if f == nil {
- c.Err = model.NewAppError("getFileInfo", "Could not find file.", "path="+path)
- c.Err.StatusCode = http.StatusNotFound
+ newInfo, err := model.GetInfoForBytes(filename, <-fileData)
+ if err != nil {
+ c.Err = err
return
+ } else {
+ fileInfoCache.Add(path, newInfo)
+ info = newInfo
}
-
- size = strconv.Itoa(len(f))
- fileInfoCache.Add(path, size)
}
if !c.HasPermissionsToChannel(cchan, "getFileInfo") {
@@ -350,19 +346,7 @@ func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "max-age=2592000, public")
- var mimeType string
- ext := filepath.Ext(filename)
- if model.IsFileExtImage(ext) {
- mimeType = model.GetImageMimeType(ext)
- } else {
- mimeType = mime.TypeByExtension(ext)
- }
-
- result := make(map[string]string)
- result["filename"] = filename
- result["size"] = size
- result["mime"] = mimeType
- w.Write([]byte(model.MapToJson(result)))
+ w.Write([]byte(info.ToJson()))
}
func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -538,7 +522,7 @@ func writeFile(f []byte, path string) *model.AppError {
auth.AccessKey = utils.Cfg.FileSettings.AmazonS3AccessKeyId
auth.SecretKey = utils.Cfg.FileSettings.AmazonS3SecretAccessKey
- s := s3.New(auth, aws.Regions[utils.Cfg.FileSettings.AmazonS3Region])
+ s := s3.New(auth, awsRegion())
bucket := s.Bucket(utils.Cfg.FileSettings.AmazonS3Bucket)
ext := filepath.Ext(path)
@@ -578,7 +562,7 @@ func readFile(path string) ([]byte, *model.AppError) {
auth.AccessKey = utils.Cfg.FileSettings.AmazonS3AccessKeyId
auth.SecretKey = utils.Cfg.FileSettings.AmazonS3SecretAccessKey
- s := s3.New(auth, aws.Regions[utils.Cfg.FileSettings.AmazonS3Region])
+ s := s3.New(auth, awsRegion())
bucket := s.Bucket(utils.Cfg.FileSettings.AmazonS3Bucket)
// try to get the file from S3 with some basic retry logic
@@ -629,3 +613,17 @@ func openFileWriteStream(path string) (io.Writer, *model.AppError) {
func closeFileWriteStream(file io.Writer) {
file.(*os.File).Close()
}
+
+func awsRegion() aws.Region {
+ if region, ok := aws.Regions[utils.Cfg.FileSettings.AmazonS3Region]; ok {
+ return region
+ }
+
+ return aws.Region{
+ Name: utils.Cfg.FileSettings.AmazonS3Region,
+ S3Endpoint: utils.Cfg.FileSettings.AmazonS3Endpoint,
+ S3BucketEndpoint: utils.Cfg.FileSettings.AmazonS3BucketEndpoint,
+ S3LocationConstraint: *utils.Cfg.FileSettings.AmazonS3LocationConstraint,
+ S3LowercaseBucket: *utils.Cfg.FileSettings.AmazonS3LowercaseBucket,
+ }
+}