Skip to content

Commit 971ee92

Browse files
asbiinasbiin
committed
Fix use of original Laravel Model and namespaces
1 parent b1d4cf3 commit 971ee92

File tree

5 files changed

+36
-35
lines changed

5 files changed

+36
-35
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ If you discover any security related issues, please email lahaxe[dot]arnaud[at]g
9292
- [Mike Robinson](https://github.com/multiwebinc)
9393
- [Chakphanu Komasathit](https://github.com/chakphanu)
9494
- [Anne Jan Brouwer](https://github.com/annejan)
95+
- [Alexis Saettler](https://github.com/asbiin)
9596

9697
## License
9798

‎src/Models/U2fKey.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class U2fKey extends Model
3030
*/
3131
public function user()
3232
{
33-
return $this->belongsTo('\App\User');
33+
$model = config('auth.providers.users.model');
34+
return $this->belongsTo($model);
3435
}
3536
}

‎src/U2f.php‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php namespace Lahaxearnaud\U2f;
22

3-
use App\User;
43
use Lahaxearnaud\U2f\Models\U2fKey;
4+
use Illuminate\Support\Facades\Request;
55
use Illuminate\Config\Repository as Config;
66
use Illuminate\Session\SessionManager as Session;
7-
7+
use Illuminate\Contracts\Auth\Authenticatable as User;
88

99
/**
1010
* Class LaravelU2f
@@ -36,29 +36,28 @@ class U2f {
3636
*/
3737
public function __construct(Config $config, Session $session)
3838
{
39-
$scheme = \Request::isSecure() ? "https://" : "http://";
40-
$this->u2f = new \u2flib_server\U2F($scheme . \Request::getHttpHost());
39+
$scheme = Request::isSecure() ? "https://" : "http://";
40+
$this->u2f = new \u2flib_server\U2F($scheme . Request::getHttpHost());
4141
$this->config = $config;
4242
$this->session = $session;
4343
}
4444

4545
/**
4646
* @author LAHAXE Arnaud
4747
*
48-
* @param \App\User $user
48+
* @param User $user
4949
*
5050
* @return mixed
5151
*/
5252
public function getRegisterData(User $user)
5353
{
54-
55-
return $this->u2f->getRegisterData(U2fKey::where('user_id', $user->id)->get()->all());
54+
return $this->u2f->getRegisterData(U2fKey::where('user_id', $user->getAuthIdentifier())->get()->all());
5655
}
5756

5857
/**
5958
* @author LAHAXE Arnaud
6059
*
61-
* @param \App\User $user
60+
* @param User $user
6261
* @param $registerData
6362
* @param $keyData
6463
*
@@ -67,28 +66,28 @@ public function getRegisterData(User $user)
6766
public function doRegister(User $user, $registerData, $keyData)
6867
{
6968
$reg = $this->u2f->doRegister($registerData, $keyData);
70-
$reg->user_id = $user->id;
69+
$reg->user_id = $user->getAuthIdentifier();
7170

7271
return U2fKey::create((array) $reg);
7372
}
7473

7574
/**
7675
* @author LAHAXE Arnaud
7776
*
78-
* @param \App\User $user
77+
* @param User $user
7978
*
8079
* @return mixed
8180
*/
8281
public function getAuthenticateData(User $user)
8382
{
8483

85-
return $this->u2f->getAuthenticateData(U2fKey::where('user_id', $user->id)->get()->all());
84+
return $this->u2f->getAuthenticateData(U2fKey::where('user_id', $user->getAuthIdentifier())->get()->all());
8685
}
8786

8887
/**
8988
* @author LAHAXE Arnaud
9089
*
91-
* @param \App\User $user
90+
* @param User $user
9291
* @param $authData
9392
* @param $keyData
9493
*
@@ -99,12 +98,12 @@ public function doAuthenticate(User $user, $authData, $keyData)
9998

10099
$reg = $this->u2f->doAuthenticate(
101100
$authData,
102-
U2fKey::where('user_id', $user->id)->get()->all(),
101+
U2fKey::where('user_id', $user->getAuthIdentifier())->get()->all(),
103102
$keyData
104103
);
105104

106105
$U2fKey = U2fKey::where([
107-
'user_id' => $user->id,
106+
'user_id' => $user->getAuthIdentifier(),
108107
'publicKey' => $reg->publicKey
109108
])->first();
110109

‎src/http/Controllers/U2fController.php‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php namespace Lahaxearnaud\U2f\Http\Controllers;
22

3-
use App\Event;
3+
use Illuminate\Http\Request;
44
use App\Http\Controllers\Controller;
5+
use Illuminate\Support\Facades\Auth;
6+
use Illuminate\Support\Facades\Event;
57
use Lahaxearnaud\U2f\U2f as LaravelU2f;
8+
use Illuminate\Support\Facades\Redirect;
69
use Illuminate\Config\Repository as Config;
710

8-
use Illuminate\Http\Request;
9-
10-
11-
1211
class U2fController extends Controller
1312
{
1413

@@ -41,8 +40,8 @@ public function __construct(LaravelU2f $u2f, Config $config)
4140
*/
4241
public function registerData()
4342
{
44-
list($req, $sigs) = $this->u2f->getRegisterData(\Auth::user());
45-
\Event::fire('u2f.register.data', [ 'user' => \Auth::user() ]);
43+
list($req, $sigs) = $this->u2f->getRegisterData(Auth::user());
44+
Event::fire('u2f.register.data', [ 'user' => Auth::user() ]);
4645

4746
session(['u2f.registerData' => $req]);
4847

@@ -61,22 +60,22 @@ public function registerData()
6160
public function register(Request $request)
6261
{
6362
try {
64-
$key = $this->u2f->doRegister(\Auth::user(), session('u2f.registerData'), json_decode($request->get('register')));
65-
\Event::fire('u2f.register', [ 'u2fKey' => $key, 'user' => \Auth::user() ]);
63+
$key = $this->u2f->doRegister(Auth::user(), session('u2f.registerData'), json_decode($request->get('register')));
64+
Event::fire('u2f.register', [ 'u2fKey' => $key, 'user' => Auth::user() ]);
6665
session()->forget('u2f.registerData');
6766

6867
session([$this->config->get('u2f.sessionU2fName') => true]);
6968

7069
if ($this->config->get('u2f.register.postSuccessRedirectRoute')) {
7170

72-
return \Redirect::route($this->config->get('u2f.register.postSuccessRedirectRoute'));
71+
return Redirect::route($this->config->get('u2f.register.postSuccessRedirectRoute'));
7372
} else {
7473
return redirect('/');
7574
}
7675

7776
} catch (\Exception $e) {
7877

79-
return \Redirect::route('u2f.register.data');
78+
return Redirect::route('u2f.register.data');
8079
}
8180
}
8281

@@ -93,8 +92,8 @@ public function authData()
9392
return $this->redirectAfterSuccessAuth();
9493
}
9594

96-
$req = $this->u2f->getAuthenticateData(\Auth::user());
97-
\Event::fire('u2f.authentication.data', [ 'user' => \Auth::user() ]);
95+
$req = $this->u2f->getAuthenticateData(Auth::user());
96+
Event::fire('u2f.authentication.data', [ 'user' => Auth::user() ]);
9897

9998
session(['u2f.authenticationData' => $req]);
10099

@@ -112,16 +111,16 @@ public function auth(Request $request)
112111
{
113112

114113
try {
115-
$key = $this->u2f->doAuthenticate(\Auth::user(), session('u2f.authenticationData'), json_decode($request->get('authentication')));
116-
\Event::fire('u2f.authentication', [ 'u2fKey' => $key, 'user' => \Auth::user() ]);
114+
$key = $this->u2f->doAuthenticate(Auth::user(), session('u2f.authenticationData'), json_decode($request->get('authentication')));
115+
Event::fire('u2f.authentication', [ 'u2fKey' => $key, 'user' => Auth::user() ]);
117116
session()->forget('u2f.authenticationData');
118117

119118
return $this->redirectAfterSuccessAuth();
120119

121120
} catch (\Exception $e) {
122121
session()->flash('error', $e->getMessage());
123122

124-
return \Redirect::route('u2f.auth.data');
123+
return Redirect::route('u2f.auth.data');
125124
}
126125
}
127126

@@ -130,9 +129,9 @@ protected function redirectAfterSuccessAuth()
130129

131130
if (strlen($this->config->get('u2f.authenticate.postSuccessRedirectRoute'))) {
132131

133-
return \Redirect::intended($this->config->get('u2f.authenticate.postSuccessRedirectRoute'));
132+
return Redirect::intended($this->config->get('u2f.authenticate.postSuccessRedirectRoute'));
134133
} else {
135-
return \Redirect::intended('/');
134+
return Redirect::intended('/');
136135
}
137136
}
138137
}

‎src/http/Middleware/U2f.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php namespace Lahaxearnaud\U2f\Http\Middleware;
22

33
use Closure;
4+
use Illuminate\Support\Facades\Auth;
45
use Lahaxearnaud\U2f\U2f as LaravelU2f;
56
use Lahaxearnaud\U2f\Models\U2fKey;
67
use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -48,9 +49,9 @@ public function handle($request, Closure $next)
4849
}
4950

5051
if (!$this->u2f->check()) {
51-
if(!\Auth::guest()){
52+
if(!Auth::guest()){
5253
if(
53-
U2fKey::where('user_id', '=', \Auth::user()->id)->count() === 0
54+
U2fKey::where('user_id', '=', Auth::user()->getAuthIdentifier())->count() === 0
5455
&& $this->config->get('u2f.byPassUserWithoutKey')
5556
) {
5657
return $next($request);

0 commit comments

Comments
 (0)