X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpassword%2FPasswordFactory.php;h=f7b283be719ca99d66dd7014161a7df779d3d97c;hb=fb73286fba73c399e119ef50ff036255dd6a1096;hp=6b634cbea701655059cbb188402d781c57169b3c;hpb=ea9fcc1e4d3b572199d82c426024e3e5efe23879;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/password/PasswordFactory.php b/includes/password/PasswordFactory.php
index 6b634cbea7..f7b283be71 100644
--- a/includes/password/PasswordFactory.php
+++ b/includes/password/PasswordFactory.php
@@ -36,19 +36,40 @@ final class PasswordFactory {
 
 	/**
 	 * Mapping of password types to classes
+	 *
 	 * @var array
 	 * @see PasswordFactory::register
 	 * @see Setup.php
 	 */
-	private $types = array(
-		'' => array( 'type' => '', 'class' => 'InvalidPassword' ),
-	);
+	private $types = [
+		'' => [ 'type' => '', 'class' => InvalidPassword::class ],
+	];
+
+	/**
+	 * Construct a new password factory.
+	 * Most of the time you'll want to use MediaWikiServices::getPasswordFactory instead.
+	 * @param array $config Mapping of password type => config
+	 * @param string $default Default password type
+	 * @see PasswordFactory::register
+	 * @see PasswordFactory::setDefaultType
+	 */
+	public function __construct( array $config = [], $default = '' ) {
+		foreach ( $config as $type => $options ) {
+			$this->register( $type, $options );
+		}
+
+		if ( $default !== '' ) {
+			$this->setDefaultType( $default );
+		}
+	}
 
 	/**
 	 * Register a new type of password hash
 	 *
-	 * @param string $type Unique type name for the hash
-	 * @param array $config Array of configuration options
+	 * @param string $type Unique type name for the hash. Will be prefixed to the password hashes
+	 *   to identify what hashing method was used.
+	 * @param array $config Array of configuration options. 'class' is required (the Password
+	 *   subclass name), everything else is passed to the constructor of that class.
 	 */
 	public function register( $type, array $config ) {
 		$config['type'] = $type;
@@ -58,8 +79,11 @@ final class PasswordFactory {
 	/**
 	 * Set the default password type
 	 *
-	 * @throws InvalidArgumentException If the type is not registered
+	 * This type will be used for creating new passwords when the type is not specified.
+	 * Passwords of a different type will be considered outdated and in need of update.
+	 *
 	 * @param string $type Password hash type
+	 * @throws InvalidArgumentException If the type is not registered
 	 */
 	public function setDefaultType( $type ) {
 		if ( !isset( $this->types[$type] ) ) {
@@ -78,6 +102,8 @@ final class PasswordFactory {
 	}
 
 	/**
+	 * @deprecated since 1.32 Initialize settings using the constructor
+	 *
 	 * Initialize the internal static variables using the global variables
 	 *
 	 * @param Config $config Configuration object to load data from
@@ -112,7 +138,7 @@ final class PasswordFactory {
 	 */
 	public function newFromCiphertext( $hash ) {
 		if ( $hash === null || $hash === false || $hash === '' ) {
-			return new InvalidPassword( $this, array( 'type' => '' ), null );
+			return new InvalidPassword( $this, [ 'type' => '' ], null );
 		} elseif ( $hash[0] !== ':' ) {
 			throw new PasswordError( 'Invalid hash given' );
 		}
@@ -156,7 +182,7 @@ final class PasswordFactory {
 	 */
 	public function newFromPlaintext( $password, Password $existing = null ) {
 		if ( $password === null ) {
-			return new InvalidPassword( $this, array( 'type' => '' ), null );
+			return new InvalidPassword( $this, [ 'type' => '' ], null );
 		}
 
 		if ( $existing === null ) {
@@ -200,11 +226,10 @@ final class PasswordFactory {
 		// stopping at a minimum of 10 chars.
 		$length = max( 10, $minLength );
 		// Multiply by 1.25 to get the number of hex characters we need
-		$length = $length * 1.25;
 		// Generate random hex chars
-		$hex = MWCryptRand::generateHex( $length );
+		$hex = MWCryptRand::generateHex( ceil( $length * 1.25 ) );
 		// Convert from base 16 to base 32 to get a proper password like string
-		return Wikimedia\base_convert( $hex, 16, 32 );
+		return substr( Wikimedia\base_convert( $hex, 16, 32, $length ), -$length );
 	}
 
 	/**
@@ -217,7 +242,7 @@ final class PasswordFactory {
 
 		if ( $password === null ) {
 			$factory = new self();
-			$password = new InvalidPassword( $factory, array( 'type' => '' ), null );
+			$password = new InvalidPassword( $factory, [ 'type' => '' ], null );
 		}
 
 		return $password;