Add MFA protection to several pages of the PAUSE #455
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package PAUSE::Web::Controller::User::Mfa; | ||
|
|
||
| use Mojo::Base "Mojolicious::Controller"; | ||
| use Auth::GoogleAuth; | ||
| use PAUSE::Crypt; | ||
| use Crypt::URandom qw(urandom); | ||
| use Convert::Base32 qw(encode_base32); | ||
| use Imager::QRCode qw(plot_qrcode); | ||
| use URI; | ||
|
|
||
| sub edit { | ||
| my $c = shift; | ||
| my $pause = $c->stash(".pause"); | ||
| my $mgr = $c->app->pause; | ||
| my $req = $c->req; | ||
| my $u = $c->active_user_record; | ||
|
|
||
| my $auth = $c->app->pause->authenticator_for($u); | ||
| $pause->{mfa_qrcode} = _generate_qrcode($auth); | ||
| if (!$u->{mfa_secret32}) { | ||
| my $dbh = $mgr->authen_connect; | ||
| my $tbl = $PAUSE::Config->{AUTHEN_USER_TABLE}; | ||
| my $sql = "UPDATE $tbl SET mfa_secret32 = ?, changed = ?, changedby = ? WHERE user = ?"; | ||
| $dbh->do($sql, undef, $auth->secret32, time, $pause->{User}{userid}, $u->{userid}) | ||
| or push @{$pause->{ERROR}}, sprintf(qq{Could not enter the data into the database: <i>%s</i>.},$dbh->errstr); | ||
| } | ||
|
|
||
| if (uc $req->method eq 'POST' and $req->param("pause99_mfa_sub")) { | ||
|
There was a problem hiding this comment. This block of code says:
This means that you can supply an empty string in It would probably be better to invert the logic and start with There was a problem hiding this comment. Inverted the logic with 684f2f0 |
||
| my $code = $req->param("pause99_mfa_code"); | ||
| $req->param("pause99_mfa_code", undef); | ||
| my $verified; | ||
| if ($code =~ /\A[0-9]{6}\z/ && $auth->verify($code)) { | ||
| $verified = 1; | ||
| } elsif ($code =~ /\A[a-z0-9]{5}\-[a-z0-9]{5}\z/ && $u->{mfa_recovery_codes} && $req->param("pause99_mfa_reset")) { | ||
| my @recovery_codes = split / /, $u->{mfa_recovery_codes} // ''; | ||
| if (grep { PAUSE::Crypt::password_verify($code, $_) } @recovery_codes) { | ||
| $verified = 1; | ||
| } | ||
| } | ||
| unless ($verified) { | ||
| $pause->{error}{invalid_code} = 1; | ||
| return; | ||
| } | ||
| my ($secret32, $recovery_codes); | ||
| if ($req->param("pause99_mfa_reset")) { | ||
| $secret32 = undef; | ||
| $recovery_codes = undef; | ||
| $c->flash(mfa_disabled => 1); | ||
| } else { | ||
| $secret32 = $auth->secret32; | ||
| $c->flash(mfa_enabled => 1); | ||
| my @codes = _generate_recovery_codes(); | ||
| $c->flash(recovery_codes => \@codes); | ||
| $recovery_codes = join " ", map { PAUSE::Crypt::hash_password($_) } @codes; | ||
| } | ||
| my $dbh = $mgr->authen_connect; | ||
| my $tbl = $PAUSE::Config->{AUTHEN_USER_TABLE}; | ||
| my $sql = "UPDATE $tbl SET mfa_secret32 = ?, mfa_recovery_codes = ?, changed = ?, changedby = ? WHERE user = ?"; | ||
| if ($dbh->do($sql, undef, $secret32, $recovery_codes, time, $pause->{User}{userid}, $u->{userid})) { | ||
| my $mailblurb = $c->render_to_string("email/user/mfa/edit", format => "email"); | ||
| my $header = {Subject => "User update for $u->{userid}"}; | ||
| my @to = $u->{secretemail}; | ||
| $mgr->send_mail_multi(\@to, $header, $mailblurb); | ||
| } else { | ||
| push @{$pause->{ERROR}}, sprintf(qq{Could not enter the data | ||
| into the database: <i>%s</i>.},$dbh->errstr); | ||
| } | ||
| $c->redirect_to('/authenquery?ACTION=mfa'); | ||
| } | ||
| } | ||
|
|
||
| sub _generate_recovery_codes { | ||
| my @codes; | ||
| for (1 .. 8) { | ||
| my $code = encode_base32(urandom(6)); | ||
| $code =~ tr/lo/89/; | ||
| $code =~ s/^(.{5})/$1-/; | ||
| push @codes, $code; | ||
| } | ||
| @codes; | ||
| } | ||
|
|
||
| # using $auth->qr_code directly is handy but insecure | ||
| sub _generate_qrcode { | ||
| my $auth = shift; | ||
| my $otpauth = $auth->qr_code(undef, undef, undef, 1); | ||
| my $img = plot_qrcode($otpauth, { casesensitive => 1, size => 4, margin => 4, version => 1, level => 'M' }); | ||
| $img->write(data => \my $qr_png, type => 'png') or die "Failed to write image: " . $img->errstr; | ||
| my $data = URI->new("data:"); | ||
| $data->data($qr_png); | ||
| $data->media_type('image/png'); | ||
| $data; | ||
| } | ||
|
|
||
| 1; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel like I'm probably going to ask a lot of questions. I hope it's useful and not just annoying.
mfamean "MFA is enabled"? If so, is there any value to having that andmfa_secret32? I would expect that you can't temporarily turn off MFA and turn it back on with the same secret, so no extra field is needed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be good to store
mfa_last_verified_atwith the time window in which it was verified. If a OTP can be used more than once, it isn't a OTP! Better practice is something like:Otherwise, the token used at 12:00:00 has 89 seconds to be exfiltrated and used again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we don't need
mfacolumn anymore.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed mfa column with e1549a5