From 0d5f22cc06e483f7acf5c9323b188a9484cee8a7 Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Thu, 29 Sep 2022 07:41:45 +0800
Subject: [PATCH] fix: use rawurlencode

---
 web/app/controllers/user_info.php | 9 +++------
 web/app/libs/uoj-html-lib.php     | 4 ++--
 web/app/views/page-header.php     | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/web/app/controllers/user_info.php b/web/app/controllers/user_info.php
index c1bb21a..50840e1 100644
--- a/web/app/controllers/user_info.php
+++ b/web/app/controllers/user_info.php
@@ -41,7 +41,7 @@
 					<?php $motto_id = uniqid("motto-{$user['username']}-"); ?>
 					<div class="card-text" id="<?= $motto_id ?>"></div>
 					<script type="text/javascript">
-						$(function() { $('#<?= $motto_id ?>').html(DOMPurify.sanitize(decodeURIComponent("<?= urlencode($user['motto']) ?>"), <?= DOM_SANITIZE_CONFIG ?>)); });
+						$(function() { $('#<?= $motto_id ?>').html(DOMPurify.sanitize(decodeURIComponent("<?= rawurlencode($user['motto']) ?>"), <?= DOM_SANITIZE_CONFIG ?>)); });
 					</script>
 				</div>
 				<ul class="list-group list-group-flush">
@@ -199,13 +199,10 @@
 					</div>
 					<div class="list-group-item">
 						<h4 class="list-group-item-heading"><?= UOJLocale::get('motto') ?></h4>
-						<?php
-								$motto_id = uniqid("motto-{$user['username']}-");
-	$dom_sanitize_config = DOM_SANITIZE_CONFIG;
-	?>
+						<?php $motto_id = uniqid("motto-{$user['username']}-"); ?>
 						<p class="list-group-item-text" id="<?= $motto_id ?>"></p>
 						<script type="text/javascript">
-							$(function() { $('#<?= $motto_id ?>').html(DOMPurify.sanitize('<?= addslashes($user['motto']) ?>', <?= $dom_sanitize_config ?>)); });
+							$(function() { $('#<?= $motto_id ?>').html(DOMPurify.sanitize('<?= addslashes($user['motto']) ?>', <?= DOM_SANITIZE_CONFIG ?>)); });
 						</script>
 					</div>
 					
diff --git a/web/app/libs/uoj-html-lib.php b/web/app/libs/uoj-html-lib.php
index 297d632..6258c62 100644
--- a/web/app/libs/uoj-html-lib.php
+++ b/web/app/libs/uoj-html-lib.php
@@ -1347,10 +1347,10 @@ function echoRanklist($config = array()) {
 		echo '<td>' . getUserLink($user['username']) . '</td>';
 		$motto_id = uniqid("motto-{$user['username']}-");
 		echo "<td id=\"$motto_id\"></td>";
-		$motto = addslashes($user['motto']);
+		$motto = rawurlencode($user['motto']);
 		$dom_sanitize_config = DOM_SANITIZE_CONFIG;
 		echo '<script type="text/javascript">';
-		echo "$(function() { $('#$motto_id').html(DOMPurify.sanitize('{$motto}', $dom_sanitize_config)); });";
+		echo "$(function() { $('#$motto_id').html(DOMPurify.sanitize(decodeURIComponent(\"{$motto}\"), $dom_sanitize_config)); });";
 		echo '</script>';
 		echo '<td>' . $user['ac_num'] . '</td>';
 		echo '</tr>';
diff --git a/web/app/views/page-header.php b/web/app/views/page-header.php
index 270e985..c7c3180 100644
--- a/web/app/views/page-header.php
+++ b/web/app/views/page-header.php
@@ -318,7 +318,7 @@
 							<div id="announcement-content-<?= $group['id'] ?>"></div>
 							<script>(function(){
 								$('#announcement-content-<?= $group['id'] ?>')
-									.html(DOMPurify.sanitize(decodeURIComponent("<?= urlencode($group_announcement) ?>"), <?= DOM_SANITIZE_CONFIG ?>)); 
+									.html(DOMPurify.sanitize(decodeURIComponent("<?= rawurlencode($group_announcement) ?>"), <?= DOM_SANITIZE_CONFIG ?>)); 
 							})();</script>
 							<?php else: ?>
 							<div>（暂无公告）</div>