git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: apply admin restrictions from .private contents
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index c313467ffe3076674dbe31631a0a25ebbcb29e72..30f0e3c59c2e645bd492b1b6f900b50d82a60f8c 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-16,7
+16,7
@@
$staticpage = "$request.html";
if (file_exists($staticpage)) {
if (is_link($staticpage)) {
$target = preg_replace('/\.html$/', '', readlink($staticpage));
if (file_exists($staticpage)) {
if (is_link($staticpage)) {
$target = preg_replace('/\.html$/', '', readlink($staticpage));
- abort($target, '30
2
Shorthand');
+ abort($target, '30
7
Shorthand');
}
}
elseif (file_exists("$request/index.html")) {
}
}
elseif (file_exists("$request/index.html")) {
@@
-40,6
+40,11
@@
if ($Page->restricted) {
$target = urlencode($Page->link);
abort("/login?goto=$target", '303 Eerst inloggen');
}
$target = urlencode($Page->link);
abort("/login?goto=$target", '303 Eerst inloggen');
}
+ elseif ($check = file_get_contents("{$Page->restricted}/.private")
+ and !$User->admin(trim($check))) {
+ http_response_code(403);
+ $Page->raw('403.inc.html');
+ }
}
# prepare page contents
}
# prepare page contents
@@
-50,6
+55,7
@@
header(sprintf('Content-Security-Policy: %s', implode('; ', [
"base-uri 'self'", # only local pages
"frame-ancestors 'none'", # prevent malicious embedding
])));
"base-uri 'self'", # only local pages
"frame-ancestors 'none'", # prevent malicious embedding
])));
+header('Referrer-Policy: no-referrer-when-downgrade');
$Page->place += [
'user' => $User->login ?: '',
$Page->place += [
'user' => $User->login ?: '',
@@
-60,7
+66,8
@@
if ($Page->editable = $User->admin("edit {$Page->link}")) {
include_once 'edit/head.inc.php';
}
include_once 'edit/head.inc.php';
}
-if (isset($Page->raw)) {
+if (isset($Page->raw)
+and @$_SERVER['HTTP_ACCEPT'] !== 'application/xml') {
$Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
}
$Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
}