dynamic,HandlerFeedGenerator: Check for read permissions

dynamic/dynamiccontent.cpp

@@ -1,8 +1,9 @@
 #include "dynamiccontent.h"
 
-DynamicContent::DynamicContent(Template &templ, Database &database, UrlProvider &provider)
+DynamicContent::DynamicContent(Template &templ, Database &database, UrlProvider &provider, Session &session)
 {
 	this->templ = &templ;
 	this->database = &database;
 	this->urlProvider = &provider;
+	this->userSession = &session;
 }

dynamic/dynamiccontent.h

@@ -10,11 +10,12 @@ class DynamicContent
 	Template *templ;
 	Database *database;
 	UrlProvider *urlProvider;
+	Session *userSession;
 
 	std::string argument;
 
   public:
-	DynamicContent(Template &templ, Database &database, UrlProvider &urlProvider);
+	DynamicContent(Template &templ, Database &database, UrlProvider &urlProvider, Session &session);
 	virtual std::string render() = 0;
 	virtual void setArgument(std::string argument)
 	{

dynamic/dynamiccontentfactory.h

@@ -9,18 +9,20 @@ private:
 	Template *templ;
 	Database *db;
 	UrlProvider *urlProvider;
+	Session *session;
 	
 public:
-	DynamicContentFactory(Template &templ, Database &db, UrlProvider &urlProvider)
+	DynamicContentFactory(Template &templ, Database &db, UrlProvider &urlProvider, Session &session)
 	{
 		this->templ = &templ;
 		this->db = &db;
 		this->urlProvider = &urlProvider;
+		this->session = &session;
 	}
 	
 	template <class T> inline std::shared_ptr<T> createDynamicContent()
 	{
-		return std::make_shared<T>(*this->templ, *this->db, *this->urlProvider);
+		return std::make_shared<T>(*this->templ, *this->db, *this->urlProvider, *this->session);
 	}
 	
 	

dynamic/dynamiccontentpostlist.cpp

@@ -6,14 +6,21 @@ std::string DynamicContentPostList::render()
 	auto categoryDao = this->database->createCategoryDao();
 	auto pageDao = this->database->createPageDao();
 	auto revisionDao = this->database->createRevisionDao();
+	auto permissionDao = this->database->createPermissionsDao();
+
 	QueryOption option;
 	option.includeInvisible = false;
 	auto members = categoryDao->fetchMembers(this->argument, option);
 	std::vector<std::pair<std::string, time_t>> pageList;
 	for(const Page &member : members)
 	{
-		auto revision = revisionDao->getRevisionForPage(member.name, 1);
+		Permissions perms = permissionDao->find(member.name, this->userSession->user.login)
-		pageList.push_back({member.name, revision->timestamp});
+								.value_or(this->userSession->user.permissions);
+		if(perms.canRead()) /* TODO: Maybe add canList() */
+		{
+			auto revision = revisionDao->getRevisionForPage(member.name, 1);
+			pageList.push_back({member.name, revision->timestamp});
+		}
 	}
 	std::sort(pageList.begin(), pageList.end(),
 			  [](std::pair<std::string, time_t> &a, std::pair<std::string, time_t> &b) { return a.second > b.second; });

handlers/handlerfeedgenerator.cpp

@@ -1,19 +1,19 @@
 #include "handlerfeedgenerator.h"
-#include "../parser.h"
 #include "../revisionrenderer.h"
 std::vector<HandlerFeedGenerator::EntryRevisionPair> HandlerFeedGenerator::fetchEntries(
 	std::vector<std::string> categories)
 {
 	auto revisionDao = this->database->createRevisionDao();
 	auto pageDao = this->database->createPageDao();
+	auto permissionDao = this->database->createPermissionsDao();
 
 	std::vector<EntryRevisionPair> result;
 	QueryOption option;
 	option.includeInvisible = false;
 	// option.limit = 20;
-	
+
 	auto comppage = [](const Page &a, const Page &b) { return a.name < b.name; };
-	std::set<Page, decltype(comppage)> members (comppage);
+	std::set<Page, decltype(comppage)> members(comppage);
 	if(categories.empty())
 	{
 		auto pages = pageDao->getPageList(option);
@@ -34,8 +34,13 @@ std::vector<HandlerFeedGenerator::EntryRevisionPair> HandlerFeedGenerator::fetch
 	}
 	for(const Page &member : members)
 	{
-		auto revision = revisionDao->getRevisionForPage(member.name, 1).value();
+		Permissions perms = permissionDao->find(member.name, this->userSession->user.login)
-		result.push_back({member, revision});
+								.value_or(this->userSession->user.permissions);
+		if(perms.canRead())
+		{
+			auto revision = revisionDao->getRevisionForPage(member.name, 1).value();
+			result.push_back({member, revision});
+		}
 	}
 	std::sort(result.begin(), result.end(),
 			  [](EntryRevisionPair &a, EntryRevisionPair &b) { return a.second.timestamp > b.second.timestamp; });
@@ -68,7 +73,7 @@ std::string HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGene
 		subtitle = "All pages";
 	}
 
-	RevisionRenderer revisionRenderer { *this->templ, *this->database, *this->urlProvider };
+	RevisionRenderer revisionRenderer{*this->templ, *this->database, *this->urlProvider, *this->userSession};
 
 	for(const EntryRevisionPair &entry : entries)
 	{

handlers/handlerpageview.cpp

@@ -138,8 +138,7 @@ Response HandlerPageView::handleRequest(PageDao &pageDao, std::string pagename,
 	Response result;
 	result.setStatus(200);
 
-	RevisionRenderer revisionRenderer { *this->templ, *this->database, *this->urlProvider };
+	RevisionRenderer revisionRenderer{*this->templ, *this->database, *this->urlProvider, *this->userSession};
-
 
 	std::string customtitle = parser.extractCommand("pagetitle", revision->content);
 	std::string parsedcontent = revisionRenderer.renderContent(revision.value(), customtitle);

revisionrenderer.h

@@ -17,7 +17,7 @@ private:
 	Parser parser;
 	
 public:
-	RevisionRenderer(Template &templ, Database &db, UrlProvider &urlProvider) :dynamicContentFactory(templ, db, urlProvider)
+	RevisionRenderer(Template &templ, Database &db, UrlProvider &urlProvider, Session &session) :dynamicContentFactory(templ, db, urlProvider, session)
 	{
 		this->db = &db;
 		this->urlProvider = &urlProvider;