Skip to content

Commit 72c0330

Browse files
committed
Fixes 2FA not honoring 'Remember Me' checkbox, closes pterodactyl#439
1 parent 999411d commit 72c0330

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
66
## v0.6.1 (Courageous Carniadactylus)
77
### Fixed
88
* Fixes a bug preventing the use of services that have no variables attached to them.
9+
* Fixes 'Remember Me' checkbox being ignored when using 2FA on an account.
10+
11+
### Changed
12+
* Renamed session cookies from `laravel_session` to `pterodactyl_session`.
13+
* Sessions are now encrypted before being stored as an additional layer of security.
914

1015
## v0.6.0 (Courageous Carniadactylus)
1116
### Fixed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ public function login(Request $request)
134134
])),
135135
], 5);
136136

137-
return redirect()->route('auth.totp')->with('authentication_token', $token);
137+
return redirect()->route('auth.totp')
138+
->with('authentication_token', $token)
139+
->with('remember', $request->has('remember'));
138140
}
139141

140142
$attempt = Auth::attempt([
@@ -167,7 +169,7 @@ public function totp(Request $request)
167169

168170
return view('auth.totp', [
169171
'verify_key' => $token,
170-
'remember' => $request->has('remember'),
172+
'remember' => $request->session()->get('remember'),
171173
]);
172174
}
173175

config/session.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
|
4545
*/
4646

47-
'encrypt' => false,
47+
'encrypt' => true,
4848

4949
/*
5050
|--------------------------------------------------------------------------
@@ -122,7 +122,7 @@
122122
|
123123
*/
124124

125-
'cookie' => 'laravel_session',
125+
'cookie' => 'pterodactyl_session',
126126

127127
/*
128128
|--------------------------------------------------------------------------

resources/themes/pterodactyl/auth/totp.blade.php

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,29 @@
2323
2FA Checkpoint
2424
@endsection
2525

26+
@section('scripts')
27+
@parent
28+
<style>
29+
input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
30+
-webkit-appearance: none;
31+
margin: 0;
32+
}
33+
</style>
34+
@endsection
35+
2636
@section('content')
2737
<div class="login-box-body">
28-
<p class="login-box-msg">@lang('auth.2fa_required')</p>
2938
<form action="{{ route('auth.totp') }}" method="POST">
30-
<div class="form-group">
31-
<input type="text" name="2fa_token" class="form-control" placeholder="@lang('strings.2fa_token')">
32-
<span class="fa fa-lock form-control-feedback"></span>
39+
<div class="form-group has-feedback">
40+
<input type="number" name="2fa_token" class="form-control input-lg text-center" placeholder="@lang('strings.2fa_token')" autofocus>
41+
<span class="fa fa-shield form-control-feedback"></span>
3342
</div>
3443
<div class="row">
3544
<div class="col-xs-12">
3645
{!! csrf_field() !!}
3746
<input type="hidden" name="verify_token" value="{{ $verify_key }}" />
3847
@if($remember)
39-
<input type="hidden" name="remember" value="true" />
48+
<input type="checkbox" name="remember" checked style="display:none;"/>
4049
@endif
4150
<button type="submit" class="btn btn-primary btn-block btn-flat">@lang('strings.submit')</button>
4251
</div>

0 commit comments

Comments
 (0)