abstract class Installer {
// This is the absolute minimum PHP version we can support
- const MINIMUM_PHP_VERSION = '5.2.0';
+ const MINIMUM_PHP_VERSION = '5.2.3';
/**
* @var array
'postgres',
'oracle',
'sqlite',
+ 'ibm_db2',
);
/**
'envCheckCache',
'envCheckDiff3',
'envCheckGraphics',
+ 'envCheckServer',
'envCheckPath',
'envCheckExtension',
'envCheckShellLocale',
'envCheckUploadsDirectory',
- 'envCheckLibicu'
+ 'envCheckLibicu',
+ 'envCheckSuhosinMaxValueLength',
);
/**
'wgDiff3',
'wgImageMagickConvertCommand',
'IP',
+ 'wgServer',
'wgScriptPath',
'wgScriptExtension',
'wgMetaNamespace',
'wgUseInstantCommons',
'wgUpgradeKey',
'wgDefaultSkin',
+ 'wgResourceLoaderMaxQueryLength',
);
/**
'_UpgradeDone' => false,
'_InstallDone' => false,
'_Caches' => array(),
- '_InstallUser' => 'root',
'_InstallPassword' => '',
'_SameAccount' => true,
'_CreateDBAccount' => false,
* @var array
*/
public $licenses = array(
+ 'cc-by' => array(
+ 'url' => 'http://creativecommons.org/licenses/by/3.0/',
+ 'icon' => '{$wgStylePath}/common/images/cc-by.png',
+ ),
'cc-by-sa' => array(
'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
'icon' => '{$wgStylePath}/common/images/cc-by-sa.png',
'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
'icon' => '{$wgStylePath}/common/images/cc-by-nc-sa.png',
),
+ 'cc-0' => array(
+ 'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
+ 'icon' => '{$wgStylePath}/common/images/cc-0.png',
+ ),
'pd' => array(
- 'url' => 'http://creativecommons.org/licenses/publicdomain/',
+ 'url' => '',
'icon' => '{$wgStylePath}/common/images/public-domain.png',
),
- 'gfdl-old' => array(
- 'url' => 'http://www.gnu.org/licenses/old-licenses/fdl-1.2.html',
- 'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
- ),
- 'gfdl-current' => array(
+ 'gfdl' => array(
'url' => 'http://www.gnu.org/copyleft/fdl.html',
'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
),
*/
public abstract function showMessage( $msg /*, ... */ );
+ /**
+ * Same as showMessage(), but for displaying errors
+ */
+ public abstract function showError( $msg /*, ... */ );
+
/**
* Show a message to the installing user by using a Status object
* @param $status Status
* Constructor, always call this from child classes.
*/
public function __construct() {
- global $wgExtensionMessagesFiles, $wgUser, $wgHooks;
+ global $wgExtensionMessagesFiles, $wgUser;
// Disable the i18n cache and LoadBalancer
Language::getLocalisationCache()->disableBackend();
// Having a user with id = 0 safeguards us from DB access via User::loadOptions().
$wgUser = User::newFromId( 0 );
- // Set our custom <doclink> hook.
- $wgHooks['ParserFirstCallInit'][] = array( $this, 'registerDocLink' );
-
$this->settings = $this->internalDefaults;
foreach ( $this->defaultVarNames as $var ) {
/**
* Get a list of known DB types.
+ *
+ * @return array
*/
public static function getDBTypes() {
return self::$dbTypes;
*
* @return Array
*/
- public function getExistingLocalSettings() {
+ public static function getExistingLocalSettings() {
global $IP;
wfSuppressWarnings();
return $html;
}
+ /**
+ * @return ParserOptions
+ */
public function getParserOptions() {
return $this->parserOptions;
}
/**
* Install step which adds a row to the site_stats table with appropriate
* initial values.
+ *
+ * @param $installer DatabaseInstaller
+ *
+ * @return Status
*/
public function populateSiteStats( DatabaseInstaller $installer ) {
$status = $installer->getConnection();
$allNames = array();
foreach ( self::getDBTypes() as $name ) {
- $db = $this->getDBInstaller( $name );
- $readableName = wfMsg( 'config-type-' . $name );
-
- if ( $db->isCompiled() ) {
+ if ( $this->getDBInstaller( $name )->isCompiled() ) {
$compiledDBs[] = $name;
}
- $allNames[] = $readableName;
+ $allNames[] = wfMsg( 'config-type-' . $name );
}
$this->setVar( '_CompiledDBs', $compiledDBs );
if ( !$compiledDBs ) {
- $this->showMessage( 'config-no-db' );
- // FIXME: this only works for the web installer!
- $this->showHelpBox( 'config-no-db-help', $wgLang->commaList( $allNames ) );
+ $this->showError( 'config-no-db', $wgLang->commaList( $allNames ) );
+ // @todo FIXME: This only works for the web installer!
return false;
}
// Check for FTS3 full-text search module
$sqlite = $this->getDBInstaller( 'sqlite' );
if ( $sqlite->isCompiled() ) {
- $db = new DatabaseSqliteStandalone( ':memory:' );
- if( $db->getFulltextSearchModule() != 'FTS3' ) {
+ if( DatabaseSqlite::getFulltextSearchModule() != 'FTS3' ) {
$this->showMessage( 'config-no-fts3' );
}
}
protected function envCheckBrokenXML() {
$test = new PhpXmlBugTester();
if ( !$test->ok ) {
- $this->showMessage( 'config-brokenlibxml' );
+ $this->showError( 'config-brokenlibxml' );
return false;
}
}
$test = new PhpRefCallBugTester;
$test->execute();
if ( !$test->ok ) {
- $this->showMessage( 'config-using531', phpversion() );
+ $this->showError( 'config-using531', phpversion() );
return false;
}
}
*/
protected function envCheckMagicQuotes() {
if( wfIniGetBool( "magic_quotes_runtime" ) ) {
- $this->showMessage( 'config-magic-quotes-runtime' );
+ $this->showError( 'config-magic-quotes-runtime' );
return false;
}
}
*/
protected function envCheckMagicSybase() {
if ( wfIniGetBool( 'magic_quotes_sybase' ) ) {
- $this->showMessage( 'config-magic-quotes-sybase' );
+ $this->showError( 'config-magic-quotes-sybase' );
return false;
}
}
*/
protected function envCheckMbstring() {
if ( wfIniGetBool( 'mbstring.func_overload' ) ) {
- $this->showMessage( 'config-mbstring' );
+ $this->showError( 'config-mbstring' );
return false;
}
}
*/
protected function envCheckZE1() {
if ( wfIniGetBool( 'zend.ze1_compatibility_mode' ) ) {
- $this->showMessage( 'config-ze1' );
+ $this->showError( 'config-ze1' );
return false;
}
}
*/
protected function envCheckXML() {
if ( !function_exists( "utf8_encode" ) ) {
- $this->showMessage( 'config-xml-bad' );
+ $this->showError( 'config-xml-bad' );
return false;
}
}
*/
protected function envCheckPCRE() {
if ( !function_exists( 'preg_match' ) ) {
- $this->showMessage( 'config-pcre' );
+ $this->showError( 'config-pcre' );
return false;
}
wfSuppressWarnings();
$regexd = preg_replace( '/[\x{0430}-\x{04FF}]/iu', '', '-АБВГД-' );
wfRestoreWarnings();
if ( $regexd != '--' ) {
- $this->showMessage( 'config-pcre-no-utf8' );
+ $this->showError( 'config-pcre-no-utf8' );
return false;
}
}
$names = array( wfIsWindows() ? 'convert.exe' : 'convert' );
$convert = self::locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) );
+ $this->setVar( 'wgImageMagickConvertCommand', '' );
if ( $convert ) {
$this->setVar( 'wgImageMagickConvertCommand', $convert );
$this->showMessage( 'config-imagemagick', $convert );
$this->showMessage( 'config-gd' );
return true;
} else {
- $this->showMessage( 'no-scaling' );
+ $this->showMessage( 'config-no-scaling' );
}
}
+ /**
+ * Environment check for the server hostname.
+ */
+ protected function envCheckServer() {
+ $server = WebRequest::detectServer();
+ $this->showMessage( 'config-using-server', $server );
+ $this->setVar( 'wgServer', $server );
+ }
+
/**
* Environment check for setting $IP and $wgScriptPath.
*/
// PHP_SELF isn't available sometimes, such as when PHP is CGI but
// cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME
// to get the path to the current script... hopefully it's reliable. SIGH
- if ( !empty( $_SERVER['PHP_SELF'] ) ) {
+ if ( $this->getVar( 'wgScriptPath' ) ) {
+ // Some kind soul has set it for us already (e.g. debconf)
+ return true;
+ } elseif ( !empty( $_SERVER['PHP_SELF'] ) ) {
$path = $_SERVER['PHP_SELF'];
} elseif ( !empty( $_SERVER['SCRIPT_NAME'] ) ) {
$path = $_SERVER['SCRIPT_NAME'];
- } elseif ( $this->getVar( 'wgScriptPath' ) ) {
- // Some kind soul has set it for us already (e.g. debconf)
return true;
} else {
- $this->showMessage( 'config-no-uri' );
+ $this->showError( 'config-no-uri' );
return false;
}
* Environment check for setting the preferred PHP file extension.
*/
protected function envCheckExtension() {
- // FIXME: detect this properly
+ // @todo FIXME: Detect this properly
if ( defined( 'MW_INSTALL_PHP5_EXT' ) ) {
$ext = 'php5';
} else {
* TODO: document
*/
protected function envCheckUploadsDirectory() {
- global $IP, $wgServer;
+ global $IP;
$dir = $IP . '/images/';
- $url = $wgServer . $this->getVar( 'wgScriptPath' ) . '/images/';
+ $url = $this->getVar( 'wgServer' ) . $this->getVar( 'wgScriptPath' ) . '/images/';
$safe = !$this->dirIsExecutable( $dir, $url );
if ( $safe ) {
}
}
+ /**
+ * Checks if suhosin.get.max_value_length is set, and if so, sets
+ * $wgResourceLoaderMaxQueryLength to that value in the generated
+ * LocalSettings file
+ */
+ protected function envCheckSuhosinMaxValueLength() {
+ $maxValueLength = ini_get( 'suhosin.get.max_value_length' );
+ if ( $maxValueLength > 0 ) {
+ $this->showMessage( 'config-suhosin-max-value-length', $maxValueLength );
+ } else {
+ $maxValueLength = -1;
+ }
+ $this->setVar( 'wgResourceLoaderMaxQueryLength', $maxValueLength );
+ }
+
/**
* Convert a hex string representing a Unicode code point to that code point.
* @param $c String
$c = hexdec($c);
if ($c <= 0x7F) {
return chr($c);
- } else if ($c <= 0x7FF) {
+ } elseif ($c <= 0x7FF) {
return chr(0xC0 | $c >> 6) . chr(0x80 | $c & 0x3F);
- } else if ($c <= 0xFFFF) {
+ } elseif ($c <= 0xFFFF) {
return chr(0xE0 | $c >> 12) . chr(0x80 | $c >> 6 & 0x3F)
. chr(0x80 | $c & 0x3F);
- } else if ($c <= 0x10FFFF) {
+ } elseif ($c <= 0x10FFFF) {
return chr(0xF0 | $c >> 18) . chr(0x80 | $c >> 12 & 0x3F)
. chr(0x80 | $c >> 6 & 0x3F)
. chr(0x80 | $c & 0x3F);
break;
}
- $text = Http::get( $url . $file, array( 'timeout' => 3 ) );
+ try {
+ $text = Http::get( $url . $file, array( 'timeout' => 3 ) );
+ }
+ catch( MWException $e ) {
+ // Http::get throws with allow_url_fopen = false and no curl extension.
+ $text = null;
+ }
unlink( $dir . $file );
if ( $text == 'exec' ) {
return false;
}
- /**
- * Register tag hook below.
- *
- * @todo Move this to WebInstaller with the two things below?
- *
- * @param $parser Parser
- */
- public function registerDocLink( Parser &$parser ) {
- $parser->setHook( 'doclink', array( $this, 'docLink' ) );
- return true;
- }
-
/**
* ParserOptions are constructed before we determined the language, so fix it
+ *
+ * @param $lang Language
*/
public function setParserLanguage( $lang ) {
$this->parserOptions->setTargetLanguage( $lang );
$this->parserOptions->setUserLang( $lang->getCode() );
}
- /**
- * Extension tag hook for a documentation link.
- */
- public function docLink( $linkText, $attribs, $parser ) {
- $url = $this->getDocUrl( $attribs['href'] );
- return '<a href="' . htmlspecialchars( $url ) . '">' .
- htmlspecialchars( $linkText ) .
- '</a>';
- }
-
/**
* Overridden by WebInstaller to provide lastPage parameters.
*/
}
$exts = array();
- $dir = $this->getVar( 'IP' ) . '/extensions';
- $dh = opendir( $dir );
+ $extDir = $this->getVar( 'IP' ) . '/extensions';
+ $dh = opendir( $extDir );
while ( ( $file = readdir( $dh ) ) !== false ) {
- if( file_exists( "$dir/$file/$file.php" ) ) {
+ if( !is_dir( "$extDir/$file" ) ) {
+ continue;
+ }
+ if( file_exists( "$extDir/$file/$file.php" ) ) {
$exts[] = $file;
}
}
global $IP;
$exts = $this->getVar( '_Extensions' );
$IP = $this->getVar( 'IP' );
- $path = $IP . '/extensions';
/**
* We need to include DefaultSettings before including extensions to avoid
* but we're not opening that can of worms
* @see https://bugzilla.wikimedia.org/show_bug.cgi?id=26857
*/
- global $wgHooks, $wgAutoloadClasses;
+ global $wgAutoloadClasses;
+ $wgAutoloadClasses = array();
+
require( "$IP/includes/DefaultSettings.php" );
foreach( $exts as $e ) {
- require( "$path/$e/$e.php" );
+ require_once( "$IP/extensions/$e/$e.php" );
}
$hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ?
// Unset everyone else's hooks. Lord knows what someone might be doing
// in ParserFirstCallInit (see bug 27171)
- unset( $wgHooks );
- $wgHooks = array( 'LoadExtensionSchemaUpdates' => $hooksWeWant );
+ $GLOBALS['wgHooks'] = array( 'LoadExtensionSchemaUpdates' => $hooksWeWant );
return Status::newGood();
}
array( 'name' => 'tables', 'callback' => array( $installer, 'createTables' ) ),
array( 'name' => 'interwiki', 'callback' => array( $installer, 'populateInterwikiTable' ) ),
array( 'name' => 'stats', 'callback' => array( $this, 'populateSiteStats' ) ),
- array( 'name' => 'secretkey', 'callback' => array( $this, 'generateSecretKey' ) ),
- array( 'name' => 'upgradekey', 'callback' => array( $this, 'generateUpgradeKey' ) ),
+ array( 'name' => 'keys', 'callback' => array( $this, 'generateKeys' ) ),
array( 'name' => 'sysop', 'callback' => array( $this, 'createSysop' ) ),
array( 'name' => 'mainpage', 'callback' => array( $this, 'createMainpage' ) ),
);
*
* @return Status
*/
- protected function generateSecretKey() {
- return $this->generateSecret( 'wgSecretKey' );
+ public function generateKeys() {
+ $keys = array( 'wgSecretKey' => 64 );
+ if ( strval( $this->getVar( 'wgUpgradeKey' ) ) === '' ) {
+ $keys['wgUpgradeKey'] = 16;
+ }
+ return $this->doGenerateKeys( $keys );
}
/**
- * Generate a secret value for a variable using either
- * /dev/urandom or mt_rand() Produce a warning in the later case.
+ * Generate a secret value for variables using either
+ * /dev/urandom or mt_rand(). Produce a warning in the later case.
*
+ * @param $keys Array
* @return Status
*/
- protected function generateSecret( $secretName, $length = 64 ) {
- if ( wfIsWindows() ) {
- $file = null;
- } else {
- wfSuppressWarnings();
- $file = fopen( "/dev/urandom", "r" );
- wfRestoreWarnings();
- }
-
+ protected function doGenerateKeys( $keys ) {
$status = Status::newGood();
- if ( $file ) {
- $secretKey = bin2hex( fread( $file, $length / 2 ) );
- fclose( $file );
- } else {
- $secretKey = '';
+ wfSuppressWarnings();
+ $file = fopen( "/dev/urandom", "r" );
+ wfRestoreWarnings();
+
+ foreach ( $keys as $name => $length ) {
+ if ( $file ) {
+ $secretKey = bin2hex( fread( $file, $length / 2 ) );
+ } else {
+ $secretKey = '';
- for ( $i = 0; $i < $length / 8; $i++ ) {
- $secretKey .= dechex( mt_rand( 0, 0x7fffffff ) );
+ for ( $i = 0; $i < $length / 8; $i++ ) {
+ $secretKey .= dechex( mt_rand( 0, 0x7fffffff ) );
+ }
}
- $status->warning( 'config-insecure-secret', '$' . $secretName );
+ $this->setVar( $name, $secretKey );
}
- $this->setVar( $secretName, $secretKey );
+ if ( $file ) {
+ fclose( $file );
+ } else {
+ $names = array_keys ( $keys );
+ $names = preg_replace( '/^(.*)$/', '\$$1', $names );
+ global $wgLang;
+ $status->warning( 'config-insecure-keys', $wgLang->listToText( $names ), count( $names ) );
+ }
return $status;
}
- /**
- * Generate a default $wgUpgradeKey. Will warn if we had to use
- * mt_rand() instead of /dev/urandom
- *
- * @return Status
- */
- public function generateUpgradeKey() {
- if ( strval( $this->getVar( 'wgUpgradeKey' ) ) === '' ) {
- return $this->generateSecret( 'wgUpgradeKey', 16 );
- }
- return Status::newGood();
- }
-
/**
* Create the first user account, grant it sysop and bureaucrat rights
*
$params['language'] = $myLang;
}
- $res = Http::post( $this->mediaWikiAnnounceUrl, array( 'postData' => $params ) );
- if( !$res ) {
- $s->warning( 'config-install-subscribe-fail' );
+ $res = MWHttpRequest::factory( $this->mediaWikiAnnounceUrl,
+ array( 'method' => 'POST', 'postData' => $params ) )->execute();
+ if( !$res->isOK() ) {
+ $s->warning( 'config-install-subscribe-fail', $res->getMessage() );
}
}
public function addInstallStep( $callback, $findStep = 'BEGINNING' ) {
$this->extraInstallSteps[$findStep][] = $callback;
}
+
+ /**
+ * Disable the time limit for execution.
+ * Some long-running pages (Install, Upgrade) will want to do this
+ */
+ protected function disableTimeLimit() {
+ wfSuppressWarnings();
+ set_time_limit( 0 );
+ wfRestoreWarnings();
+ }
}
dépôts / lhc / web / wiklou.git / blobdiff