robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

improve error handling during connect

Browse source
This commit is contained in:
Robin Appelman 2018-03-27 17:53:29 +02:00
commit b888dd81bd
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Connection.php
View file

@ -34,10 +34,14 @@ class Connection extends RawConnection {
parent::write($input . PHP_EOL); parent::write($input . PHP_EOL);
} }
/**
* @throws ConnectException
*/
public function clearTillPrompt() { public function clearTillPrompt() {
$this->write(''); $this->write('');
do { do {
$promptLine = $this->readLine(); $promptLine = $this->readLine();
$this->parser->checkConnectionError($promptLine);
} while (!$this->isPrompt($promptLine)); } while (!$this->isPrompt($promptLine));
$this->write(''); $this->write('');
$this->readLine(); $this->readLine();

4
src/Parser.php
View file

@ -81,6 +81,7 @@ class Parser {
* @throws AuthenticationException * @throws AuthenticationException
* @throws InvalidHostException * @throws InvalidHostException
* @throws NoLoginServerException * @throws NoLoginServerException
* @throws AccessDeniedException
*/ */
public function checkConnectionError($line) { public function checkConnectionError($line) {
$line = rtrim($line, ')'); $line = rtrim($line, ')');
@ -99,6 +100,9 @@ class Parser {
if (substr($line, -26) === ErrorCodes::NoLogonServers) { if (substr($line, -26) === ErrorCodes::NoLogonServers) {
throw new NoLoginServerException('No login server'); throw new NoLoginServerException('No login server');
} }
if (substr($line, -23) === ErrorCodes::AccessDenied) {
throw new AccessDeniedException('Access denied');
}
} }
public function parseMode($mode) { public function parseMode($mode) {