Page MenuHomePhabricator
Files F15302726

D8748.diff
No OneTemporary
Actions

D8748.diff
View Options

diff --git a/resources/sql/autopatches/20140410.accountsecret.1.sql b/resources/sql/autopatches/20140410.accountsecret.1.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20140410.accountsecret.1.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_user.user
+ ADD accountSecret CHAR(64) NOT NULL COLLATE latin1_bin;
diff --git a/resources/sql/autopatches/20140410.accountsecret.2.php b/resources/sql/autopatches/20140410.accountsecret.2.php
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20140410.accountsecret.2.php
@@ -0,0 +1,23 @@
+<?php
+
+echo "Updating users...\n";
+
+
+foreach (new LiskMigrationIterator(new PhabricatorUser()) as $user) {
+
+ $id = $user->getID();
+ echo "Updating {$id}...\n";
+
+ if (strlen($user->getAccountSecret())) {
+ continue;
+ }
+
+ queryfx(
+ $user->establishConnection('w'),
+ 'UPDATE %T SET accountSecret = %s WHERE id = %d',
+ $user->getTableName(),
+ Filesystem::readRandomCharacters(64),
+ $id);
+}
+
+echo "Done.\n";
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -32,6 +32,8 @@
protected $isEmailVerified = 0;
protected $isApproved = 0;
+ protected $accountSecret;
+
private $profileImage = self::ATTACHABLE;
private $profile = null;
private $status = self::ATTACHABLE;
@@ -157,6 +159,11 @@
if (!$this->getConduitCertificate()) {
$this->setConduitCertificate($this->generateConduitCertificate());
}
+
+ if (!strlen($this->getAccountSecret())) {
+ $this->setAccountSecret(Filesystem::readRandomCharacters(64));
+ }
+
$result = parent::save();
if ($this->profile) {
@@ -305,7 +312,7 @@
private function generateToken($epoch, $frequency, $key, $len) {
if ($this->getPHID()) {
- $vec = $this->getPHID().$this->getPasswordHash();
+ $vec = $this->getPHID().$this->getAccountSecret();
} else {
$vec = $this->getAlternateCSRFString();
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 6, 8:44 PM (11 h, 26 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7309111
Default Alt Text
D8748.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility