Updated SQL data for IP anonymization

Geeklog-Core · Jun 3, 2021 · 353d00b · 353d00b
1 parent 6ca4a9a
commit 353d00b
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 1 deletion.
diff --git a/public_html/admin/install/classes/Common.php b/public_html/admin/install/classes/Common.php
@@ -1592,6 +1592,11 @@ protected function doDatabaseUpgrades($currentGlVersion, $checkForMessage = fals
                     break;
 
                 case '2.2.1sr1':
+                    require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_2.2.1_to_2.2.2.php';
+                    $this->updateDB($_SQL, $progress);
+                    update_ConfValuesFor222();
+                    update_TablesContainingIPAddresses222();
+
                     $currentGlVersion = '2.2.2';
                     break;
 

diff --git a/public_html/admin/install/config-install.php b/public_html/admin/install/config-install.php
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Initial configuration setup.                                              |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2007-2019 by the following authors:                         |
+// | Copyright (C) 2007-2021 by the following authors:                         |
 // |                                                                           |
 // | Authors: Aaron Blankstein  - kantai AT gmail DOT com                      |
 // +---------------------------------------------------------------------------+
@@ -70,6 +70,7 @@ function install_config(ConfigInterface $c)
     $c->add('about_cookies_link','','text',0,0,NULL,2040,TRUE, $me, 0);
     $c->add('terms_of_use_link','','text',0,0,NULL,2050,TRUE, $me, 0);
     $c->add('privacy_policy_link','','text',0,0,NULL,2060,TRUE, $me, 0);
+    $c->add('ip_anonymization',\Geeklog\IP::POLICY_NEVER_ANONYMIZE,'text',0,0,NULL,2070,TRUE, $me, 0);
 
     $c->add('tab_mail', NULL, 'tab', 0, 1, NULL, 0, TRUE, $me, 1);
     $c->add('fs_mail', NULL, 'fieldset', 0, 1, NULL, 0, TRUE, $me, 1);

diff --git a/public_html/lib-common.php b/public_html/lib-common.php
@@ -235,6 +235,11 @@
 $_PAGE_TIMER = new timerobject();
 $_PAGE_TIMER->startTimer();
 
+// Initialize IP class
+if (!defined('GL_INSTALL_ACTIVE')) {
+    \Geeklog\IP::init($_TABLES['ip_addresses'], $_CONF['ip_anonymization']);
+}
+
 /**
  * This provides optional URL rewriting functionality.
  *
@@ -9309,6 +9314,10 @@ function COM_handleEval($code, $type = 1, $embeddedPHP = false)
     if (($_VARS['last_scheduled_run'] + $_CONF['cron_schedule_interval']) <= time()) {
         DB_query("UPDATE {$_TABLES['vars']} SET value=UNIX_TIMESTAMP() WHERE name='last_scheduled_run'");
         PLG_runScheduledTask();
+
+        if (!defined('GL_INSTALL_ACTIVE')) {
+            \Geeklog\IP::updateIPAddressesTable();
+        }
     }
 }
 

diff --git a/sql/mysql_tableanddata.php b/sql/mysql_tableanddata.php
@@ -183,6 +183,16 @@
 ) ENGINE=MyISAM
 ";
 
+$_SQL[] = "
+CREATE TABLE {$_TABLES['ip_addresses']} (
+  seq INT NOT NULL AUTO_INCREMENT,
+  ipaddress VARCHAR(39) NOT NULL DEFAULT '0.0.0.0',
+  created_at INT NOT NULL DEFAULT 0,
+  is_anonymized INT NOT NULL default 0,
+  PRIMARY KEY (seq)
+) ENGINE=MyISAM
+";
+
 $_SQL[] ="
 CREATE TABLE {$_TABLES['language_items']} (
   id INT(11) NOT NULL AUTO_INCREMENT,

diff --git a/sql/pgsql_tableanddata.php b/sql/pgsql_tableanddata.php
@@ -180,6 +180,16 @@
   CREATE UNIQUE INDEX {$_TABLES['groups']}_grp_name ON {$_TABLES['groups']}(grp_name);
 ";
 
+$_SQL[] = "
+CREATE TABLE {$_TABLES['ip_addresses']} (
+  seq SERIAL,
+  ipaddress VARCHAR(39) NOT NULL DEFAULT '0.0.0.0',
+  created_at INT NOT NULL DEFAULT 0,
+  is_anonymized INT NOT NULL default 0,
+  PRIMARY KEY (seq)
+)
+";
+
 $_SQL[] = "
 CREATE TABLE {$_TABLES['language_items']} (
   id SERIAL NOT NULL,

diff --git a/sql/updates/mysql_2.2.1_to_2.2.2.php b/sql/updates/mysql_2.2.1_to_2.2.2.php
@@ -0,0 +1,94 @@
+<?php
+
+// *************************************
+// New 'ip_addresses' table
+$_SQL[] = "
+CREATE TABLE {$_TABLES['ip_addresses']} (
+  seq INT NOT NULL AUTO_INCREMENT,
+  ipaddress VARCHAR(39) NOT NULL DEFAULT '0.0.0.0',
+  created_at INT NOT NULL DEFAULT 0,
+  is_anonymized INT NOT NULL default 0,
+  PRIMARY KEY (seq)
+) ENGINE=MyISAM
+";
+
+/**
+ * Add/Edit/Delete config options for new version
+ */
+function update_ConfValuesFor222()
+{
+    global $_CONF, $_TABLES;
+
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+    $c = config::get_instance();
+    $me = 'Core';
+
+    // Add IP anonymization policy
+    $c->add('ip_anonymization', \Geeklog\IP::POLICY_NEVER_ANONYMIZE, 'text', 0, 0, null, 2070, true, $me, 0);
+
+    return true;
+}
+
+/**
+ * Move IP addresses to the new 'ip_addresses' table
+ *
+ * @return bool
+ */
+function update_TablesContainingIPAddresses222()
+{
+    global $_TABLES;
+
+    $data = [
+        'comments'          => ['cid', 'ipaddress'],
+        'commentsumissions' => ['cid', 'ipaddress'],
+        'likes'             => ['lid', 'ipaddress'],
+        'sessions'          => ['sess_id', 'remote_ip'],
+        'speedlimit'        => ['id', 'ipaddress'],
+        'trackback'         => ['cid', 'ipaddress'],
+    ];
+
+    foreach ($data as $table => $pair) {
+        $primaryKeyColumn = $pair[0];
+        $ipColumn = $pair[1];
+
+        // Add 'seq' column
+        DB_query("ALTER TABLE $_TABLES[$table] ADD COLUMN seq INT NOT NULL DEFAULT 0");
+
+        // Collect primary ke values and IP addresses
+        $result = DB_query("SELECT $primaryKeyColumn, $ipColumn FROM $_TABLES[$table]");
+        $rows = [];
+
+        while (($A = DB_fetchArray($result, false)) != false) {
+            $rows[] = $A;
+        }
+
+        \Geeklog\IP::init($_TABLES['ip_addresses'], \Geeklog\IP::POLICY_NEVER_ANONYMIZE);
+
+        foreach ($rows as $row) {
+            $primaryKeyValue = $row[$primaryKeyColumn];
+            $ipAddress = $row[$ipColumn];
+
+            // Move IP addresses to 'ip_addresses' table
+            $seq = \Geeklog\IP::getSeq($ipAddress);
+
+            // Update 'seq' column
+            if ($table === 'sessions') {
+                DB_query("UPDATE $_TABLES[$table] SET seq = $seq WHERE $primaryKeyColumn = $primaryKeyValue");
+            } else {
+                $primaryKeyValue = DB_escapeString($primaryKeyValue);
+                DB_query("UPDATE $_TABLES[$table] SET seq = $seq WHERE $primaryKeyColumn = '$primaryKeyValue'");
+            }
+        }
+
+        // Drop key related to IP addresses
+        if ($table === 'speedlimit') {
+            DB_query("ALTER TABLE $_TABLES[$table] DROP KEY type_ipaddress");
+        }
+
+        // Drop column 'ipaddress'
+        DB_query("ALTER TABLE $_TABLES[$table] DROP COLUMN $ipColumn");
+    }
+
+    return true;
+}
diff --git a/sql/updates/pgsql_2.2.1_to_2.2.2.php b/sql/updates/pgsql_2.2.1_to_2.2.2.php
@@ -0,0 +1,93 @@
+<?php
+
+// *************************************
+// New 'ip_addresses' table
+$_SQL[] = "
+CREATE TABLE {$_TABLES['ip_addresses']} (
+  seq SERIAL,
+  ipaddress VARCHAR(39) NOT NULL DEFAULT '0.0.0.0',
+  created_at INT NOT NULL DEFAULT 0,
+  is_anonymized INT NOT NULL default 0,
+  PRIMARY KEY (seq)
+";
+
+/**
+ * Add/Edit/Delete config options for new version
+ */
+function update_ConfValuesFor222()
+{
+    global $_CONF, $_TABLES;
+
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+    $c = config::get_instance();
+    $me = 'Core';
+
+    // Add IP anonymization policy
+    $c->add('ip_anonymization',\Geeklog\IP::POLICY_NEVER_ANONYMIZE,'text',0,0,NULL,2070,TRUE, $me, 0);
+
+    return true;
+}
+
+/**
+ * Move IP addresses to the new 'ip_addresses' table
+ *
+ * @return bool
+ */
+function update_TablesContainingIPAddresses222()
+{
+    global $_TABLES;
+
+    $data = [
+        'comments'          => ['cid', 'ipaddress'],
+        'commentsumissions' => ['cid', 'ipaddress'],
+        'likes'             => ['lid', 'ipaddress'],
+        'sessions'          => ['sess_id', 'remote_ip'],
+        'speedlimit'        => ['id', 'ipaddress'],
+        'trackback'         => ['cid', 'ipaddress'],
+    ];
+
+    foreach ($data as $table => $pair) {
+        $primaryKeyColumn = $pair[0];
+        $ipColumn = $pair[1];
+
+        // Add 'seq' column
+        DB_query("ALTER TABLE $_TABLES[$table] ADD COLUMN seq INT NOT NULL DEFAULT 0");
+
+        // Collect primary ke values and IP addresses
+        $result = DB_query("SELECT $primaryKeyColumn, $ipColumn FROM $_TABLES[$table]");
+        $rows = [];
+
+        while (($A = DB_fetchArray($result, false)) != false) {
+            $rows[] = $A;
+        }
+
+        \Geeklog\IP::init($_TABLES['ip_addresses'], \Geeklog\IP::POLICY_NEVER_ANONYMIZE);
+
+        foreach ($rows as $row) {
+            $primaryKeyValue = $row[$primaryKeyColumn];
+            $ipAddress = $row[$ipColumn];
+
+            // Move IP addresses to 'ip_addresses' table
+            $seq = \Geeklog\IP::getSeq($ipAddress);
+
+            // Update 'seq' column
+            if ($table === 'sessions') {
+                DB_query("UPDATE $_TABLES[$table] SET seq = $seq WHERE $primaryKeyColumn = $primaryKeyValue");
+            } else {
+                $primaryKeyValue = DB_escapeString($primaryKeyValue);
+                DB_query("UPDATE $_TABLES[$table] SET seq = $seq WHERE $primaryKeyColumn = '$primaryKeyValue'");
+            }
+        }
+
+        // Drop index related to IP addresses
+        if ($table === 'speedlimit') {
+            DB_query("ALTER TABLE $_TABLES[$table] DROP INDEX {$_TABLES['speedlimit']}_type_ipaddress");
+        }
+
+        // Drop column 'ipaddress'
+        DB_query("ALTER TABLE $_TABLES[$table] DROP COLUMN $ipColumn");
+    }
+
+    return true;
+}