Page MenuHomePhabricator
Files F15383608

D14260.id34425.diff
No OneTemporary
Actions

D14260.id34425.diff
View Options

diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -372,6 +372,13 @@
$result = $this->routePath($maps, $path.'/');
if ($result) {
$slash_uri = $request->getRequestURI()->setPath($path.'/');
+
+ // We need to restore URI encoding because the webserver has
+ // interpreted it. For example, this allows us to redirect a path
+ // like `/tag/aa%20bb` to `/tag/aa%20bb/`, which may eventually be
+ // resolved meaningfully by an application.
+ $slash_uri = phutil_escape_uri($slash_uri);
+
$external = strlen($request->getRequestURI()->getDomain());
return $this->buildRedirectController($slash_uri, $external);
}
diff --git a/src/applications/project/controller/PhabricatorProjectViewController.php b/src/applications/project/controller/PhabricatorProjectViewController.php
--- a/src/applications/project/controller/PhabricatorProjectViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectViewController.php
@@ -26,10 +26,17 @@
}
$project = $query->executeOne();
if (!$project) {
+
+ // If this request corresponds to a project but just doesn't have the
+ // slug quite right, redirect to the proper URI.
+ $uri = $this->getNormalizedURI($slug);
+ if ($uri !== null) {
+ return id(new AphrontRedirectResponse())->setURI($uri);
+ }
+
return new Aphront404Response();
}
-
$columns = id(new PhabricatorProjectColumnQuery())
->setViewer($viewer)
->withProjectPHIDs(array($project->getPHID()))
@@ -53,4 +60,31 @@
return $this->delegateToController($controller_object);
}
+ private function getNormalizedURI($slug) {
+ if (!strlen($slug)) {
+ return null;
+ }
+
+ $normal = PhabricatorSlug::normalizeProjectSlug($slug);
+ if ($normal === $slug) {
+ return null;
+ }
+
+ $viewer = $this->getViewer();
+
+ // Do execute() instead of executeOne() here so we canonicalize before
+ // raising a policy exception. This is a little more polished than letting
+ // the user hit the error on any variant of the slug.
+
+ $projects = id(new PhabricatorProjectQuery())
+ ->setViewer($viewer)
+ ->withSlugs(array($normal))
+ ->execute();
+ if (!$projects) {
+ return null;
+ }
+
+ return "/tag/{$normal}/";
+ }
+
}
diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -498,9 +498,7 @@
PhabricatorLiskDAO $object,
$name) {
- $object = (clone $object);
- $object->setPhrictionSlug($name);
- $slug = $object->getPrimarySlug();
+ $slug = PhabricatorSlug::normalizeProjectSlug($name);
$slug_object = id(new PhabricatorProjectSlug())->loadOneWhere(
'slug = %s',
diff --git a/src/infrastructure/util/PhabricatorSlug.php b/src/infrastructure/util/PhabricatorSlug.php
--- a/src/infrastructure/util/PhabricatorSlug.php
+++ b/src/infrastructure/util/PhabricatorSlug.php
@@ -2,6 +2,12 @@
final class PhabricatorSlug extends Phobject {
+ public static function normalizeProjectSlug($slug) {
+ $slug = str_replace('/', ' ', $slug);
+ $slug = self::normalize($slug);
+ return rtrim($slug, '/');
+ }
+
public static function normalize($slug) {
$slug = preg_replace('@/+@', '/', $slug);
$slug = trim($slug, '/');

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 5:20 PM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7699060
Default Alt Text
D14260.id34425.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility