From: Gergő Tisza <tgr.huwiki@gmail.com>
Date: Fri, 12 Feb 2016 21:47:31 +0000 (-0800)
Subject: Log logouts
X-Git-Tag: 1.31.0-rc.0~6915^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=cb7d532818d6334df18f530844f3729bb140eceb;p=lhc%2Fweb%2Fwiklou.git

Log logouts

Not terribly useful but we log all other auth events so why not.

Bug: T125184
Change-Id: I636f0eb5e1e9ffc49023941801c7c286410514d8
---

diff --git a/includes/user/User.php b/includes/user/User.php
index 71023c08a4..ce2ac830f0 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -3859,6 +3859,7 @@ class User implements IDBAccessObject {
 		if ( !$session->canSetUser() ) {
 			\MediaWiki\Logger\LoggerFactory::getInstance( 'session' )
 				->warning( __METHOD__ . ": Cannot log out of an immutable session" );
+			$error = 'immutable';
 		} elseif ( !$session->getUser()->equals( $this ) ) {
 			\MediaWiki\Logger\LoggerFactory::getInstance( 'session' )
 				->warning( __METHOD__ .
@@ -3866,6 +3867,7 @@ class User implements IDBAccessObject {
 				);
 			// But we still may as well make this user object anon
 			$this->clearInstanceCache( 'defaults' );
+			$error = 'wronguser';
 		} else {
 			$this->clearInstanceCache( 'defaults' );
 			$delay = $session->delaySave();
@@ -3874,7 +3876,13 @@ class User implements IDBAccessObject {
 			$session->setUser( new User );
 			$session->set( 'wsUserID', 0 ); // Other code expects this
 			ScopedCallback::consume( $delay );
+			$error = false;
 		}
+		\MediaWiki\Logger\LoggerFactory::getInstance( 'authmanager' )->info( 'Logout', [
+			'event' => 'logout',
+			'successful' => $error === false,
+			'status' => $error ?: 'success',
+		] );
 	}
 
 	/**