[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[wmf/1.28.0-wmf.15]: Let abusefilter-modify users see history of hidden filters

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/305596

Change subject: Let abusefilter-modify users see history of hidden filters
......................................................................

Let abusefilter-modify users see history of hidden filters

d0439337 (I9e15326c) made abusefilter-view-private required
even for users with abusefilter-modify that can see and
change private filters.

Bug: T143365
Change-Id: I401effc5f1e429b5ec12c7f48dcc00ada74eafb6
(cherry picked from commit bb277d437ef79f7cc4a1b57718697479bfa89a77)
---
M Views/AbuseFilterViewDiff.php
M Views/AbuseFilterViewHistory.php
2 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/96/305596/1

diff --git a/Views/AbuseFilterViewDiff.php b/Views/AbuseFilterViewDiff.php
index b0361c0..b43d8a0 100644
--- a/Views/AbuseFilterViewDiff.php
+++ b/Views/AbuseFilterViewDiff.php
@@ -100,7 +100,7 @@
                $this->mFilter = $this->mParams[1];
 
                if ( AbuseFilter::filterHidden( $this->mFilter )
-                       && !$this->getUser()->isAllowed( 
'abusefilter-view-private' )
+                       && !$this->getUser()->isAllowedAny( array( 
'abusefilter-modify', 'abusefilter-view-private' ) )
                ) {
                        $this->getOutput()->addWikiMsg( 
'abusefilter-history-error-hidden' );
                        return false;
diff --git a/Views/AbuseFilterViewHistory.php b/Views/AbuseFilterViewHistory.php
index 82e18bf..c000485 100644
--- a/Views/AbuseFilterViewHistory.php
+++ b/Views/AbuseFilterViewHistory.php
@@ -16,9 +16,9 @@
                        $out->setPageTitle( $this->msg( 
'abusefilter-filter-log' ) );
                }
 
-               # Check perms
+               # Check perms. abusefilter-modify is a superset of 
abusefilter-view-private
                if ( $filter && AbuseFilter::filterHidden( $filter )
-                       && !$this->getUser()->isAllowed( 
'abusefilter-view-private' )
+                       && !$this->getUser()->isAllowedAny( array( 
'abusefilter-modify', 'abusefilter-view-private' ) )
                ) {
                        $out->addWikiMsg( 'abusefilter-history-error-hidden' );
                        return;
@@ -234,7 +234,9 @@
                        $info['conds']['afh_filter'] = $this->mFilter;
                }
 
-               if ( !$this->getUser()->isAllowed( 'abusefilter-view-private' ) 
) {
+               if ( !$this->getUser()->isAllowedAny(
+                       array( 'abusefilter-modify', 'abusefilter-view-private' 
) )
+               ) {
                        // Hide data the user can't see.
                        $info['conds']['af_hidden'] = 0;
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/305596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I401effc5f1e429b5ec12c7f48dcc00ada74eafb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: wmf/1.28.0-wmf.15
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Platonides <platoni...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits