Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CliInstaller: fail in a sane way when the password is invalid

Browse source 
Bug: T256620
Change-Id: Ie33bd076834124228dffc4760153e3a3b5238724
This commit is contained in:
Gergő Tisza 2020-07-13 11:40:16 +02:00
parent 6a20eebf3d
commit a6e27b533d
No known key found for this signature in database
GPG key ID: C34FEC97E6257F96
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
includes/installer/CliInstaller.php
View file

@ -55,7 +55,7 @@ class CliInstaller extends Installer {
* @throws InstallException
*/
public function __construct( $siteName, $admin = null, array $options = [] ) {
global $wgContLang;
global $wgContLang, $wgPasswordPolicy;
parent::__construct();
@ -89,10 +89,6 @@ class CliInstaller extends Installer {
}
$this->setVar( 'wgMetaNamespace', $metaNS );
if ( $admin ) {
$this->setVar( '_AdminName', $admin );
}
if ( !isset( $options['installdbuser'] ) ) {
$this->setVar( '_InstallUser',
$this->getVar( 'wgDBuser' ) );
@ -108,8 +104,25 @@ class CliInstaller extends Installer {
$this->setVar( '_CreateDBAccount', true );
}
if ( isset( $options['pass'] ) ) {
$this->setVar( '_AdminPassword', $options['pass'] );
if ( $admin ) {
$this->setVar( '_AdminName', $admin );
if ( isset( $options['pass'] ) ) {
$adminUser = User::newFromName( $admin );
if ( !$adminUser ) {
throw new InstallException( Status::newFatal( 'config-admin-name-invalid' ) );
}
$upp = new UserPasswordPolicy(
$wgPasswordPolicy['policies'],
$wgPasswordPolicy['checks']
);
$status = $upp->checkUserPasswordForGroups( $adminUser, $options['pass'],
[ 'bureaucrat', 'sysop', 'interface-admin' ] ); // per Installer::createSysop()
if ( !$status->isGood() ) {
throw new InstallException( Status::newFatal(
$status->getMessage( 'config-admin-error-password-invalid' ) ) );
}
$this->setVar( '_AdminPassword', $options['pass'] );
}
}
// Detect and inject any extension found

1
includes/installer/i18n/en.json
View file

@ -166,6 +166,7 @@
"config-admin-email-help": "Enter an email address here to allow you to receive email from other users on the wiki, reset your password, and be notified of changes to pages on your watchlist. You can leave this field empty.",
"config-admin-error-user": "Internal error when creating an admin with the name \"<nowiki>$1</nowiki>\".",
"config-admin-error-password": "Internal error when setting a password for the admin \"<nowiki>$1</nowiki>\": <pre>$2</pre>",
"config-admin-error-password-invalid": "Invalid wiki admin password: $1",
"config-admin-error-bademail": "You have entered an invalid email address.",
"config-subscribe": "Subscribe to the [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce release announcements mailing list].",
"config-subscribe-help": "This is a low-volume mailing list used for release announcements, including important security announcements.\nYou should subscribe to it and update your MediaWiki installation when new versions come out.",

1
includes/installer/i18n/qqq.json
View file

@ -190,6 +190,7 @@
"config-admin-email-help": "Help text for an administrator email address in the MediaWiki installer.",
"config-admin-error-user": "Used as error message. Parameters:\n* $1 - username of administrator\nSee also:\n* {{msg-mw|Config-admin-error-password}}",
"config-admin-error-password": "Used as error message. Parameters:\n* $1 - username of administrator\n* $2 - error message\nSee also:\n* {{msg-mw|Config-admin-error-user}}",
"config-admin-error-password-invalid": "Used as error message. Parameters:\n* $1 - list of password errors\nSee also:\n* {{msg-mw|Config-admin-error-password}}",
"config-admin-error-bademail": "Error text in the MediaWiki installer when an entered email address does not validate.",
"config-subscribe": "Used as label for the installer checkbox",
"config-subscribe-help": "\"Low-volume\" in this context means that there will be few e-mails to that mailing list per time period.",