return $result;
}
- /**
- * Check whether the given nickname is potentially usable, or if it's
- * excluded by any blacklists on this system.
- *
- * WARNING: INPUT IS NOT VALIDATED OR NORMALIZED. NON-NORMALIZED INPUT
- * OR INVALID INPUT MAY LEAD TO FALSE RESULTS.
- *
- * @param string $nickname
- * @return boolean true if clear, false if blacklisted
- */
- static function allowed_nickname($nickname)
- {
- // XXX: should already be validated for size, content, etc.
- $blacklist = common_config('nickname', 'blacklist');
-
- //all directory and file names should be blacklisted
- $d = dir(INSTALLDIR);
- while (false !== ($entry = $d->read())) {
- $blacklist[]=$entry;
- }
- $d->close();
-
- //all top level names in the router should be blacklisted
- $router = Router::get();
- foreach(array_keys($router->m->getPaths()) as $path){
- if(preg_match('/^\/(.*?)[\/\?]/',$path,$matches)){
- $blacklist[]=$matches[1];
- }
- }
- return !in_array($nickname, $blacklist);
- }
-
/**
* Get the most recent notice posted by this user, if any.
*
$profile = new Profile();
- if(!empty($email))
- {
+ if (!empty($email)) {
$email = common_canonical_email($email);
}
- $nickname = common_canonical_nickname($nickname);
- $profile->nickname = $nickname;
- if(! User::allowed_nickname($nickname)){
- common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname),
- __FILE__);
+ try {
+ $profile->nickname = Nickname::normalize($nickname, true);
+ } catch (NicknameException $e) {
+ common_log(LOG_WARNING, sprintf('Bad nickname during User registration for %s: %s', $profile->nickname, $e->getMessage()), __FILE__);
return false;
}
- $profile->profileurl = common_profile_url($nickname);
+
+ $profile->profileurl = common_profile_url($profile->nickname);
if (!empty($fullname)) {
$profile->fullname = $fullname;
$user = new User();
- $user->nickname = $nickname;
+ $user->nickname = $profile->nickname;
$invite = null;
$profile->query('BEGIN');
$id = $profile->insert();
-
if (empty($id)) {
common_log_db_error($profile, 'INSERT', __FILE__);
return false;
if (!$result) {
common_log_db_error($user, 'INSERT', __FILE__);
+ $profile->query('ROLLBACK');
return false;
}
if (!$result) {
common_log_db_error($subscription, 'INSERT', __FILE__);
+ $profile->query('ROLLBACK');
return false;
}
if (!$result) {
common_log_db_error($confirm, 'INSERT', __FILE__);
+ $profile->query('ROLLBACK');
return false;
}
}
*
* Note that valid nicknames may be in use or reserved.
*
- * @param string $str
- * @return boolean
+ * @param string $str The nickname string to test
+ * @param boolean $checkuse Check if it's in use (return false if it is)
+ *
+ * @return boolean True if nickname is valid. False if invalid (or taken if checkuse==true).
*/
- public static function isValid($str)
+ public static function isValid($str, $checkuse=false)
{
try {
- self::normalize($str);
- return true;
+ self::normalize($str, $checkuse);
} catch (NicknameException $e) {
return false;
}
+
+ return true;
}
/**
* Validate an input nickname string, and normalize it to its canonical form.
* The canonical form will be returned, or an exception thrown if invalid.
*
- * @param string $str
+ * @param string $str The nickname string to test
+ * @param boolean $checkuse Check if it's in use (return false if it is)
* @return string Normalized canonical form of $str
*
* @throws NicknameException (base class)
- * @throws NicknameInvalidException
+ * @throws NicknameBlacklistedException
* @throws NicknameEmptyException
+ * @throws NicknameInvalidException
+ * @throws NicknamePathCollisionException
+ * @throws NicknameTakenException
* @throws NicknameTooLongException
*/
- public static function normalize($str)
+ public static function normalize($str, $checkuse=false)
{
if (mb_strlen($str) > self::MAX_LEN) {
// Display forms must also fit!
if (!self::isCanonical($str)) {
throw new NicknameInvalidException();
}
- if (!User::allowed_nickname($str)) {
- throw new NicknameBlacklistException();
+ if (self::isBlacklisted($str)) {
+ throw new NicknameBlacklistedException();
+ }
+ if (self::isSystemPath($str)) {
+ throw new NicknamePathCollisionException();
+ }
+ if ($checkuse && $user = self::isTaken($str)) {
+ if ($user instanceof User) {
+ throw new NicknameTakenException();
+ }
}
return $str;
{
return preg_match('/^(?:' . self::CANONICAL_FMT . ')$/', $str);
}
+
+ /**
+ * Is the given string in our nickname blacklist?
+ *
+ * @param string $str
+ * @return boolean
+ */
+ public static function isBlacklisted($str)
+ {
+ $blacklist = common_config('nickname', 'blacklist');
+ return in_array($str, $blacklist);
+ }
+
+ /**
+ * Is the given string identical to a system path or route?
+ * This could probably be put in some other class, but at
+ * at the moment, only Nickname requires this functionality.
+ *
+ * @param string $str
+ * @return boolean
+ */
+ public static function isSystemPath($str)
+ {
+ $paths = array();
+
+ // All directory and file names in site root should be blacklisted
+ $d = dir(INSTALLDIR);
+ while (false !== ($entry = $d->read())) {
+ $paths[] = $entry;
+ }
+ $d->close();
+
+ // All top level names in the router should be blacklisted
+ $router = Router::get();
+ foreach (array_keys($router->m->getPaths()) as $path) {
+ if (preg_match('/^\/(.*?)[\/\?]/',$path,$matches)) {
+ $paths[] = $matches[1];
+ }
+ }
+ return in_array($str, $paths);
+ }
+
+ /**
+ * Is the nickname already in use locally? Checks the User table.
+ *
+ * @param string $str
+ * @return User|null Returns null if no such user, otherwise a User object
+ */
+ public static function isTaken($str)
+ {
+ $user = User::getKV('nickname', $str);
+ return $user; // null if no such User entry
+ }
}
class NicknameException extends ClientException
}
}
-class NicknameEmptyException extends NicknameException
+class NicknameEmptyException extends NicknameInvalidException
{
/**
* Default localized message for this type of exception.
}
}
-class NicknameBlacklistException extends NicknameInvalidException
+class NicknameBlacklistedException extends NicknameException
+{
+ protected function defaultMessage()
+ {
+ // TRANS: Validation error in form for registration, profile and group settings, etc.
+ return _('Nickname is disallowed through blacklist.');
+ }
+}
+
+class NicknamePathCollisionException extends NicknameException
+{
+ protected function defaultMessage()
+ {
+ // TRANS: Validation error in form for registration, profile and group settings, etc.
+ return _('Nickname is identical to system path names.');
+ }
+}
+
+class NicknameTakenException extends NicknameException
{
+ public $user = null; // the User which occupies the nickname
+
+ public function __construct(User $user, $msg=null, $code=400)
+ {
+ $this->byuser = $user;
+
+ if ($msg === null) {
+ $msg = $this->defaultMessage();
+ }
+
+ parent::__construct($msg, $code);
+ }
+
protected function defaultMessage()
{
// TRANS: Validation error in form for registration, profile and group settings, etc.
- return _('Nickname is disallowed through blacklist or system path list.');
+ return _('Nickname is already in use on this server.');
}
}
projects / quix0rs-gnu-social.git / commitdiff