This commit is contained in:
Christophe Maudoux 2018-04-03 23:03:29 +02:00
parent 8acf60dcf2
commit ee380f1f6b
4 changed files with 13 additions and 14 deletions

View File

@ -238,7 +238,7 @@ sub _displayRegister {
400 ); 400 );
} }
unless ( $m->{r}->( $req, $req->userData ) ) { unless ( $m->{r}->( $req, $req->userData ) ) {
return $self->p->sendError( $req, 'Registration unauthorizated', return $self->p->sendError( $req, 'Registration not authorized',
403 ); 403 );
} }
return $self->p->sendHtml( $req, $m->{m}->template ); return $self->p->sendHtml( $req, $m->{m}->template );

View File

@ -135,7 +135,7 @@ sub run {
$nk = 1; $nk = 1;
} }
elsif ( $req->param('newkey') ) { elsif ( $req->param('newkey') ) {
return $self->p->sendError( $req, 'notAutorizated', 200 ); return $self->p->sendError( $req, 'notAuthorized', 200 );
} }
elsif ( $self->conf->{totp2fDisplayExistingSecret} ) { elsif ( $self->conf->{totp2fDisplayExistingSecret} ) {
$secret = $req->userData->{_totp2fSecret}; $secret = $req->userData->{_totp2fSecret};
@ -174,8 +174,8 @@ sub run {
} }
# Check if unregistration is allowed # Check if unregistration is allowed
unless ( $self->conf->{totp2fUserCanChangeKey} ) { unless ( $self->conf->{TOTP2fUserCanChangeKey} ) {
return $self->p->sendError( $req, 'notAutorizated', 200 ); return $self->p->sendError( $req, 'notAuthorized', 400 );
} }
# Get or generate master key # Get or generate master key
@ -185,10 +185,8 @@ sub run {
return [ 200, [ 'Content-Type' => 'application/json' ], return [ 200, [ 'Content-Type' => 'application/json' ],
['{"result":1}'] ]; ['{"result":1}'] ];
} }
elsif ( $action eq 'delete' ) { elsif ( $action eq 'delete' ) {
my $epoch = $req->param('epoch'); my $epoch = $req->param('epoch');
my $list2FDevices = eval { my $list2FDevices = eval {
$self->logger->debug("Loading 2F Devices ..."); $self->logger->debug("Loading 2F Devices ...");

View File

@ -167,8 +167,9 @@ sub run {
# Check if unregistration is allowed # Check if unregistration is allowed
unless ( $self->conf->{u2fUserCanRemoveKey} ) { unless ( $self->conf->{u2fUserCanRemoveKey} ) {
return $self->p->sendError( $req, 'notAutorizated', 200 ); return $self->p->sendError( $req, 'notAuthorized', 200 );
} }
if ( $action eq 'unregister' ) { if ( $action eq 'unregister' ) {
my $challenge = $self->crypter->registrationChallenge; my $challenge = $self->crypter->registrationChallenge;
return [ return [
@ -199,8 +200,7 @@ sub run {
return $self->p->sendError( $req, $err, 200 ); return $self->p->sendError( $req, $err, 200 );
} }
elsif ( $action eq 'delete' ) { elsif ( $action eq 'delete' ) {
my $epoch = $req->param('epoch'); my $epoch = $req->param('epoch');
my $list2FDevices = eval { my $list2FDevices = eval {
$self->logger->debug("Loading 2F Devices ..."); $self->logger->debug("Loading 2F Devices ...");
@ -238,7 +238,7 @@ sub run {
return $self->p->sendError( $req, $err, 200 ); return $self->p->sendError( $req, $err, 200 );
} }
$self->logger->error("Unknown action $action"); $self->logger->error("Unknown action $action");
return $self->p->sendError( $req, 'notAutorizated', 200 ); return $self->p->sendError( $req, 'notAuthorized', 200 );
} }
sub loadUser { sub loadUser {

View File

@ -76,7 +76,8 @@ sub run {
$self->logger->debug("Same 2F Device found ? $SameUBKFound"); $self->logger->debug("Same 2F Device found ? $SameUBKFound");
if ($SameUBKFound) { if ($SameUBKFound) {
$self->userLogger->error("Yubikey already registered !"); $self->userLogger->error("Yubikey already registered !");
return $self->p->sendError( $req, 'Yubikey already registered', 200 ); return $self->p->sendError( $req, 'Yubikey already registered',
200 );
} }
push @{$list2FDevices}, push @{$list2FDevices},
@ -114,8 +115,8 @@ sub run {
} }
# Check if unregistration is allowed # Check if unregistration is allowed
unless ( $self->conf->{u2fUserCanRemoveKey} ) { unless ( $self->conf->{yubikey2fUserCanRemoveKey} ) {
return $self->p->sendError( $req, 'notAutorizated', 200 ); return $self->p->sendError( $req, 'notAuthorized', 400 );
} }
if ( $action eq 'delete' ) { if ( $action eq 'delete' ) {