Skip to content
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

Fix recaptcha v3 tickets|register , fix server upgrade #1133

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Fix recaptcha v3 tickets|register , fix server upgrade #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e48dc6d
fix Upgrade dependend on egg
1day2die Jan 16, 2025
cc062f9
Fix recaptcha v3
1day2die Jan 16, 2025
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
31 changes: 21 additions & 10 deletions app/Http/Controllers/Auth/ForgotPasswordController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,39 @@ class ForgotPasswordController extends Controller

use SendsPasswordResetEmails;

private $recaptcha_version;

/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
public function __construct(GeneralSettings $generalSettings)
{
$this->middleware('guest');
$this->recaptcha_version = $generalSettings->recaptcha_version;
}

protected function validateEmail(Request $request)
{
$this->validate($request, [
$validateData = [
'email' => ['required', 'string', 'email', 'max:255'],
]);

$recaptcha_enabled = app(GeneralSettings::class)->recaptcha_enabled;

if ($recaptcha_enabled) {
$this->validate($request, [
'g-recaptcha-response' => 'required|recaptcha',
]);
];

$recaptchaEnabled = $this->recaptcha_version;

if ($recaptchaEnabled) {
switch ($this->recaptcha_version) {
case "v2":
$validateData['g-recaptcha-response'] = ['required', 'recaptcha'];
break;
case "v3":
$validateData['g-recaptcha-response'] = ['required', 'recaptchav3:recaptchathree,0.4'];
break;
}
}

$this->validate($request, $validateData);
}

}
2 changes: 0 additions & 2 deletions app/Http/Controllers/Auth/RegisterController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ class RegisterController extends Controller

private $credits_display_name;

private $recaptcha_enabled;

private $website_show_tos;

private $register_ip_check;
Expand Down
8 changes: 5 additions & 3 deletions app/Http/Controllers/ServerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,15 +395,17 @@ private function getUpgradeOptions(Server $server, array $serverInfo): \Illumina
$currentProduct = Product::find($server->product_id);
$nodeId = $serverInfo['relationships']['node']['attributes']['id'];
$pteroNode = $this->pterodactyl->getNode($nodeId);
$currentEgg = $serverInfo['egg'];

$currentProductEggs = $currentProduct->eggs->pluck('id')->toArray();
//$currentProductEggs = $currentProduct->eggs->pluck('id')->toArray();

return Product::orderBy('created_at')
->with('nodes')->with('eggs')
->whereHas('nodes', function (Builder $builder) use ($nodeId) {
$builder->where('id', $nodeId);
})
->whereHas('eggs', function (Builder $builder) use ($currentProductEggs) {
$builder->whereIn('id', $currentProductEggs);
->whereHas('eggs', function (Builder $builder) use ($currentEgg) {
$builder->where('id', $currentEgg);
})
->get()
->map(function ($product) use ($currentProduct, $pteroNode) {
Expand Down
11 changes: 9 additions & 2 deletions app/Http/Controllers/TicketsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,15 @@ public function store(Request $request, GeneralSettings $generalSettings)
'message' => 'required|string|min:10|max:2000',
];

if ($generalSettings->recaptcha_enabled) {
$validateData['g-recaptcha-response'] = ['required', 'recaptcha'];
if ($generalSettings->recaptcha_version) {
switch ($generalSettings->recaptcha_version) {
case "v2":
$validateData['g-recaptcha-response'] = ['required', 'recaptcha'];
break;
case "v3":
$validateData['g-recaptcha-response'] = ['required', 'recaptchav3:recaptchathree,0.5'];
break;
}
}

$validator = Validator::make($request->all(), $validateData);
Expand Down
29 changes: 19 additions & 10 deletions themes/default/views/auth/passwords/email.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,25 @@ class="mr-1">{{ config('app.name', 'Laravel') }}</b></a>
</span>
@enderror
</div>
@if (app(App\Settings\GeneralSettings::class)->recaptcha_enabled)
<div class="mb-3 input-group">
{!! htmlFormSnippet() !!}
@error('g-recaptcha-response')
<span class="text-danger" role="alert">
<small><strong>{{ $message }}</strong></small>
</span>
@enderror
</div>
@endif
@php ($recaptchaVersion = app(App\Settings\GeneralSettings::class)->recaptcha_version)
@if ($recaptchaVersion)
<div class="mb-3 input-group">
@switch($recaptchaVersion)
@case("v2")
{!! htmlFormSnippet() !!}
@break
@case("v3")
{!! RecaptchaV3::field('recaptchathree') !!}
@break
@endswitch

@error('g-recaptcha-response')
<span class="text-danger" role="alert">
<small><strong>{{ $message }}</strong></small>
</span>
@enderror
</div>
@endif

<div class="row">
<div class="col-12">
Expand Down
43 changes: 31 additions & 12 deletions themes/default/views/ticket/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
@extends('layouts.main')

@php ($recaptchaVersion = app(App\Settings\GeneralSettings::class)->recaptcha_version)
@if ($recaptchaVersion)
@switch($recaptchaVersion)
@case("v2")
{!! htmlScriptTagJsApi() !!}
@break
@case("v3")
{!! RecaptchaV3::initJs() !!}
@break
@endswitch
@endif
@section('content')
<!-- CONTENT HEADER -->
<section class="content-header">
Expand Down Expand Up @@ -92,17 +102,25 @@
</span>
@endif
</div>
@if (app(App\Settings\GeneralSettings::class)->recaptcha_enabled)
<div class="input-group mb-3">
{!! htmlScriptTagJsApi() !!}
{!! htmlFormSnippet() !!}
@error('g-recaptcha-response')
<span class="text-danger" role="alert">
<small><strong>{{ $message }}</strong></small>
</span>
@enderror
</div>
@endif
@php ($recaptchaVersion = app(App\Settings\GeneralSettings::class)->recaptcha_version)
@if ($recaptchaVersion)
<div class="mb-3 input-group">
@switch($recaptchaVersion)
@case("v2")
{!! htmlFormSnippet() !!}
@break
@case("v3")
{!! RecaptchaV3::field('recaptchathree') !!}
@break
@endswitch

@error('g-recaptcha-response')
<span class="text-danger" role="alert">
<small><strong>{{ $message }}</strong></small>
</span>
@enderror
</div>
@endif
</div>
<div class="card-footer">
<button type="submit" class="btn btn-primary ticket-once">
Expand Down Expand Up @@ -136,6 +154,7 @@
</form>
</div>
</section>

<!-- END CONTENT -->
<script type="text/javascript">
$(".ticket-form").submit(function (e) {
Expand Down