archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Phame - allow blogs to specify custom URIs

Browse Source 
Summary: this then enables people to create blog.theircompany.com. And for us, blog.phacility.com...!

Test Plan:
 - created custom URIs of various goodness and verified the error messages were sensical.
 - verified if "false" in configuration then custom uri stuff disappears

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T1373

Differential Revision: https://secure.phabricator.com/D3542
This commit is contained in:
Bob Trahan
2012-09-30 17:10:27 -07:00
parent f29804a62a
commit 9e1b643896
8 changed files with 147 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/aphront/configuration/AphrontApplicationConfiguration.php
View File

@@ -91,9 +91,11 @@ abstract class AphrontApplicationConfiguration {
/**
* Using builtin and application routes, build the appropriate
* @{class:AphrontController} class for the request. To route a request, we
* test the URI against all builtin routes from @{method:getURIMap}, then
* against all application routes from installed
* @{class:PhabricatorApplication}s.
* first test if the HTTP_HOST is configured as a valid Phabricator URI. If
* it isn't, we do a special check to see if it's a custom domain for a blog
* in the Phame application and if that fails we error. Otherwise, we test
* the URI against all builtin routes from @{method:getURIMap}, then against
* all application routes from installed @{class:PhabricatorApplication}s.
*
* If we match a route, we construct the controller it points at, build it,
* and return it.
@@ -117,7 +119,6 @@ abstract class AphrontApplicationConfiguration {
*/
final public function buildController() {
$request = $this->getRequest();
$path = $request->getPath();
if (PhabricatorEnv::getEnvConfig('security.require-https')) {
if (!$request->isHTTPS()) {
@@ -128,6 +129,41 @@ abstract class AphrontApplicationConfiguration {
}
}
$path = $request->getPath();
$host = $request->getHost();
$base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
$prod_uri = PhabricatorEnv::getEnvConfig('phabricator.production-uri');
$file_uri = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
if ($host != id(new PhutilURI($base_uri))->getDomain() &&
$host != id(new PhutilURI($prod_uri))->getDomain() &&
$host != id(new PhutilURI($file_uri))->getDomain()) {
$blogs = id(new PhameBlogQuery())->withDomain($host)->execute();
$blog = reset($blogs);
if (!$blog) {
if ($prod_uri) {
$prod_str = ' or '.$prod_uri;
} else {
$prod_str = '';
}
throw new Exception(
'Specified domain '.$host.' is not configured for Phabricator '.
'requests. Please use '.$base_uri.$prod_str.' to visit this instance.'
);
}
// 2 basic cases
// -- looking at a list of blog posts, path is nothing or '/'
// -- looking at an actual blog post, path is like /btrahan/post_title
if (!$path || $path == '/') {
$path = $blog->getViewURI();
} else {
$path = '/phame/posts/'.trim($path, '/').'/';
}
// TODO - now we need to tell Celerity to render static resources with
// full URIs like secure.phabricator.org/rsrc/blahblah
}
list($controller, $uri_data) = $this->buildControllerForPath($path);
if (!$controller) {
if (!preg_match('@/$@', $path)) {