#1 Changed Status code check for FTP Servers not answering with a spa…

…ce after the status code
Nexific · Feb 11, 2020 · 13ffb1d · 13ffb1d
1 parent 1d237f8
commit 13ffb1d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.4.0
 
--
+- Fixed Issue #1 (FTP Servers not sending a space after the status code)
 
 ## 0.3.0
 

diff --git a/lib/src/commands/directory.dart b/lib/src/commands/directory.dart
@@ -11,30 +11,30 @@ class FTPDirectory {
 
     String sResponse = _socket.readResponse();
 
-    return sResponse.startsWith('257 ');
+    return sResponse.startsWith('257');
   }
 
   bool deleteDirectory(String sName) {
     _socket.sendCommand('RMD $sName');
 
     String sResponse = _socket.readResponse();
 
-    return sResponse.startsWith('250 ');
+    return sResponse.startsWith('250');
   }
 
   bool changeDirectory(String sName) {
     _socket.sendCommand('CWD $sName');
 
     String sResponse = _socket.readResponse();
 
-    return sResponse.startsWith('250 ');
+    return sResponse.startsWith('250');
   }
 
   String currentDirectory() {
     _socket.sendCommand('PWD');
 
     String sResponse = _socket.readResponse();
-    if (!sResponse.startsWith('257 ')) {
+    if (!sResponse.startsWith('257')) {
       throw FTPException('Failed to get current working directory', sResponse);
     }
 

diff --git a/lib/src/commands/file.dart b/lib/src/commands/file.dart
@@ -9,14 +9,14 @@ class FTPFile {
     _socket.sendCommand('RNFR $sOldName');
 
     String sResponse = _socket.readResponse();
-    if (!sResponse.startsWith('350 ')) {
+    if (!sResponse.startsWith('350')) {
       return false;
     }
 
     _socket.sendCommand('RNTO $sNewName');
 
     sResponse = _socket.readResponse();
-    if (!sResponse.startsWith('250 ')) {
+    if (!sResponse.startsWith('250')) {
       return false;
     }
 
@@ -27,6 +27,6 @@ class FTPFile {
     _socket.sendCommand('DELE $sFilename');
 
     String sResponse = _socket.readResponse();
-    return sResponse.startsWith('250 ');
+    return sResponse.startsWith('250');
   }
 }
diff --git a/lib/src/commands/filedownload.dart b/lib/src/commands/filedownload.dart
@@ -24,15 +24,15 @@ class FileDownload {
     _socket.sendCommand('PASV');
 
     String sResponse = _socket.readResponse();
-    if (!sResponse.startsWith('227 ')) {
+    if (!sResponse.startsWith('227')) {
       throw FTPException('Could not start Passive Mode', sResponse);
     }
 
     int iPort = TransferUtil.parsePort(sResponse);
 
     _socket.sendCommand('RETR $sRemoteName');
     sResponse = _socket.readResponse(true);
-    if (sResponse.startsWith('550 ')) {
+    if (sResponse.startsWith('550')) {
       throw FTPException('Remote File $sRemoteName does not exist!', sResponse);
     }
 

diff --git a/lib/src/commands/fileupload.dart b/lib/src/commands/fileupload.dart
@@ -28,7 +28,7 @@ class FileUpload {
     _socket.sendCommand('PASV');
 
     String sResponse = _socket.readResponse();
-    if (!sResponse.startsWith('227 ')) {
+    if (!sResponse.startsWith('227')) {
       throw FTPException('Could not start Passive Mode', sResponse);
     }
 

diff --git a/lib/src/ftpsocket.dart b/lib/src/ftpsocket.dart
@@ -63,23 +63,23 @@ class FTPSocket {
 
     // Wait for Connect
     String sResponse = readResponse();
-    if (!sResponse.startsWith('220 ')) {
+    if (!sResponse.startsWith('220')) {
       throw FTPException('Unknown response from FTP server', sResponse);
     }
 
     // Send Username
     sendCommand('USER $user');
 
     sResponse = readResponse();
-    if (!sResponse.startsWith('331 ')) {
+    if (!sResponse.startsWith('331')) {
       throw FTPException('Wrong username $user', sResponse);
     }
 
     // Send Password
     sendCommand('PASS $pass');
 
     sResponse = readResponse();
-    if (!sResponse.startsWith('230 ')) {
+    if (!sResponse.startsWith('230')) {
       throw FTPException('Wrong password', sResponse);
     }