diff options
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | api/file.go | 76 | ||||
-rw-r--r-- | api/file_test.go | 9 | ||||
-rw-r--r-- | model/client.go | 18 | ||||
-rw-r--r-- | web/react/components/file_attachment.jsx | 15 | ||||
-rw-r--r-- | web/react/components/new_channel.jsx | 11 | ||||
-rw-r--r-- | web/react/components/view_image.jsx | 18 | ||||
-rw-r--r-- | web/react/stores/socket_store.jsx | 4 | ||||
-rw-r--r-- | web/react/utils/client.jsx | 14 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 17 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 4 |
11 files changed, 149 insertions, 39 deletions
diff --git a/.travis.yml b/.travis.yml index b8a503714..877977dd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_install: install: - export PATH=$PATH:$HOME/gopath/bin - go get github.com/tools/godep -- godep restore +#- godep restore before_script: - mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot - mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot diff --git a/api/file.go b/api/file.go index 558f9357e..50482a057 100644 --- a/api/file.go +++ b/api/file.go @@ -30,12 +30,15 @@ import ( "time" ) +var fileInfoCache *utils.Cache = utils.NewLru(1000) + func InitFile(r *mux.Router) { l4g.Debug("Initializing file api routes") sr := r.PathPrefix("/files").Subrouter() sr.Handle("/upload", ApiUserRequired(uploadFile)).Methods("POST") - sr.Handle("/get/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+(\\.[A-Za-z0-9]{3,})?}", ApiAppHandler(getFile)).Methods("GET", "HEAD") + sr.Handle("/get/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+(\\.[A-Za-z0-9]{3,})?}", ApiAppHandler(getFile)).Methods("GET") + sr.Handle("/get_info/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+(\\.[A-Za-z0-9]{3,})?}", ApiAppHandler(getFileInfo)).Methods("GET") sr.Handle("/get_public_link", ApiUserRequired(getPublicLink)).Methods("POST") } @@ -213,9 +216,72 @@ type ImageGetResult struct { ImageData []byte } +func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) { + if !utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage { + c.Err = model.NewAppError("getFileInfo", "Unable to get file info. Amazon S3 not configured and local server storage turned off. ", "") + c.Err.StatusCode = http.StatusNotImplemented + return + } + + params := mux.Vars(r) + + channelId := params["channel_id"] + if len(channelId) != 26 { + c.SetInvalidParam("getFileInfo", "channel_id") + return + } + + userId := params["user_id"] + if len(userId) != 26 { + c.SetInvalidParam("getFileInfo", "user_id") + return + } + + filename := params["filename"] + if len(filename) == 0 { + c.SetInvalidParam("getFileInfo", "filename") + return + } + + cchan := Srv.Store.Channel().CheckPermissionsTo(c.Session.TeamId, channelId, c.Session.UserId) + + path := "teams/" + c.Session.TeamId + "/channels/" + channelId + "/users/" + userId + "/" + filename + size := "" + + if s, ok := fileInfoCache.Get(path); ok { + size = s.(string) + } else { + + fileData := make(chan []byte) + asyncGetFile(path, fileData) + + f := <-fileData + + if f == nil { + c.Err = model.NewAppError("getFileInfo", "Could not find file.", "path="+path) + c.Err.StatusCode = http.StatusNotFound + return + } + + size = strconv.Itoa(len(f)) + fileInfoCache.Add(path, size) + } + + if !c.HasPermissionsToChannel(cchan, "getFileInfo") { + return + } + + w.Header().Set("Cache-Control", "max-age=2592000, public") + + result := make(map[string]string) + result["filename"] = filename + result["size"] = size + w.Write([]byte(model.MapToJson(result))) +} + func getFile(c *Context, w http.ResponseWriter, r *http.Request) { if !utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage { - c.Err = model.NewAppError("getFile", "Unable to upload file. Amazon S3 not configured and local server storage turned off. ", "") + c.Err = model.NewAppError("getFile", "Unable to get file. Amazon S3 not configured and local server storage turned off. ", "") c.Err.StatusCode = http.StatusNotImplemented return } @@ -281,11 +347,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) { } w.Header().Set("Cache-Control", "max-age=2592000, public") - w.Header().Set("Content-Length", strconv.Itoa(len(f))) - - if r.Method != "HEAD" { - w.Write(f) - } + w.Write(f) } func asyncGetFile(path string, fileData chan []byte) { diff --git a/api/file_test.go b/api/file_test.go index 566fd69d0..eb1fcf2ce 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -201,6 +201,15 @@ func TestGetFile(t *testing.T) { t.Fatal(downErr) } + if resp, downErr := Client.GetFileInfo(filenames[0]); downErr != nil { + t.Fatal(downErr) + } else { + m := resp.Data.(map[string]string) + if len(m["size"]) == 0 { + t.Fail() + } + } + team2 := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} team2 = Client.Must(Client.CreateTeam(team2)).Data.(*model.Team) diff --git a/model/client.go b/model/client.go index 17e2466df..9fcb06cf8 100644 --- a/model/client.go +++ b/model/client.go @@ -589,6 +589,24 @@ func (c *Client) GetFile(url string, isFullUrl bool) (*Result, *AppError) { } } +func (c *Client) GetFileInfo(url string) (*Result, *AppError) { + var rq *http.Request + rq, _ = http.NewRequest("GET", c.Url+"/files/get_info"+url, nil) + + if len(c.AuthToken) > 0 { + rq.Header.Set(HEADER_AUTH, "BEARER "+c.AuthToken) + } + + if rp, err := c.HttpClient.Do(rq); err != nil { + return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + } else if rp.StatusCode >= 300 { + return nil, AppErrorFromJson(rp.Body) + } else { + return &Result{rp.Header.Get(HEADER_REQUEST_ID), + rp.Header.Get(HEADER_ETAG_SERVER), MapFromJson(rp.Body)}, nil + } +} + func (c *Client) GetPublicLink(data map[string]string) (*Result, *AppError) { if r, err := c.DoPost("/files/get_public_link", MapToJson(data)); err != nil { return nil, err diff --git a/web/react/components/file_attachment.jsx b/web/react/components/file_attachment.jsx index c36c908d2..ab550d500 100644 --- a/web/react/components/file_attachment.jsx +++ b/web/react/components/file_attachment.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. var utils = require('../utils/utils.jsx'); +var Client = require('../utils/client.jsx'); var Constants = require('../utils/constants.jsx'); module.exports = React.createClass({ @@ -103,12 +104,16 @@ module.exports = React.createClass({ if (this.state.fileSize < 0) { var self = this; - // asynchronously request the size of the file so that we can display it next to the thumbnail - utils.getFileSize(utils.getFileUrl(filename), function(fileSize) { - if (self.canSetState) { - self.setState({fileSize: fileSize}); + Client.getFileInfo( + filename, + function(data) { + if (self.canSetState) { + self.setState({fileSize: parseInt(data["size"], 10)}); + } + }, + function(err) { } - }); + ); } else { fileSizeString = utils.fileSizeToString(this.state.fileSize); } diff --git a/web/react/components/new_channel.jsx b/web/react/components/new_channel.jsx index 38c9ea76d..fc24a7cdc 100644 --- a/web/react/components/new_channel.jsx +++ b/web/react/components/new_channel.jsx @@ -84,6 +84,17 @@ module.exports = React.createClass({ var button = e.relatedTarget; self.setState({channelType: $(button).attr('data-channeltype')}); }); + $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', this.handleClose); + }, + componentWillUnmount: function() { + $(this.refs.modal.getDOMNode()).off('hidden.bs.modal', this.handleClose); + }, + handleClose: function() { + $(this.getDOMNode()).find('.form-control').each(function clearForms() { + this.value = ''; + }); + + this.setState({channelType: '', displayNameError: '', nameError: '', serverError: '', inValid: false}); }, getInitialState: function() { return {channelType: ''}; diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 6077c4ebc..24efce0f1 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -224,18 +224,24 @@ module.exports = React.createClass({ </div> </div> ); + bgClass = 'white-bg'; // asynchronously request the actual size of this file if (!(filename in this.state.fileSizes)) { var self = this; - utils.getFileSize(utils.getFileUrl(filename), function fileSizeOp(fileSize) { - if (self.canSetState) { - var fileSizes = self.state.fileSizes; - fileSizes[filename] = fileSize; - self.setState(fileSizes); + Client.getFileInfo( + filename, + function(data) { + if (self.canSetState) { + var fileSizes = self.state.fileSizes; + fileSizes[filename] = parseInt(data["size"], 10); + self.setState(fileSizes); + } + }, + function(err) { } - }); + ); } } } else { diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index c3c331828..e43a8f2be 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -25,12 +25,10 @@ var SocketStore = assign({}, EventEmitter.prototype, { if (window.WebSocket && !conn) { var protocol = 'ws://'; - var port = ''; if (window.location.protocol === 'https:') { protocol = 'wss://'; - port = ':8443'; } - var connUrl = protocol + location.host + port + '/api/v1/websocket'; + var connUrl = protocol + location.host + '/api/v1/websocket'; console.log('connecting to ' + connUrl); conn = new WebSocket(connUrl); diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 754843697..13d6c3f54 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -831,6 +831,20 @@ module.exports.uploadFile = function(formData, success, error) { return request; }; +module.exports.getFileInfo = function(filename, success, error) { + $.ajax({ + url: '/api/v1/files/get_info' + filename, + dataType: 'json', + contentType: 'application/json', + type: 'GET', + success: success, + error: function onError(xhr, status, err) { + var e = handleError('getFileInfo', xhr, status, err); + error(e); + } + }); +}; + module.exports.getPublicLink = function(data, success, error) { $.ajax({ url: '/api/v1/files/get_public_link', diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index f718f7435..f19dd2b47 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -604,23 +604,6 @@ module.exports.splitFileLocation = function(fileLocation) { return {ext: ext, name: filename, path: filePath}; }; -// Asynchronously gets the size of a file by requesting its headers. If successful, it calls the -// provided callback with the file size in bytes as the argument. -module.exports.getFileSize = function(url, callback) { - var request = new XMLHttpRequest(); - - request.open('HEAD', url, true); - request.onreadystatechange = function onReadyStateChange() { - if (request.readyState === 4 && request.status === 200) { - if (callback) { - callback(parseInt(request.getResponseHeader('content-length'), 10)); - } - } - }; - - request.send(); -}; - module.exports.toTitleCase = function(str) { function doTitleCase(txt) { return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 5b68b488f..e817761ee 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -124,3 +124,7 @@ div.theme { .black-bg { background-color: black !important; } + +.white-bg { + background-color: white !important; +} |