MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8092 from DCSO/fix/linotp-throw2 

LinOTP minor fixes
pull/8111/head
Alexandre Dulaunoy 2022-01-17 20:13:16 +01:00 committed by GitHub
parent 6dc2fefb41 7644a19b7f
commit f650521b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Model/Server.php
View File

@ -1388,6 +1388,7 @@ class Server extends AppModel
'misc' => 'Security',
'Security' => 'Security',
'Session' => 'Security',
'LinOTPAuth' => 'Security',
'SimpleBackgroundJobs' => 'SimpleBackgroundJobs'
);
@ -7135,6 +7136,37 @@ class Server extends AppModel
'type' => 'boolean',
'null' => true
),
'LinOTPAuth' => array(
'branch' => 1,
'baseUrl' => array(
'level' => 2,
'description' => __('The default LinOTP URL.'),
'value' => 'https://<your-linotp-baseUrl>',
'test' => 'testForEmpty',
'type' => 'string',
),
'realm' => array(
'level' => 2,
'description' => __('The LinOTP realm to authenticate against.'),
'value' => 'lino',
'test' => 'testForEmpty',
'type' => 'string',
),
'verifyssl' => array(
'level' => 2,
'description' => __('Set to false to skip SSL/TLS verify'),
'value' => true,
'test' => 'testBoolTrue',
'type' => 'boolean',
),
'mixedauth' => array(
'level' => 2,
'description' => __('Set to true to enforce OTP usage'),
'value' => false,
'test' => 'testBoolFalse',
'type' => 'boolean',
),
),
);
}

8
app/Plugin/LinOTPAuth/Controller/Component/Auth/LinOTPAuthenticate.php
View File

@ -50,7 +50,13 @@ class LinOTPAuthenticate extends BaseAuthenticate
$url = "$baseUrl/validate/check";
CakeLog::debug( "Sending POST request to ${url}");
$results = $HttpSocket->post($url, $data);
try {
$results = $HttpSocket->post($url, $data);
}
catch (SocketException $ex) {
CakeLog::error("LinOTP: {$ex->getMessage()}.");
return false;
}
if ($results->code != "200") {
return false;
}

7
app/View/Users/login.ctp
View File

@ -41,6 +41,13 @@
echo $this->Form->input('password', array('autocomplete' => 'off'));
if (!empty(Configure::read('LinOTPAuth'))) {
echo $this->Form->input('otp', array('autocomplete' => 'off', 'type' => 'password', 'label' => 'OTP'));
echo "<div class=\"clear\">";
echo sprintf(
'%s <a href="%s/selfservice" title="LinOTP Selfservice">LinOTP Selfservice</a> %s',
__('Visit'),
Configure::read('LinOTPAuth.baseUrl'),
__('for the One-Time-Password selfservice.')
);
}
?>
<div class="clear">