Skip to content

Reject new Modern skin defaults #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
addshore wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject new Modern skin defaults #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/Http/Controllers/WikiSettingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ class WikiSettingController extends Controller {
/**
* @return (SettingWikibaseManifestEquivEntities|string)[][]
*/
private function getSettingValidations(): array {
private function getSettingValidations(bool $allowModernSkin = false): array {
// FIXME: this list is evil and should be kept in sync with the model in Wiki.php?! (mostly)
$defaultSkinValidation = $allowModernSkin
? 'in:vector,modern,timeless'
: 'in:vector,timeless';

return [
'wgDefaultSkin' => ['required', 'string', 'in:vector,modern,timeless'],
'wgDefaultSkin' => ['required', 'string', $defaultSkinValidation],
'wwExtEnableConfirmAccount' => ['required', 'boolean'],
'wwExtEnableWikibaseLexeme' => ['required', 'boolean'],
'wwWikibaseStringLengthString' => ['required', 'integer', 'between:400,2500'],
Expand All @@ -40,10 +44,17 @@ public function update($setting, Request $request) {
'setting' => 'required|string|in:' . implode(',', array_keys($settingValidations)),
]);
$settingName = $request->input('setting');
$wiki = $request->attributes->get('wiki');

if ($settingName === 'wgDefaultSkin' && $request->input('value') === 'modern') {
$hasModernDefault = $wiki->settings()
->where('name', 'wgDefaultSkin')
->value('value') === 'modern';
$settingValidations = $this->getSettingValidations($hasModernDefault);
}

$request->validate(['value' => $settingValidations[$settingName]]);
$value = $request->input('value');
$wiki = $request->attributes->get('wiki');

WikiSetting::updateOrCreate(
[
Expand Down
20 changes: 20 additions & 0 deletions tests/Routes/Wiki/SettingUpdateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,28 @@ public function testValidSetting($settingName, $settingValue, $expectedStored) {
);
}

public function testExistingModernDefaultCanBeRetained(): void {
$user = User::factory()->create(['verified' => true]);
$wiki = Wiki::factory('nodb')->create();
WikiManager::factory()->create(['wiki_id' => $wiki->id, 'user_id' => $user->id]);
WikiSetting::factory()->create([
'wiki_id' => $wiki->id,
'name' => 'wgDefaultSkin',
'value' => 'modern',
]);

$this->actingAs($user, 'api')
->json('POST', str_replace('foo', 'wgDefaultSkin', $this->route), [
'wiki' => $wiki->id,
'setting' => 'wgDefaultSkin',
'value' => 'modern',
])
->assertStatus(200);
}

public static function provideValidSettingsBadValues() {
yield ['wgDefaultSkin', 'foo'];
yield ['wgDefaultSkin', 'modern'];
yield ['wwExtEnableConfirmAccount', 'foo'];
yield ['wwWikibaseStringLengthString', 12];
yield ['wwWikibaseStringLengthMonolingualText', 12];
Expand Down
Loading