Changed post permalink handling

data/config.ini

@@ -4,8 +4,8 @@ dbLocation     = "./data/db.sqlite"
 dbUser         = "test"
 dbPass         = "test"
 cachePath      = "./cache/"
-filesPath      = "./data/files/"
 logsPath       = "./data/logs/{yyyy}-{mm}.log"
+filesPath      = "./public_html/files/"
 mediaPath      = "./public_html/media/"
 thumbnailsPath = "./public_html/thumbs/"
 avatarsPath    = "./public_html/avatars/"
@@ -104,17 +104,6 @@ viewPost.sketchy=registered
 viewPost.unsafe=registered
 viewPost.hidden=moderator
 
-;privilege to download post file, e.g. example.com/8ca21cb48aaf6ba5d361e6bebebc8cfe/retrieve
-;note that the hash cannot be guessed with basic url manipulation. giving
-;anonymous access in this case is reasonable - it allows privileged users to
-;share permalinks with unprivileged folks, also it allows to properly feature
-;posts otherwise unavailable to unregistered people.
-downloadPost=anonymous
-downloadPost.safe=anonymous
-downloadPost.sketchy=anonymous
-downloadPost.unsafe=anonymous
-downloadPost.hidden=moderator
-
 retrievePost=anonymous
 favoritePost=registered
 

public_html/.htaccess

@@ -10,6 +10,10 @@ RewriteCond %{DOCUMENT_ROOT}/thumbs/$1.thumb -f
 RewriteRule ^/?post/(.*)/thumb/?$ /thumbs/$1.thumb
 RewriteRule ^/?thumbs/(.*).thumb - [L,T=image/jpeg]
 
+RewriteCond %{DOCUMENT_ROOT}/files/$1 -f
+RewriteRule ^/?post/(.*)/retrieve/?$ /files/$1
+RewriteRule ^/?files/(.*) - [L]
+
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^.*$ /dispatch.php

src/Api/Jobs/PostJobs/GetPostContentJob.php

@@ -36,20 +36,12 @@ class GetPostContentJob extends AbstractJob
 
 	public function getRequiredMainPrivilege()
 	{
-		return Privilege::DownloadPost;
+		return null;
 	}
 
 	public function getRequiredSubPrivileges()
 	{
-		$post = $this->postRetriever->retrieve();
+		return null;
-		$privileges = [];
-
-		if ($post->isHidden())
-			$privileges []= 'hidden';
-
-		$privileges []= $post->getSafety()->toString();
-
-		return $privileges;
 	}
 
 	public function isAuthenticationRequired()

src/Controllers/PostController.php

@@ -320,6 +320,7 @@ class PostController extends AbstractController
 
 	public function fileView($name)
 	{
+		die;
 		$ret = Api::run(new GetPostContentJob(), [JobArgs::ARG_POST_NAME => $name]);
 
 		$options = new FileRendererOptions();

src/Enums/Privilege.php

@@ -3,7 +3,6 @@ class Privilege extends AbstractEnum implements IEnum
 {
 	const ListPosts = 'listPosts';
 	const ViewPost = 'viewPost';
-	const DownloadPost = 'downloadPost';
 	const RetrievePost = 'retrievePost';
 	const FavoritePost = 'favoritePost';
 	const HidePost = 'hidePost';

src/Models/Entities/PostEntity.php

@@ -360,6 +360,11 @@ final class PostEntity extends AbstractEntity implements IValidatable, ISerializ
 	}
 
 
+	public function getContentUrl()
+	{
+		return Core::getRouter()->linkTo(['PostController', 'fileView'], ['name' => $this->getName()]);
+	}
+
 	public function getThumbnailUrl()
 	{
 		return Core::getRouter()->linkTo(['PostController', 'thumbnailView'], ['name' => $this->getName()]);

src/Router.php

@@ -63,9 +63,9 @@ class Router extends \Chibi\Routing\Router
 		$this->get('/{source}/{query}/{additionalInfo}/{page}', ['PostController', 'listView'], $postValidation);
 		$this->post('/{source}-redirect', ['PostController', 'listRedirectAction'], $postValidation);
 
-		$this->get('/post/{name}/retrieve', ['PostController', 'fileView'], $postValidation);
 		$this->get('/post/{identifier}', ['PostController', 'genericView'], $postValidation);
 		$this->get('/post/{identifier}/search={query}', ['PostController', 'genericView'], $postValidation);
+		$this->get('/post/{name}/retrieve', ['PostController', 'fileView'], $postValidation);
 		$this->get('/post/{name}/thumb', ['PostController', 'thumbnailView'], $postValidation);
 
 		$this->any('/post/{identifier}/toggle-tag/{tag}/{enable}', ['PostController', 'toggleTagAction'], $postValidation);

src/Views/post/post-file-render.phtml

@@ -1,16 +1,11 @@
 <?php
-$this->assets->setPageThumbnail(Core::getRouter()->linkTo(
-	['PostController', 'thumbnailView'],
-	['name' => $this->context->transport->post->getName()]));
 $post = $this->context->transport->post;
+$this->assets->setPageThumbnail($post->getThumbnailUrl());
 ?>
 
 <?php if ($post->getType()->toInteger() == PostType::Image): ?>
 
-	<img alt="<?= $post->getName() ?>"
+	<img alt="<?= $post->getName() ?>" src="<?= $post->getContentUrl() ?>"/>
-		src="<?= Core::getRouter()->linkTo(
-			['PostController', 'fileView'],
-			['name' => $post->getName()]) ?>"/>
 
 <?php elseif ($post->getType()->toInteger() ==  PostType::Flash): ?>
 
@@ -18,14 +13,10 @@ $post = $this->context->transport->post;
 		type="<?= $post->getMimeType() ?>"
 		width="<?= $post->getImageWidth() ?>"
 		height="<?= $post->getImageHeight() ?>"
-		data="<?= Core::getRouter()->linkTo(
+		data="<?= $post->getContentUrl() ?>">
-			['PostController', 'fileView'],
-			['name' => $post->getName()]) ?>">
 
 		<param name="wmode" value="opaque"/>
-		<param name="movie" value="<?= Core::getRouter()->linkTo(
+		<param name="movie" value="<?= $post->getContentUrl() ?>"/>
-			['PostController', 'fileView'],
-			['name' => $post->getName()]) ?>"/>
 
 	</object>
 
@@ -39,9 +30,7 @@ $post = $this->context->transport->post;
 	<video controls>
 		<source
 			type="<?= $post->getMimeType() ?>"
-			src="<?= Core::getRouter()->linkTo(
+			src="<?= $post->getContentUrl() ?>"/>
-				['PostController', 'fileView'],
-				['name' => $post->getName()]) ?>">
 
 		Your browser doesn't support HTML5 &lt;video&gt; tag.
 	</video>

src/Views/post/post-view.phtml

@@ -199,9 +199,7 @@ $canEditAnything = count(array_filter($editPostPrivileges)) > 0;
 	<div class="unit hl-options">
 		<?php if ($post->getType()->toInteger() != PostType::Youtube): ?>
 			<div class="hl-option">
-				<a title="Download" href="<?= Core::getRouter()->linkTo(
+				<a title="Download" href="<?= $post->getContentUrl() ?>">
-					['PostController', 'fileView'],
-					['name' => $post->getName()]) ?>">
 					<i class="icon-dl"></i>
 					<span>
 						<?php

tests/Tests/ApiTests/ApiPrivilegeTest.php

@@ -120,10 +120,8 @@ class ApiPrivilegeTest extends AbstractFullApiTest
 		$job->setArgument(JobArgs::ARG_POST_ID, $post->getId());
 		$job->setArgument(JobArgs::ARG_POST_NAME, $post->getName());
 		$job->prepare();
-		$this->assert->areEqual(Privilege::DownloadPost, $job->getRequiredMainPrivilege());
+		$this->assert->isNull($job->getRequiredMainPrivilege());
-		$sub = $job->getRequiredSubPrivileges();
+		$this->assert->isNull($job->getRequiredSubPrivileges());
-		natcasesort($sub);
-		$this->assert->areEquivalent(['hidden', 'safe'], $sub);
 	}
 
 	public function testDynamicPostThumbnailPrivileges()
@@ -131,6 +129,7 @@ class ApiPrivilegeTest extends AbstractFullApiTest
 		$job = new GetPostThumbnailJob();
 		$this->testedJobs []= $job;
 		$this->assert->isNull($job->getRequiredMainPrivilege());
+		$this->assert->isNull($job->getRequiredSubPrivileges());
 	}
 
 	public function testDynamicUserPrivileges()

tests/Tests/JobTests/GetPostContentJobTest.php

@@ -3,7 +3,6 @@ class GetPostContentJobTest extends AbstractTest
 {
 	public function testPostRetrieval()
 	{
-		$this->grantAccess('downloadPost');
 		$post = $this->postMocker->mockSingle();
 
 		$output = $this->assert->doesNotThrow(function() use ($post)
@@ -24,8 +23,6 @@ class GetPostContentJobTest extends AbstractTest
 
 	public function testIdFail()
 	{
-		$this->grantAccess('downloadPost');
-
 		$this->assert->throws(function()
 		{
 			Api::run(
@@ -38,8 +35,6 @@ class GetPostContentJobTest extends AbstractTest
 
 	public function testInvalidName()
 	{
-		$this->grantAccess('downloadPost');
-
 		$this->assert->throws(function()
 		{
 			Api::run(