Merge pull request #100 from Human-Connection/67-remove-ip-address-fields

67 Remove IP address fields (GDPR compliance)

Author: matboehm

core/db.js

@@ -200,9 +200,9 @@ exports.saveEntry = function(fields, callback){
                     callback({email: "Email address already exists"});
                     return;
                 }else{
-                    let sql  = "INSERT INTO entries (firstname, lastname, email, country, message, anon, ipv4, image, "
+                    let sql  = "INSERT INTO entries (firstname, lastname, email, country, message, anon, image, "
                         + "created_at, updated_at, confirm_key, beta, newsletter, pax) "
-                        + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
+                        + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
 
                     // run the query
                     connection.query(
@@ -214,7 +214,6 @@ exports.saveEntry = function(fields, callback){
                             data.country,
                             data.message,
                             data.anon,
-                            data.ipv4,
                             data.image,
                             data.created_at,
                             data.updated_at,

core/entryController.js

@@ -31,8 +31,6 @@ exports.getAll = function(req, res) {
                 obj.lastname        = item.lastname;
                 obj.message         = item.message;
                 obj.country         = item.country;
-                obj.ipv4            = item.ipv4;
-                obj.ipv6            = item.ipv6;
                 obj.email_confirmed = item.email_confirmed;
                 obj.confirm_key     = item.confirm_key;
                 obj.status          = item.status;
@@ -210,10 +208,6 @@ exports.createEntry = function(req, res) {
 
             res.status(400).json(out);
         }else{
-            // TODO: handle ipv6
-            // bundle required stuff into fields
-            fields["ipv4"]  = req.ip;
-
             if(hasFile){
                 fields["image"] = files[0].path.replace(/^.*[\\\/]/, '');
 

documentation/tables.sql

@@ -12,7 +12,6 @@ CREATE TABLE IF NOT EXISTS `entries` (
   `country` char(2) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `message` text COLLATE utf8mb4_unicode_ci NOT NULL,
   `anon` int(1) DEFAULT '0',
-  `ipv4` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `image` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `created_at` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `updated_at` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -23,4 +22,4 @@ CREATE TABLE IF NOT EXISTS `entries` (
   `email_confirmed` int(1) DEFAULT '0',
   `status` int(1) DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

migrations/20200122150107-remove-ip-fields.js

@@ -0,0 +1,63 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+    dbm = options.dbmigrate;
+    type = dbm.dataType;
+    seed = seedLink;
+};
+
+exports.up = function (db, callback) {
+    db.removeColumn(
+        'entries',
+        'ipv4',
+        function (err) {
+            if (err) return callback(err);
+            return callback();
+        });
+    db.removeColumn(
+        'entries',
+        'ipv6',
+        function (err) {
+            if (err) return callback(err);
+            return callback();
+        });
+};
+
+exports.down = function (db, callback) {
+    db.addColumn(
+        'entries',
+        'ipv4',
+        {
+            type: 'string',
+            length: 30,
+            defaultValue: null,
+        },
+        function (err) {
+            if (err) return callback(err);
+            return callback();
+        });
+    db.addColumn(
+        'entries',
+        'ipv6',
+        {
+            type: 'string',
+            length: 60,
+            defaultValue: null,
+        },
+        function (err) {
+            if (err) return callback(err);
+            return callback();
+        });
+};
+
+exports._meta = {
+    'version': 1
+};