Merge "Add attributes parameter to ShowSearchHitTitle"

[lhc/web/wiklou.git] / includes / htmlform / fields / HTMLUserTextField.php

diff --git a/includes/htmlform/fields/HTMLUserTextField.php b/includes/htmlform/fields/HTMLUserTextField.php
index 14b5e59..e193970 100644 (file)
--- a/includes/htmlform/fields/HTMLUserTextField.php
+++ b/includes/htmlform/fields/HTMLUserTextField.php
@@ -10,15 +10,25 @@ use MediaWiki\Widget\UserInputWidget;
  *
  * Optional parameters:
  * 'exists' - Whether to validate that the user already exists
+ * 'ipallowed' - Whether an IP adress is interpreted as "valid"
+ * 'iprange' - Whether an IP adress range is interpreted as "valid"
+ * 'iprangelimits' - Specifies the valid IP ranges for IPv4 and IPv6 in an array.
+ *  defaults to IPv4 => 16; IPv6 => 32.
  *
  * @since 1.26
  */
 class HTMLUserTextField extends HTMLTextField {
        public function __construct( $params ) {
-               $params += [
-                       'exists' => false,
-                       'ipallowed' => false,
-               ];
+               $params = wfArrayPlus2d( $params, [
+                               'exists' => false,
+                               'ipallowed' => false,
+                               'iprange' => false,
+                               'iprangelimits' => [
+                                       'IPv4' => '16',
+                                       'IPv6' => '32',
+                               ],
+                       ]
+               );
 
                parent::__construct( $params );
        }
@@ -26,19 +36,63 @@ class HTMLUserTextField extends HTMLTextField {
        public function validate( $value, $alldata ) {
                // check, if a user exists with the given username
                $user = User::newFromName( $value, false );
+               $rangeError = null;
 
                if ( !$user ) {
-                       return $this->msg( 'htmlform-user-not-valid', $value )->parse();
+                       return $this->msg( 'htmlform-user-not-valid', $value );
                } elseif (
+                       // check, if the user exists, if requested
                        ( $this->mParams['exists'] && $user->getId() === 0 ) &&
-                       !( $this->mParams['ipallowed'] && User::isIP( $value ) )
+                       // check, if the username is a valid IP address, otherweise save the error message
+                       !( $this->mParams['ipallowed'] && IP::isValid( $value ) ) &&
+                       // check, if the username is a valid IP range, otherwise save the error message
+                       !( $this->mParams['iprange'] && ( $rangeError = $this->isValidIPRange( $value ) ) === true )
                ) {
-                       return $this->msg( 'htmlform-user-not-exists', $user->getName() )->parse();
+                       if ( is_string( $rangeError ) ) {
+                               return $rangeError;
+                       }
+                       return $this->msg( 'htmlform-user-not-exists', $user->getName() );
                }
 
                return parent::validate( $value, $alldata );
        }
 
+       protected function isValidIPRange( $value ) {
+               $cidrIPRanges = $this->mParams['iprangelimits'];
+
+               if ( !IP::isValidBlock( $value ) ) {
+                       return false;
+               }
+
+               list( $ip, $range ) = explode( '/', $value, 2 );
+
+               if (
+                       ( IP::isIPv4( $ip ) && $cidrIPRanges['IPv4'] == 32 ) ||
+                       ( IP::isIPv6( $ip ) && $cidrIPRanges['IPv6'] == 128 )
+               ) {
+                       // Range block effectively disabled
+                       return $this->msg( 'ip_range_toolow' )->parse();
+               }
+
+               if (
+                       ( IP::isIPv4( $ip ) && $range > 32 ) ||
+                       ( IP::isIPv6( $ip ) && $range > 128 )
+               ) {
+                       // Dodgy range
+                       return $this->msg( 'ip_range_invalid' )->parse();
+               }
+
+               if ( IP::isIPv4( $ip ) && $range < $cidrIPRanges['IPv4'] ) {
+                       return $this->msg( 'ip_range_exceeded', $cidrIPRanges['IPv4'] )->parse();
+               }
+
+               if ( IP::isIPv6( $ip ) && $range < $cidrIPRanges['IPv6'] ) {
+                       return $this->msg( 'ip_range_exceeded', $cidrIPRanges['IPv6'] )->parse();
+               }
+
+               return true;
+       }
+
        protected function getInputWidget( $params ) {
                return new UserInputWidget( $params );
        }