diff --git a/db/app_uoj233.sql b/db/app_uoj233.sql index cc468cb..bb96614 100644 --- a/db/app_uoj233.sql +++ b/db/app_uoj233.sql @@ -837,16 +837,20 @@ UNLOCK TABLES; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `users_images` ( - `id` varchar(30) NOT NULL, - `username` varchar(20) NOT NULL, + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `path` varchar(100) NOT NULL, + `uploader` varchar(20) NOT NULL, `width` int(11) NOT NULL, `height` int(11) NOT NULL, `upload_time` datetime NOT NULL, `size` int(11) NOT NULL, + `hash` varchar(70) NOT NULL, PRIMARY KEY (`id`), - KEY `username` (`username`), + KEY `uploader` (`uploader`), + KET `path` (`path`), KEY `upload_time` (`upload_time`), - KEY `size` (`size`) + KEY `size` (`size`), + KEY `hash` (`hash`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/docker-compose.development.yml b/docker-compose.development.yml index 531f1a5..2158beb 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -11,6 +11,14 @@ services: environment: - MYSQL_DATABASE=app_uoj233 - MYSQL_ROOT_PASSWORD=root + + phpmyadmin: + image: phpmyadmin + restart: always + ports: + - 28080:80 + environment: + - PMA_ARBITRARY=1 uoj-judger: build: diff --git a/web/app/controllers/image_hosting/index.php b/web/app/controllers/image_hosting/index.php index ca06821..d86685e 100644 --- a/web/app/controllers/image_hosting/index.php +++ b/web/app/controllers/image_hosting/index.php @@ -1,21 +1,279 @@ 'error', 'message' => $msg])); + } + + $allowedTypes = [IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF]; + if ($_POST['image_upload_file_submit'] == 'submit') { + header('Content-Type: application/json'); + + if (!crsf_check()) { + throwError('expired'); + } + + if (!isset($_SESSION['phrase']) || !PhraseBuilder::comparePhrases($_SESSION['phrase'], $_POST['captcha'])) { + throwError("bad_captcha"); + } + + if ($_FILES["image_upload_file"]["error"] > 0) { + throwError($_FILES["image_upload_file"]["error"]); + } + + if ($_FILES["image_upload_file"]["size"] > 5242880) { // 5 MB + throwError('too_large'); + } + + if ($used + $_FILES["image_upload_file"]["size"] > $limit) { + throwError('storage_limit_exceeded'); + } + + $size = getimagesize($_FILES['image_upload_file']['tmp_name']); + + if (!$size || !in_array($size[2], $allowedTypes)) { + throwError('not_a_image'); + } + + list($width, $height, $type) = $size; + $hash = hash_file("sha256", $_FILES['image_upload_file']['tmp_name']); + + $watermark_text = UOJConfig::$data['profile']['oj-name-short']; + if (isSuperUser($myUser) && $_POST['watermark'] == 'no_watermark') { + $watermark_text = ""; + $hash += "__no"; + } elseif ($_POST['watermark'] == 'site_shortname_and_username') { + $watermark_text .= ' @'.Auth::id(); + $hash += "__id"; + } + + $existing_image = DB::selectFirst("SELECT * FROM users_images WHERE `hash` = '$hash'"); + + if ($existing_image) { + die(json_encode(['status' => 'success', 'path' => $existing_image['path']])); + } + + $img = imagecreatefromstring(file_get_contents($_FILES["image_upload_file"]["tmp_name"])); + $white = imagecolorallocate($img, 255, 255, 255); + $black = imagecolorallocate($img, 150, 150, 150); + + imagettftext($img, '16', 0, 10 + 1, max(0, $height - 20) + 1, $black, UOJContext::documentRoot().'/fonts/roboto-mono/RobotoMono-Bold.ttf', $watermark_text); + imagettftext($img, '16', 0, 10, max(0, $height - 20), $white, UOJContext::documentRoot().'/fonts/roboto-mono/RobotoMono-Bold.ttf', $watermark_text); + imagepng($img, $_FILES["image_upload_file"]["tmp_name"]); + imagedestroy($img); + + $filename = uojRandAvaiableFileName('/image_hosting/', 10, '.png'); + if (!move_uploaded_file($_FILES["image_upload_file"]["tmp_name"], UOJContext::storagePath().$filename)) { + throwError('unknown error'); + } + + DB::insert("INSERT INTO users_images (`path`, uploader, width, height, upload_time, size, `hash`) VALUES ('$filename', '{$myUser['username']}', $width, $height, now(), {$_FILES["image_upload_file"]["size"]}, '$hash')"); + + die(json_encode(['status' => 'success', 'path' => $filename])); + } ?> + +

+
+
+
+
+ + 点击此处选择图片 +
+ + +
+

水印

+ +
+ + +
+ +
+ + +
+
+ + +
+
+
+

上传须知

+
    +
  • 上传的图片必须符合法律与社会道德；
    • +
  • 图床仅供 S2OJ 站内使用；
    • +
  • 在合适的地方插入图片即可引用。
    • +
+
+
+
+
+ + diff --git a/web/app/libs/uoj-rand-lib.php b/web/app/libs/uoj-rand-lib.php index 5c40015..838d777 100644 --- a/web/app/libs/uoj-rand-lib.php +++ b/web/app/libs/uoj-rand-lib.php @@ -17,7 +17,7 @@ function uojRandAvaiableFileName($dir, $length = 20, $suffix = '') { do { $fileName = $dir . uojRandString($length); } while (file_exists(UOJContext::storagePath().$fileName.$suffix)); - return $fileName; + return $fileName.$suffix; } function uojRandAvaiableTmpFileName() { diff --git a/web/app/route.php b/web/app/route.php index 753207d..43377cb 100644 --- a/web/app/route.php +++ b/web/app/route.php @@ -81,8 +81,8 @@ Route::group([ Route::any('/click-zan', '/click_zan.php'); // Image Hosting - Route::any('/image-hosting', '/image_hosting/index.php'); - Route::get('/image-hosting/{image_name}.png', '/image_hosting/get_image.php'); + Route::any('/image_hosting', '/image_hosting/index.php'); + Route::get('/image_hosting/{image_name}.png', '/image_hosting/get_image.php'); } ); diff --git a/web/app/upgrade/4_image_hosting/up.sql b/web/app/upgrade/4_image_hosting/up.sql index 5a64bd1..14a47f6 100644 --- a/web/app/upgrade/4_image_hosting/up.sql +++ b/web/app/upgrade/4_image_hosting/up.sql @@ -6,16 +6,20 @@ ALTER TABLE `user_info` ADD COLUMN `images_size_limit` int(11) UNSIGNED NOT NULL /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8mb4 */; -CREATE TABLE IF NOT EXISTS `users_images` ( - `id` varchar(30) NOT NULL, - `username` varchar(20) NOT NULL, +CREATE TABLE `users_images` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `path` varchar(100) NOT NULL, + `uploader` varchar(20) NOT NULL, `width` int(11) NOT NULL, `height` int(11) NOT NULL, `upload_time` datetime NOT NULL, `size` int(11) NOT NULL, + `hash` varchar(70) NOT NULL, PRIMARY KEY (`id`), - KEY `username` (`username`), + KEY `uploader` (`uploader`), + KEY `path` (`path`), KEY `upload_time` (`upload_time`), - KEY `size` (`size`) + KEY `size` (`size`), + KEY `hash` (`hash`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/web/app/views/main-nav.php b/web/app/views/main-nav.php index 0ad8496..ee77856 100644 --- a/web/app/views/main-nav.php +++ b/web/app/views/main-nav.php @@ -111,7 +111,7 @@ mb-4" role="navigation">