From d75a7d3eadea23a60c77b925282242b0785bd961 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 20 Aug 2020 10:14:38 +0800
Subject: [PATCH] fix that private texture can be used as avatar

---
 app/Http/Controllers/UserController.php       |  8 ++++++
 resources/misc/changelogs/en/5.1.0.md         |  1 +
 resources/misc/changelogs/zh_CN/5.1.0.md      |  1 +
 .../ControllersTest/UserControllerTest.php    | 28 +++++++++++++------
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index d7fe89d9..a638e6ac 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -329,6 +329,14 @@ class UserController extends Controller
                 return json(trans('user.profile.avatar.wrong-type'), 1);
             }
 
+            if (
+                !$texture->public &&
+                $user->uid !== $texture->uploader &&
+                !$user->isAdmin()
+            ) {
+                return json(trans('skinlib.show.private'), 1);
+            }
+
             $user->avatar = $tid;
             $user->save();
 
diff --git a/resources/misc/changelogs/en/5.1.0.md b/resources/misc/changelogs/en/5.1.0.md
index 93211835..29fb55bf 100644
--- a/resources/misc/changelogs/en/5.1.0.md
+++ b/resources/misc/changelogs/en/5.1.0.md
@@ -13,3 +13,4 @@
 - Fixed that previews and avatars cannot be indivdually cached by image format.
 - Fixed that message for private textures doesn't match with HTTP status code.
 - Fixed that texture isn't checked if it's existed in closet when being applied to player.
+- Fixed that private texture can be used as avatar.
diff --git a/resources/misc/changelogs/zh_CN/5.1.0.md b/resources/misc/changelogs/zh_CN/5.1.0.md
index 9c7b06af..a1b74989 100644
--- a/resources/misc/changelogs/zh_CN/5.1.0.md
+++ b/resources/misc/changelogs/zh_CN/5.1.0.md
@@ -13,3 +13,4 @@
 - 修复预览图和头像不能根据图像格式来单独缓存的问题
 - 修复针对私有材质的错误消息不与 HTTP 状态码相符的问题
 - 修复应用材质到角色时未检查材质是否在衣柜中的问题
+- 修复可将私有材质设为头像的问题
diff --git a/tests/HttpTest/ControllersTest/UserControllerTest.php b/tests/HttpTest/ControllersTest/UserControllerTest.php
index 16dc77db..aae1b2e2 100644
--- a/tests/HttpTest/ControllersTest/UserControllerTest.php
+++ b/tests/HttpTest/ControllersTest/UserControllerTest.php
@@ -4,6 +4,7 @@ namespace Tests;
 
 use App\Events;
 use App\Mail\EmailVerification;
+use App\Models\Texture;
 use App\Models\User;
 use Blessing\Filter;
 use Blessing\Rejection;
@@ -507,20 +508,20 @@ class UserControllerTest extends TestCase
     {
         $user = factory(User::class)->create();
         $uid = $user->uid;
-        $steve = factory(\App\Models\Texture::class)->create();
-        $cape = factory(\App\Models\Texture::class)->states('cape')->create();
+        $steve = factory(Texture::class)->create();
+        $cape = factory(Texture::class)->states('cape')->create();
 
-        // Without `tid` field
+        // without `tid` field
         $this->actingAs($user)
             ->postJson('/user/profile/avatar')
             ->assertJsonValidationErrors('tid');
 
-        // TID is not a integer
+        // `tid` is not a integer
         $this->actingAs($user)
             ->postJson('/user/profile/avatar', ['tid' => 'string'])
             ->assertJsonValidationErrors('tid');
 
-        // Texture cannot be found
+        // texture cannot be found
         $this->actingAs($user)
             ->postJson('/user/profile/avatar', ['tid' => -1])
             ->assertJson([
@@ -528,7 +529,7 @@ class UserControllerTest extends TestCase
                 'message' => trans('skinlib.non-existent'),
             ]);
 
-        // Use cape
+        // use cape
         $this->actingAs($user)
             ->postJson('/user/profile/avatar', ['tid' => $cape->tid])
             ->assertJson([
@@ -536,7 +537,16 @@ class UserControllerTest extends TestCase
                 'message' => trans('user.profile.avatar.wrong-type'),
             ]);
 
-        // Success
+        // use private texture
+        $private = factory(Texture::class)->state('private')->create();
+        $this->actingAs($user)
+            ->postJson('/user/profile/avatar', ['tid' => $private->tid])
+            ->assertJson([
+                'code' => 1,
+                'message' => trans('skinlib.show.private'),
+            ]);
+
+        // success
         Event::fake();
         $this->actingAs($user)
             ->postJson('/user/profile/avatar', ['tid' => $steve->tid])
@@ -566,7 +576,7 @@ class UserControllerTest extends TestCase
             }
         );
 
-        // Reset avatar
+        // reset avatar
         Event::fake();
         $this->postJson('/user/profile/avatar', ['tid' => 0])
             ->assertJson(['code' => 0]);
@@ -582,7 +592,7 @@ class UserControllerTest extends TestCase
             }
         );
 
-        // Rejected by filter
+        // rejected by filter
         $filter = resolve(Filter::class);
         $filter->add('user_can_update_avatar', function ($can, $user, $tid) use ($uid, $steve) {
             $this->assertEquals($uid, $user->uid);