mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-25 16:22:43 +01:00
Unify logic for username validation
Summary: Revisit of D1254. Don't require lowercase, just standardize the logic. The current implementation has nonuniform logic -- PeopleEditController forbids uppercase. Test Plan: Ran unit tests, see also D1254. Reviewers: btrahan, jungejason, aran Reviewed By: btrahan CC: aran Differential Revision: https://secure.phabricator.com/D1415
This commit is contained in:
parent
5fd46dce66
commit
82c0795e54
11 changed files with 79 additions and 10 deletions
|
@ -2,7 +2,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -31,6 +31,13 @@ if (!strlen($username)) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
if (!PhabricatorUser::validateUsername($username)) {
|
||||
echo "The username '{$username}' is invalid. Usernames must consist of only ".
|
||||
"numbers and letters.\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
$user = id(new PhabricatorUser())->loadOneWhere(
|
||||
'username = %s',
|
||||
$username);
|
||||
|
|
|
@ -721,6 +721,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/people/controller/settings/panels/sshkeys',
|
||||
'PhabricatorUserSettingsController' => 'applications/people/controller/settings',
|
||||
'PhabricatorUserSettingsPanelController' => 'applications/people/controller/settings/panels/base',
|
||||
'PhabricatorUserTestCase' => 'applications/people/storage/user/__tests__',
|
||||
'PhabricatorWorker' => 'infrastructure/daemon/workers/worker',
|
||||
'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/base',
|
||||
'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/task',
|
||||
|
@ -1363,6 +1364,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorUserSSHKeysSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
|
||||
'PhabricatorUserSettingsController' => 'PhabricatorPeopleController',
|
||||
'PhabricatorUserSettingsPanelController' => 'PhabricatorPeopleController',
|
||||
'PhabricatorUserTestCase' => 'PhabricatorTestCase',
|
||||
'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO',
|
||||
'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
|
||||
'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -39,13 +39,12 @@ class PhabricatorOAuthDefaultRegistrationController
|
|||
|
||||
$user->setUsername($request->getStr('username'));
|
||||
$username = $user->getUsername();
|
||||
$matches = null;
|
||||
if (!strlen($user->getUsername())) {
|
||||
$e_username = 'Required';
|
||||
$errors[] = 'Username is required.';
|
||||
} else if (!preg_match('/^[a-zA-Z0-9]+$/', $username, $matches)) {
|
||||
} else if (!PhabricatorUser::validateUsername($username)) {
|
||||
$e_username = 'Invalid';
|
||||
$errors[] = 'Username may only contain letters and numbers.';
|
||||
$errors[] = 'Username must consist of only numbers and letters.';
|
||||
} else {
|
||||
$e_username = null;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -139,7 +139,7 @@ class PhabricatorPeopleEditController extends PhabricatorPeopleController {
|
|||
if (!strlen($user->getUsername())) {
|
||||
$errors[] = "Username is required.";
|
||||
$e_username = 'Required';
|
||||
} else if (!preg_match('/^[a-z0-9]+$/', $user->getUsername())) {
|
||||
} else if (!PhabricatorUser::validateUsername($user->getUsername())) {
|
||||
$errors[] = "Username must consist of only numbers and letters.";
|
||||
$e_username = 'Invalid';
|
||||
} else {
|
||||
|
|
|
@ -504,4 +504,8 @@ EOBODY;
|
|||
->saveAndSend();
|
||||
}
|
||||
|
||||
public static function validateUsername($username) {
|
||||
return (bool)preg_match('/^[a-zA-Z0-9]+$/', $username);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
final class PhabricatorUserTestCase extends PhabricatorTestCase {
|
||||
|
||||
public function testUsernameValidation() {
|
||||
$map = array(
|
||||
'alincoln' => true,
|
||||
'alincoln69' => true,
|
||||
'hd3' => true,
|
||||
'7' => true, // Silly, but permitted.
|
||||
'0' => true,
|
||||
'Alincoln' => true,
|
||||
|
||||
'alincoln!' => false,
|
||||
' alincoln' => false,
|
||||
'____' => false,
|
||||
'' => false,
|
||||
);
|
||||
|
||||
foreach ($map as $name => $expect) {
|
||||
$this->assertEqual(
|
||||
$expect,
|
||||
PhabricatorUser::validateUsername($name),
|
||||
"Validity of '{$name}'.");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
13
src/applications/people/storage/user/__tests__/__init__.php
Normal file
13
src/applications/people/storage/user/__tests__/__init__.php
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?php
|
||||
/**
|
||||
* This file is automatically generated. Lint this module to rebuild it.
|
||||
* @generated
|
||||
*/
|
||||
|
||||
|
||||
|
||||
phutil_require_module('phabricator', 'applications/people/storage/user');
|
||||
phutil_require_module('phabricator', 'infrastructure/testing/testcase');
|
||||
|
||||
|
||||
phutil_require_source('PhabricatorUserTestCase.php');
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
Loading…
Reference in a new issue