Merge remote-tracking branch 'origin/master'

Author: Salim Lachdhaf

.gitignore

@@ -1,3 +1,5 @@
+test/test_res_files
+
 # Miscellaneous
 *.class
 *.log

lib/src/ftp_socket.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import '/src/ftp_reply.dart';
-
 import '../ftpconnect.dart';
 
 class FTPSocket {
@@ -89,12 +88,24 @@ class FTPSocket {
   Future<bool> connect(String user, String pass, {String? account}) async {
     logger.log('Connecting...');
 
+    final timeout = Duration(seconds: this.timeout);
+
     try {
-      _socket = await RawSocket.connect(
-        host,
-        port,
-        timeout: Duration(seconds: timeout),
-      );
+      // FTPS starts secure
+      if (securityType == SecurityType.FTPS) {
+        _socket = await RawSecureSocket.connect(
+          host,
+          port,
+          timeout: timeout,
+          onBadCertificate: (certificate) => true,
+        );
+      } else {
+        _socket = await RawSocket.connect(
+          host,
+          port,
+          timeout: timeout,
+        );
+      }
     } catch (e) {
       throw FTPConnectException(
           'Could not connect to $host ($port)', e.toString());
@@ -103,22 +114,23 @@ class FTPSocket {
     logger.log('Connection established, waiting for welcome message...');
     await readResponse();
 
-    if (securityType == SecurityType.FTPS ||
-        securityType == SecurityType.FTPES) {
-      if (securityType == SecurityType.FTPES) {
-        FTPReply lResp = await sendCommand('AUTH TLS');
+    // FTPES needs to be upgraded prior to getting a welcome
+    if (securityType == SecurityType.FTPES) {
+      FTPReply lResp = await sendCommand('AUTH TLS');
+      if (!lResp.isSuccessCode()) {
+        lResp = await sendCommand('AUTH SSL');
         if (!lResp.isSuccessCode()) {
-          lResp = await sendCommand('AUTH SSL');
-          if (!lResp.isSuccessCode()) {
-            throw FTPConnectException(
-                'FTPES cannot be applied: the server refused both AUTH TLS and AUTH SSL commands',
-                lResp.message);
-          }
+          throw FTPConnectException(
+              'FTPES cannot be applied: the server refused both AUTH TLS and AUTH SSL commands',
+              lResp.message);
         }
       }
+
       _socket = await RawSecureSocket.secure(_socket,
           onBadCertificate: (certificate) => true);
+    }
 
+    if ([SecurityType.FTPES, SecurityType.FTPS].contains(securityType)) {
       await sendCommand('PBSZ 0');
       await sendCommand('PROT P');
     }

lib/src/ftpconnect_base.dart

@@ -17,23 +17,30 @@ class FTPConnect {
   /// Create a FTP Client instance
   ///
   /// [host]: Hostname or IP Address
-  /// [port]: Port number (Defaults to 21)
+  /// [port]: Port number (Defaults to 21 for FTP and FTPES, 990 for FTPS)
   /// [user]: Username (Defaults to anonymous)
   /// [pass]: Password if not anonymous login
   /// [debug]: Enable Debug Logging
   /// [timeout]: Timeout in seconds to wait for responses
-  FTPConnect(String host,
-      {int port = 21,
-      String user = 'anonymous',
-      String pass = '',
-      bool showLog = false,
-      SecurityType securityType = SecurityType.FTP,
-      Logger? logger,
-      int timeout = 30})
-      : _user = user,
+  FTPConnect(
+    String host, {
+    int? port,
+    String user = 'anonymous',
+    String pass = '',
+    bool showLog = false,
+    SecurityType securityType = SecurityType.FTP,
+    Logger? logger,
+    int timeout = 30,
+  })  : _user = user,
         _pass = pass {
-    _socket = FTPSocket(host, port, securityType,
-        logger != null ? logger : Logger(isEnabled: showLog), timeout);
+    port ??= securityType == SecurityType.FTPS ? 990 : 21;
+    _socket = FTPSocket(
+      host,
+      port,
+      securityType,
+      logger != null ? logger : Logger(isEnabled: showLog),
+      timeout,
+    );
   }
 
   set transferMode(TransferMode pTransferMode) {

test/ftpConnect_test.dart

@@ -14,6 +14,15 @@ void main() async {
   );
   _ftpConnect.supportIPV6 = true;
 
+  final FTPConnect _ftpsConnect = new FTPConnect(
+    "test.rebex.net",
+    user: "demo",
+    pass: "password",
+    securityType: SecurityType.FTPS,
+    showLog: true,
+  );
+  _ftpConnect.supportIPV6 = true;
+
   final FTPConnect _ftpConnectSecured = new FTPConnect(
     "ftp.dlptest.com",
     user: "dlpuser",
@@ -57,6 +66,10 @@ void main() async {
         throwsA(isA<FTPConnectException>()));
   });
 
+  test('test ftps', () async {
+    expect(await _ftpsConnect.connect(), equals(true));
+  });
+
   test('test ftpConnect No log', () async {
     final FTPConnect _ftpConnectNoLog = new FTPConnect("users.on.net",
         user: "pvpt", pass: "Lachdhaf", showLog: true);