fix(auth): update checks, ensure secure is set using ftps

QuorumDMS · Jun 26, 2017 · 8aeb697 · 8aeb697
1 parent 84a68ae
commit 8aeb697
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/commands/registration/auth.js b/src/commands/registration/auth.js
@@ -20,7 +20,8 @@ module.exports = {
 };
 
 function handleTLS() {
-  if (!this.server._tls) return this.reply(504);
+  if (!this.server._tls) return this.reply(502);
+  if (this.secure) return this.reply(202);
 
   return this.reply(234)
   .then(() => {

diff --git a/src/commands/registration/pbsz.js b/src/commands/registration/pbsz.js
@@ -8,6 +8,7 @@ module.exports = {
   syntax: '{{cmd}}',
   description: 'Protection Buffer Size',
   flags: {
-    no_auth: true
+    no_auth: true,
+    feat: 'PBSZ'
   }
 };
diff --git a/src/commands/registration/prot.js b/src/commands/registration/prot.js
@@ -17,6 +17,7 @@ module.exports = {
   syntax: '{{cmd}}',
   description: 'Data Channel Protection Level',
   flags: {
-    no_auth: true
+    no_auth: true,
+    feat: 'PROT'
   }
 };
diff --git a/src/connection.js b/src/connection.js
@@ -18,6 +18,8 @@ class FtpConnection {
     this.transferType = 'binary';
     this.encoding = 'utf8';
     this.bufferSize = false;
+    this.restByteCount = 0;
+    this._secure = false;
 
     this.connector = new BaseConnector(this);
 
@@ -48,6 +50,13 @@ class FtpConnection {
     }
   }
 
+  get secure() {
+    return this.server.isTLS || this._secure;
+  }
+  set secure(sec) {
+    this._secure = sec;
+  }
+
   close(code = 421, message = 'Closing connection') {
     return when
       .resolve(code)