page: ignore failed user setup during errors

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index e23b3e23bce2a5abdc1e975d3108774d697407b9..ed0ec1b9af93772e0b9cbbbc15e1721846ad9ffe 100644 (file)
--- a/page.php
+++ b/page.php
@@ -54,7 +54,7 @@ function getoutput($blocks = [])
 
        # keep either login or logout parts depending on user level
        global $User;
-       $hideclass = empty($User) ? 'login' : 'logout';
+       $hideclass = $User && property_exists($User, 'login') && $User->login ? 'logout' : 'login';
        $doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
 
        return preg_replace_callback(
@@ -86,6 +86,7 @@ function fail($error)
        global $User, $Page, $Args;
        http_response_code(500);
        if (!isset($Article)) {
+               require_once('article.inc.php');
                $Article = new ArchiveArticle(NULL);
                $Article->title = 'Fout';
        }
@@ -118,42 +119,17 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
-$User = NULL;
-include_once 'auth.inc.php';
+include_once 'auth.inc.php'; // sets global $User
 $Edit = isset($_GET['edit']);
 
-# distinguish subpage Args from topmost Page script
+# setup requested page
 
 $Args = '';
 $Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
-while (TRUE) {
-       if (file_exists("$Page/.private")) {
-               # access restriction
-               if (empty($User)) {
-                       http_response_code(303);
-                       $target = urlencode($_SERVER['REQUEST_URI']);
-                       header("Location: /login?goto=$target");
-                       exit;
-               }
-               $PageAccess = $Page;
-       }
-
-       if (file_exists("$Page/index.php")) {
-               break;
-       }
-
-       $up = strrpos($Page, '/');
-       $Args = substr($Page, $up) . $Args;
-       $Page = substr($Page, 0, $up);
-       if ($up === FALSE) {
-               break;
-       }
-}
 
-$staticpage = NULL;
-if (file_exists("$Page$Args.html")) {
-       $staticpage = "$Page$Args.html";
+$staticpage = "$Page.html";
+if (file_exists($staticpage)) {
        if (is_link($staticpage)) {
                $target = preg_replace('/\.html$/', '', readlink($staticpage));
                header("HTTP/1.1 302 Shorthand");
@@ -161,26 +137,43 @@ if (file_exists("$Page$Args.html")) {
                exit;
        }
 }
-elseif (file_exists("$Page$Args/index.html")) {
-       $staticpage = "$Page$Args/index.html";
+elseif (file_exists("$Page/index.html")) {
+       $staticpage = "$Page/index.html";
 }
-elseif ($User and $User->admin("edit $Page$Args")) {
-       $staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
+
+$Page = $Article->handler;
+$Args = $Article->path;
+
+if ($PageAccess = $Article->restricted) {
+       # access restriction
+       if (!$User->login) {
+               http_response_code(303);
+               $target = urlencode($Article->link);
+               header("Location: /login?goto=$target");
+               exit;
+       }
 }
 
 # prepare page contents
 
-require_once('article.inc.php');
-$Article = new ArchiveArticle($staticpage);
+header(sprintf('Content-Security-Policy: %s', implode('; ', [
+       "default-src 'self' 'unsafe-inline' http://cdn.ckeditor.com", # some overrides remain
+       "img-src 'self' data: http://cdn.ckeditor.com", # inline svg (in css)
+       "base-uri 'self'", # only local pages
+       "frame-ancestors 'none'", # prevent malicious embedding
+])));
 
 ob_start(); # page body
 $Place = [
-       'user'  => $User ? $User->login : '',
+       'user'  => $User->login ?: '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
 if (isset($Article->raw)) {
-       if ($User and $User->admin("edit $Page$Args")) {
+       if ($User->admin("edit $Page$Args")) {
                # restore meta tags in static contents for editing
                foreach (array_reverse($Article->meta) as $metaprop => $val) {
                        $Article->raw = sprintf(
@@ -189,6 +182,11 @@ if (isset($Article->raw)) {
                        ) . $Article->raw;
                }
        }
+}
+elseif ($User->admin("edit {$Article->link}")) {
+       $Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+}
+if (isset($Article->raw)) {
        $Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
 }