Page MenuHomePhorge
Files F2685188

D25561.1734701516.diff
No OneTemporary
Actions

D25561.1734701516.diff
View Options

diff --git a/src/applications/meta/engineextension/PhabricatorDatasourceURIEngineExtension.php b/src/applications/meta/engineextension/PhabricatorDatasourceURIEngineExtension.php
--- a/src/applications/meta/engineextension/PhabricatorDatasourceURIEngineExtension.php
+++ b/src/applications/meta/engineextension/PhabricatorDatasourceURIEngineExtension.php
@@ -10,35 +10,37 @@
public function newJumpURI($query) {
// If you search for a URI on the local install, just redirect to that
// URI as though you had pasted it into the URI bar.
- if (PhabricatorEnv::isSelfURI($query)) {
- // Strip off the absolute part of the URI. If we don't, the URI redirect
- // validator will get upset that we're performing an unmarked external
- // redirect.
-
- // The correct host and protocol may also differ from the host and
- // protocol used in the search: for example, if you search for "http://"
- // we want to redirect to "https://" if an install is HTTPS, and
- // the "isSelfURI()" check includes alternate domains in addition to the
- // canonical domain.
-
- $uri = id(new PhutilURI($query))
- ->setDomain(null)
- ->setProtocol(null)
- ->setPort(null);
-
- $uri = phutil_string_cast($uri);
-
- // See T13412. If the URI was in the form "http://dev.example.com" with
- // no trailing slash, there may be no path. Redirecting to the empty
- // string is considered an error by safety checks during redirection,
- // so treat this like the user entered the URI with a trailing slash.
- if (!strlen($uri)) {
- $uri = '/';
- }
-
- return $uri;
+ // Skip things that are really not full URLs, like "asdasd".
+ // Note that the backend of "isSelfURI" is faster with a PhutilURI.
+ $uri = new PhutilURI($query);
+ if ($uri->getDomain() === '' || !PhabricatorEnv::isSelfURI($uri)) {
+ return null;
}
- return null;
+ // Strip off the absolute part of the URI. If we don't, the URI redirect
+ // validator will get upset that we're performing an unmarked external
+ // redirect.
+
+ // The correct host and protocol may also differ from the host and
+ // protocol used in the search: for example, if you search for "http://"
+ // we want to redirect to "https://" if an install is HTTPS, and
+ // the "isSelfURI()" check includes alternate domains in addition to the
+ // canonical domain.
+ $uri = $uri
+ ->setDomain(null)
+ ->setProtocol(null)
+ ->setPort(null);
+
+ $uri = phutil_string_cast($uri);
+
+ // See T13412. If the URI was in the form "http://dev.example.com" with
+ // no trailing slash, there may be no path. Redirecting to the empty
+ // string is considered an error by safety checks during redirection,
+ // so treat this like the user entered the URI with a trailing slash.
+ if (!strlen($uri)) {
+ $uri = '/';
+ }
+
+ return $uri;
}
}

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 13:31 (8 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1015061
Default Alt Text
D25561.1734701516.diff (2 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0