Search result deleted by HaloACL
'; + } + + } + } +/*op-patch|TS|2014-09-30|end*/ $result = $matches->next(); } $out .= "\n"; --- includes/specials/SpecialWatchlist.php 2014-12-17 21:11:53.000000000 +0100 +++ includes/specials/SpecialWatchlist.php 2015-03-22 15:16:45.045067856 +0100 @@ -359,6 +359,12 @@ foreach ( $rows as $obj ) { # Make RC entry $rc = RecentChange::newFromRow( $obj ); + /*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ + // See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + if (!$rc->getTitle()->userCanReadEx()) { + continue; + } + /*op-patch|TS|2014-09-30|end*/ $rc->counter = $counter++; if ( $this->getConfig()->get( 'ShowUpdatedMarker' ) ) { --- includes/specials/SpecialWhatlinkshere.php 2014-12-17 21:11:53.000000000 +0100 +++ includes/specials/SpecialWhatlinkshere.php 2015-03-22 15:16:45.101068132 +0100 @@ -272,6 +272,12 @@ $out->addHTML( $this->listStart( $level ) ); foreach ( $rows as $row ) { $nt = Title::makeTitle( $row->page_namespace, $row->page_title ); +/*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ +// See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + if (!$nt->userCanReadEx()) { + continue; + } +/*op-patch|TS|2014-09-30|end*/ if ( $row->rd_from && $level < 2 ) { $out->addHTML( $this->listItem( $row, $nt, $target, true ) ); --- includes/Title.php 2014-12-17 21:11:53.000000000 +0100 +++ includes/Title.php 2015-03-22 15:16:45.257068906 +0100 @@ -227,9 +227,15 @@ public static function newFromDBkey( $key ) { $t = new Title(); $t->mDbkeyform = $key; - if ( $t->secureAndSplit() ) { - return $t; - } else { + if( $t->secureAndSplit() ) { + /*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ + // See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + return $t->checkAccessControl(); + } + /*op-patch|TS|2014-09-30|end*/ + //Replaced by patch return $t; + + else { return null; } } @@ -291,7 +297,11 @@ if ( $defaultNamespace == NS_MAIN ) { $cache->set( $text, $t ); } - return $t; +/*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ +// See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + return $t->checkAccessControl(); +/*op-patch|TS|2014-09-30|end*/ +// Preplaced by patch return $t; } else { return null; } @@ -324,7 +334,11 @@ $t->mDbkeyform = str_replace( ' ', '_', $url ); if ( $t->secureAndSplit() ) { - return $t; +/*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ +// See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + return $t->checkAccessControl(); +/*op-patch|TS|2014-09-30|end*/ +// Preplaced by patch return $t; } else { return null; } @@ -483,7 +497,12 @@ $t->mUrlform = wfUrlencode( $t->mDbkeyform ); $t->mTextform = str_replace( '_', ' ', $title ); $t->mContentModel = false; # initialized lazily in getContentModel() +/*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ +// See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + $t = $t->checkAccessControl(); return $t; ++/*op-patch|TS|2014-09-30|end*/ ++// Preplaced by patch return $t; } /** @@ -505,7 +524,11 @@ $t = new Title(); $t->mDbkeyform = Title::makeName( $ns, $title, $fragment, $interwiki ); if ( $t->secureAndSplit() ) { - return $t; +/*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ +// See http://dmwiki.ontoprise.com:8888/dmwiki/index.php/SafeTitle + return $t->checkAccessControl(); +/*op-patch|TS|2014-09-30|end*/ +// Preplaced by patch return $t; } else { return null; } @@ -1175,6 +1198,29 @@ return $result; } + /*op-patch|TS|2012-02-24|HaloACL|HaloACLMemcache|start*/ + // See http://dmwiki.ontoprise.com/index.php/HaloACLMemcache + public function userCanRead() { + if (!defined('HACL_HALOACL_VERSION')) { + //HaloACL is disabled + return $this->userCanReadOrig(); + } + + global $wgUser; + $hmc = HACLMemcache::getInstance(); + $allowed = $hmc->retrievePermission($wgUser, $this, 'read'); + if ($allowed === -1) { + $allowed = $this->userCanReadOrig(); + $hmc->storePermission($wgUser, $this, 'read', $allowed); + } + return $allowed; + } + + public function userCanReadOrig() { + wfDeprecated( __METHOD__, '1.19' ); + return $this->userCan( 'read' ); + } + /** * Is this the mainpage? * @note Title::newFromText seems to be sufficiently optimized by the title @@ -1511,6 +1557,23 @@ return implode( '/', $parts ); } +/*op-patch|TS|2012-02-24|HaloACL|HaloACLMemcache|start*/ + public function userCanOrig($action, $doExpensiveQueries = true) { + if (!defined('HACL_HALOACL_VERSION')) { + //HaloACL is disabled + return $this->userCanOrig($action, $doExpensiveQueries); + } + + global $wgUser; + $hmc = HACLMemcache::getInstance(); + $allowed = $hmc->retrievePermission($wgUser, $this, $action); + if ($allowed === -1) { + $allowed = $this->userCanOrig($action, $doExpensiveQueries); + $hmc->storePermission($wgUser, $this, $action, $allowed); + } + return $allowed; + } + /** * Get the base page name title, i.e. the part before the subpage name * @@ -2364,7 +2427,7 @@ # If it's a special page, ditch the subpage bit and check again $name = $this->getDBkey(); list( $name, /* $subpage */ ) = SpecialPageFactory::resolveAlias( $name ); - if ( $name ) { + if ( !is_null($name) ) { $pure = SpecialPage::getTitleFor( $name )->getPrefixedText(); if ( in_array( $pure, $wgWhitelistRead, true ) ) { $whitelisted = true; @@ -2384,6 +2447,8 @@ } } + wfRunHooks( 'userCan', array( &$this, &$user, $action, &$whitelisted ) ); + if ( !$whitelisted ) { # If the title is not whitelisted, give extensions a chance to do so... wfRunHooks( 'TitleReadWhitelist', array( $this, $user, &$whitelisted ) ); @@ -4338,6 +4403,99 @@ return $exists; } +/*op-patch|TS|2014-09-30|HaloACL|SafeTitle|start*/ + + + /** + * This function is called from the patches for HaloACL for secure listings + * (e.g. Spcecial:AllPages). It checks, whether the current user is allowed + * to read the article for this title object. For normal pages this is + * evaluate in the method