T180488-REL1_29.patch
No One
Actions

Authored By

	Bawolff
	Nov 14 2017, 7:01 PM

Size

1 KB

Referenced Files

None

Subscribers

None

T180488-REL1_29.patch
View Options

	From 97ed34ae8f7bd1541d1ae3378e4120f1d3e31f9e Mon Sep 17 00:00:00 2001
	From: Brad Jorsch <bjorsch@wikimedia.org>
	Date: Tue, 14 Nov 2017 11:17:02 -0500
	Subject: [PATCH] SECURITY: Fix rebase error in 4d38a489

	The fix for T125177 from F4932228 was incorrectly rebased when it was
	applied to master as 4d38a489, causing the bug to not actually be fixed.

	Bug: T180488
	Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
	---
	includes/api/ApiBase.php \| 6 +++---
	1 file changed, 3 insertions(+), 3 deletions(-)

	diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
	index a6c4b2a..eabcad3 100644
	--- a/includes/api/ApiBase.php
	+++ b/includes/api/ApiBase.php
	@@ -1039,10 +1039,10 @@ abstract class ApiBase extends ContextSource {
	} else {
	$type = 'NULL'; // allow everything
	}
	+ }

	- if ( $type == 'password' \|\| !empty( $paramSettings[self::PARAM_SENSITIVE] ) ) {
	- $this->getMain()->markParamsSensitive( $encParamName );
	- }
	+ if ( $type == 'password' \|\| !empty( $paramSettings[self::PARAM_SENSITIVE] ) ) {
	+ $this->getMain()->markParamsSensitive( $encParamName );
	}

	if ( $type == 'boolean' ) {
	--
	1.9.5 (Apple Git-50.3)

Attached To	Mode
T168823: Tracking bug for 1.27.4/1.28.3/1.29.2 security releases	Attached	Detach File
T180488: api.log still contains passwords in plaintext due to a rebase error in 4d38a489	Attached	Detach File