revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00
Code Issues Releases Wiki Activity

Allow slugs to contain most utf8 characters

Browse source 
Summary:
Ref T2632. Fixes T1466.

Currently, we normalize slugs (and thus Phriction URIs and canonical project names) to a small number of latin characters. Instead, blacklist a few characters and permit everything else (including utf8 characters).

When generating Phriction URIs, encode any utf8 characters. This means we render URIs encoded, but browsers handle this fine and display them readably in the URI and address bar, etc.

The blacklisted characters are mostly for practical reasons: \x00-\x19 are control characters, `#%?` are meaningful in URIs, `+` is sometimes configured to be interprted as space by apache, etc., `<>\\` are just silly, `&= ` are largely cosmetic.

This allows some silly stuff, like generating URIs with zero-width spaces and RTL markers in them. Possibly we should go blacklist those characters at some point.

Depends on: D5191

Test Plan: {F34402}

Reviewers: AnhNhan, chad, vrana

Reviewed By: chad

CC: aran

Maniphest Tasks: T1466, T2632

Differential Revision: https://secure.phabricator.com/D5192
This commit is contained in:
epriestley 2013-03-03 10:56:33 -08:00
parent cb2d0adf95
commit 555c0421bb
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/phriction/storage/PhrictionDocument.php
View file

@ -42,6 +42,10 @@ final class PhrictionDocument extends PhrictionDAO
if ($slug == '/') { if ($slug == '/') {
return $prefix; return $prefix;
} else { } else {
// NOTE: The effect here is to escape non-latin characters, since modern
// browsers deal with escaped UTF8 characters in a reasonable way (showing
// the user a readable URI) but older programs may not.
$slug = phutil_escape_uri($slug);
return $prefix.$slug; return $prefix.$slug;
} }
} }

13
src/infrastructure/util/PhabricatorSlug.php
View file

@ -3,14 +3,11 @@
final class PhabricatorSlug { final class PhabricatorSlug {
public static function normalize($slug) { public static function normalize($slug) {
// TODO: We need to deal with unicode at some point, this is just a very
// basic proof-of-concept implementation.
$slug = strtolower($slug);
$slug = preg_replace('@/+@', '/', $slug); $slug = preg_replace('@/+@', '/', $slug);
$slug = trim($slug, '/'); $slug = trim($slug, '/');
$slug = preg_replace('@[^a-z0-9/]+@', '_', $slug); $slug = phutil_utf8_strtolower($slug);
$slug = preg_replace("@[\\x00-\\x19#%&+=\\\\?<> ]+@", '_', $slug);
$slug = preg_replace('@_+@', '_', $slug);
$slug = trim($slug, '_'); $slug = trim($slug, '_');
return $slug.'/'; return $slug.'/';
@ -20,8 +17,8 @@ final class PhabricatorSlug {
$parts = explode('/', trim($slug, '/')); $parts = explode('/', trim($slug, '/'));
$default_title = end($parts); $default_title = end($parts);
$default_title = str_replace('_', ' ', $default_title); $default_title = str_replace('_', ' ', $default_title);
$default_title = ucwords($default_title); $default_title = phutil_utf8_ucwords($default_title);
$default_title = nonempty($default_title, 'Untitled Document'); $default_title = nonempty($default_title, pht('Untitled Document'));
return $default_title; return $default_title;
} }

6
src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php
View file

@ -13,8 +13,10 @@ final class PhabricatorSlugTestCase extends PhabricatorTestCase {
'derp//derp' => 'derp/derp/', 'derp//derp' => 'derp/derp/',
'DERP//DERP' => 'derp/derp/', 'DERP//DERP' => 'derp/derp/',
'a B c' => 'a_b_c/', 'a B c' => 'a_b_c/',
'-1~2.3abcd' => '1_2_3abcd/', '-1~2.3abcd' => '-1~2.3abcd/',
"T\x95O\x95D\x95O" => 't_o_d_o/', "T\x00O\x00D\x00O" => "t_o_d_o/",
'x#%&+=\\?<> y' => 'x_y/',
"\xE2\x98\x83" => "\xE2\x98\x83/",
); );
foreach ($slugs as $slug => $normal) { foreach ($slugs as $slug => $normal) {