コミット: 1dd1bb561c173b4f56857a9b43c2a83f76ae0674 - pukiwiki-fork (git)

コミットメタ情報

• リビジョン: 1dd1bb561c173b4f56857a9b43c2a83f76ae0674 (tree)
• 日時: 2021-11-28 20:18:18
• 作者: umorigu <umorigu@gmai...>
• コミッター: umorigu

ログメッセージ

BugTrack/2525 Page-URI customization mechanism

Introduce PukiWikiStandardPageURIHandler class

* URI virtual query: '?' + pagename_encode($Page)
* Convert QueryString by PageURIHandler
* Support make_link
* Invalid page name mechanism

変更サマリ

• modified: lib/func.php
• modified: lib/init.php
• modified: lib/make_link.php
• modified: lib/pukiwiki.php
• modified: pukiwiki.ini.php

差分

--- a/lib/func.php
+++ b/lib/func.php
@@ -524,20 +524,17 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 		mb_regex_encoding(SOURCE_ENCODING);
 		$readings = get_readings($pages);
 	}
-
 	$list = $matches = array();
-
-	// Shrink URI for read
-	if ($cmd == 'read') {
-		$href = $script . '?';
-	} else {
-		$href = $script . '?cmd=' . $cmd . '&page=';
-	}
 	uasort($pages, 'strnatcmp');
 	foreach($pages as $file=>$page) {
-		$r_page  = pagename_urlencode($page);
 		$s_page  = htmlsc($page, ENT_QUOTES);
-		$str = '   <li><a href="' . $href . $r_page . '">' .
+		// Shrink URI for read
+		if ($cmd == 'read') {
+			$href = get_page_uri($page);
+		} else {
+			$href = $script . '?cmd=' . $cmd . '&amp;page=' . rawurlencode($page);
+		}
+		$str = '   <li><a href="' . $href . '">' .
 			$s_page . '</a> ' . get_pg_passage($page);
 		if ($withfilename) {
 			$s_file = htmlsc($file);
@@ -647,6 +644,21 @@ EOD;
 	exit;
 }
 
+function die_invalid_pagename() {
+	$title = 'Error';
+	$page = 'Error: Invlid page name';
+	$body = <<<EOD
+<h3>Error</h3>
+<strong>Error message: Invalid page name</strong>
+EOD;
+
+	pkwk_common_headers();
+	header('HTTP/1.0 400 Bad request');
+	catbody($title, $page, $body);
+	exit;
+}
+
+
 // Have the time (as microtime)
 function getmicrotime()
 {
@@ -861,11 +873,8 @@ function get_base_uri($uri_type = PKWK_URI_RELATIVE)
  */
 function get_page_uri($page, $uri_type = PKWK_URI_RELATIVE)
 {
-	global $defaultpage;
-	if ($page === $defaultpage) {
-		return get_base_uri($uri_type);
-	}
-	return get_base_uri($uri_type) . '?' . pagename_urlencode($page);
+	global $page_uri_handler;
+	return get_base_uri($uri_type) . $page_uri_handler->get_page_uri_virtual_query($page);
 }
 
 // Get absolute-URI of this script
@@ -1180,6 +1189,34 @@ function get_preg_u() {
 	return $utf8u;
 }
 
+// Default Page name - URI mapping handler
+class PukiWikiStandardPageURIHandler {
+	function filter_raw_query_string($query_string) {
+		return $query_string;
+	}
+
+	function get_page_uri_virtual_query($page) {
+		return '?' . pagename_urlencode($page);
+	}
+
+	function get_page_from_query_string($query_string) {
+		$param1st = preg_replace("#^([^&]*)&.*$#", "$1", $query_string);
+		if ($param1st == '') {
+			return null; // default page
+		}
+		if (strpos($param1st, '=') !== FALSE) {
+			// Found '/?key=value' (NG chars)
+			return FALSE; // Error page
+		}
+		$page = urldecode($param1st);
+		$page2 = input_filter($page);
+		if ($page !== $page2) {
+			return FALSE; // Error page
+		}
+		return $page2;
+	}
+}
+
 //// Compat ////
 
 // is_a --  Returns TRUE if the object is of this class or has this class as one of its parents

--- a/lib/init.php
+++ b/lib/init.php
@@ -63,6 +63,12 @@ if (! file_exists(INI_FILE) || ! is_readable(INI_FILE)) {
 if ($die) die_message(nl2br("\n\n" . $die));
 
 /////////////////////////////////////////////////
+// Page-URI mapping handler (default)
+if (! $page_uri_handler) {
+	$page_uri_handler = new PukiWikiStandardPageURIHandler();
+}
+
+/////////////////////////////////////////////////
 // INI_FILE: LANG に基づくエンコーディング設定
 
 // MB_LANGUAGE: mb_language (for mbstring extension)
@@ -295,6 +301,21 @@ if (PKWK_QUERY_STRING_MAX && strlen($arg) > PKWK_QUERY_STRING_MAX) {
 }
 $arg = input_filter($arg); // \0 除去
 
+// Convert QueryString by PageURIHandler
+$arg_replaced = $page_uri_handler->filter_raw_query_string($arg);
+if ($arg_replaced !== $arg) {
+	$_GET = array();
+	$m = array();
+	foreach (explode('&', $arg_replaced) as $kv) {
+		if (preg_match('/^([^=]+)(=(.+))?/', $kv, $m)) {
+			$_GET[$m[1]] = is_null($m[3]) ? '' : $m[3];
+		}
+	}
+	unset($m);
+	$arg = $arg_replaced;
+}
+unset($arg_replaced);
+
 // unset QUERY_STRINGs
 foreach (array('QUERY_STRING', 'argv', 'argc') as $key) {
 	unset(${$key}, $_SERVER[$key], $HTTP_SERVER_VARS[$key]);
@@ -398,13 +419,14 @@ if (isset($get['md5']) && $get['md5'] != '' &&
 if (! isset($vars['cmd']) && ! isset($vars['plugin'])) {
 
 	$get['cmd']  = $post['cmd']  = $vars['cmd']  = 'read';
-
-	$arg = preg_replace("#^([^&]*)&.*$#", "$1", $arg);
-	if ($arg == '') $arg = $defaultpage;
-	if (strpos($arg, '=') !== false) $arg = $defaultpage; // Found '/?key=value'
-	$arg = urldecode($arg);
-	$arg = strip_bracket($arg);
-	$arg = input_filter($arg);
+	$arg = $page_uri_handler->get_page_from_query_string($arg);
+	if ($arg === FALSE) {
+		// page is FALSE if page name is not valid
+		// Keep $arg is FALSE
+	} else if (!$arg) {
+		// if $arg is null or '' ($arg is NOT FALSE)
+		$arg = $defaultpage;
+	}
 	$get['page'] = $post['page'] = $vars['page'] = $arg;
 }
 

--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -854,9 +854,6 @@ function make_pagelink($page, $alias = '', $anchor = '', $refer = '', $isautolin
 
 	if ($page == '') return '<a href="' . $anchor . '">' . $s_alias . '</a>';
 
-	$r_page  = pagename_urlencode($page);
-	$r_refer = ($refer == '') ? '' : '&amp;refer=' . rawurlencode($refer);
-
 	$page_filetime = fast_get_filetime($page);
 	$is_page = $page_filetime !== 0;
 	if (! isset($related[$page]) && $page !== $vars['page'] && $is_page) {
@@ -877,12 +874,14 @@ function make_pagelink($page, $alias = '', $anchor = '', $refer = '', $isautolin
 		if ($s_page !== $s_alias) {
 			$title_attr_html = ' title="' . $s_page . '"';
 		}
-		return $al_left . '<a ' . 'href="' . $script . '?' . $r_page . $anchor .
+		return $al_left . '<a ' . 'href="' . get_page_uri($page) . $anchor .
 			'"' . $title_attr_html . ' class="' .
 			$attrs['class'] . '" data-mtime="' . $attrs['data_mtime'] .
 			'">' . $s_alias . '</a>' . $al_right;
 	} else {
 		// Support Page redirection
+		$r_page  = rawurlencode($page);
+		$r_refer = ($refer == '') ? '' : '&amp;refer=' . rawurlencode($refer);
 		$redirect_page = get_pagename_on_redirect($page);
 		if ($redirect_page !== false) {
 			return make_pagelink($redirect_page, $s_alias);

--- a/lib/pukiwiki.php
+++ b/lib/pukiwiki.php
@@ -45,6 +45,10 @@ if ($notify) {
 
 /////////////////////////////////////////////////
 // Main
+if ($vars['page'] === FALSE) {
+	die_invalid_pagename();
+	exit;
+}
 if (manage_page_redirect()) {
 	exit;
 }

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -543,6 +543,11 @@ $logging_updates = 0;
 $logging_updates_log_dir = '/var/log/pukiwiki';
 
 /////////////////////////////////////////////////
+// Page-URI mapping handler ( See https://pukiwiki.osdn.jp/?PukiWiki/PageURI )
+$page_uri_handler = null; // default
+// $page_uri_handler = new PukiWikiStandardPageURIHandler();
+
+/////////////////////////////////////////////////
 // User-Agent settings
 //
 // If you want to ignore embedded browsers for rich-content-wikisite,