@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | - * @return mixed |
|
| 115 | + * @return null|DateTimeImmutable |
|
| 116 | 116 | */ |
| 117 | 117 | public function getTimeout() |
| 118 | 118 | { |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | - * @param mixed $timeout |
|
| 127 | + * @param null|DateTimeImmutable $timeout |
|
| 128 | 128 | */ |
| 129 | 129 | public function setTimeout(DateTimeImmutable $timeout = null) |
| 130 | 130 | { |
@@ -281,6 +281,9 @@ discard block |
||
| 281 | 281 | $this->redirect("login/" . $this->nextPageMap[$nextStage]); |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | + /** |
|
| 285 | + * @param integer|null $partialStage |
|
| 286 | + */ |
|
| 284 | 287 | private function setupAlternates(User $user, $partialStage, PdoDatabase $database) |
| 285 | 288 | { |
| 286 | 289 | // get the providers available |
@@ -313,7 +316,7 @@ discard block |
||
| 313 | 316 | |
| 314 | 317 | /** |
| 315 | 318 | * @param $types |
| 316 | - * @param $type |
|
| 319 | + * @param string $type |
|
| 317 | 320 | * @param $userOptions |
| 318 | 321 | * |
| 319 | 322 | * @return mixed |
@@ -15,30 +15,20 @@ discard block |
||
| 15 | 15 | use Waca\Pages\PageEmailManagement; |
| 16 | 16 | use Waca\Pages\PageExpandedRequestList; |
| 17 | 17 | use Waca\Pages\PageJobQueue; |
| 18 | -use Waca\Pages\RequestAction\PageCreateRequest; |
|
| 19 | -use Waca\Pages\UserAuth\Login\PageOtpLogin; |
|
| 20 | -use Waca\Pages\UserAuth\Login\PagePasswordLogin; |
|
| 21 | -use Waca\Pages\UserAuth\Login\PageU2FLogin; |
|
| 22 | -use Waca\Pages\UserAuth\PageChangePassword; |
|
| 23 | -use Waca\Pages\UserAuth\PageForgotPassword; |
|
| 24 | 18 | use Waca\Pages\PageLog; |
| 25 | -use Waca\Pages\UserAuth\PageLogout; |
|
| 26 | 19 | use Waca\Pages\PageMain; |
| 27 | -use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 28 | -use Waca\Pages\UserAuth\PageOAuth; |
|
| 29 | -use Waca\Pages\UserAuth\PageOAuthCallback; |
|
| 30 | -use Waca\Pages\UserAuth\PagePreferences; |
|
| 31 | -use Waca\Pages\Registration\PageRegisterStandard; |
|
| 32 | -use Waca\Pages\Registration\PageRegisterOption; |
|
| 33 | 20 | use Waca\Pages\PageSearch; |
| 34 | 21 | use Waca\Pages\PageSiteNotice; |
| 35 | 22 | use Waca\Pages\PageTeam; |
| 36 | 23 | use Waca\Pages\PageUserManagement; |
| 37 | 24 | use Waca\Pages\PageViewRequest; |
| 38 | 25 | use Waca\Pages\PageWelcomeTemplateManagement; |
| 26 | +use Waca\Pages\Registration\PageRegisterOption; |
|
| 27 | +use Waca\Pages\Registration\PageRegisterStandard; |
|
| 39 | 28 | use Waca\Pages\RequestAction\PageBreakReservation; |
| 40 | 29 | use Waca\Pages\RequestAction\PageCloseRequest; |
| 41 | 30 | use Waca\Pages\RequestAction\PageComment; |
| 31 | +use Waca\Pages\RequestAction\PageCreateRequest; |
|
| 42 | 32 | use Waca\Pages\RequestAction\PageCustomClose; |
| 43 | 33 | use Waca\Pages\RequestAction\PageDeferRequest; |
| 44 | 34 | use Waca\Pages\RequestAction\PageDropRequest; |
@@ -52,6 +42,16 @@ discard block |
||
| 52 | 42 | use Waca\Pages\Statistics\StatsTemplateStats; |
| 53 | 43 | use Waca\Pages\Statistics\StatsTopCreators; |
| 54 | 44 | use Waca\Pages\Statistics\StatsUsers; |
| 45 | +use Waca\Pages\UserAuth\Login\PageOtpLogin; |
|
| 46 | +use Waca\Pages\UserAuth\Login\PagePasswordLogin; |
|
| 47 | +use Waca\Pages\UserAuth\Login\PageU2FLogin; |
|
| 48 | +use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 49 | +use Waca\Pages\UserAuth\PageChangePassword; |
|
| 50 | +use Waca\Pages\UserAuth\PageForgotPassword; |
|
| 51 | +use Waca\Pages\UserAuth\PageLogout; |
|
| 52 | +use Waca\Pages\UserAuth\PageOAuth; |
|
| 53 | +use Waca\Pages\UserAuth\PageOAuthCallback; |
|
| 54 | +use Waca\Pages\UserAuth\PagePreferences; |
|
| 55 | 55 | use Waca\Tasks\IRoutedTask; |
| 56 | 56 | use Waca\WebRequest; |
| 57 | 57 | |
@@ -31,6 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * @param User $user |
| 34 | + * @return void |
|
| 34 | 35 | */ |
| 35 | 36 | public function deleteCredential(User $user); |
| 36 | 37 | |
@@ -61,6 +61,9 @@ |
||
| 61 | 61 | return $totp->verify($data, null, 2); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | + /** |
|
| 65 | + * @param null|string $data |
|
| 66 | + */ |
|
| 64 | 67 | public function verifyEnable(User $user, $data) |
| 65 | 68 | { |
| 66 | 69 | $storedData = $this->getCredentialData($user->getId(), true); |
@@ -9,13 +9,13 @@ |
||
| 9 | 9 | namespace Waca\Security\CredentialProviders; |
| 10 | 10 | |
| 11 | 11 | use DateTimeImmutable; |
| 12 | -use u2flib_server\Error; |
|
| 13 | -use u2flib_server\U2F; |
|
| 14 | 12 | use Waca\DataObjects\User; |
| 15 | 13 | use Waca\Exceptions\ApplicationLogicException; |
| 16 | 14 | use Waca\PdoDatabase; |
| 17 | 15 | use Waca\SiteConfiguration; |
| 18 | 16 | use Waca\WebRequest; |
| 17 | +use u2flib_server\Error; |
|
| 18 | +use u2flib_server\U2F; |
|
| 19 | 19 | |
| 20 | 20 | class U2FCredentialProvider extends CredentialProviderBase |
| 21 | 21 | { |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
| 107 | - * @param $result |
|
| 107 | + * @param string $result |
|
| 108 | 108 | * |
| 109 | 109 | * @return array |
| 110 | 110 | */ |
@@ -123,6 +123,9 @@ discard block |
||
| 123 | 123 | return $data; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | + /** |
|
| 127 | + * @param string $data |
|
| 128 | + */ |
|
| 126 | 129 | private function getYubikeyId($data) |
| 127 | 130 | { |
| 128 | 131 | return substr($data, 0, -32); |
@@ -146,7 +149,7 @@ discard block |
||
| 146 | 149 | } |
| 147 | 150 | |
| 148 | 151 | /** |
| 149 | - * @param $data |
|
| 152 | + * @param string $data |
|
| 150 | 153 | * |
| 151 | 154 | * @return bool |
| 152 | 155 | */ |
@@ -16,11 +16,6 @@ discard block |
||
| 16 | 16 | use Waca\Pages\PageJobQueue; |
| 17 | 17 | use Waca\Pages\PageLog; |
| 18 | 18 | use Waca\Pages\PageMain; |
| 19 | -use Waca\Pages\RequestAction\PageCreateRequest; |
|
| 20 | -use Waca\Pages\UserAuth\PageChangePassword; |
|
| 21 | -use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 22 | -use Waca\Pages\UserAuth\PageOAuth; |
|
| 23 | -use Waca\Pages\UserAuth\PagePreferences; |
|
| 24 | 19 | use Waca\Pages\PageSearch; |
| 25 | 20 | use Waca\Pages\PageSiteNotice; |
| 26 | 21 | use Waca\Pages\PageTeam; |
@@ -30,6 +25,7 @@ discard block |
||
| 30 | 25 | use Waca\Pages\RequestAction\PageBreakReservation; |
| 31 | 26 | use Waca\Pages\RequestAction\PageCloseRequest; |
| 32 | 27 | use Waca\Pages\RequestAction\PageComment; |
| 28 | +use Waca\Pages\RequestAction\PageCreateRequest; |
|
| 33 | 29 | use Waca\Pages\RequestAction\PageCustomClose; |
| 34 | 30 | use Waca\Pages\RequestAction\PageDeferRequest; |
| 35 | 31 | use Waca\Pages\RequestAction\PageDropRequest; |
@@ -43,6 +39,10 @@ discard block |
||
| 43 | 39 | use Waca\Pages\Statistics\StatsTemplateStats; |
| 44 | 40 | use Waca\Pages\Statistics\StatsTopCreators; |
| 45 | 41 | use Waca\Pages\Statistics\StatsUsers; |
| 42 | +use Waca\Pages\UserAuth\MultiFactor\PageMultiFactor; |
|
| 43 | +use Waca\Pages\UserAuth\PageChangePassword; |
|
| 44 | +use Waca\Pages\UserAuth\PageOAuth; |
|
| 45 | +use Waca\Pages\UserAuth\PagePreferences; |
|
| 46 | 46 | |
| 47 | 47 | class RoleConfiguration |
| 48 | 48 | { |
@@ -513,6 +513,10 @@ |
||
| 513 | 513 | return isset($session['oauthPartialLogin']) ? (int)$session['oauthPartialLogin'] : null; |
| 514 | 514 | } |
| 515 | 515 | |
| 516 | + /** |
|
| 517 | + * @param integer $userId |
|
| 518 | + * @param integer $stage |
|
| 519 | + */ |
|
| 516 | 520 | public static function setAuthPartialLogin($userId, $stage) |
| 517 | 521 | { |
| 518 | 522 | $session = &self::$globalStateProvider->getSessionSuperGlobal(); |