68c433bd23
Migrate all callers of Hooks::run() to use the new HookContainer/HookRunner system. General principles: * Use DI if it is already used. We're not changing the way state is managed in this patch. * HookContainer is always injected, not HookRunner. HookContainer is a service, it's a more generic interface, it is the only thing that provides isRegistered() which is needed in some cases, and a HookRunner can be efficiently constructed from it (confirmed by benchmark). Because HookContainer is needed for object construction, it is also needed by all factories. * "Ask your friendly local base class". Big hierarchies like SpecialPage and ApiBase have getHookContainer() and getHookRunner() methods in the base class, and classes that extend that base class are not expected to know or care where the base class gets its HookContainer from. * ProtectedHookAccessorTrait provides protected getHookContainer() and getHookRunner() methods, getting them from the global service container. The point of this is to ease migration to DI by ensuring that call sites ask their local friendly base class rather than getting a HookRunner from the service container directly. * Private $this->hookRunner. In some smaller classes where accessor methods did not seem warranted, there is a private HookRunner property which is accessed directly. Very rarely (two cases), there is a protected property, for consistency with code that conventionally assumes protected=private, but in cases where the class might actually be overridden, a protected accessor is preferred over a protected property. * The last resort: Hooks::runner(). Mostly for static, file-scope and global code. In a few cases it was used for objects with broken construction schemes, out of horror or laziness. Constructors with new required arguments: * AuthManager * BadFileLookup * BlockManager * ClassicInterwikiLookup * ContentHandlerFactory * ContentSecurityPolicy * DefaultOptionsManager * DerivedPageDataUpdater * FullSearchResultWidget * HtmlCacheUpdater * LanguageFactory * LanguageNameUtils * LinkRenderer * LinkRendererFactory * LocalisationCache * MagicWordFactory * MessageCache * NamespaceInfo * PageEditStash * PageHandlerFactory * PageUpdater * ParserFactory * PermissionManager * RevisionStore * RevisionStoreFactory * SearchEngineConfig * SearchEngineFactory * SearchFormWidget * SearchNearMatcher * SessionBackend * SpecialPageFactory * UserNameUtils * UserOptionsManager * WatchedItemQueryService * WatchedItemStore Constructors with new optional arguments: * DefaultPreferencesFactory * Language * LinkHolderArray * MovePage * Parser * ParserCache * PasswordReset * Router setHookContainer() now required after construction: * AuthenticationProvider * ResourceLoaderModule * SearchEngine Change-Id: Id442b0dbe43aba84bd5cf801d86dedc768b082c7
85 lines
2.1 KiB
PHP
85 lines
2.1 KiB
PHP
<?php
|
|
|
|
/**
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
* @file
|
|
*/
|
|
|
|
use Wikimedia\IPSet;
|
|
|
|
/**
|
|
* @since 1.28
|
|
*/
|
|
class ProxyLookup {
|
|
|
|
/**
|
|
* @var string[]
|
|
*/
|
|
private $proxyServers;
|
|
|
|
/**
|
|
* @var string[]
|
|
*/
|
|
private $proxyServersComplex;
|
|
|
|
/**
|
|
* @var IPSet|null
|
|
*/
|
|
private $proxyIPSet;
|
|
|
|
/**
|
|
* @param string[] $proxyServers Simple list of IPs
|
|
* @param string[] $proxyServersComplex Complex list of IPs/ranges
|
|
*/
|
|
public function __construct( $proxyServers, $proxyServersComplex ) {
|
|
$this->proxyServers = $proxyServers;
|
|
$this->proxyServersComplex = $proxyServersComplex;
|
|
}
|
|
|
|
/**
|
|
* Checks if an IP matches a proxy we've configured
|
|
*
|
|
* @param string $ip
|
|
* @return bool
|
|
*/
|
|
public function isConfiguredProxy( $ip ) {
|
|
// Quick check of known singular proxy servers
|
|
if ( in_array( $ip, $this->proxyServers, true ) ) {
|
|
return true;
|
|
}
|
|
|
|
// Check against addresses and CIDR nets in the complex list
|
|
if ( !$this->proxyIPSet ) {
|
|
$this->proxyIPSet = new IPSet( $this->proxyServersComplex );
|
|
}
|
|
return $this->proxyIPSet->match( $ip );
|
|
}
|
|
|
|
/**
|
|
* Checks if an IP is a trusted proxy provider.
|
|
* Useful to tell if X-Forwarded-For data is possibly bogus.
|
|
* CDN cache servers for the site are whitelisted.
|
|
*
|
|
* @param string $ip
|
|
* @return bool
|
|
*/
|
|
public function isTrustedProxy( $ip ) {
|
|
$trusted = $this->isConfiguredProxy( $ip );
|
|
Hooks::runner()->onIsTrustedProxy( $ip, $trusted );
|
|
return $trusted;
|
|
}
|
|
}
|