Skip to content

Refactor: split login process #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rymiyamoto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor: split login process #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/SftpAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,32 @@ protected function login()

$authentication = $this->getAuthentication();

$this->attemptLogin($authentication);

if ($authentication instanceof Agent) {
$authentication->startSSHForwarding($this->connection);
}
}

/**
* Attempt Login
*
* @param Agent|RSA|string $authentication
*
* @throws ConnectionErrorException
*/
private function attemptLogin($authentication)
{
if ($this->connection->login($this->getUsername(), $authentication)) {
goto past_login;
return;
}

// try double authentication, key is already given so now give password
if ($authentication instanceof RSA && $this->connection->login($this->getUsername(), $this->getPassword())) {
goto past_login;
return;
}

throw new ConnectionErrorException('Could not login with username: '.$this->getUsername().', host: '.$this->host);

past_login:

if ($authentication instanceof Agent) {
$authentication->startSSHForwarding($this->connection);
}
}

/**
Expand Down