summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2016-03-13 11:37:48 +0100
committerLukas Fleischer <lfleischer@archlinux.org>2016-03-13 11:47:30 +0100
commit32c8d0c3f837950518f886ed9baef00e98740049 (patch)
tree59200bcb746be355d649915f28626e24fecf998f
parent761952d424ded8848335116beef962c39c551bc4 (diff)
downloadaur-32c8d0c3f837950518f886ed9baef00e98740049.tar.gz
aur-32c8d0c3f837950518f886ed9baef00e98740049.tar.xz
Store last login address as plain text
Directly store the information contained in $_SERVER['REMOTE_ADDR'] instead of using ip2long() which does not support IPv6 addresses. Note that the LastLoginIPAddress field is designed to be used by the administrator on rare occasions only (e.g. to fight spam) and is not displayed anywhere. Fixes FS#48557. Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--schema/aur-schema.sql2
-rw-r--r--upgrading/4.2.1.txt5
-rw-r--r--web/lib/acctfuncs.inc.php4
3 files changed, 8 insertions, 3 deletions
diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql
index 1a141c14..aa5ed9da 100644
--- a/schema/aur-schema.sql
+++ b/schema/aur-schema.sql
@@ -35,7 +35,7 @@ CREATE TABLE Users (
IRCNick VARCHAR(32) NOT NULL DEFAULT '',
PGPKey VARCHAR(40) NULL DEFAULT NULL,
LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0,
- LastLoginIPAddress INTEGER UNSIGNED NOT NULL DEFAULT 0,
+ LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL,
InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0,
RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
CommentNotify TINYINT(1) NOT NULL DEFAULT 1,
diff --git a/upgrading/4.2.1.txt b/upgrading/4.2.1.txt
new file mode 100644
index 00000000..83c8d46a
--- /dev/null
+++ b/upgrading/4.2.1.txt
@@ -0,0 +1,5 @@
+1. Convert the LastLoginIPAddress column to VARCHAR(40):
+
+----
+ALTER TABLE Users MODIFY LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL;
+----
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index b39420fe..2d70f65f 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -554,8 +554,8 @@ function try_login() {
}
$q = "UPDATE Users SET LastLogin = UNIX_TIMESTAMP(), ";
- $q.= "LastLoginIPAddress = " . $dbh->quote(ip2long($_SERVER['REMOTE_ADDR'])) . " ";
- $q.= "WHERE ID = '$userID'";
+ $q.= "LastLoginIPAddress = " . $dbh->quote($_SERVER['REMOTE_ADDR']) . " ";
+ $q.= "WHERE ID = $userID";
$dbh->exec($q);
/* Set the SID cookie. */