revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 14:30:56 +01:00
Code Issues Releases Wiki Activity

Fix username route for new "._-" usernames

Browse source 
Summary: We allow ".", "_" and "-" in usernames now, but not in the route.

Test Plan: Went to /p/.-_/, got 404'd at the route level before and now make it to the profile controller.

Reviewers: vrana, btrahan

Reviewed By: vrana

CC: aran

Maniphest Tasks: T1348

Differential Revision: https://secure.phabricator.com/D2729
This commit is contained in:
epriestley 2012-06-13 08:39:02 -07:00
parent 371419344a
commit d73a6d3dcd
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
View file

@ -73,7 +73,7 @@ class AphrontDefaultApplicationConfiguration
'edit/(?:(?P<id>\d+)/(?:(?P<view>\w+)/)?)?' 'edit/(?:(?P<id>\d+)/(?:(?P<view>\w+)/)?)?'
=> 'PhabricatorPeopleEditController', => 'PhabricatorPeopleEditController',
), ),
'/p/(?P<username>\w+)/(?:(?P<page>\w+)/)?' '/p/(?P<username>[\w._-]+)/(?:(?P<page>\w+)/)?'
=> 'PhabricatorPeopleProfileController', => 'PhabricatorPeopleProfileController',
'/conduit/' => array( '/conduit/' => array(
'' => 'PhabricatorConduitListController', '' => 'PhabricatorConduitListController',

7
src/applications/people/storage/PhabricatorUser.php
View file

@ -595,6 +595,13 @@ EOBODY;
} }
public static function validateUsername($username) { public static function validateUsername($username) {
// NOTE: If you update this, make sure to update:
//
// - Remarkup rule for @mentions.
// - Routing rule for "/p/username/".
// - Unit tests, obviously.
// - describeValidUsername() method, above.
return (bool)preg_match('/^[a-zA-Z0-9._-]*[a-zA-Z0-9_-]$/', $username); return (bool)preg_match('/^[a-zA-Z0-9._-]*[a-zA-Z0-9_-]$/', $username);
} }