refactor for file upload response handlers API

packages/rocketchat-file-upload/package.js

@@ -24,9 +24,13 @@ Package.onUse(function(api) {
 
 	api.addFiles('client/lib/fileUploadHandler.js', 'client');
 
+	api.addFiles('server/lib/fileUploadResponse.js', 'server');
+	api.addFiles('server/lib/requests.js', 'server');
+	api.addFiles('server/lib/responseGridFS.js', 'server');
+	api.addFiles('server/lib/responseS3.js', 'server');
+
 	api.addFiles('server/configS3.js', 'server');
-	api.addFiles('server/requests.js', 'server');
-	api.addFiles('server/settings.js', 'server');
+	api.addFiles('server/startup/settings.js', 'server');
 
 	api.addFiles('server/methods/sendFileMessage.js', 'server');
 

packages/rocketchat-file-upload/server/lib/fileUploadResponse.js

@@ -0,0 +1,17 @@
+fileUploadResponse = new class {
+	constructor() {
+		this.workers = {};
+	}
+	register(store, callback) {
+		this.workers[store] = callback;
+	}
+	process(file, req, res, next) {
+		if (file.store && this.workers && this.workers[file.store]) {
+			this.workers[file.store].call(this, file, req, res, next);
+		} else {
+			res.writeHead(404);
+			res.end();
+			return;
+		}
+	}
+};

packages/rocketchat-file-upload/server/lib/requests.js

@@ -0,0 +1,53 @@
+var protectedFiles;
+
+RocketChat.settings.get('FileUpload_ProtectFiles', function(key, value) {
+	protectedFiles = value;
+});
+
+WebApp.connectHandlers.use('/file-upload/', function(req, res, next) {
+	var file;
+
+	var dd = new Date();
+
+	var match = /^\/([^\/]+)\/(.*)/.exec(req.url);
+
+	if (match[1]) {
+		file = RocketChat.models.Uploads.findOneById(match[1]);
+
+		if (file) {
+			if (protectedFiles) {
+				var cookie, rawCookies, ref, token, uid;
+				cookie = new Cookies();
+
+				if ((typeof req !== "undefined" && req !== null ? (ref = req.headers) != null ? ref.cookie : void 0 : void 0) != null) {
+					rawCookies = req.headers.cookie;
+				}
+
+				if (rawCookies != null) {
+					uid = cookie.get('rc_uid', rawCookies);
+				}
+
+				if (rawCookies != null) {
+					token = cookie.get('rc_token', rawCookies);
+				}
+
+				if (uid == null) {
+					uid = req.query.rc_uid;
+					token = req.query.rc_token;
+				}
+
+				if (!(uid && token && RocketChat.models.Users.findOneByIdAndLoginToken(uid, token))) {
+					res.writeHead(403);
+					res.end();
+					return false;
+				}
+			}
+
+			return fileUploadResponse.process(file, req, res, next);
+		}
+	}
+
+	res.writeHead(404);
+	res.end();
+	return;
+});

packages/rocketchat-file-upload/server/lib/responseGridFS.js

@@ -0,0 +1,59 @@
+var stream = Npm.require('stream');
+var zlib = Npm.require('zlib');
+
+// code from: https://github.com/jalik/jalik-ufs/blob/master/ufs-server.js#L91
+var readFromGridFS = function(storeName, fileId, file, req, res) {
+	var store = UploadFS.getStore(storeName);
+	var rs = store.getReadStream(fileId, file);
+	var ws = new stream.PassThrough();
+
+	rs.on('error', function (err) {
+		store.onReadError.call(store, err, fileId, file);
+		res.end();
+	});
+	ws.on('error', function (err) {
+		store.onReadError.call(store, err, fileId, file);
+		res.end();
+	});
+	ws.on('close', function () {
+		// Close output stream at the end
+		ws.emit('end');
+	});
+
+	var accept = req.headers['accept-encoding'] || '';
+	var headers = {
+		'Content-Type': file.type,
+		'Content-Length': file.size
+	};
+
+	// Transform stream
+	store.transformRead(rs, ws, fileId, file, req, headers);
+
+	// Compress data using gzip
+	if (accept.match(/\bgzip\b/)) {
+		headers['Content-Encoding'] = 'gzip';
+		delete headers['Content-Length'];
+		res.writeHead(200, headers);
+		ws.pipe(zlib.createGzip()).pipe(res);
+	}
+	// Compress data using deflate
+	else if (accept.match(/\bdeflate\b/)) {
+		headers['Content-Encoding'] = 'deflate';
+		delete headers['Content-Length'];
+		res.writeHead(200, headers);
+		ws.pipe(zlib.createDeflate()).pipe(res);
+	}
+	// Send raw data
+	else {
+		res.writeHead(200, headers);
+		ws.pipe(res);
+	}
+};
+
+fileUploadResponse.register('rocketchat_uploads', function(file, req, res, next) {
+	res.setHeader('Content-Disposition', "attachment; filename=\"" + encodeURIComponent(file.name) + "\"");
+	res.setHeader('Last-Modified', file.uploadedAt.toUTCString());
+	res.setHeader('Content-Type', file.type);
+	res.setHeader('Content-Length', file.size);
+	return readFromGridFS(file.store, file._id, file, req, res);
+});

packages/rocketchat-file-upload/server/lib/responseS3.js

@@ -0,0 +1,28 @@
+var crypto = Npm.require("crypto");
+
+var S3bucket, S3accessKey, S3secretKey;
+
+RocketChat.settings.get('FileUpload_S3_Bucket', function(key, value) {
+	S3bucket = value;
+});
+RocketChat.settings.get('FileUpload_S3_AWSAccessKeyId', function(key, value) {
+	S3accessKey = value;
+});
+RocketChat.settings.get('FileUpload_S3_AWSSecretAccessKey', function(key, value) {
+	S3secretKey = value;
+});
+
+var generateURL = function(fullUrl) {
+	var resourceURL = '/' + fullUrl.substr(fullUrl.indexOf(S3bucket));
+	var expires = parseInt(new Date().getTime() / 1000) + 60;
+	var StringToSign = 'GET\n\n\n' + expires +'\n'+resourceURL;
+
+	var signature = crypto.createHmac('sha1', S3secretKey).update(new Buffer(StringToSign, "utf-8")).digest('base64');
+	return fullUrl + '?AWSAccessKeyId='+encodeURIComponent(S3accessKey)+'&Expires='+expires+'&Signature='+encodeURIComponent(signature);
+};
+
+fileUploadResponse.register('s3', function(file, req, res, next) {
+	res.setHeader('Location', generateURL(file.url));
+	res.writeHead(302);
+	res.end();
+});

packages/rocketchat-file-upload/server/requests.js

@@ -1,135 +0,0 @@
-var crypto = Npm.require("crypto");
-var stream = Npm.require('stream');
-var zlib = Npm.require('zlib');
-
-var S3bucket, S3accessKey, S3secretKey, protectedFiles;
-
-RocketChat.settings.get('FileUpload_S3_Bucket', function(key, value) {
-	S3bucket = value;
-});
-RocketChat.settings.get('FileUpload_S3_AWSAccessKeyId', function(key, value) {
-	S3accessKey = value;
-});
-RocketChat.settings.get('FileUpload_S3_AWSSecretAccessKey', function(key, value) {
-	S3secretKey = value;
-});
-
-RocketChat.settings.get('FileUpload_ProtectFiles', function(key, value) {
-	protectedFiles = value;
-});
-
-var generateURL = function(fullUrl) {
-	var resourceURL = '/' + fullUrl.substr(fullUrl.indexOf(S3bucket));
-	var expires = parseInt(new Date().getTime() / 1000) + 60;
-	var StringToSign = 'GET\n\n\n' + expires +'\n'+resourceURL;
-
-	var signature = crypto.createHmac('sha1', S3secretKey).update(new Buffer(StringToSign, "utf-8")).digest('base64');
-	return fullUrl + '?AWSAccessKeyId='+encodeURIComponent(S3accessKey)+'&Expires='+expires+'&Signature='+encodeURIComponent(signature);
-};
-
-// code from: https://github.com/jalik/jalik-ufs/blob/master/ufs-server.js#L91
-var readFromGridFS = function(storeName, fileId, file, req, res) {
-	var store = UploadFS.getStore(storeName);
-	var rs = store.getReadStream(fileId, file);
-	var ws = new stream.PassThrough();
-
-	rs.on('error', function (err) {
-		store.onReadError.call(store, err, fileId, file);
-		res.end();
-	});
-	ws.on('error', function (err) {
-		store.onReadError.call(store, err, fileId, file);
-		res.end();
-	});
-	ws.on('close', function () {
-		// Close output stream at the end
-		ws.emit('end');
-	});
-
-	var accept = req.headers['accept-encoding'] || '';
-	var headers = {
-		'Content-Type': file.type,
-		'Content-Length': file.size
-	};
-
-	// Transform stream
-	store.transformRead(rs, ws, fileId, file, req, headers);
-
-	// Compress data using gzip
-	if (accept.match(/\bgzip\b/)) {
-		headers['Content-Encoding'] = 'gzip';
-		delete headers['Content-Length'];
-		res.writeHead(200, headers);
-		ws.pipe(zlib.createGzip()).pipe(res);
-	}
-	// Compress data using deflate
-	else if (accept.match(/\bdeflate\b/)) {
-		headers['Content-Encoding'] = 'deflate';
-		delete headers['Content-Length'];
-		res.writeHead(200, headers);
-		ws.pipe(zlib.createDeflate()).pipe(res);
-	}
-	// Send raw data
-	else {
-		res.writeHead(200, headers);
-		ws.pipe(res);
-	}
-};
-
-WebApp.connectHandlers.use('/file-upload/', function(req, res, next) {
-	var file;
-
-	var match = /^\/([^\/]+)\/(.*)/.exec(req.url);
-
-	if (match[1]) {
-		file = RocketChat.models.Uploads.findOneById(match[1]);
-
-		if (file) {
-			if (protectedFiles) {
-				var cookie, rawCookies, ref, token, uid;
-				cookie = new Cookies();
-
-				if ((typeof req !== "undefined" && req !== null ? (ref = req.headers) != null ? ref.cookie : void 0 : void 0) != null) {
-					rawCookies = req.headers.cookie;
-				}
-
-				if (rawCookies != null) {
-					uid = cookie.get('rc_uid', rawCookies);
-				}
-
-				if (rawCookies != null) {
-					token = cookie.get('rc_token', rawCookies);
-				}
-
-				if (uid == null) {
-					uid = req.query.rc_uid;
-					token = req.query.rc_token;
-				}
-
-				if (!(uid && token && RocketChat.models.Users.findOneByIdAndLoginToken(uid, token))) {
-					res.writeHead(403);
-					res.end();
-					return false;
-				}
-			}
-			res.setHeader('Content-Disposition', "attachment; filename=\"" + encodeURIComponent(file.name) + "\"");
-			res.setHeader('Last-Modified', file.uploadedAt.toUTCString());
-			res.setHeader('Content-Type', file.type);
-			res.setHeader('Content-Length', file.size);
-
-			if (file.store === 's3') {
-				var newUrl = generateURL(file.url);
-				res.setHeader('Location', newUrl);
-				res.writeHead(302);
-				res.end();
-				return;
-			} else {
-				return readFromGridFS(file.store, file._id, file, req, res);
-			}
-		}
-	}
-
-	res.writeHead(404);
-	res.end();
-	return;
-});

packages/rocketchat-file-upload/server/startup/settings.js

@@ -21,7 +21,7 @@ Meteor.startup(function() {
 			value: 'AmazonS3'
 		}
 	});
-	RocketChat.settings.add('FileUpload_S3_Acl', 'public-read', {
+	RocketChat.settings.add('FileUpload_S3_Acl', '', {
 		group: 'FileUpload',
 		section: 'Amazon S3',
 		type: 'string',