Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Replace validator's xss() with caja's sanitize() #1633

Closed
wants to merge 1 commit into from
Closed

[WIP] Replace validator's xss() with caja's sanitize() #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions core/server/models/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var ghostBookshelf,
config = require('../config'),
Validator = require('validator').Validator,
unidecode = require('unidecode'),
sanitize = require('validator').sanitize;
sanitize = require('caja-sanitizer').sanitize;

// Initializes a new Bookshelf instance, for reference elsewhere in Ghost.
ghostBookshelf = Bookshelf.ghost = Bookshelf.initialize(config().database);
Expand Down Expand Up @@ -80,7 +80,10 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
},

sanitize: function (attr) {
return sanitize(this.get(attr)).xss();
if (this.get(attr) === null || this.get(attr) === undefined) {
return this.get(attr);
}
return sanitize(this.get(attr));
},

// #### generateSlug
Expand Down
44 changes: 20 additions & 24 deletions core/server/models/post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
var Post,
Posts,
_ = require('underscore'),
uuid = require('node-uuid'),
when = require('when'),
errors = require('../errorHandling'),
Showdown = require('showdown'),
github = require('../../shared/vendor/showdown/extensions/github'),
converter = new Showdown.converter({extensions: [github]}),
User = require('./user').User,
Tag = require('./tag').Tag,
Tags = require('./tag').Tags,
ghostBookshelf = require('./base');
var _ = require('underscore'),
uuid = require('node-uuid'),
when = require('when'),
Showdown = require('showdown'),
errors = require('../errorHandling'),
github = require('../../shared/vendor/showdown/extensions/github'),
User = require('./user').User,
Tag = require('./tag').Tag,
Tags = require('./tag').Tags,
ghostBookshelf = require('./base'),

converter = new Showdown.converter({extensions: [github]}),
Post,
Posts;

Post = ghostBookshelf.Model.extend({

Expand All @@ -33,25 +34,20 @@ Post = ghostBookshelf.Model.extend({
this.on('creating', this.creating, this);
this.on('saving', this.updateTags, this);
this.on('saving', this.saving, this);
this.on('saving', this.validate, this);
},

validate: function () {
ghostBookshelf.validator.check(this.get('title'), "Post title cannot be blank").notEmpty();
ghostBookshelf.validator.check(this.get('title'), 'Post title maximum length is 150 characters.').len(0, 150);
return true;
},

saving: function (newPage, attr, options) {
/*jslint unparam:true*/
var self = this;

// Remove any properties which don't belong on the post model
this.attributes = this.pick(this.permittedAttributes);
var self = this,
unsafeTitle = this.get('title');

this.set('html', converter.makeHtml(this.get('markdown')));

this.set('title', this.sanitize('title').trim());
ghostBookshelf.validator.check(this.get('title'),
this.get('title') === unsafeTitle ? "Post title cannot be blank" : "Post title cannot be blank (current text is classified as unsafe and will be removed)")
.notEmpty();
ghostBookshelf.validator.check(this.get('title'), 'Post title maximum length is 150 characters.').len(0, 150);

if (this.hasChanged('status') && this.get('status') === 'published') {
if (!this.get('published_at')) {
Expand Down
4 changes: 2 additions & 2 deletions core/test/integration/model/model_posts_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@ describe('Post Model', function () {

it('should sanitize the title', function (done) {
new PostModel().fetch().then(function (model) {
return model.set({'title': "</title></head><body><script>alert('blogtitle');</script>"}).save();
return model.set({'title': '<b onclick="alert(\'foo\')" class="bar">title</b></title></head><body><script>alert("blogtitle");</script>'}).save();
}).then(function (saved) {
saved.get('title').should.eql("&lt;/title&gt;&lt;/head>&lt;body&gt;[removed]alert&#40;'blogtitle'&#41;;[removed]");
saved.get('title').should.eql('<b class="bar">title</b>');
done();
}).otherwise(done);
});
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"underscore": "1.5.2",
"unidecode": "0.1.3",
"validator": "1.4.0",
"when": "2.7.0"
"when": "2.7.0",
"caja-sanitizer": "0.1.1"
},
"optionalDependencies": {
"mysql": "2.0.0-alpha9"
Expand Down