From 4779cb3bcc1debe14725fe945e635b64f3b9a8a1 Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Sat, 8 Oct 2022 14:10:14 +0800
Subject: [PATCH] fix(web/blog): ban contest_only user

---
 web/app/controllers/subdomain/blog/aboutme.php      | 6 +++++-
 web/app/controllers/subdomain/blog/archive.php      | 6 +++++-
 web/app/controllers/subdomain/blog/blog.php         | 6 +++++-
 web/app/controllers/subdomain/blog/blog_delete.php  | 6 +++++-
 web/app/controllers/subdomain/blog/blog_write.php   | 6 +++++-
 web/app/controllers/subdomain/blog/index.php        | 6 +++++-
 web/app/controllers/subdomain/blog/self_reviews.php | 2 +-
 web/app/controllers/subdomain/blog/slide.php        | 6 +++++-
 web/app/controllers/subdomain/blog/slide_write.php  | 6 +++++-
 9 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/web/app/controllers/subdomain/blog/aboutme.php b/web/app/controllers/subdomain/blog/aboutme.php
index 74bf060..ebe3bc1 100644
--- a/web/app/controllers/subdomain/blog/aboutme.php
+++ b/web/app/controllers/subdomain/blog/aboutme.php
@@ -1,10 +1,14 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
 
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
+
 	$REQUIRE_LIB['bootstrap5'] = '';
 	$REQUIRE_LIB['calendar_heatmap'] = '';
 	?>
diff --git a/web/app/controllers/subdomain/blog/archive.php b/web/app/controllers/subdomain/blog/archive.php
index 3517b0f..8c081a2 100644
--- a/web/app/controllers/subdomain/blog/archive.php
+++ b/web/app/controllers/subdomain/blog/archive.php
@@ -1,10 +1,14 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
 
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
+
 	$REQUIRE_LIB['bootstrap5'] = '';
 	
 	$blogs_cond = "poster = '".UOJContext::userid()."'";
diff --git a/web/app/controllers/subdomain/blog/blog.php b/web/app/controllers/subdomain/blog/blog.php
index 663dbc0..a832249 100644
--- a/web/app/controllers/subdomain/blog/blog.php
+++ b/web/app/controllers/subdomain/blog/blog.php
@@ -1,10 +1,14 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
 
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
+
 	if (!isset($_GET['id']) || !validateUInt($_GET['id']) || !($blog = queryBlog($_GET['id'])) || !UOJContext::isHis($blog)) {
 		become404Page();
 	}
diff --git a/web/app/controllers/subdomain/blog/blog_delete.php b/web/app/controllers/subdomain/blog/blog_delete.php
index 8088ad3..9760764 100644
--- a/web/app/controllers/subdomain/blog/blog_delete.php
+++ b/web/app/controllers/subdomain/blog/blog_delete.php
@@ -1,9 +1,13 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
+
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
 	
 	if (!UOJContext::hasBlogPermission()) {
 		become403Page();
diff --git a/web/app/controllers/subdomain/blog/blog_write.php b/web/app/controllers/subdomain/blog/blog_write.php
index fcfdc73..9070c93 100644
--- a/web/app/controllers/subdomain/blog/blog_write.php
+++ b/web/app/controllers/subdomain/blog/blog_write.php
@@ -1,10 +1,14 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
 
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
+
 	if (!UOJContext::hasBlogPermission()) {
 		become403Page();
 	}
diff --git a/web/app/controllers/subdomain/blog/index.php b/web/app/controllers/subdomain/blog/index.php
index e0700b3..2b1263a 100644
--- a/web/app/controllers/subdomain/blog/index.php
+++ b/web/app/controllers/subdomain/blog/index.php
@@ -1,8 +1,12 @@
 <?php
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
 
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
+
 	if (!isset($_COOKIE['bootstrap4'])) {
 		$REQUIRE_LIB['bootstrap5'] = '';
 	}
diff --git a/web/app/controllers/subdomain/blog/self_reviews.php b/web/app/controllers/subdomain/blog/self_reviews.php
index f6e64eb..4f12519 100644
--- a/web/app/controllers/subdomain/blog/self_reviews.php
+++ b/web/app/controllers/subdomain/blog/self_reviews.php
@@ -1,5 +1,5 @@
 <?php
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
 
diff --git a/web/app/controllers/subdomain/blog/slide.php b/web/app/controllers/subdomain/blog/slide.php
index 3d46a01..f7615e9 100644
--- a/web/app/controllers/subdomain/blog/slide.php
+++ b/web/app/controllers/subdomain/blog/slide.php
@@ -1,9 +1,13 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
+
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
 	
 	if (!isset($_GET['id']) || !validateUInt($_GET['id']) || !($blog = queryBlog($_GET['id'])) || !UOJContext::isHisSlide($blog)) {
 		become404Page();
diff --git a/web/app/controllers/subdomain/blog/slide_write.php b/web/app/controllers/subdomain/blog/slide_write.php
index d1b7898..46520bb 100644
--- a/web/app/controllers/subdomain/blog/slide_write.php
+++ b/web/app/controllers/subdomain/blog/slide_write.php
@@ -1,9 +1,13 @@
 <?php
 	requirePHPLib('form');
 
-	if (!Auth::check()) {
+	if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
 		redirectToLogin();
 	}
+
+	if (!isNormalUser($myUser) && UOJConfig::$data['switch']['force-login']) {
+		become403Page();
+	}
 	
 	if (!UOJContext::hasBlogPermission()) {
 		become403Page();