Merge pull request #7159 from shleeable/fix/directory-exclude-private-profiles

Exclude private profiles from public directory and clear suggestable on going private

app/Http/Controllers/LandingController.php

@@ -38,6 +38,8 @@ class LandingController extends Controller
 
         return DirectoryProfile::collection(
             Profile::whereNull('domain')
+                ->where('is_private', false)
+                ->whereNull('status')
                 ->whereIsSuggestable(true)
                 ->orderByDesc('updated_at')
                 ->cursorPaginate(20)

app/Http/Controllers/Settings/PrivacySettings.php

@@ -242,6 +242,9 @@ trait PrivacySettings
             }
         }
         $profile->is_private = true;
+        // Clear directory listing when going private so the profile can't leak
+        // into the public directory (which lists is_suggestable profiles).
+        $profile->is_suggestable = false;
         $settings->show_guests = false;
         $settings->show_discover = false;
         $settings->save();

tests/Feature/Directory/DirectoryPrivateProfileTest.php

@@ -0,0 +1,63 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
+
+uses(LazilyRefreshDatabase::class);
+
+/*
+|--------------------------------------------------------------------------
+| Public directory excludes private profiles
+|--------------------------------------------------------------------------
+|
+| The directory API lists suggestable local profiles. Private accounts must
+| never appear, even if is_suggestable is (stale) true.
+|
+*/
+
+beforeEach(function () {
+    config(['instance.landing.show_directory' => true]);
+    config(['instance.enable_cc' => false]);
+});
+
+it('excludes private suggestable profiles from the directory', function () {
+    $publicUser = User::factory()->create();
+    $publicUser->refresh();
+    $publicProfile = $publicUser->profile;
+    $publicProfile->is_private = false;
+    $publicProfile->is_suggestable = true;
+    $publicProfile->save();
+
+    $privateUser = User::factory()->create();
+    $privateUser->refresh();
+    $privateProfile = $privateUser->profile;
+    $privateProfile->is_private = true;
+    $privateProfile->is_suggestable = true; // stale bug state
+    $privateProfile->save();
+
+    $res = $this->getJson('/api/landing/v1/directory')
+        ->assertOk()
+        ->json('data');
+
+    $ids = collect($res)->pluck('id')->map(fn ($id) => (string) $id)->all();
+
+    expect($ids)->toContain((string) $publicProfile->id);
+    expect($ids)->not->toContain((string) $privateProfile->id);
+});
+
+it('clears is_suggestable when an account goes private', function () {
+    $user = User::factory()->create();
+    $user->refresh();
+    $profile = $user->profile;
+    $profile->is_suggestable = true;
+    $profile->save();
+
+    $this->actingAs($user)
+        ->withSession(['auth.password_confirmed_at' => time()])
+        ->post('/settings/privacy/account', ['mode' => 'keep-all', 'duration' => 60])
+        ->assertOk();
+
+    $fresh = $profile->fresh();
+    expect((bool) $fresh->is_private)->toBeTrue();
+    expect((bool) $fresh->is_suggestable)->toBeFalse();
+});