Commit d9e19b60 authored by Wu Cheng-Han's avatar Wu Cheng-Han
Browse files

Update to remove null byte before saving to DB and remove null byte on changes

parent c3a96ff1
......@@ -20,6 +20,13 @@ if (config.dburl)
else
sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
// [Postgres] Handling NULL bytes
// https://github.com/sequelize/sequelize/issues/6485
function stripNullByte(value) {
return value ? value.replace(/\u0000/g, "") : value;
}
sequelize.stripNullByte = stripNullByte;
var db = {};
fs
......
......@@ -52,13 +52,22 @@ module.exports = function (sequelize, DataTypes) {
defaultValue: 0
},
title: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('title', sequelize.stripNullByte(value));
}
},
content: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('content', sequelize.stripNullByte(value));
}
},
authorship: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('authorship', JSON.stringify(value));
}
},
lastchangeAt: {
type: DataTypes.DATE
......
......@@ -59,19 +59,31 @@ module.exports = function (sequelize, DataTypes) {
defaultValue: Sequelize.UUIDV4
},
patch: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('patch', sequelize.stripNullByte(value));
}
},
lastContent: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('lastContent', sequelize.stripNullByte(value));
}
},
content: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('content', sequelize.stripNullByte(value));
}
},
length: {
type: DataTypes.INTEGER
},
authorship: {
type: DataTypes.TEXT
type: DataTypes.TEXT,
set: function (value) {
this.setDataValue('authorship', value ? JSON.stringify(value) : value);
}
}
}, {
classMethods: {
......
......@@ -3207,6 +3207,12 @@ function buildCursor(user) {
}
//editor actions
function removeNullByte(cm, change) {
var str = change.text.join("\n");
if (/\u0000/g.test(str) && change.update) {
change.update(change.from, change.to, str.replace(/\u0000/g, "").split("\n"));
}
}
function enforceMaxLength(cm, change) {
var maxLength = cm.getOption("maxLength");
if (maxLength && change.update) {
......@@ -3228,6 +3234,7 @@ var ignoreEmitEvents = ['setValue', 'ignoreHistory'];
editor.on('beforeChange', function (cm, change) {
if (debug)
console.debug(change);
removeNullByte(cm, change);
if (enforceMaxLength(cm, change)) {
$('.limit-modal').modal('show');
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment