TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-09-21 18:08:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #697 from jamesbloomer/619-image-upload-overwrites-existing-images-merge

Browse Source 
Ensure image uploads do not overwrite if they have the same name
This commit is contained in:
Hannah Wolfe 2013-09-11 06:51:55 -07:00
commit 821106b5f0
2 changed files with 173 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/server/controllers/admin.js
View File

@ -53,19 +53,40 @@ function setSelected(list, name) {
return list;
}
// TODO: this could be a separate module
function getUniqueFileName(dir, name, ext, i, done) {
var filename,
append = '';
if (i) {
append = '-' + i;
}
filename = path.join(dir, name + append + ext);
fs.exists(filename, function (exists) {
if (exists) {
setImmediate(function () {
i = i + 1;
return getUniqueFileName(dir, name, ext, i, done);
});
} else {
return done(filename);
}
});
}
adminControllers = {
'uploader': function (req, res) {
var currentDate = moment(),
month = currentDate.format("MMM"),
year = currentDate.format("YYYY"),
tmp_path = req.files.uploadimage.path,
dir = path.join('content/images', year, month),
target_path = path.join(dir, req.files.uploadimage.name),
ext = path.extname(req.files.uploadimage.name).toLowerCase(),
// the src for the image must be in URI format, not a file system path, which in Windows uses \
src = path.join('/', target_path).replace(new RegExp('\\' + path.sep, 'g'), '/');
basename = path.basename(req.files.uploadimage.name, ext);
function renameFile() {
function renameFile(target_path) {
// adds directories recursively
fs.mkdirs(dir, function (err) {
if (err) {
@ -75,6 +96,9 @@ adminControllers = {
if (err) {
errors.logError(err);
} else {
// TODO: should delete temp file at tmp_path. Or just move the file instead of copy.
// the src for the image must be in URI format, not a file system path, which in Windows uses \
var src = path.join('/', target_path).replace(new RegExp('\\' + path.sep, 'g'), '/');
res.send(src);
}
});
@ -82,8 +106,11 @@ adminControllers = {
});
}
// TODO: is it better to use file type eg. image/png?
if (ext === ".jpg" || ext === ".png" || ext === ".gif") {
renameFile();
getUniqueFileName(dir, basename, ext, null, function (filename) {
renameFile(filename);
});
} else {
res.send(404, "Invalid filetype");
}

141
core/test/unit/admin_spec.js Normal file
View File

@ -0,0 +1,141 @@
/*globals describe, beforeEach, it*/
var admin = require('../../server/controllers/admin'),
fs = require('fs-extra'),
should = require('should'),
sinon = require('sinon'),
when = require('when');
describe('Admin Controller', function() {
describe('uploader', function() {
var req;
var res;
beforeEach(function() {
req = {
files: {
uploadimage: {
path: "/tmp/TMPFILEID"
}
}
};
res = {
send: function(){}
};
});
describe('can not upload invalid file', function() {
it('should return 404 for invalid file type', function() {
res.send = sinon.stub();
req.files.uploadimage.name = "INVALID.FILE";
admin.uploader(req, res);
res.send.calledOnce.should.be.true;
res.send.args[0][0].should.equal(404);
res.send.args[0][1].should.equal('Invalid filetype');
});
});
describe('valid file', function() {
var clock;
beforeEach(function() {
req.files.uploadimage.name = "IMAGE.jpg";
sinon.stub(fs, 'mkdirs').yields();
sinon.stub(fs, 'copy').yields();
sinon.stub(fs, 'exists').yields(false);
});
afterEach(function() {
fs.mkdirs.restore();
fs.copy.restore();
fs.exists.restore();
clock.restore();
});
it('can upload jpg', function(done) {
clock = sinon.useFakeTimers(42);
sinon.stub(res, 'send', function(data) {
data.should.not.equal(404);
return done();
});
admin.uploader(req, res);
});
it('can upload png', function(done) {
req.files.uploadimage.name = "IMAGE.png";
clock = sinon.useFakeTimers(42);
sinon.stub(res, 'send', function(data) {
data.should.not.equal(404);
return done();
});
admin.uploader(req, res);
});
it('can upload gif', function(done) {
req.files.uploadimage.name = "IMAGE.gif";
clock = sinon.useFakeTimers(42);
sinon.stub(res, 'send', function(data) {
data.should.not.equal(404);
return done();
});
admin.uploader(req, res);
});
it('should send correct path to image when today is in Sep 2013', function(done) {
clock = sinon.useFakeTimers(1378585460681); // Sat Sep 07 2013 21:24:20 GMT+0100 (BST)
sinon.stub(res, 'send', function(data) {
data.should.equal('/content/images/2013/Sep/IMAGE.jpg');
return done();
});
return admin.uploader(req, res);
});
it('should send correct path to image when today is in Jan 2014', function(done) {
clock = sinon.useFakeTimers(1388534400000); // Wed Jan 01 2014 00:00:00 GMT+0000 (GMT)
sinon.stub(res, 'send', function(data) {
data.should.equal('/content/images/2014/Jan/IMAGE.jpg');
return done();
});
admin.uploader(req, res);
});
it('can upload two different images with the same name without overwriting the first', function(done) {
clock = sinon.useFakeTimers(1378634224614); // Sun Sep 08 2013 10:57:04 GMT+0100 (BST)
fs.exists.withArgs('content/images/2013/Sep/IMAGE.jpg').yields(true);
fs.exists.withArgs('content/images/2013/Sep/IMAGE-1.jpg').yields(false);
sinon.stub(res, 'send', function(data) {
data.should.equal('/content/images/2013/Sep/IMAGE-1.jpg');
return done();
});
return admin.uploader(req, res);
});
it('can upload five different images with the same name without overwriting the first', function(done) {
clock = sinon.useFakeTimers(1378634224614); // Sun Sep 08 2013 10:57:04 GMT+0100 (BST)
fs.exists.withArgs('content/images/2013/Sep/IMAGE.jpg').yields(true);
fs.exists.withArgs('content/images/2013/Sep/IMAGE-1.jpg').yields(true);
fs.exists.withArgs('content/images/2013/Sep/IMAGE-2.jpg').yields(true);
fs.exists.withArgs('content/images/2013/Sep/IMAGE-3.jpg').yields(true);
fs.exists.withArgs('content/images/2013/Sep/IMAGE-4.jpg').yields(false);
sinon.stub(res, 'send', function(data) {
data.should.equal('/content/images/2013/Sep/IMAGE-4.jpg');
return done();
});
return admin.uploader(req, res);
});
});
});
});