properly escape GEOMETRY and GEOGRAPHY types (#6302)

changelog.md

@@ -2,6 +2,7 @@
 - [FIXED] Fixed an issue where custom-named model fields break when offsetting, ordering, and including hasMany simultaneously. [#5985](https://github.com/sequelize/sequelize/issues/5985)
 - [FIXED] Fixed an issue where custom-named model fields break when offsetting, ordering, and including hasMany simultaneously. [#5985](https://github.com/sequelize/sequelize/issues/5985)
 - [FIXED] Don't remove includes from count queries and unify findAndCount and count queries. [#6123](https://github.com/sequelize/sequelize/issues/6123)
 - [FIXED] Don't remove includes from count queries and unify findAndCount and count queries. [#6123](https://github.com/sequelize/sequelize/issues/6123)
 - [FIXED] `Model.count` don't include attributes [#5057](https://github.com/sequelize/sequelize/issues/5057)
 - [FIXED] `Model.count` don't include attributes [#5057](https://github.com/sequelize/sequelize/issues/5057)
+- [SECURITY] `GEOMETRY` and `GEOGRAPHY` SQL injection attacks [#6194](https://github.com/sequelize/sequelize/issues/6194)
 
 
 # 3.23.3
 # 3.23.3
 - [FIXED] Pass ResourceLock instead of raw connection in MSSQL disconnect handling
 - [FIXED] Pass ResourceLock instead of raw connection in MSSQL disconnect handling

lib/dialects/postgres/data-types.js

@@ -266,8 +266,8 @@ module.exports = function (BaseTypes) {
     return wkx.Geometry.parse(b).toGeoJSON();
     return wkx.Geometry.parse(b).toGeoJSON();
   };
   };
 
 
-  GEOMETRY.prototype.$stringify = function (value) {
-    return 'ST_GeomFromGeoJSON(\'' + JSON.stringify(value) + '\')';
+  GEOMETRY.prototype.$stringify = function (value, options) {
+    return 'ST_GeomFromGeoJSON(' + options.escape(JSON.stringify(value)) + ')';
   };
   };
 
 
   var GEOGRAPHY = BaseTypes.GEOGRAPHY.inherits();
   var GEOGRAPHY = BaseTypes.GEOGRAPHY.inherits();
@@ -293,13 +293,13 @@ module.exports = function (BaseTypes) {
     array_oids: []
     array_oids: []
   };
   };
 
 
-  GEOGRAPHY.parse = GEOGRAPHY.prototype.parse = function(value) {
+  GEOGRAPHY.parse = GEOGRAPHY.prototype.parse = function(value, options) {
     var b = new Buffer(value, 'hex');
     var b = new Buffer(value, 'hex');
     return wkx.Geometry.parse(b).toGeoJSON();
     return wkx.Geometry.parse(b).toGeoJSON();
   };
   };
 
 
-  GEOGRAPHY.prototype.$stringify = function (value) {
-    return 'ST_GeomFromGeoJSON(\'' + JSON.stringify(value) + '\')';
+  GEOGRAPHY.prototype.$stringify = function (value, options) {
+    return 'ST_GeomFromGeoJSON(' + options.escape(JSON.stringify(value)) + ')';
   };
   };
 
 
   var hstore;
   var hstore;

test/integration/model/geography.test.js

@@ -177,5 +177,26 @@ describe(Support.getTestDialectTeaser('Model'), function() {
         });
         });
       });
       });
     });
     });
+
+    describe('sql injection attacks', function () {
+      beforeEach(function() {
+        this.Model = this.sequelize.define('Model', {
+          location: DataTypes.GEOGRAPHY
+        });
+        return this.sequelize.sync({ force: true });
+      });
+
+      it('should properly escape the single quotes', function () {
+        return this.Model.create({
+          location: {
+            type: "Point",
+            properties: {
+              exploit: "'); DELETE YOLO INJECTIONS; -- "
+            },
+            coordinates: [39.807222,-76.984722]
+          }
+        });
+      });
+    });
   }
   }
 });
 });

test/integration/model/geometry.test.js

@@ -177,5 +177,26 @@ describe(Support.getTestDialectTeaser('Model'), function() {
         });
         });
       });
       });
     });
     });
+
+    describe('sql injection attacks', function () {
+      beforeEach(function() {
+        this.Model = this.sequelize.define('Model', {
+          location: DataTypes.GEOMETRY
+        });
+        return this.sequelize.sync({ force: true });
+      });
+
+      it('should properly escape the single quotes', function () {
+        return this.Model.create({
+          location: {
+            type: "Point",
+            properties: {
+              exploit: "'); DELETE YOLO INJECTIONS; -- "
+            },
+            coordinates: [39.807222,-76.984722]
+          }
+        });
+      });
+    });
   }
   }
 });
 });