Merge pull request #10910 from mrclay/10389_pw_salt

chore(schema): removes legacy salt/password columns
Elgg · Apr 13, 2017 · 617ebad · 617ebad
2 parents f48f6d5 + 0257070
commit 617ebad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/docs/guides/upgrading.rst b/docs/guides/upgrading.rst
@@ -170,6 +170,8 @@ Metastrings in the database have been denormalized for performance purposes. We
 metadata and annotation tables. You need to update your custom queries to reflect these changes. Also the ``msv`` and ``msn`` table aliases are no longer available.
 It is best practice not to rely on the table aliases used in core queries. If you need to use custom clauses you should do your own joins.
 
+From the "users_entity" table, the ``password`` and ``hash`` columns have been removed.
+
 Multi Site Changes
 ------------------
 

diff --git a/engine/lib/upgrades/2017041200-3.0.0-remove_old_pwd_cols-b65b19c86568068f.php b/engine/lib/upgrades/2017041200-3.0.0-remove_old_pwd_cols-b65b19c86568068f.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Elgg 3.0.0 upgrade 2017041200
+ *
+ * Removes old password/hash columns
+ */
+
+$db = elgg()->getDb();
+
+$db->updateData("
+	ALTER TABLE {$db->prefix}users_entity
+	DROP KEY `password`,
+	DROP COLUMN `password`,
+	DROP COLUMN `salt`
+");
diff --git a/engine/schema/mysql.sql b/engine/schema/mysql.sql
@@ -255,8 +255,6 @@ CREATE TABLE `prefix_users_entity` (
   `guid` bigint(20) unsigned NOT NULL,
   `name` text NOT NULL,
   `username` varchar(128) NOT NULL DEFAULT '',
-  `password` varchar(32) NOT NULL DEFAULT '' COMMENT 'Legacy password hashes',
-  `salt` varchar(8) NOT NULL DEFAULT '' COMMENT 'Legacy password salts',
   -- 255 chars is recommended by PHP.net to hold future hash formats
   `password_hash` varchar(255) NOT NULL DEFAULT '',
   `email` text NOT NULL,
@@ -269,7 +267,6 @@ CREATE TABLE `prefix_users_entity` (
   `prev_last_login` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`),
   UNIQUE KEY `username` (`username`),
-  KEY `password` (`password`),
   KEY `email` (`email`(50)),
   KEY `last_action` (`last_action`),
   KEY `last_login` (`last_login`),

diff --git a/version.php b/version.php
@@ -11,7 +11,7 @@
 
 // YYYYMMDD = Elgg Date
 // XX = Interim incrementer
-$version = 2016110900;
+$version = 2017041200;
 
 $composerJson = file_get_contents(dirname(__FILE__) . "/composer.json");
 if ($composerJson === false) {