From 8494a7cb91a444de2b8770fc34593598180ff99e Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 8 Feb 2021 17:35:26 +0100
Subject: [PATCH] Log user authentication failure type (#3950)

See #3395
---
 .../files/acp/templates/userAuthenticationFailureList.tpl   | 6 ++++++
 .../install/files/acp/update_com.woltlab.wcf_5.4_db.php     | 6 ++++++
 wcfsetup/install/files/lib/acp/form/LoginForm.class.php     | 1 +
 .../install/files/lib/acp/form/RescueModeForm.class.php     | 1 +
 wcfsetup/install/lang/de.xml                                | 3 +++
 wcfsetup/install/lang/en.xml                                | 3 +++
 wcfsetup/setup/db/install.sql                               | 1 +
 7 files changed, 21 insertions(+)

diff --git a/wcfsetup/install/files/acp/templates/userAuthenticationFailureList.tpl b/wcfsetup/install/files/acp/templates/userAuthenticationFailureList.tpl
index 9536cc01ee..cddec7e82e 100644
--- a/wcfsetup/install/files/acp/templates/userAuthenticationFailureList.tpl
+++ b/wcfsetup/install/files/acp/templates/userAuthenticationFailureList.tpl
@@ -29,6 +29,7 @@
 					<th class="columnText columnEnvironment{if $sortField == 'environment'} active {@$sortOrder}{/if}"><a href="{link controller='UserAuthenticationFailureList'}pageNo={@$pageNo}&sortField=environment&sortOrder={if $sortField == 'environment' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.authentication.failure.environment{/lang}</a></th>
 					<th class="columnTitle columnUsername{if $sortField == 'username'} active {@$sortOrder}{/if}"><a href="{link controller='UserAuthenticationFailureList'}pageNo={@$pageNo}&sortField=username&sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.user.username{/lang}</a></th>
 					<th class="columnDate columnTime{if $sortField == 'time'} active {@$sortOrder}{/if}"><a href="{link controller='UserAuthenticationFailureList'}pageNo={@$pageNo}&sortField=time&sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.authentication.failure.time{/lang}</a></th>
+					<th class="columnText columnValidationError{if $sortField === 'validationError'} active {@$sortOrder}{/if}"><a href="{link controller='UserAuthenticationFailureList'}pageNo={@$pageNo}&sortField=validationError&sortOrder={if $sortField === 'validationError' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.authentication.failure.validationError{/lang}</a></th>
 					<th class="columnURL columnIpAddress{if $sortField == 'ipAddress'} active {@$sortOrder}{/if}"><a href="{link controller='UserAuthenticationFailureList'}pageNo={@$pageNo}&sortField=ipAddress&sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.user.ipAddress{/lang}</a></th>
 					<th class="columnText columnUserAgent{if $sortField == 'userAgent'} active {@$sortOrder}{/if}"><a href="{link controller='UserAuthenticationFailureList'}pageNo={@$pageNo}&sortField=userAgent&sortOrder={if $sortField == 'userAgent' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.user.userAgent{/lang}</a></th>
 					
@@ -46,6 +47,11 @@
 							{if $authenticationFailure->userID}<a href="{link controller='UserEdit' id=$authenticationFailure->userID}{/link}">{$authenticationFailure->username}</a>{else}{$authenticationFailure->username}{/if}
 						</td>
 						<td class="columnDate columnTime">{@$authenticationFailure->time|time}</td>
+						<td class="columnText columnValidationError">
+							{if $authenticationFailure->validationError}
+								{lang}wcf.acp.user.authentication.failure.validationError.{$authenticationFailure->validationError}{/lang}
+							{/if}
+						</td>
 						<td class="columnSmallText columnIpAddress">{$authenticationFailure->getIpAddress()}</td>
 						<td class="columnSmallText columnUserAgent" title="{$authenticationFailure->userAgent}">{$authenticationFailure->userAgent|truncate:75|tableWordwrap}</td>
 						
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
index 2fdd9ca351..64f65a1d6f 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
@@ -74,6 +74,12 @@ $tables = [
             DefaultFalseBooleanDatabaseTableColumn::create('multifactorActive'),
         ]),
 
+    PartialDatabaseTable::create('wcf1_user_authentication_failure')
+        ->columns([
+            NotNullVarchar255DatabaseTableColumn::create('validationError')
+                ->defaultValue(''),
+        ]),
+
     PartialDatabaseTable::create('wcf1_user_avatar')
         ->columns([
             DefaultFalseBooleanDatabaseTableColumn::create("hasWebP"),
diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
index 4aae8934e2..7d36887dec 100755
--- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
@@ -173,6 +173,7 @@ class LoginForm extends AbstractCaptchaForm
                         'time' => TIME_NOW,
                         'ipAddress' => UserUtil::getIpAddress(),
                         'userAgent' => UserUtil::getUserAgent(),
+                        'validationError' => 'invalid' . \ucfirst($this->errorField),
                     ],
                 ]);
                 $action->executeAction();
diff --git a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
index a2701649d3..d8d102b0fa 100644
--- a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
@@ -261,6 +261,7 @@ class RescueModeForm extends AbstractCaptchaForm
                         'time' => TIME_NOW,
                         'ipAddress' => UserUtil::getIpAddress(),
                         'userAgent' => UserUtil::getUserAgent(),
+                        'validationError' => 'invalid' . \ucfirst($this->errorField),
                     ],
                 ]);
                 $action->executeAction();
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 4c1deaddee..f3237fbfc7 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3215,6 +3215,9 @@ aus Sicherheitsgründen erforderlich, dass {if LANGUAGE_USE_INFORMAL_VARIANT}du{
 		<item name="wcf.acp.user.authentication.failure.time"><![CDATA[Datum]]></item>
 		<item name="wcf.acp.user.authentication.failure.password"><![CDATA[Ungültiges Kennwort]]></item>
 		<item name="wcf.acp.user.authentication.failure.username"><![CDATA[Unbekannter Benutzername]]></item>
+		<item name="wcf.acp.user.authentication.failure.validationError"><![CDATA[Fehler]]></item>
+		<item name="wcf.acp.user.authentication.failure.validationError.invalidPassword"><![CDATA[Falsches Passwort]]></item>
+		<item name="wcf.acp.user.authentication.failure.validationError.invalidUsername"><![CDATA[Unbekannter Benutzer]]></item>
 		<item name="wcf.acp.user.activation.mail.subject"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto auf der Website: {@PAGE_TITLE|language} wurde freigeschaltet]]></item>
 		<item name="wcf.acp.user.activation.mail.html.headline"><![CDATA[Hallo {$mailbox->getUser()->username},]]></item>
 		<item name="wcf.acp.user.activation.mail.html.text"><![CDATA[
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c9ac9e208f..f0814b1533 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3139,6 +3139,9 @@ the lost password form <a href="{link controller='LostPassword' isHtmlEmail=true
 		<item name="wcf.acp.user.authentication.failure.time"><![CDATA[Date]]></item>
 		<item name="wcf.acp.user.authentication.failure.password"><![CDATA[Invalid Password]]></item>
 		<item name="wcf.acp.user.authentication.failure.username"><![CDATA[Unknown Username]]></item>
+		<item name="wcf.acp.user.authentication.failure.validationError"><![CDATA[Error]]></item>
+		<item name="wcf.acp.user.authentication.failure.validationError.invalidPassword"><![CDATA[Incorrect password]]></item>
+		<item name="wcf.acp.user.authentication.failure.validationError.invalidUsername"><![CDATA[Unknown user]]></item>
 		<item name="wcf.acp.user.activation.mail.subject"><![CDATA[Your account on the website: {@PAGE_TITLE|language} has been approved]]></item>
 		<item name="wcf.acp.user.activation.mail.html.headline"><![CDATA[Dear {$mailbox->getUser()->username},]]></item>
 		<item name="wcf.acp.user.activation.mail.html.text"><![CDATA[
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index a252feb21f..c035d5d883 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1532,6 +1532,7 @@ CREATE TABLE wcf1_user_authentication_failure (
 	time INT(10) NOT NULL DEFAULT 0,
 	ipAddress VARCHAR(39) NOT NULL DEFAULT '',
 	userAgent VARCHAR(255) NOT NULL DEFAULT '',
+	validationError VARCHAR(255) NOT NULL DEFAULT '',
 	KEY (ipAddress, time),
 	KEY (time)
 );
-- 
2.20.1