Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-15 03:01:37 -05:00
Code Issues Activity

Check file type and file extension when importing csv (#7185)

Browse source 
issue #7144
- added a check for file type and file extension
- added an error message to the localization file
- added integration test
This commit is contained in:
Tim Walling 2016-08-11 03:46:06 -04:00 • committed by Hannah Wolfe
parent cd4fb88236
commit a0288303f6
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/server/api/subscribers.js
View file

@ -275,7 +275,10 @@ subscribers = {
return Promise.reject(new errors.ValidationError(i18n.t('errors.api.db.selectFileToImport')));
}
// TODO: check for valid entries
// Check for valid file type
if (!utils.checkFileIsValid(options, ['text/csv','application/csv'], ['.csv'])) {
return Promise.reject(new errors.ValidationError(i18n.t('errors.api.subscribers.selectValidFile')));
}
return options;
}

3
core/server/translations/en.json
View file

@ -347,7 +347,8 @@
},
"subscribers": {
"subscriberNotFound": "Subscriber not found.",
"subscriberAlreadyExists": "Email address is already subscribed."
"subscriberAlreadyExists": "Email address is already subscribed.",
"selectValidFile": "Please select a valid CSV file to import."
},
"tags": {
"tagNotFound": "Tag not found."

21
core/test/integration/api/api_subscription_spec.js
View file

@ -238,13 +238,15 @@ describe('Subscribers API', function () {
});
describe('Read CSV', function () {
var scope = {};
var scope = {},
stub;
beforeEach(function () {
sinon.stub(fs, 'unlink', function (path, cb) {
cb();
});
sinon.stub(apiUtils, 'checkFileExists').returns(true);
stub = sinon.stub(apiUtils, 'checkFileIsValid').returns(true);
sinon.stub(serverUtils, 'readCSV', function () {
if (scope.csvError) {
return Promise.reject(new Error('csv'));
@ -257,7 +259,9 @@ describe('Subscribers API', function () {
afterEach(function () {
fs.unlink.restore();
apiUtils.checkFileExists.restore();
apiUtils.checkFileIsValid.restore();
serverUtils.readCSV.restore();
scope.csvError = false;
});
it('check that fn works in general', function (done) {
@ -286,7 +290,7 @@ describe('Subscribers API', function () {
.catch(done);
});
it('read csv throws an error', function (done) {
it('read csv throws a not found error', function (done) {
scope.csvError = true;
SubscribersAPI.importCSV(_.merge(testUtils.context.internal, {path: '/somewhere'}))
@ -298,5 +302,18 @@ describe('Subscribers API', function () {
done();
});
});
it('throws an invalid file error', function (done) {
stub.returns(false);
SubscribersAPI.importCSV(_.merge(testUtils.context.internal, {path: '/somewhere'}))
.then(function () {
done(new Error('we expected an error here!'));
})
.catch(function (err) {
err.message.should.eql('Please select a valid CSV file to import.');
done();
});
});
});
});