octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2021-11-03 22:28:16 -05:00
parent 878526d7c9 9fb26d478a
commit a0405d4816
1 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
phpseclib/Net/SSH2.php
View File

@ -1096,6 +1096,14 @@ class SSH2
*/
private $regenerate_decompression_context = false;
/**
* Smart multi-factor authentication flag
*
* @var bool
* @access private
*/
private $smartMFA = true;
/**
* Default Constructor.
*
@ -2163,9 +2171,57 @@ class SSH2
return $this->login_helper($username);
}
foreach ($args as $arg) {
if ($this->login_helper($username, $arg)) {
return true;
while (count($args)) {
if (!$this->auth_methods_to_continue || !$this->smartMFA) {
$newargs = $args;
$args = [];
} else {
$newargs = [];
foreach ($this->auth_methods_to_continue as $method) {
switch ($method) {
case 'publickey':
foreach ($args as $key => $arg) {
if ($arg instanceof PrivateKey || $arg instanceof Agent) {
$newargs[] = $arg;
unset($args[$key]);
break;
}
}
break;
case 'keyboard-interactive':
$hasArray = $hasString = false;
foreach ($args as $arg) {
if ($hasArray || is_array($arg)) {
$hasArray = true;
break;
}
if ($hasString || is_string($arg)) {
$hasString = true;
break;
}
}
if ($hasArray && $hasString) {
foreach ($args as $key => $arg) {
if (is_array($arg)) {
$newargs[] = $arg;
break 2;
}
}
}
case 'password':
foreach ($args as $key => $arg) {
$newargs[] = $arg;
unset($args[$key]);
break;
}
}
}
}
foreach ($newargs as $arg) {
if ($this->login_helper($username, $arg)) {
return true;
}
}
}
return false;
@ -5085,4 +5141,20 @@ class SSH2
{
return $this->auth_methods_to_continue;
}
/**
* Enables "smart" multi-factor authentication (MFA)
*/
public function enableSmartMFA()
{
$this->smartMFA = true;
}
/**
* Disables "smart" multi-factor authentication (MFA)
*/
public function disableSmartMFA()
{
$this->smartMFA = false;
}
}