admin/messages.php: Security - CSRF protection for admin message forms; viewpage.php, admin/custpages.php: Security - do not execute PHP in stored pages and CSRF protection, but delete is a confirmation prompt instead - from @ariadoss
admin/messages.php: Security - CSRF protection for admin message forms; viewpage.php, admin/custpages.php: Security - do not execute PHP in stored pages and CSRF protection, but delete is a confirmation prompt instead - from @ariadoss

--- a/admin/custpages.php
+++ b/admin/custpages.php
@@ -24,12 +24,29 @@
 
 if(!defined("_CHARSET")) exit( );
 
+$csrfKey = SITEKEY . '_custpages_csrf';
+if(empty($_SESSION[$csrfKey])) $_SESSION[$csrfKey] = bin2hex(random_bytes(32));
+$isWrite = isset($_POST['submit']) || isset($_POST['preview']);
+if($isWrite && (!isset($_POST['csrf']) || !hash_equals($_SESSION[$csrfKey], (string) $_POST['csrf']))) {
+	http_response_code(403);
+	exit('Forbidden');
+}
+$efCsrfField = "<input type='hidden' name='csrf' value='".htmlspecialchars($_SESSION[$csrfKey], ENT_QUOTES, 'UTF-8')."'>";
+$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
 
 	$output .= "<div id=\"pagetitle\">"._CUSTPAGES."</div>";
 if(isset($_GET['delete']) && isNumber($_GET['delete'])) {
-	$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_messages WHERE message_id = ".$_GET['delete']." LIMIT 1");
-	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
-	else $output .= write_error(_ERROR);
+	if($confirm == "yes") {
+		$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_messages WHERE message_id = ".$_GET['delete']." LIMIT 1");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+	}
+	else if($confirm == "no") {
+	$output .= write_message(_ACTIONCANCELLED);
+	}
+	else {
+		$output .= write_message("Are you sure you want to remove this custom page? <a href='admin.php?action=custpages&amp;delete=".$_GET['delete']."&amp;confirm=yes'>"._YES."</a> "._OR." <a href='admin.php?action=custpages&amp;delete=".$_GET['delete']."&amp;confirm=no'>"._NO."</a>");
+	}
 }
 if(isset($_POST['submit'])) {
 	if(!preg_match("!^[a-z0-9_]{3,30}$!i", $_POST['name'])) $output .= write_error(_BADVARNAME);
@@ -54,12 +71,8 @@
 		$title = descript($_POST['title']);
 		$thistext = descript($_POST['text']);
 		$edit = isset($_GET['edit']) ? $_GET['edit'] : "";
-		if(strpos($thistext, "?>") === false) $output .= "<div id='pagetitle'>$title</div>\n\n$thistext";
-		else {
-			$text = "";
-			eval("?>".$thistext."<?php ");
-			$output .= "<div id='pagetitle'>$title</div>\n\n$text";
-		}
+		if(preg_match('/<\?(?:php|=)|\?>/i', (string) $thistext)) $output .= "<div id='pagetitle'>$title</div>".write_error("This draft contains embedded PHP. This eFiction fork does not execute stored PHP; convert the page to static HTML.");
+		else $output .= "<div id='pagetitle'>$title</div>\n\n$thistext";
 		$text = $thistext;
 	}
 	else if(isset($_GET['edit'])) {
@@ -77,6 +90,7 @@
 		$text = "";
 	}
 	$output .= "<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=custpages".(isset($edit) ? "&amp;edit=$edit" : "")."\">
+		$efCsrfField
 		<div><label for=\"name\">"._NAME.":</label> <input type=\"text\" class=\"textbox\" name=\"name\" value=\"$name\"></div>
 		<div><label for=\"title\">"._TITLE.":</label> <input type=\"text\" class=\"textbox\" name=\"title\" value=\"$title\" size=\"30\"></div>
 		<div><label for=\"text\">"._TEXT.":</label><br />
@@ -94,7 +108,7 @@
 		if($msg['message_name'] == "welcome" ||  $msg['message_name'] == "nothankyou" || $msg['message_name'] == "thankyou" ||
 		$msg['message_name'] == "copyright" || $msg['message_name'] == "printercopyright") continue;
 		$output .= "<tr><td class=\"tblborder\">$msg[message_id]</td><td class=\"tblborder\">$msg[message_name]</td><td class=\"tblborder\"><a href='viewpage.php?page=$msg[message_name]'>$msg[message_title]</a></td>
-		<td class=\"tblborder\"><a href=\"admin.php?action=custpages&amp;edit=$msg[message_id]\">"._EDIT."</a> | 
+		<td class=\"tblborder\"><a href=\"admin.php?action=custpages&amp;edit=$msg[message_id]\">"._EDIT."</a> |
 		<a href=\"admin.php?action=custpages&amp;delete=$msg[message_id]\">"._DELETE."</a></td></tr>";
 	}
 	if(!dbnumrows($listquery)) $output .= "<tr><td class=\"tblborder\" colspan=\"3\" align=\"center\">"._NORESULTS."</td></tr>";
@@ -103,3 +117,4 @@
 	$output .= write_message(_CUSTPAGENOTE);
 }
 ?>
+

--- a/admin/messages.php
+++ b/admin/messages.php
@@ -22,22 +22,34 @@
 
 if(!defined("_CHARSET")) exit( );
 
+$csrfKey = SITEKEY . '_messages_csrf';
+if(empty($_SESSION[$csrfKey])) $_SESSION[$csrfKey] = bin2hex(random_bytes(32));
+if(isset($_POST['submit']) && (!isset($_POST['csrf']) || !hash_equals($_SESSION[$csrfKey], (string) $_POST['csrf']))) {
+	http_response_code(403);
+	exit('Forbidden');
+}
+$messageName = (isset($_GET['message']) && preg_match('/^[a-z0-9_]{3,30}$/i', (string) $_GET['message'])) ? (string) $_GET['message'] : "";
+$efCsrfField = "<input type='hidden' name='csrf' value='".htmlspecialchars($_SESSION[$csrfKey], ENT_QUOTES, 'UTF-8')."'>";
+
 	$output .= "<div id=\"pagetitle\">"._MESSAGESETTINGS."</div>";
 
-if(isset($_POST['submit'])) {
-	$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_messages SET message_text = '".escapestring(descript($_POST['text']))."' WHERE message_name = '".$_GET['message']."' LIMIT 1");
+if($messageName === "") {
+	$output .= write_error(_BADVARNAME);
+} else if(isset($_POST['submit'])) {
+	$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_messages SET message_text = '".escapestring(descript($_POST['text']))."' WHERE message_name = '".escapestring($messageName)."' LIMIT 1");
 	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
 	else $output .= write_error(_ERROR);
 }
 else {
-	$pagequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_messages WHERE message_name = '".$_GET['message']."' LIMIT 1");
+	$pagequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_messages WHERE message_name = '".escapestring($messageName)."' LIMIT 1");
 	$message =  dbassoc($pagequery);
 	$text = $message['message_text'];
-	if(!$message) dbquery("INSERT INTO `".TABLEPREFIX."fanfiction_messages` (`message_name` , `message_title` , `message_text` ) VALUES ('".$_GET['message']."', '', '')");
-	$output .= "<div class='sectionheader'>".preg_replace("@\{sitename\}@", $sitename, $message['message_title'])."</div>
-		<div style='width: 100%;'><div style='width: 35%; margin: 0 auto;'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=messages&message=".$_GET['message']."\">
-		<textarea rows=\"10\" cols=\"60\" style=\"width: 100%;\" ".($_GET['message'] == "tinyMCE" ? "class='mceNoEditor'" :"")." name=\"text\">$text</textarea>";
-	if($tinyMCE && $_GET['message'] != "tinyMCE") 
+	if(!$message) dbquery("INSERT INTO `".TABLEPREFIX."fanfiction_messages` (`message_name` , `message_title` , `message_text` ) VALUES ('".escapestring($messageName)."', '', '')");
+	$output .= "<div class='sectionheader'>".htmlspecialchars(preg_replace("@\{sitename\}@", (string) $sitename, (string) $message['message_title']), ENT_QUOTES, 'UTF-8')."</div>
+		<div style='width: 100%;'><div  id=\"settingsform\"><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=messages&message=".htmlspecialchars($messageName, ENT_QUOTES, 'UTF-8')."\">
+		$efCsrfField
+		<textarea rows=\"10\" cols=\"60\" style=\"width: 100%;\" ".($messageName == "tinyMCE" ? "class='mceNoEditor'" :"")." name=\"text\">$text</textarea>";
+	if($tinyMCE && $messageName != "tinyMCE")
 		$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('text');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
 	$output .= "<div style='clear: both;'>&nbsp; &nbsp;</div><INPUT type='submit' class='button' id='submit' value='"._SUBMIT."' name='submit'>
 				</form></div><div style='clear: both;'>&nbsp;</div></div>";

--- a/viewpage.php
+++ b/viewpage.php
@@ -34,12 +34,14 @@
 
 $page = dbquery("SELECT message_title, message_text FROM ".TABLEPREFIX."fanfiction_messages WHERE ".($current ? "message_name = '".escapestring($current)."'" : "message_id = '".(isNumber($_GET['id']) ? $_GET[id] : "0")."'")." LIMIT 1");
 if(dbnumrows($page)) list($title, $text) = dbrow($page);
-else $text = write_message(_ERROR);
-if(strpos($text, "?>") === false) $tpl->assign("output", "<div id='pagetitle'>$title</div>\n\n$text");
-else {
-	eval("?>".$text."<?php ");
+else { $title = ""; $text = write_message(_ERROR); }
+if(preg_match('/<\?(?:php|=)|\?>/i', (string) $text)) {
+	http_response_code(503);
+	$tpl->assign("output", "This custom page needs administrator review.");
+} else {
 	$tpl->assign("output", "<div id='pagetitle'>$title</div>\n\n$text");
 }
 $tpl->printToScreen();
 dbclose( );
 ?>
+