fix: disallow PORT connections to alternate hosts

Ensure the data socket that the server connects to from the PORT command is the same IP as the current command socket.

* fix: add error handling to additional connection commands

.circleci/config.yml

@@ -1,108 +1,97 @@
 version: 2
 
-create-cache-file: &create-cache-file
-  run:
-    name: Setup cache
-    command: echo "$NODE_VERSION" > _cache_node_version
-
-package-json-cache: &package-json-cache
-  key: npm-install-{{ checksum "_cache_node_version" }}-{{ checksum "package-lock.json" }}
-
-base-build: &base-build
-  steps:
-    - checkout
-    - <<: *create-cache-file
-    - restore_cache:
-        <<: *package-json-cache
-    - run:
-        name: Install
-        command: npm install
-    - save_cache:
-        <<: *package-json-cache
-        paths:
-          - node_modules
-    - run:
-        name: Lint
-        command: npm run verify:js
-    - run:
-        name: Test
-        command: npm run test:unit:once
-
 jobs:
-  test_node_10:
+  build:
     docker:
-      - image: circleci/node:10
-    environment:
-      - NODE_VERSION: 10
-    <<: *base-build
+      - image: &node-image circleci/node:lts
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - &npm-cache-key npm-cache-{{ .Branch }}-{{ .Revision }}
+            - npm-cache-{{ .Branch }}
+            - npm-cache
+      - run:
+          name: Install
+          command: npm ci
+      - persist_to_workspace:
+          root: .
+          paths:
+            - node_modules
+      - save_cache:
+          key: *npm-cache-key
+          paths:
+            - ~/.npm/_cacache
 
-  test_node_8:
+  lint:
     docker:
-      - image: circleci/node:8
-    environment:
-      - NODE_VERSION: 8
-    <<: *base-build
+      - image: *node-image
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Lint
+          command: npm run verify
 
-  test_node_6:
+  test:
     docker:
-      - image: circleci/node:6
-    environment:
-      - NODE_VERSION: 6
-    <<: *base-build
+      - image: *node-image
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - deploy:
+          name: Test
+          command: |
+            npm run test
+
+  release_dry_run:
+    docker:
+      - image: *node-image
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - deploy:
+          name: Dry Release
+          command: |
+            npm run semantic-release -- --dry-run
 
   release:
     docker:
-      - image: circleci/node:8
-    environment:
-      - NODE_VERSION: 8
+      - image: *node-image
     steps:
       - checkout
-      - <<: *create-cache-file
-      - restore_cache:
-          <<: *package-json-cache
-      - run:
-          name: Update NPM
-          command: |
-            npm install npm@5
-            npm install semantic-release@11
+      - attach_workspace:
+          at: .
       - deploy:
-          name: Semantic Release
+          name: Release
           command: |
-            npm run semantic-release || true
+            npm run semantic-release
 
 workflows:
   version: 2
-  test_and_tag:
+  publish:
     jobs:
-      - test_node_10:
-          filters:
-            branches:
-              only: master
-      - test_node_8:
-          filters:
-            branches:
-              only: master
-      - test_node_6:
+      - build
+      - lint:
+          requires:
+            - build
+      - test:
+          requires:
+            - build
+      - release_dry_run:
           filters:
             branches:
               only: master
+          requires:
+            - test
+            - lint
+      - hold_release:
+          type: approval
+          requires:
+            - release_dry_run
       - release:
           requires:
-            - test_node_6
-            - test_node_8
-            - test_node_10
-
-  build_and_test:
-    jobs:
-      - test_node_10:
-          filters:
-            branches:
-              ignore: master
-      - test_node_8:
-          filters:
-            branches:
-              ignore: master
-      - test_node_6:
-          filters:
-            branches:
-              ignore: master
+            - hold_release

.eslintignore

@@ -1,9 +1,2 @@
-# START_CONFIT_GENERATED_CONTENT
-# Common folders to ignore
 node_modules/*
 bower_components/*
-
-# Config folder (optional - you might want to lint this...)
-config/*
-
-# END_CONFIT_GENERATED_CONTENT

.gitignore

@@ -1,7 +1,6 @@
+test_tmp/
+
 node_modules/
 
 dist/
-reports/
 npm-debug.log
-.nyc_output/
-test_tmp/

CONTRIBUTING.md

@@ -16,5 +16,10 @@
 
 - Any new fixes are features should include new or updated [tests](/test).
 - Commits follow the [AngularJS Git Commit Message Conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit), please review and commit accordingly
-- Submit your pull requests to the `master` branch, these will normally be merged into a seperate branch for any finally changes before being merged into `master`.
-- Submit any bugs or requests to the issues page in Github.
+- Submit your pull requests to the `master` branch, these will normally be merged into a separate branch for any finally changes before being merged into `master`.
+- Submit any bugs or requests to the issues page in Github.
+
+## Setup
+
+- Clone the repository `git clone`
+- Install dependencies `npm install`

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Tyler Stewart
+Copyright (c) 2019 Tyler Stewart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://github.com/trs/ftp-srv">
+  <a href="https://github.com/autovance/ftp-srv">
     <img alt="ftp-srv" src="logo.png" width="600px"  />
   </a>
 </p>
@@ -14,8 +14,8 @@
     <img alt="npm" src="https://img.shields.io/npm/dm/ftp-srv.svg?style=for-the-badge" />
   </a>
 
-  <a href="https://circleci.com/gh/trs/workflows/ftp-srv/tree/master">
-    <img alt="circleci" src="https://img.shields.io/circleci/project/github/trs/ftp-srv/master.svg?style=for-the-badge" />
+  <a href="https://circleci.com/gh/autovance/workflows/ftp-srv/tree/master">
+    <img alt="circleci" src="https://img.shields.io/circleci/project/github/autovance/ftp-srv/master.svg?style=for-the-badge" />
   </a>
 </p>
 
@@ -51,7 +51,7 @@
 // Quick start
 
 const FtpSrv = require('ftp-srv');
-const ftpServer = new FtpSrv('ftp://0.0.0.0:9876', { options ... });
+const ftpServer = new FtpSrv({ options ... });
 
 ftpServer.on('login', (data, resolve, reject) => { ... });
 ...
@@ -62,7 +62,7 @@ ftpServer.listen()
 
 ## API
 
-### `new FtpSrv(url, [{options}])`
+### `new FtpSrv({options})`
 #### url
 [URL string](https://nodejs.org/api/url.html#url_url_strings_and_url_objects) indicating the protocol, hostname, and port to listen on for connections.
 Supported protocols:
@@ -72,45 +72,45 @@ Supported protocols:
 _Note:_ The hostname must be the external IP address to accept external connections. `0.0.0.0` will listen on any available hosts for server and passive connections.  
 __Default:__ `"ftp://127.0.0.1:21"`
 
-#### options
+#### `pasv_url`
+The hostname to provide a client when attempting a passive connection (`PASV`).  
+If not provided, clients can only connect using an `Active` connection.
 
-##### `pasv_url`
-The hostname to provide a client when attempting a passive connection (`PASV`). This defaults to the provided `url` hostname.
+#### `pasv_min`
+Tne starting port to accept passive connections.  
+__Default:__ `1024`
 
-_Note:_ If set to `0.0.0.0`, this will automatically resolve to the external IP of the box.  
-__Default:__ `"127.0.0.1"`
+#### `pasv_max`
+The ending port to accept passive connections.  
+The range is then queried for an available port to use when required.  
+__Default:__ `65535`
 
-##### `pasv_range`
-A starting port (eg `8000`) or a range (eg `"8000-9000"`) to accept passive connections.  
-This range is then queried for an available port to use when required.  
-__Default:__ `22`
-
-##### `greeting`
+#### `greeting`
 A human readable array of lines or string to send when a client connects.  
 __Default:__ `null`
 
-##### `tls`
+#### `tls`
 Node [TLS secure context object](https://nodejs.org/api/tls.html#tls_tls_createsecurecontext_options) used for implicit (`ftps` protocol) or explicit (`AUTH TLS`) connections.  
 __Default:__ `false`
 
-##### `anonymous`
+#### `anonymous`
 If true, will allow clients to authenticate using the username `anonymous`, not requiring a password from the user.  
 Can also set as a string which allows users to authenticate using the username provided.  
 The `login` event is then sent with the provided username and `@anonymous` as the password.  
 __Default:__ `false`
 
-##### `blacklist`
+#### `blacklist`
 Array of commands that are not allowed.  
 Response code `502` is sent to clients sending one of these commands.  
 __Example:__ `['RMD', 'RNFR', 'RNTO']` will not allow users to delete directories or rename any files.  
 __Default:__ `[]`
 
-##### `whitelist`
+#### `whitelist`
 Array of commands that are only allowed.  
 Response code `502` is sent to clients sending any other command.  
 __Default:__ `[]`
 
-##### `file_format`
+#### `file_format`
 Sets the format to use for file stat queries such as `LIST`.  
 __Default:__ `"ls"`  
 __Allowable values:__
@@ -119,9 +119,13 @@ __Allowable values:__
   - `function () {}` A custom function returning a format or promise for one.
     - Only one argument is passed in: a node [file stat](https://nodejs.org/api/fs.html#fs_class_fs_stats) object with additional file `name` parameter
 
-##### `log`
+#### `log`
 A [bunyan logger](https://github.com/trentm/node-bunyan) instance. Created by default.
 
+#### `timeout`
+Sets the timeout (in ms) after that an idle connection is closed by the server  
+__Default:__ `0`
+
 ## CLI
 
 `ftp-srv` also comes with a builtin CLI.
@@ -135,19 +139,29 @@ $ ftp-srv ftp://0.0.0.0:9876 --root ~/Documents
 ```
 
 #### `url`
-
 Set the listening URL.
 
 Defaults to `ftp://127.0.0.1:21`
 
-#### `--root` / `-r`
+#### `--pasv_url`
+The hostname to provide a client when attempting a passive connection (`PASV`).  
+If not provided, clients can only connect using an `Active` connection.
 
+#### `--pasv_min`
+The starting port to accept passive connections.  
+__Default:__ `1024`
+
+#### `--pasv_max`
+The ending port to accept passive connections.  
+The range is then queried for an available port to use when required.  
+__Default:__ `65535`
+
+#### `--root` / `-r`
 Set the default root directory for users.
 
 Defaults to the current directory.
 
 #### `--credentials` / `-c`
-
 Set the path to a json credentials file.
 
 Format:
@@ -164,13 +178,14 @@ Format:
 ```
 
 #### `--username`
-
 Set the username for the only user. Do not provide an argument to allow anonymous login.
 
 #### `--password`
-
 Set the password for the given `username`.
 
+#### `--read-only`
+Disable write actions such as upload, delete, etc.
+
 ## Events
 
 The `FtpSrv` class extends the [node net.Server](https://nodejs.org/api/net.html#net_class_net_server). Some custom events can be resolved or rejected, such as `login`.
@@ -233,6 +248,16 @@ Occurs when a file is uploaded.
 `error` if successful, will be `null`  
 `fileName` name of the file that was uploaded
 
+### `RNTO`
+```js
+connection.on('RNTO', (error, fileName) => { ... });
+```
+
+Occurs when a file is renamed.
+
+`error` if successful, will be `null`  
+`fileName` name of the file that was renamed
+
 ## Supported Commands
 
 See the [command registry](src/commands/registration) for a list of all implemented FTP commands.
@@ -260,80 +285,83 @@ class MyFileSystem extends FileSystem {
 Custom file systems can implement the following variables depending on the developers needs:
 
 ### Methods
-#### [`currentDirectory()`](src/fs.js#L29)
+#### [`currentDirectory()`](src/fs.js#L40)
 Returns a string of the current working directory  
 __Used in:__ `PWD`
 
-#### [`get(fileName)`](src/fs.js#L33)
+#### [`get(fileName)`](src/fs.js#L44)
 Returns a file stat object of file or directory  
 __Used in:__ `LIST`, `NLST`, `STAT`, `SIZE`, `RNFR`, `MDTM`
 
-#### [`list(path)`](src/fs.js#L39)
+#### [`list(path)`](src/fs.js#L50)
 Returns array of file and directory stat objects  
 __Used in:__ `LIST`, `NLST`, `STAT`
 
-#### [`chdir(path)`](src/fs.js#L56)
+#### [`chdir(path)`](src/fs.js#L67)
 Returns new directory relative to current directory  
 __Used in:__ `CWD`, `CDUP`
 
-#### [`mkdir(path)`](src/fs.js#L96)
+#### [`mkdir(path)`](src/fs.js#L114)
 Returns a path to a newly created directory  
 __Used in:__ `MKD`
 
-#### [`write(fileName, {append, start})`](src/fs.js#L68)
+#### [`write(fileName, {append, start})`](src/fs.js#L79)
 Returns a writable stream  
 Options:  
  `append` if true, append to existing file  
  `start` if set, specifies the byte offset to write to  
 __Used in:__ `STOR`, `APPE`
 
-#### [`read(fileName, {start})`](src/fs.js#L75)
+#### [`read(fileName, {start})`](src/fs.js#L90)
 Returns a readable stream  
 Options:  
  `start` if set, specifies the byte offset to read from  
 __Used in:__ `RETR`
 
-#### [`delete(path)`](src/fs.js#L87)
+#### [`delete(path)`](src/fs.js#L105)
 Delete a file or directory  
 __Used in:__ `DELE`
 
-#### [`rename(from, to)`](src/fs.js#L102)
+#### [`rename(from, to)`](src/fs.js#L120)
 Renames a file or directory  
 __Used in:__ `RNFR`, `RNTO`
 
-#### [`chmod(path)`](src/fs.js#L108)
+#### [`chmod(path)`](src/fs.js#L126)
 Modifies a file or directory's permissions  
 __Used in:__ `SITE CHMOD`
 
-#### [`getUniqueName()`](src/fs.js#L113)
+#### [`getUniqueName()`](src/fs.js#L131)
 Returns a unique file name to write to  
 __Used in:__ `STOU`
 
-<!--[RM_CONTRIBUTING]-->
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md).
 
-<!--[]-->
-
 ## Contributors
 
 - [OzairP](https://github.com/OzairP)
-- [qchar](https://github.com/qchar)
-- [jorinvo](https://github.com/jorinvo)
-- [voxsoftware](https://github.com/voxsoftware)
-- [pkeuter](https://github.com/pkeuter)
 - [TimLuq](https://github.com/TimLuq)
-- [edin-mg](https://github.com/edin-m)
+- [crabl](https://github.com/crabl)
+- [hirviid](https://github.com/hirviid)
 - [DiegoRBaquero](https://github.com/DiegoRBaquero)
+- [edin-m](https://github.com/edin-m)
+- [voxsoftware](https://github.com/voxsoftware)
+- [jorinvo](https://github.com/jorinvo)
+- [Johnnyrook777](https://github.com/Johnnyrook777)
+- [qchar](https://github.com/qchar)
+- [mikejestes](https://github.com/mikejestes)
+- [pkeuter](https://github.com/pkeuter)
+- [qiansc](https://github.com/qiansc)
+- [broofa](https://github.com/broofa)
+- [lafin](https://github.com/lafin)
+- [alancnet](https://github.com/alancnet)
+- [zgwit](https://github.com/zgwit)
 
-<!--[RM_LICENSE]-->
 ## License
 
 This software is licensed under the MIT Licence. See [LICENSE](LICENSE).
 
-<!--[]-->
-
 ## References
 
 - [https://cr.yp.to/ftp.html](https://cr.yp.to/ftp.html)

bin/index.js

@@ -19,7 +19,8 @@ function setupYargs() {
     })
     .option('username', {
       describe: 'Blank for anonymous',
-      type: 'string'
+      type: 'string',
+      default: ''
     })
     .option('password', {
       describe: 'Password for given username',
@@ -36,6 +37,23 @@ function setupYargs() {
       boolean: true,
       default: false
     })
+    .option('pasv-url', {
+      describe: 'URL to provide for passive connections',
+      type: 'string',
+      alias: 'pasv_url'
+    })
+    .option('pasv-min', {
+      describe: 'Starting point to use when creating passive connections',
+      type: 'number',
+      default: 1024,
+      alias: 'pasv_min'
+    })
+    .option('pasv-max', {
+      describe: 'Ending port to use when creating passive connections',
+      type: 'number',
+      default: 65535,
+      alias: 'pasv_max'
+    })
     .parse();
 }
 
@@ -46,15 +64,18 @@ function setupState(_args) {
     if (_args._ && _args._.length > 0) {
       _state.url = _args._[0];
     }
+    _state.pasv_url = _args.pasv_url;
+    _state.pasv_min = _args.pasv_min;
+    _state.pasv_max = _args.pasv_max;
     _state.anonymous = _args.username === '';
   }
 
   function setupRoot() {
     const dirPath = _args.root;
     if (dirPath) {
-      _state.root = process.cwd();
-    } else {
       _state.root = dirPath;
+    } else {
+      _state.root = process.cwd();
     }
   }
 
@@ -95,17 +116,25 @@ function setupState(_args) {
 }
 
 function startFtpServer(_state) {
+  // Remove null/undefined options so they get set to defaults, below
+  for (const key in _state) {
+    if (_state[key] === undefined) delete _state[key];
+  }
 
   function checkLogin(data, resolve, reject) {
-    const user = _state.credentials[data.username]
-    if (_state.anonymous || (user && user.password === data.password)) {
-      return resolve({root: (user && user.root) || _state.root});
+    const user = _state.credentials[data.username];
+    if (_state.anonymous || user && user.password === data.password) {
+      return resolve({root: user && user.root || _state.root});
     }
 
     return reject(new errors.GeneralError('Invalid username or password', 401));
   }
 
-  const ftpServer = new FtpSrv(_state.url, {
+  const ftpServer = new FtpSrv({
+    url: _state.url,
+    pasv_url: _state.pasv_url,
+    pasv_min: _state.pasv_min,
+    pasv_max: _state.pasv_max,
     anonymous: _state.anonymous,
     blacklist: _state.blacklist
   });

changelog/v2_to_v3_migation.md

@@ -0,0 +1,44 @@
+# Migration Guide - v2 to v3
+
+The `FtpServer` constructor has been changed to only take one object option. Combining the two just made sense.
+
+### From:
+
+```js
+const server = new FtpServer('ftp://0.0.0.0:21');
+```
+
+### To:
+
+```js
+const server = new FtpServer({
+  url: 'ftp://0.0.0.0:21'
+});
+```
+
+----
+
+The `pasv_range` option has been changed to separate integer variables: `pasv_min`, `pasv_max`.
+
+### From:
+
+```js
+const server = new FtpServer(..., {
+  pasv_range: '1000-2000'
+});
+```
+
+### To:
+
+```js
+const server = new FtpServer({
+  pasv_min: 1000,
+  pasv_max: 2000
+})
+```
+
+----
+
+The default passive port range has been changed to `1024` - `65535`
+
+----

config/release/commitMessageConfig.js

@@ -1,38 +0,0 @@
-'use strict';
-
-module.exports = {
-
-  types: [
-    {value: 'feat',     name: 'feat:     A new feature'},
-    {value: 'fix',      name: 'fix:      A bug fix'},
-    {value: 'docs',     name: 'docs:     Documentation only changes'},
-    {value: 'style',    name: 'style:    Changes that do not affect the meaning of the code\n            (white-space, formatting, missing semi-colons, etc)'},
-    {value: 'refactor', name: 'refactor: A code change that neither fixes a bug nor adds a feature'},
-    {value: 'perf',     name: 'perf:     A code change that improves performance'},
-    {value: 'test',     name: 'test:     Adding missing tests'},
-    {value: 'chore',    name: 'chore:    Changes to the build process or auxiliary tools\n            and libraries such as documentation generation'},
-    {value: 'revert',   name: 'revert:   Revert to a commit'},
-    {value: 'WIP',      name: 'WIP:      Work in progress'}
-  ],
-
-  scopes: [],
-
-  // it needs to match the value for field type. Eg.: 'fix'
-  /*
-   scopeOverrides: {
-   fix: [
-
-   {name: 'merge'},
-   {name: 'style'},
-   {name: 'e2eTest'},
-   {name: 'unitTest'}
-   ]
-   },
-   */
-
-  allowCustomScopes: true,
-  allowBreakingChanges: ['feat', 'fix'],
-
-  // Appends the branch name to the footer of the commit. Useful for tracking commits after branches have been merged
-  appendBranchNameToCommitMessage: false
-};

config/testUnit/mocha.opts

@@ -1,5 +0,0 @@
-test/**/*.spec.js
---reporter mocha-multi-reporters
---reporter-options configFile=config/testUnit/reporters.json
---ui bdd
---bail

config/testUnit/reporters.json

@@ -1,6 +0,0 @@
-{
-  "reporterEnabled": "spec",
-  "mochaJunitReporterReporterOptions": {
-    "mochaFile": "reports/junit.xml"
-  }
-}

config/verify/.eslintrc

@@ -1,162 +0,0 @@
-{
-  "extends": "eslint:recommended",
-  "env": {
-    "node": true,
-    "mocha": true,
-    "es6": true
-  },
-  "plugins": [
-    "mocha",
-    "node"
-  ],
-  "rules": {
-    "mocha/no-exclusive-tests": 2,
-    "no-warning-comments": [
-      1,
-      {
-        "terms": ["todo", "fixme", "xxx"],
-        "location": "start"
-      },
-    ],
-    "object-curly-spacing": [
-      2,
-      "never"
-    ],
-    "array-bracket-spacing": [
-      2,
-      "never"
-    ],
-    "brace-style": [
-      2,
-      "1tbs"
-    ],
-    "consistent-return": 0,
-    "indent": [
-      "error",
-      2,
-      {
-        "SwitchCase": 1,
-        "MemberExpression": "off"
-      }
-    ],
-    "no-multiple-empty-lines": [
-      2,
-      {
-        "max": 2
-      }
-    ],
-    "no-use-before-define": [
-      2,
-      "nofunc"
-    ],
-    "one-var": [
-      2,
-      "never"
-    ],
-    "quote-props": [
-      2,
-      "as-needed"
-    ],
-    "quotes": [
-      2,
-      "single"
-    ],
-    "keyword-spacing": 2,
-    "space-before-function-paren": [
-      2,
-      {
-        "anonymous": "always",
-        "named": "never"
-      }
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
-    "strict": [
-      2,
-      "global"
-    ],
-    "curly": [
-      2,
-      "multi-line"
-    ],
-    "eol-last": 2,
-    "key-spacing": [
-      2,
-      {
-        "beforeColon": false,
-        "afterColon": true
-      }
-    ],
-    "no-eval": 2,
-    "no-with": 2,
-    "space-infix-ops": 2,
-    "dot-notation": [
-      2,
-      {
-        "allowKeywords": true
-      }
-    ],
-    "eqeqeq": 2,
-    "no-alert": 2,
-    "no-caller": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-implied-eval": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": 2,
-    "no-lone-blocks": 2,
-    "no-loop-func": 2,
-    "no-multi-spaces": 2,
-    "no-multi-str": 2,
-    "no-native-reassign": 2,
-    "no-new": 2,
-    "no-new-func": 2,
-    "no-new-wrappers": 2,
-    "no-octal-escape": 2,
-    "no-proto": 2,
-    "no-return-assign": 2,
-    "no-script-url": 2,
-    "no-sequences": 2,
-    "no-unused-expressions": 2,
-    "yoda": 2,
-    "no-shadow": 2,
-    "no-shadow-restricted-names": 2,
-    "no-undef-init": 2,
-    "no-console": 1,
-    "camelcase": [
-      0,
-      {
-        "properties": "never"
-      }
-    ],
-    "comma-spacing": 2,
-    "comma-dangle": 1,
-    "new-cap": 2,
-    "new-parens": 2,
-    "arrow-parens": [2, "as-needed"],
-    "no-array-constructor": 2,
-    "array-callback-return": 1,
-    "no-extra-parens": 2,
-    "no-new-object": 2,
-    "no-spaced-func": 2,
-    "no-trailing-spaces": 2,
-    "no-underscore-dangle": 0,
-    "no-fallthrough": 0,
-    "semi": 2,
-    "semi-spacing": [
-      2,
-      {
-        "before": false,
-        "after": true
-      }
-    ]
-  },
-  "parserOptions": {
-    "emcaVersion": 6,
-    "sourceType": "module",
-    "impliedStrict": true
-  }
-}

ftp-srv.d.ts

@@ -59,18 +59,22 @@ export class FtpConnection extends EventEmitter {
 }
 
 export interface FtpServerOptions {
-    pasv_range?: number | string,
+    url?: string,
+    pasv_min?: number,
+    pasv_max?: number,
+    pasv_url?: string,
     greeting?: string | string[],
-    tls?: tls.SecureContext | false,
+    tls?: tls.SecureContextOptions | false,
     anonymous?: boolean,
     blacklist?: Array<string>,
     whitelist?: Array<string>,
     file_format?: (stat: Stats) => string | Promise<string> | "ls" | "ep",
-	log?: any
+	log?: any,
+	timeout?: number
 }
 
 export class FtpServer extends EventEmitter {
-    constructor(url: string, options?: FtpServerOptions);
+    constructor(options?: FtpServerOptions);
 
     readonly isTLS: boolean;
 
@@ -78,7 +82,7 @@ export class FtpServer extends EventEmitter {
 
     emitPromise(action: any, ...data: any[]): Promise<any>;
 
-    emit(action: any, ...data: any[]): void;
+    // emit is exported from super class
 
     setupTLS(_tls: boolean): boolean | {
       cert: string;
@@ -108,7 +112,14 @@ export class FtpServer extends EventEmitter {
             whitelist?: Array<string>
         }) => void,
 		reject: (err?: Error) => void
-	) => void): EventEmitter;
+  ) => void): this;
+
+	on(event: "disconnect", listener: (
+		data: {
+      connection: FtpConnection,
+      id: string
+		}
+	) => void): this;
 
 	on(event: "client-error", listener: (
 		data: {
@@ -116,7 +127,7 @@ export class FtpServer extends EventEmitter {
 			context: string,
 			error: Error,
 		}
-	) => void): EventEmitter;
+	) => void): this;
 }
 
 export {FtpServer as FtpSrv};

meta/contributors/contributors.js

@@ -0,0 +1,27 @@
+const {get} = require('https');
+
+get('https://api.github.com/repos/trs/ftp-srv/contributors', {
+  headers: {
+    'User-Agent': 'Chrome'
+  }
+}, (res) => {
+  let response = '';
+  res.on('data', (data) => {
+    response += data;
+  });
+  res.on('end', () => {
+    const contributors = JSON.parse(response)
+      .filter((contributor) => contributor.type === 'User');
+
+    for (const contributor of contributors) {
+      const url = contributor.html_url;
+      const username = contributor.login;
+
+      const markdown = `- [${username}](${url})\n`;
+
+      process.stdout.write(markdown);
+    }
+  });
+}).on('error', (err) => {
+  process.stderr.write(err);
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftp-srv",
-  "version": "0.0.0-development",
+  "version": "0.0.0",
   "description": "Modern, extensible FTP Server",
   "keywords": [
     "ftp",
@@ -22,70 +22,70 @@
   "types": "./ftp-srv.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/trs/ftp-srv"
+    "url": "https://github.com/autovance/ftp-srv"
   },
   "scripts": {
     "pre-release": "npm run verify",
-    "commitmsg": "cz-customizable-ghooks",
-    "dev": "cross-env NODE_ENV=development npm run verify:watch",
-    "prepush": "npm-run-all verify test:unit:once --silent",
     "semantic-release": "semantic-release",
-    "start": "npm run dev",
-    "test": "npm run test:unit",
-    "test:unit": "cross-env NODE_ENV=test mocha --opts config/testUnit/mocha.opts -w",
-    "test:unit:once": "cross-env NODE_ENV=test mocha --opts config/testUnit/mocha.opts",
-    "verify": "npm run verify:js --silent",
-    "verify:js": "eslint -c config/verify/.eslintrc \"src/**/*.js\" \"test/**/*.js\" \"config/**/*.js\" && echo ✅ verify:js success",
-    "verify:js:fix": "eslint --fix -c config/verify/.eslintrc \"src/**/*.js\" \"test/**/*.js\" \"config/**/*.js\" && echo ✅ verify:js:fix success",
-    "verify:js:watch": "chokidar 'src/**/*.js' 'test/**/*.js' 'config/**/*.js' -c 'npm run verify:js:fix' --initial --silent",
-    "verify:watch": "npm run verify:js:watch --silent"
+    "test": "mocha test/**/*.spec.js test/*.spec.js --ui bdd",
+    "verify": "eslint src/**/*.js test/**/*.js bin/**/*.js"
   },
   "release": {
     "verifyConditions": "condition-circle"
   },
-  "config": {
-    "commitizen": {
-      "path": "node_modules/cz-customizable"
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
+  "lint-staged": {
+    "*.js": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "eslintConfig": {
+    "extends": "eslint:recommended",
+    "env": {
+      "node": true,
+      "mocha": true,
+      "es6": true
     },
-    "cz-customizable": {
-      "config": "config/release/commitMessageConfig.js"
+    "parserOptions": {
+      "ecmaVersion": 6,
+      "sourceType": "module"
     }
   },
   "dependencies": {
     "bluebird": "^3.5.1",
     "bunyan": "^1.8.12",
     "ip": "^1.1.5",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.15",
     "moment": "^2.22.1",
     "uuid": "^3.2.1",
     "yargs": "^11.0.0"
   },
   "devDependencies": {
+    "@commitlint/cli": "^8.1.0",
+    "@commitlint/config-conventional": "^8.1.0",
     "@icetee/ftp": "^1.0.2",
-    "chai": "^4.0.2",
-    "chokidar-cli": "1.2.0",
-    "condition-circle": "^1.6.0",
-    "cross-env": "3.1.4",
-    "cz-customizable": "5.2.0",
-    "cz-customizable-ghooks": "1.5.0",
-    "dotenv": "^4.0.0",
-    "eslint": "4.5.0",
-    "eslint-config-google": "0.8.0",
-    "eslint-friendly-formatter": "3.0.0",
-    "eslint-plugin-mocha": "^4.11.0",
-    "eslint-plugin-node": "5.1.1",
-    "husky": "0.13.3",
-    "istanbul": "0.4.5",
-    "mocha": "3.5.0",
-    "mocha-junit-reporter": "1.13.0",
-    "mocha-multi-reporters": "1.1.5",
-    "npm-run-all": "^4.1.3",
-    "rimraf": "2.6.1",
-    "semantic-release": "^11.0.2",
+    "chai": "^4.2.0",
+    "condition-circle": "^2.0.2",
+    "eslint": "^5.14.1",
+    "husky": "^1.3.1",
+    "lint-staged": "^8.1.4",
+    "mocha": "^5.2.0",
+    "rimraf": "^2.6.1",
+    "semantic-release": "^15.13.24",
     "sinon": "^2.3.5"
   },
   "engines": {
-    "node": ">=6.x",
-    "npm": ">=5.x"
+    "node": ">=6.x"
   }
 }

src/commands/index.js

@@ -3,25 +3,30 @@ const Promise = require('bluebird');
 
 const REGISTRY = require('./registry');
 
+const CMD_FLAG_REGEX = new RegExp(/^-(\w{1})$/);
+
 class FtpCommands {
   constructor(connection) {
     this.connection = connection;
     this.previousCommand = {};
-    this.blacklist = _.get(this.connection, 'server.options.blacklist', []).map(cmd => _.upperCase(cmd));
-    this.whitelist = _.get(this.connection, 'server.options.whitelist', []).map(cmd => _.upperCase(cmd));
+    this.blacklist = _.get(this.connection, 'server.options.blacklist', []).map((cmd) => _.upperCase(cmd));
+    this.whitelist = _.get(this.connection, 'server.options.whitelist', []).map((cmd) => _.upperCase(cmd));
   }
 
   parse(message) {
     const strippedMessage = message.replace(/"/g, '');
-    const [directive, ...args] = strippedMessage.split(' ');
+    let [directive, ...args] = strippedMessage.split(' ');
+    directive = _.chain(directive).trim().toUpper().value();
+
+    const parseCommandFlags = !['RETR', 'SIZE', 'STOR'].includes(directive);
     const params = args.reduce(({arg, flags}, param) => {
-      if (/^-{1,2}[a-zA-Z0-9_]+/.test(param)) flags.push(param);
+      if (parseCommandFlags && CMD_FLAG_REGEX.test(param)) flags.push(param);
       else arg.push(param);
       return {arg, flags};
     }, {arg: [], flags: []});
 
     const command = {
-      directive: _.chain(directive).trim().toUpper().value(),
+      directive,
       arg: params.arg.length ? params.arg.join(' ') : null,
       flags: params.flags,
       raw: message
@@ -40,25 +45,25 @@ class FtpCommands {
     log.trace({command: logCommand}, 'Handle command');
 
     if (!REGISTRY.hasOwnProperty(command.directive)) {
-      return this.connection.reply(402, 'Command not allowed');
+      return this.connection.reply(502, `Command not allowed: ${command.directive}`);
     }
 
     if (_.includes(this.blacklist, command.directive)) {
-      return this.connection.reply(502, 'Command blacklisted');
+      return this.connection.reply(502, `Command blacklisted: ${command.directive}`);
     }
 
     if (this.whitelist.length > 0 && !_.includes(this.whitelist, command.directive)) {
-      return this.connection.reply(502, 'Command not whitelisted');
+      return this.connection.reply(502, `Command not whitelisted: ${command.directive}`);
     }
 
     const commandRegister = REGISTRY[command.directive];
     const commandFlags = _.get(commandRegister, 'flags', {});
     if (!commandFlags.no_auth && !this.connection.authenticated) {
-      return this.connection.reply(530, 'Command requires authentication');
+      return this.connection.reply(530, `Command requires authentication: ${command.directive}`);
     }
 
     if (!commandRegister.handler) {
-      return this.connection.reply(502, 'Handler not set on command');
+      return this.connection.reply(502, `Handler not set on command: ${command.directive}`);
     }
 
     const handler = commandRegister.handler.bind(this.connection);

src/commands/registration/abor.js

@@ -2,12 +2,12 @@ module.exports = {
   directive: 'ABOR',
   handler: function () {
     return this.connector.waitForConnection()
-    .then(socket => {
+    .then((socket) => {
       return this.reply(426, {socket})
-      .then(() => this.connector.end())
       .then(() => this.reply(226));
     })
-    .catch(() => this.reply(225));
+    .catch(() => this.reply(225))
+    .finally(() => this.connector.end());
   },
   syntax: '{{cmd}}',
   description: 'Abort an active file transfer'

src/commands/registration/auth.js

@@ -20,17 +20,17 @@ module.exports = {
 };
 
 function handleTLS() {
-  if (!this.server._tls) return this.reply(502);
+  if (!this.server.options.tls) return this.reply(502);
   if (this.secure) return this.reply(202);
 
   return this.reply(234)
   .then(() => {
-    const secureContext = tls.createSecureContext(this.server._tls);
+    const secureContext = tls.createSecureContext(this.server.options.tls);
     const secureSocket = new tls.TLSSocket(this.commandSocket, {
       isServer: true,
       secureContext
     });
-    ['data', 'timeout', 'end', 'close', 'drain', 'error'].forEach(event => {
+    ['data', 'timeout', 'end', 'close', 'drain', 'error'].forEach((event) => {
       function forwardEvent() {
         this.emit.apply(this, arguments);
       }

src/commands/registration/cwd.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.chdir) return this.reply(402, 'Not supported by file system');
 
-    return Promise.resolve(this.fs.chdir(command.arg))
-    .then(cwd => {
+    return Promise.try(() => this.fs.chdir(command.arg))
+    .then((cwd) => {
       const path = cwd ? `"${escapePath(cwd)}"` : undefined;
       return this.reply(250, path);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/dele.js

@@ -6,11 +6,11 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.delete) return this.reply(402, 'Not supported by file system');
 
-    return Promise.resolve(this.fs.delete(command.arg))
+    return Promise.try(() => this.fs.delete(command.arg))
     .then(() => {
       return this.reply(250);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/eprt.js

@@ -8,14 +8,18 @@ const FAMILY = {
 
 module.exports = {
   directive: 'EPRT',
-  handler: function ({command} = {}) {
+  handler: function ({log, command} = {}) {
     const [, protocol, ip, port] = _.chain(command).get('arg', '').split('|').value();
     const family = FAMILY[protocol];
     if (!family) return this.reply(504, 'Unknown network protocol');
 
     this.connector = new ActiveConnector(this);
     return this.connector.setupConnection(ip, port, family)
-    .then(() => this.reply(200));
+    .then(() => this.reply(200))
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
+    });
   },
   syntax: '{{cmd}} |<protocol>|<address>|<port>|',
   description: 'Specifies an address and port to which the server should connect'

src/commands/registration/epsv.js

@@ -2,13 +2,17 @@ const PassiveConnector = require('../../connector/passive');
 
 module.exports = {
   directive: 'EPSV',
-  handler: function () {
+  handler: function ({log}) {
     this.connector = new PassiveConnector(this);
     return this.connector.setupServer()
-    .then(server => {
+    .then((server) => {
       const {port} = server.address();
 
       return this.reply(229, `EPSV OK (|||${port}|)`);
+    })
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
     });
   },
   syntax: '{{cmd}} [<protocol>]',

src/commands/registration/feat.js

@@ -1,9 +1,9 @@
 const _ = require('lodash');
+const registry = require('../registry');
 
 module.exports = {
   directive: 'FEAT',
   handler: function () {
-    const registry = require('../registry');
     const features = Object.keys(registry)
       .reduce((feats, cmd) => {
         const feat = _.get(registry[cmd], 'flags.feat', null);
@@ -11,7 +11,7 @@ module.exports = {
         return feats;
       }, ['UTF8'])
       .sort()
-      .map(feat => ({
+      .map((feat) => ({
         message: ` ${feat}`,
         raw: true
       }));

src/commands/registration/help.js

@@ -12,7 +12,7 @@ module.exports = {
       const reply = _.concat([syntax.replace('{{cmd}}', directive), description]);
       return this.reply(214, ...reply);
     } else {
-      const supportedCommands = _.chunk(Object.keys(registry), 5).map(chunk => chunk.join('\t'));
+      const supportedCommands = _.chunk(Object.keys(registry), 5).map((chunk) => chunk.join('\t'));
       return this.reply(211, 'Supported commands:', ...supportedCommands, 'Use "HELP [command]" for syntax help.');
     }
   },

src/commands/registration/list.js

@@ -16,33 +16,34 @@ module.exports = {
     const path = command.arg || '.';
     return this.connector.waitForConnection()
     .tap(() => this.commandSocket.pause())
-    .then(() => Promise.resolve(this.fs.get(path)))
-    .then(stat => stat.isDirectory() ? Promise.resolve(this.fs.list(path)) : [stat])
-    .then(files => {
-      const getFileMessage = file => {
+    .then(() => Promise.try(() => this.fs.get(path)))
+    .then((stat) => stat.isDirectory() ? Promise.try(() => this.fs.list(path)) : [stat])
+    .then((files) => {
+      const getFileMessage = (file) => {
         if (simple) return file.name;
         return getFileStat(file, _.get(this, 'server.options.file_format', 'ls'));
       };
 
-      const fileList = files.map(file => {
+      return Promise.try(() => files.map((file) => {
         const message = getFileMessage(file);
         return {
           raw: true,
           message,
           socket: this.connector.socket
         };
-      });
-      return this.reply(150)
-      .then(() => {
-        if (fileList.length) return this.reply({}, ...fileList);
-      });
+      }));
     })
-    .then(() => this.reply(226))
-    .catch(Promise.TimeoutError, err => {
+    .tap(() => this.reply(150))
+    .then((fileList) => {
+      if (fileList.length) return this.reply({}, ...fileList);
+      return this.reply({socket: this.connector.socket, useEmptyMessage: true});
+    })
+    .tap(() => this.reply(226))
+    .catch(Promise.TimeoutError, (err) => {
       log.error(err);
       return this.reply(425, 'No connection established');
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(451, err.message || 'No directory');
     })

src/commands/registration/mdtm.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
-    return Promise.resolve(this.fs.get(command.arg))
-    .then(fileStat => {
+    return Promise.try(() => this.fs.get(command.arg))
+    .then((fileStat) => {
       const modificationTime = moment.utc(fileStat.mtime).format('YYYYMMDDHHmmss.SSS');
       return this.reply(213, modificationTime);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/mkd.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.mkdir) return this.reply(402, 'Not supported by file system');
 
-    return Promise.resolve(this.fs.mkdir(command.arg))
-    .then(dir => {
+    return Promise.try(() => this.fs.mkdir(command.arg))
+    .then((dir) => {
       const path = dir ? `"${escapePath(dir)}"` : undefined;
       return this.reply(257, path);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/opts.js

@@ -13,7 +13,7 @@ module.exports = {
     const [_option, ...args] = command.arg.split(' ');
     const option = _.toUpper(_option);
 
-    if (!OPTIONS.hasOwnProperty(option)) return this.reply(500);
+    if (!OPTIONS.hasOwnProperty(option)) return this.reply(501, 'Unknown option command');
     return OPTIONS[option].call(this, args);
   },
   syntax: '{{cmd}}',
@@ -33,7 +33,6 @@ function utf8([setting] = []) {
   if (!encoding) return this.reply(501, 'Unknown setting for option');
 
   this.encoding = encoding;
-  if (this.transferType !== 'binary') this.transferType = this.encoding;
 
   return this.reply(200, `UTF8 encoding ${_.toLower(setting)}`);
 }

src/commands/registration/pass.js

@@ -12,7 +12,7 @@ module.exports = {
     .then(() => {
       return this.reply(230);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(530, err.message || 'Authentication failed');
     });

src/commands/registration/pasv.js

@@ -1,18 +1,31 @@
 const PassiveConnector = require('../../connector/passive');
+const {isLocalIP} = require('../../helpers/is-local');
 
 module.exports = {
   directive: 'PASV',
-  handler: function () {
+  handler: function ({log} = {}) {
+    if (!this.server.options.pasv_url) {
+      return this.reply(502);
+    }
+
     this.connector = new PassiveConnector(this);
     return this.connector.setupServer()
-    .then(server => {
-      const address = this.server.options.pasv_url;
+    .then((server) => {
+      let address = this.server.options.pasv_url;
+      // Allow connecting from local
+      if (isLocalIP(this.ip)) {
+        address = this.ip;
+      }
       const {port} = server.address();
       const host = address.replace(/\./g, ',');
       const portByte1 = port / 256 | 0;
       const portByte2 = port % 256;
 
       return this.reply(227, `PASV OK (${host},${portByte1},${portByte2})`);
+    })
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
     });
   },
   syntax: '{{cmd}}',

src/commands/registration/port.js

@@ -3,18 +3,22 @@ const ActiveConnector = require('../../connector/active');
 
 module.exports = {
   directive: 'PORT',
-  handler: function ({command} = {}) {
+  handler: function ({log, command} = {}) {
     this.connector = new ActiveConnector(this);
 
     const rawConnection = _.get(command, 'arg', '').split(',');
     if (rawConnection.length !== 6) return this.reply(425);
 
     const ip = rawConnection.slice(0, 4).join('.');
-    const portBytes = rawConnection.slice(4).map(p => parseInt(p));
+    const portBytes = rawConnection.slice(4).map((p) => parseInt(p));
     const port = portBytes[0] * 256 + portBytes[1];
 
     return this.connector.setupConnection(ip, port)
-    .then(() => this.reply(200));
+    .then(() => this.reply(200))
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
+    });
   },
   syntax: '{{cmd}} <x>,<x>,<x>,<x>,<y>,<y>',
   description: 'Specifies an address and port to which the server should connect'

src/commands/registration/pwd.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.currentDirectory) return this.reply(402, 'Not supported by file system');
 
-    return Promise.resolve(this.fs.currentDirectory())
-    .then(cwd => {
+    return Promise.try(() => this.fs.currentDirectory())
+    .then((cwd) => {
       const path = cwd ? `"${escapePath(cwd)}"` : undefined;
       return this.reply(257, path);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/retr.js

@@ -10,18 +10,25 @@ module.exports = {
 
     return this.connector.waitForConnection()
     .tap(() => this.commandSocket.pause())
-    .then(() => Promise.resolve(this.fs.read(filePath, {start: this.restByteCount})))
-    .then(stream => {
-      const destroyConnection = (connection, reject) => err => {
+    .then(() => Promise.try(() => this.fs.read(filePath, {start: this.restByteCount})))
+    .then((fsResponse) => {
+      let {stream, clientPath} = fsResponse;
+      if (!stream && !clientPath) {
+        stream = fsResponse;
+        clientPath = filePath;
+      }
+      const serverPath = stream.path || filePath;
+
+      const destroyConnection = (connection, reject) => (err) => {
         if (connection) connection.destroy(err);
         reject(err);
       };
 
       const eventsPromise = new Promise((resolve, reject) => {
-        stream.on('data', data => {
+        stream.on('data', (data) => {
           if (stream) stream.pause();
           if (this.connector.socket) {
-            this.connector.socket.write(data, this.transferType, () => stream && stream.resume());
+            this.connector.socket.write(data, () => stream && stream.resume());
           }
         });
         stream.once('end', () => resolve());
@@ -34,15 +41,15 @@ module.exports = {
 
       return this.reply(150).then(() => stream.resume() && this.connector.socket.resume())
       .then(() => eventsPromise)
-      .tap(() => this.emit('RETR', null, filePath))
+      .tap(() => this.emit('RETR', null, serverPath))
+      .then(() => this.reply(226, clientPath))
       .finally(() => stream.destroy && stream.destroy());
     })
-    .then(() => this.reply(226))
-    .catch(Promise.TimeoutError, err => {
+    .catch(Promise.TimeoutError, (err) => {
       log.error(err);
       return this.reply(425, 'No connection established');
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       this.emit('RETR', err);
       return this.reply(551, err.message);

src/commands/registration/rnfr.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
     const fileName = command.arg;
-    return Promise.resolve(this.fs.get(fileName))
+    return Promise.try(() => this.fs.get(fileName))
     .then(() => {
       this.renameFrom = fileName;
       return this.reply(350);
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/rnto.js

@@ -11,12 +11,14 @@ module.exports = {
     const from = this.renameFrom;
     const to = command.arg;
 
-    return Promise.resolve(this.fs.rename(from, to))
+    return Promise.try(() => this.fs.rename(from, to))
     .then(() => {
       return this.reply(250);
     })
-    .catch(err => {
+    .tap(() => this.emit('RNTO', null, to))
+    .catch((err) => {
       log.error(err);
+      this.emit('RNTO', err);
       return this.reply(550, err.message);
     })
     .finally(() => {

src/commands/registration/site/chmod.js

@@ -6,11 +6,11 @@ module.exports = function ({log, command} = {}) {
 
   const [mode, ...fileNameParts] = command.arg.split(' ');
   const fileName = fileNameParts.join(' ');
-  return Promise.resolve(this.fs.chmod(fileName, parseInt(mode, 8)))
+  return Promise.try(() => this.fs.chmod(fileName, parseInt(mode, 8)))
   .then(() => {
     return this.reply(200);
   })
-  .catch(err => {
+  .catch((err) => {
     log.error(err);
     return this.reply(500);
   });

src/commands/registration/size.js

@@ -6,11 +6,11 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
-    return Promise.resolve(this.fs.get(command.arg))
-    .then(fileStat => {
+    return Promise.try(() => this.fs.get(command.arg))
+    .then((fileStat) => {
       return this.reply(213, {message: fileStat.size});
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/stat.js

@@ -11,28 +11,28 @@ module.exports = {
       if (!this.fs) return this.reply(550, 'File system not instantiated');
       if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
-      return Promise.resolve(this.fs.get(path))
-      .then(stat => {
+      return Promise.try(() => this.fs.get(path))
+      .then((stat) => {
         if (stat.isDirectory()) {
           if (!this.fs.list) return this.reply(402, 'Not supported by file system');
 
-          return Promise.resolve(this.fs.list(path))
-          .then(stats => [213, stats]);
+          return Promise.try(() => this.fs.list(path))
+          .then((stats) => [213, stats]);
         }
         return [212, [stat]];
       })
       .then(([code, fileStats]) => {
-        return Promise.map(fileStats, file => {
+        return Promise.map(fileStats, (file) => {
           const message = getFileStat(file, _.get(this, 'server.options.file_format', 'ls'));
           return {
             raw: true,
             message
           };
         })
-        .then(messages => [code, messages]);
+        .then((messages) => [code, messages]);
       })
       .then(([code, messages]) => this.reply(code, 'Status begin', ...messages, 'Status end'))
-      .catch(err => {
+      .catch((err) => {
         log.error(err);
         return this.reply(450, err.message);
       });

src/commands/registration/stor.js

@@ -11,11 +11,24 @@ module.exports = {
 
     return this.connector.waitForConnection()
     .tap(() => this.commandSocket.pause())
-    .then(() => Promise.resolve(this.fs.write(fileName, {append, start: this.restByteCount})))
-    .then(stream => {
-      const destroyConnection = (connection, reject) => err => {
-        if (connection) connection.destroy(err);
-        reject(err);
+    .then(() => Promise.try(() => this.fs.write(fileName, {append, start: this.restByteCount})))
+    .then((fsResponse) => {
+      let {stream, clientPath} = fsResponse;
+      if (!stream && !clientPath) {
+        stream = fsResponse;
+        clientPath = fileName;
+      }
+      const serverPath = stream.path || fileName;
+
+      const destroyConnection = (connection, reject) => (err) => {
+        try {
+          if (connection) {
+            if (connection.writable) connection.end();
+            connection.destroy(err);
+          }
+        } finally {
+          reject(err);
+        }
       };
 
       const streamPromise = new Promise((resolve, reject) => {
@@ -24,10 +37,10 @@ module.exports = {
       });
 
       const socketPromise = new Promise((resolve, reject) => {
-        this.connector.socket.on('data', data => {
+        this.connector.socket.on('data', (data) => {
           if (this.connector.socket) this.connector.socket.pause();
-          if (stream) {
-            stream.write(data, this.transferType, () => this.connector.socket && this.connector.socket.resume());
+          if (stream && stream.writable) {
+            stream.write(data, () => this.connector.socket && this.connector.socket.resume());
           }
         });
         this.connector.socket.once('end', () => {
@@ -41,16 +54,16 @@ module.exports = {
       this.restByteCount = 0;
 
       return this.reply(150).then(() => this.connector.socket.resume())
-      .then(() => Promise.join(streamPromise, socketPromise))
-      .tap(() => this.emit('STOR', null, fileName))
+      .then(() => Promise.all([streamPromise, socketPromise]))
+      .tap(() => this.emit('STOR', null, serverPath))
+      .then(() => this.reply(226, clientPath))
       .finally(() => stream.destroy && stream.destroy());
     })
-    .then(() => this.reply(226, fileName))
-    .catch(Promise.TimeoutError, err => {
+    .catch(Promise.TimeoutError, (err) => {
       log.error(err);
       return this.reply(425, 'No connection established');
     })
-    .catch(err => {
+    .catch((err) => {
       log.error(err);
       this.emit('STOR', err);
       return this.reply(550, err.message);

src/commands/registration/stou.js

@@ -8,12 +8,10 @@ module.exports = {
     if (!this.fs.get || !this.fs.getUniqueName) return this.reply(402, 'Not supported by file system');
 
     const fileName = args.command.arg;
-    return Promise.try(() => {
-      return Promise.resolve(this.fs.get(fileName))
-      .then(() => Promise.resolve(this.fs.getUniqueName()))
-      .catch(() => Promise.resolve(fileName));
-    })
-    .then(name => {
+    return Promise.try(() => this.fs.get(fileName))
+    .then(() => Promise.try(() => this.fs.getUniqueName()))
+    .catch(() => fileName)
+    .then((name) => {
       args.command.arg = name;
       return stor.call(this, args);
     });

src/commands/registration/user.js

@@ -13,7 +13,7 @@ module.exports = {
       .then(() => {
         return this.reply(230);
       })
-      .catch(err => {
+      .catch((err) => {
         log.error(err);
         return this.reply(530, err.message || 'Authentication failed');
       });

src/commands/registry.js

@@ -43,7 +43,7 @@ const commands = [
 
 const registry = commands.reduce((result, cmd) => {
   const aliases = Array.isArray(cmd.directive) ? cmd.directive : [cmd.directive];
-  aliases.forEach(alias => result[alias] = cmd);
+  aliases.forEach((alias) => result[alias] = cmd);
   return result;
 }, {});
 

src/connection.js

@@ -25,12 +25,15 @@ class FtpConnection extends EventEmitter {
     this.connector = new BaseConnector(this);
 
     this.commandSocket = options.socket;
-    this.commandSocket.on('error', err => {
+    this.commandSocket.on('error', (err) => {
       this.log.error(err, 'Client error');
       this.server.emit('client-error', {connection: this, context: 'commandSocket', error: err});
     });
     this.commandSocket.on('data', this._handleData.bind(this));
-    this.commandSocket.on('timeout', () => {});
+    this.commandSocket.on('timeout', () => {
+      this.log.trace('Client timeout');
+      this.close();
+    });
     this.commandSocket.on('close', () => {
       if (this.connector) this.connector.end();
       if (this.commandSocket && !this.commandSocket.destroyed) this.commandSocket.destroy();
@@ -41,7 +44,7 @@ class FtpConnection extends EventEmitter {
   _handleData(data) {
     const messages = _.compact(data.toString(this.encoding).split('\r\n'));
     this.log.trace(messages);
-    return Promise.mapSeries(messages, message => this.commands.handle(message));
+    return Promise.mapSeries(messages, (message) => this.commands.handle(message));
   }
 
   get ip() {
@@ -68,8 +71,8 @@ class FtpConnection extends EventEmitter {
 
   close(code = 421, message = 'Closing connection') {
     return Promise.resolve(code)
-      .then(_code => _code && this.reply(_code, message))
-      .then(() => this.commandSocket && this.commandSocket.end());
+      .then((_code) => _code && this.reply(_code, message))
+      .finally(() => this.commandSocket && this.commandSocket.destroy());
   }
 
   login(username, password) {
@@ -96,46 +99,55 @@ class FtpConnection extends EventEmitter {
       if (!letters.length) letters = [{}];
       return Promise.map(letters, (promise, index) => {
         return Promise.resolve(promise)
-        .then(letter => {
+        .then((letter) => {
           if (!letter) letter = {};
           else if (typeof letter === 'string') letter = {message: letter}; // allow passing in message as first param
 
           if (!letter.socket) letter.socket = options.socket ? options.socket : this.commandSocket;
-          if (!letter.message) letter.message = DEFAULT_MESSAGE[options.code] || 'No information';
-          if (!letter.encoding) letter.encoding = this.encoding;
+          if (!options.useEmptyMessage) {
+            if (!letter.message) letter.message = DEFAULT_MESSAGE[options.code] || 'No information';
+            if (!letter.encoding) letter.encoding = this.encoding;
+          }
           return Promise.resolve(letter.message) // allow passing in a promise as a message
-          .then(message => {
-            const seperator = !options.hasOwnProperty('eol') ?
-              letters.length - 1 === index ? ' ' : '-' :
-              options.eol ? ' ' : '-';
-            message = !letter.raw ? _.compact([letter.code || options.code, message]).join(seperator) : message;
-            letter.message = message;
+          .then((message) => {
+            if (!options.useEmptyMessage) {
+              const seperator = !options.hasOwnProperty('eol') ?
+                letters.length - 1 === index ? ' ' : '-' :
+                options.eol ? ' ' : '-';
+              message = !letter.raw ? _.compact([letter.code || options.code, message]).join(seperator) : message;
+              letter.message = message;
+            } else {
+              letter.message = '';
+            }
             return letter;
           });
         });
       });
     };
 
-    const processLetter = letter => {
+    const processLetter = (letter) => {
       return new Promise((resolve, reject) => {
         if (letter.socket && letter.socket.writable) {
           this.log.trace({port: letter.socket.address().port, encoding: letter.encoding, message: letter.message}, 'Reply');
-          letter.socket.write(letter.message + '\r\n', letter.encoding, err => {
+          letter.socket.write(letter.message + '\r\n', letter.encoding, (err) => {
             if (err) {
               this.log.error(err);
               return reject(err);
             }
             resolve();
           });
-        } else reject(new errors.SocketError('Socket not writable'));
+        } else {
+          this.log.trace({message: letter.message}, 'Could not write message');
+          reject(new errors.SocketError('Socket not writable'));
+        }
       });
     };
 
     return satisfyParameters()
-    .then(satisfiedLetters => Promise.mapSeries(satisfiedLetters, (letter, index) => {
+    .then((satisfiedLetters) => Promise.mapSeries(satisfiedLetters, (letter, index) => {
       return processLetter(letter, index);
     }))
-    .catch(err => {
+    .catch((err) => {
       this.log.error(err);
     });
   }

src/connector/active.js

@@ -1,7 +1,9 @@
 const {Socket} = require('net');
 const tls = require('tls');
+const ip = require('ip');
 const Promise = require('bluebird');
 const Connector = require('./base');
+const {SocketError} = require('../errors');
 
 class Active extends Connector {
   constructor(connection) {
@@ -27,14 +29,17 @@ class Active extends Connector {
 
     return closeExistingServer()
     .then(() => {
+      if (!ip.isEqual(this.connection.commandSocket.remoteAddress, host)) {
+        throw new SocketError('The given address is not yours', 500);
+      }
+
       this.dataSocket = new Socket();
-      this.dataSocket.setEncoding(this.connection.transferType);
-      this.dataSocket.on('error', err => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
+      this.dataSocket.on('error', (err) => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
       this.dataSocket.connect({host, port, family}, () => {
         this.dataSocket.pause();
 
         if (this.connection.secure) {
-          const secureContext = tls.createSecureContext(this.server._tls);
+          const secureContext = tls.createSecureContext(this.server.options.tls);
           const secureSocket = new tls.TLSSocket(this.dataSocket, {
             isServer: true,
             secureContext

src/connector/base.js

@@ -26,22 +26,28 @@ class Connector {
     return Promise.reject(new errors.ConnectorError('No connector setup, send PASV or PORT'));
   }
 
-  end() {
-    const closeDataSocket = new Promise(resolve => {
-      if (this.dataSocket) this.dataSocket.end();
-      else resolve();
-    });
-    const closeDataServer = new Promise(resolve => {
-      if (this.dataServer) this.dataServer.close(() => resolve());
-      else resolve();
-    });
-
-    return Promise.all([closeDataSocket, closeDataServer])
-    .then(() => {
+  closeSocket() {
+    if (this.dataSocket) {
+      const socket = this.dataSocket;
+      this.dataSocket.end(() => socket && socket.destroy());
       this.dataSocket = null;
+    }
+  }
+
+  closeServer() {
+    if (this.dataServer) {
+      this.dataServer.close();
       this.dataServer = null;
-      this.type = false;
-    });
+    }
+  }
+
+
+  end() {
+    this.closeSocket();
+    this.closeServer();
+
+    this.type = false;
+    this.connection.connector = new Connector(this);
   }
 }
 module.exports = Connector;

src/connector/passive.js

@@ -4,16 +4,17 @@ const ip = require('ip');
 const Promise = require('bluebird');
 
 const Connector = require('./base');
-const findPort = require('../helpers/find-port');
 const errors = require('../errors');
 
+const CONNECT_TIMEOUT = 30 * 1000;
+
 class Passive extends Connector {
   constructor(connection) {
     super(connection);
     this.type = 'passive';
   }
 
-  waitForConnection({timeout = 5000, delay = 250} = {}) {
+  waitForConnection({timeout = 5000, delay = 50} = {}) {
     if (!this.dataServer) return Promise.reject(new errors.ConnectorError('Passive server not setup'));
 
     const checkSocket = () => {
@@ -28,14 +29,13 @@ class Passive extends Connector {
   }
 
   setupServer() {
-    const closeExistingServer = () => this.dataServer ?
-      new Promise(resolve => this.dataServer.close(() => resolve())) :
-      Promise.resolve();
+    this.closeServer();
+    return this.server.getNextPasvPort()
+    .then((port) => {
+      this.dataSocket = null;
+      let idleServerTimeout;
 
-    return closeExistingServer()
-    .then(() => this.getPort())
-    .then(port => {
-      const connectionHandler = socket => {
+      const connectionHandler = (socket) => {
         if (!ip.isEqual(this.connection.commandSocket.remoteAddress, socket.remoteAddress)) {
           this.log.error({
             pasv_connection: socket.remoteAddress,
@@ -46,40 +46,41 @@ class Passive extends Connector {
           return this.connection.reply(550, 'Remote addresses do not match')
           .finally(() => this.connection.close());
         }
+        clearTimeout(idleServerTimeout);
+
         this.log.trace({port, remoteAddress: socket.remoteAddress}, 'Passive connection fulfilled.');
 
-        if (this.connection.secure) {
-          const secureContext = tls.createSecureContext(this.server._tls);
-          const secureSocket = new tls.TLSSocket(socket, {
-            isServer: true,
-            secureContext
-          });
-          this.dataSocket = secureSocket;
-        } else {
-          this.dataSocket = socket;
+        this.dataSocket = socket;
+        this.dataSocket.on('error', (err) => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
+        this.dataSocket.once('close', () => this.closeServer());
+
+        if (!this.connection.secure) {
+          this.dataSocket.connected = true;
         }
-        this.dataSocket.connected = true;
-        this.dataSocket.setEncoding(this.connection.transferType);
-        this.dataSocket.on('error', err => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
-        this.dataSocket.on('close', () => {
-          this.log.trace('Passive connection closed');
-          this.end();
-        });
       };
 
-      this.dataSocket = null;
-      this.dataServer = net.createServer({pauseOnConnect: true}, connectionHandler);
+      const serverOptions = Object.assign({}, this.connection.secure ? this.server.options.tls : {}, {pauseOnConnect: true});
+      this.dataServer = (this.connection.secure ? tls : net).createServer(serverOptions, connectionHandler);
       this.dataServer.maxConnections = 1;
-      this.dataServer.on('error', err => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataServer', error: err}));
-      this.dataServer.on('close', () => {
+
+      this.dataServer.on('error', (err) => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataServer', error: err}));
+      this.dataServer.once('close', () => {
         this.log.trace('Passive server closed');
-        this.dataServer = null;
+        this.end();
       });
 
+      if (this.connection.secure) {
+        this.dataServer.on('secureConnection', (socket) => {
+          socket.connected = true;
+        });
+      }
+
       return new Promise((resolve, reject) => {
-        this.dataServer.listen(port, this.server.url.hostname, err => {
+        this.dataServer.listen(port, this.server.url.hostname, (err) => {
           if (err) reject(err);
           else {
+            idleServerTimeout = setTimeout(() => this.closeServer(), CONNECT_TIMEOUT);
+
             this.log.debug({port}, 'Passive connection listening');
             resolve(this.dataServer);
           }
@@ -88,15 +89,5 @@ class Passive extends Connector {
     });
   }
 
-  getPort() {
-    if (this.server.options.pasv_range) {
-      const [min, max] = typeof this.server.options.pasv_range === 'string' ?
-        this.server.options.pasv_range.split('-').map(v => v ? parseInt(v) : v) :
-        [this.server.options.pasv_range];
-      return findPort(min, max);
-    }
-    throw new errors.ConnectorError('Invalid pasv_range');
-  }
-
 }
 module.exports = Passive;

src/fs.js

@@ -2,13 +2,14 @@ const _ = require('lodash');
 const nodePath = require('path');
 const uuid = require('uuid');
 const Promise = require('bluebird');
-const fs = Promise.promisifyAll(require('fs'));
+const {createReadStream, createWriteStream, constants} = require('fs');
+const fsAsync = require('./helpers/fs-async');
 const errors = require('./errors');
 
 class FileSystem {
   constructor(connection, {root, cwd} = {}) {
     this.connection = connection;
-    this.cwd = cwd ? nodePath.join(nodePath.sep, cwd) : nodePath.sep;
+    this.cwd = nodePath.normalize(cwd ? nodePath.join(nodePath.sep, cwd) : nodePath.sep);
     this._root = nodePath.resolve(root || process.cwd());
   }
 
@@ -17,7 +18,7 @@ class FileSystem {
   }
 
   _resolvePath(path = '.') {
-    const serverPath = (() => {
+    const clientPath = (() => {
       path = nodePath.normalize(path);
       if (nodePath.isAbsolute(path)) {
         return nodePath.join(path);
@@ -27,12 +28,12 @@ class FileSystem {
     })();
 
     const fsPath = (() => {
-      const resolvedPath = nodePath.resolve(this.root, `.${nodePath.sep}${serverPath}`);
-      return nodePath.join(resolvedPath);
+      const resolvedPath = nodePath.join(this.root, clientPath);
+      return nodePath.resolve(nodePath.normalize(nodePath.join(resolvedPath)));
     })();
 
     return {
-      serverPath,
+      clientPath,
       fsPath
     };
   }
@@ -43,20 +44,20 @@ class FileSystem {
 
   get(fileName) {
     const {fsPath} = this._resolvePath(fileName);
-    return fs.statAsync(fsPath)
-    .then(stat => _.set(stat, 'name', fileName));
+    return fsAsync.stat(fsPath)
+    .then((stat) => _.set(stat, 'name', fileName));
   }
 
   list(path = '.') {
     const {fsPath} = this._resolvePath(path);
-    return fs.readdirAsync(fsPath)
-    .then(fileNames => {
-      return Promise.map(fileNames, fileName => {
+    return fsAsync.readdir(fsPath)
+    .then((fileNames) => {
+      return Promise.map(fileNames, (fileName) => {
         const filePath = nodePath.join(fsPath, fileName);
-        return fs.accessAsync(filePath, fs.constants.F_OK)
+        return fsAsync.access(filePath, constants.F_OK)
         .then(() => {
-          return fs.statAsync(filePath)
-          .then(stat => _.set(stat, 'name', fileName));
+          return fsAsync.stat(filePath)
+          .then((stat) => _.set(stat, 'name', fileName));
         })
         .catch(() => null);
       });
@@ -65,61 +66,67 @@ class FileSystem {
   }
 
   chdir(path = '.') {
-    const {fsPath, serverPath} = this._resolvePath(path);
-    return fs.statAsync(fsPath)
-    .tap(stat => {
+    const {fsPath, clientPath} = this._resolvePath(path);
+    return fsAsync.stat(fsPath)
+    .tap((stat) => {
       if (!stat.isDirectory()) throw new errors.FileSystemError('Not a valid directory');
     })
     .then(() => {
-      this.cwd = serverPath;
+      this.cwd = clientPath;
       return this.currentDirectory();
     });
   }
 
   write(fileName, {append = false, start = undefined} = {}) {
-    const {fsPath} = this._resolvePath(fileName);
-    const stream = fs.createWriteStream(fsPath, {flags: !append ? 'w+' : 'a+', start});
-    stream.once('error', () => fs.unlinkAsync(fsPath));
+    const {fsPath, clientPath} = this._resolvePath(fileName);
+    const stream = createWriteStream(fsPath, {flags: !append ? 'w+' : 'a+', start});
+    stream.once('error', () => fsAsync.unlink(fsPath));
     stream.once('close', () => stream.end());
-    return stream;
+    return {
+      stream,
+      clientPath
+    };
   }
 
   read(fileName, {start = undefined} = {}) {
-    const {fsPath} = this._resolvePath(fileName);
-    return fs.statAsync(fsPath)
-    .tap(stat => {
+    const {fsPath, clientPath} = this._resolvePath(fileName);
+    return fsAsync.stat(fsPath)
+    .tap((stat) => {
       if (stat.isDirectory()) throw new errors.FileSystemError('Cannot read a directory');
     })
     .then(() => {
-      const stream = fs.createReadStream(fsPath, {flags: 'r', start});
-      return stream;
+      const stream = createReadStream(fsPath, {flags: 'r', start});
+      return {
+        stream,
+        clientPath
+      };
     });
   }
 
   delete(path) {
     const {fsPath} = this._resolvePath(path);
-    return fs.statAsync(fsPath)
-    .then(stat => {
-      if (stat.isDirectory()) return fs.rmdirAsync(fsPath);
-      else return fs.unlinkAsync(fsPath);
+    return fsAsync.stat(fsPath)
+    .then((stat) => {
+      if (stat.isDirectory()) return fsAsync.rmdir(fsPath);
+      else return fsAsync.unlink(fsPath);
     });
   }
 
   mkdir(path) {
     const {fsPath} = this._resolvePath(path);
-    return fs.mkdirAsync(fsPath)
+    return fsAsync.mkdir(fsPath)
     .then(() => fsPath);
   }
 
   rename(from, to) {
     const {fsPath: fromPath} = this._resolvePath(from);
     const {fsPath: toPath} = this._resolvePath(to);
-    return fs.renameAsync(fromPath, toPath);
+    return fsAsync.rename(fromPath, toPath);
   }
 
   chmod(path, mode) {
     const {fsPath} = this._resolvePath(path);
-    return fs.chmodAsync(fsPath, mode);
+    return fsAsync.chmod(fsPath, mode);
   }
 
   getUniqueName() {

src/helpers/find-port.js

@@ -1,27 +1,61 @@
 const net = require('net');
-const Promise = require('bluebird');
 const errors = require('../errors');
 
-module.exports = function (min = 1, max = undefined) {
-  return new Promise((resolve, reject) => {
-    let checkPort = min;
-    let portCheckServer = net.createServer();
+const MAX_PORT = 65535;
+const MAX_PORT_CHECK_ATTEMPT = 5;
+
+function* portNumberGenerator(min, max = MAX_PORT) {
+  let current = min;
+  while (true) {
+    if (current > MAX_PORT || current > max) {
+      current = min;
+    }
+    yield current++;
+  }
+}
+
+function getNextPortFactory(host, portMin, portMax, maxAttempts = MAX_PORT_CHECK_ATTEMPT) {
+  const nextPortNumber = portNumberGenerator(portMin, portMax);
+
+  return () => new Promise((resolve, reject) => {
+    const portCheckServer = net.createServer();
     portCheckServer.maxConnections = 0;
-    portCheckServer.on('error', () => {
-      if (checkPort < 65535 && (!max || checkPort < max)) {
-        checkPort = checkPort + 1;
-        portCheckServer.listen(checkPort);
-      } else {
-        reject(new errors.GeneralError('Unable to find open port', 500));
+
+    let attemptCount = 0;
+    const tryGetPort = () => {
+      attemptCount++;
+      if (attemptCount > maxAttempts) {
+        reject(new errors.ConnectorError('Unable to find valid port'));
+        return;
       }
-    });
-    portCheckServer.on('listening', () => {
-      const {port} = portCheckServer.address();
-      portCheckServer.close(() => {
-        portCheckServer = null;
-        resolve(port);
+
+      const {value: port} = nextPortNumber.next();
+
+      portCheckServer.removeAllListeners();
+      portCheckServer.once('error', (err) => {
+        if (['EADDRINUSE'].includes(err.code)) {
+          tryGetPort();
+        } else {
+          reject(err);
+        }
       });
-    });
-    portCheckServer.listen(checkPort);
+      portCheckServer.once('listening', () => {
+        portCheckServer.removeAllListeners();
+        portCheckServer.close(() => resolve(port));
+      });
+
+      try {
+        portCheckServer.listen(port, host);
+      } catch (err) {
+        reject(err);
+      }
+    };
+
+    tryGetPort();
   });
+}
+
+module.exports = {
+  getNextPortFactory,
+  portNumberGenerator
 };

src/helpers/fs-async.js

@@ -0,0 +1,18 @@
+const fs = require('fs');
+const {promisify} = require('bluebird');
+
+const methods = [
+  'stat',
+  'readdir',
+  'access',
+  'unlink',
+  'rmdir',
+  'mkdir',
+  'rename',
+  'chmod'
+];
+
+module.exports = methods.reduce((obj, method) => {
+  obj[method] = promisify(fs[method]);
+  return obj;
+}, {});

src/helpers/is-local.js

@@ -0,0 +1,3 @@
+module.exports.isLocalIP = function(ip) {
+  return ip === '127.0.0.1' || ip == '::1';
+}

src/helpers/resolve-host.js

@@ -1,25 +0,0 @@
-const http = require('http');
-const Promise = require('bluebird');
-const errors = require('../errors');
-
-const IP_WEBSITE = 'http://api.ipify.org/';
-
-module.exports = function (hostname) {
-  return new Promise((resolve, reject) => {
-    if (!hostname || hostname === '0.0.0.0') {
-      let ip = '';
-      http.get(IP_WEBSITE, response => {
-        if (response.statusCode !== 200) {
-          return reject(new errors.GeneralError('Unable to resolve hostname', response.statusCode));
-        }
-        response.setEncoding('utf8');
-        response.on('data', chunk => {
-          ip += chunk;
-        });
-        response.on('end', () => {
-          resolve(ip);
-        });
-      });
-    } else resolve(hostname);
-  });
-};

src/index.js

@@ -4,52 +4,62 @@ const nodeUrl = require('url');
 const buyan = require('bunyan');
 const net = require('net');
 const tls = require('tls');
-const fs = require('fs');
 const EventEmitter = require('events');
 
 const Connection = require('./connection');
-const resolveHost = require('./helpers/resolve-host');
+const {getNextPortFactory} = require('./helpers/find-port');
 
 class FtpServer extends EventEmitter {
-  constructor(url, options = {}) {
+  constructor(options = {}) {
     super();
-    this.options = _.merge({
+    this.options = Object.assign({
       log: buyan.createLogger({name: 'ftp-srv'}),
-      anonymous: false,
-      pasv_range: 22,
+      url: 'ftp://127.0.0.1:21',
+      pasv_min: 1024,
+      pasv_max: 65535,
       pasv_url: null,
+      anonymous: false,
       file_format: 'ls',
       blacklist: [],
       whitelist: [],
       greeting: null,
-      tls: false
+      tls: false,
+      timeout: 0
     }, options);
+
     this._greeting = this.setupGreeting(this.options.greeting);
     this._features = this.setupFeaturesMessage();
-    this._tls = this.setupTLS(this.options.tls);
 
     delete this.options.greeting;
-    delete this.options.tls;
 
     this.connections = {};
     this.log = this.options.log;
-    this.url = nodeUrl.parse(url || 'ftp://127.0.0.1:21');
+    this.url = nodeUrl.parse(this.options.url);
+    this.getNextPasvPort = getNextPortFactory(
+      _.get(this, 'url.hostname'),
+      _.get(this, 'options.pasv_min'),
+      _.get(this, 'options.pasv_max'));
 
-    const serverConnectionHandler = socket => {
+    const timeout = Number(this.options.timeout);
+    this.options.timeout = isNaN(timeout) ? 0 : Number(timeout);
+
+    const serverConnectionHandler = (socket) => {
+      this.options.timeout > 0 && socket.setTimeout(this.options.timeout);
       let connection = new Connection(this, {log: this.log, socket});
       this.connections[connection.id] = connection;
 
       socket.on('close', () => this.disconnectClient(connection.id));
+      socket.once('close', () => this.emit('disconnect', {connection, id: connection.id}));
 
       const greeting = this._greeting || [];
       const features = this._features || 'Ready';
       return connection.reply(220, ...greeting, features)
-      .finally(() => socket.resume());
+        .finally(() => socket.resume());
     };
-    const serverOptions = _.assign(this.isTLS ? this._tls : {}, {pauseOnConnect: true});
+    const serverOptions = Object.assign({}, this.isTLS ? this.options.tls : {}, {pauseOnConnect: true});
 
     this.server = (this.isTLS ? tls : net).createServer(serverOptions, serverConnectionHandler);
-    this.server.on('error', err => this.log.error(err, '[Event] error'));
+    this.server.on('error', (err) => this.log.error(err, '[Event] error'));
 
     const quit = _.debounce(this.quit.bind(this), 100);
 
@@ -59,26 +69,25 @@ class FtpServer extends EventEmitter {
   }
 
   get isTLS() {
-    return this.url.protocol === 'ftps:' && this._tls;
+    return this.url.protocol === 'ftps:' && this.options.tls;
   }
 
   listen() {
-    return resolveHost(this.options.pasv_url || this.url.hostname)
-    .then(pasvUrl => {
-      this.options.pasv_url = pasvUrl;
+    if (!this.options.pasv_url) {
+      this.log.warn('Passive URL not set. Passive connections not available.');
+    }
 
-      return new Promise((resolve, reject) => {
-        this.server.once('error', reject);
-        this.server.listen(this.url.port, this.url.hostname, err => {
-          this.server.removeListener('error', reject);
-          if (err) return reject(err);
-          this.log.info({
-            protocol: this.url.protocol.replace(/\W/g, ''),
-            ip: this.url.hostname,
-            port: this.url.port
-          }, 'Listening');
-          resolve('Listening');
-        });
+    return new Promise((resolve, reject) => {
+      this.server.once('error', reject);
+      this.server.listen(this.url.port, this.url.hostname, (err) => {
+        this.server.removeListener('error', reject);
+        if (err) return reject(err);
+        this.log.info({
+          protocol: this.url.protocol.replace(/\W/g, ''),
+          ip: this.url.hostname,
+          port: this.url.port
+        }, 'Listening');
+        resolve('Listening');
       });
     });
   }
@@ -90,15 +99,6 @@ class FtpServer extends EventEmitter {
     });
   }
 
-  setupTLS(_tls) {
-    if (!_tls) return false;
-    return _.assign({}, _tls, {
-      cert: _tls.cert ? fs.readFileSync(_tls.cert) : undefined,
-      key: _tls.key ? fs.readFileSync(_tls.key) : undefined,
-      ca: _tls.ca ? Array.isArray(_tls.ca) ? _tls.ca.map(_ca => fs.readFileSync(_ca)) : [fs.readFileSync(_tls.ca)] : undefined
-    });
-  }
-
   setupGreeting(greet) {
     if (!greet) return [];
     const greeting = Array.isArray(greet) ? greet : greet.split('\n');
@@ -117,7 +117,7 @@ class FtpServer extends EventEmitter {
   }
 
   disconnectClient(id) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       const client = this.connections[id];
       if (!client) return resolve();
       delete this.connections[id];
@@ -139,9 +139,9 @@ class FtpServer extends EventEmitter {
   close() {
     this.log.info('Server closing...');
     this.server.maxConnections = 0;
-    return Promise.map(Object.keys(this.connections), id => Promise.try(this.disconnectClient.bind(this, id)))
-    .then(() => new Promise(resolve => {
-      this.server.close(err => {
+    return Promise.map(Object.keys(this.connections), (id) => Promise.try(this.disconnectClient.bind(this, id)))
+    .then(() => new Promise((resolve) => {
+      this.server.close((err) => {
         if (err) this.log.error(err, 'Error closing server');
         resolve('Closed');
       });

test/commands/index.spec.js

@@ -20,7 +20,7 @@ describe('FtpCommands', function () {
   };
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     commands = new FtpCommands(mockConnection);
 
@@ -64,8 +64,8 @@ describe('FtpCommands', function () {
     it('two args, with flags: test -l arg1 -A arg2 --zz88A', () => {
       const cmd = commands.parse('test -l arg1 -A arg2 --zz88A');
       expect(cmd.directive).to.equal('TEST');
-      expect(cmd.arg).to.equal('arg1 arg2');
-      expect(cmd.flags).to.deep.equal(['-l', '-A', '--zz88A']);
+      expect(cmd.arg).to.equal('arg1 arg2 --zz88A');
+      expect(cmd.flags).to.deep.equal(['-l', '-A']);
       expect(cmd.raw).to.equal('test -l arg1 -A arg2 --zz88A');
     });
 
@@ -76,6 +76,13 @@ describe('FtpCommands', function () {
       expect(cmd.flags).to.deep.equal(['-l']);
       expect(cmd.raw).to.equal('list -l');
     });
+
+    it('does not check for option flags', () => {
+      const cmd = commands.parse('retr -test');
+      expect(cmd.directive).to.equal('RETR');
+      expect(cmd.arg).to.equal('-test');
+      expect(cmd.flags).to.deep.equal([]);
+    });
   });
 
   describe('handle', function () {
@@ -83,7 +90,7 @@ describe('FtpCommands', function () {
       return commands.handle('bad')
       .then(() => {
         expect(mockConnection.reply.callCount).to.equal(1);
-        expect(mockConnection.reply.args[0][0]).to.equal(402);
+        expect(mockConnection.reply.args[0][0]).to.equal(502);
       });
     });
 

test/commands/registration/abor.spec.js

@@ -3,7 +3,7 @@ const {expect} = require('chai');
 const sinon = require('sinon');
 
 const CMD = 'ABOR';
-describe(CMD, function () {
+describe.skip(CMD, function () {
   let sandbox;
   const mockClient = {
     reply: () => Promise.resolve(),
@@ -15,7 +15,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
     sandbox.spy(mockClient.connector, 'waitForConnection');

test/commands/registration/allo.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/auth.spec.js

@@ -8,13 +8,15 @@ describe(CMD, function () {
   const mockClient = {
     reply: () => Promise.resolve(),
     server: {
-      _tls: {}
+      options: {
+        tls: {}
+      }
     }
   };
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/cdup.spec.js

@@ -16,7 +16,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
     sandbox.spy(mockClient.fs, 'chdir');

test/commands/registration/cwd.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'chdir').resolves();

test/commands/registration/dele.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'delete').resolves();

test/commands/registration/eprt.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
     sandbox.stub(ActiveConnector.prototype, 'setupConnection').resolves();
@@ -23,7 +23,7 @@ describe(CMD, function () {
   });
 
   it('// unsuccessful | no argument', () => {
-    return cmdFn()
+    return cmdFn({})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(504);
     });

test/commands/registration/epsv.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(PassiveConnector.prototype, 'setupServer').resolves({
@@ -25,7 +25,7 @@ describe(CMD, function () {
   });
 
   it('// successful IPv4', () => {
-    return cmdFn()
+    return cmdFn({})
     .then(() => {
       const [code, message] = mockClient.reply.args[0];
       expect(code).to.equal(229);

test/commands/registration/help.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/list.spec.js

@@ -15,7 +15,7 @@ describe(CMD, function () {
     },
     connector: {
       waitForConnection: () => Promise.resolve({}),
-      end: () => {}
+      end: () => Promise.resolve({})
     },
     commandSocket: {
       resume: () => {},
@@ -25,7 +25,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'get').resolves({

test/commands/registration/mdtm.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'get').resolves({mtime: 'Mon, 10 Oct 2011 23:24:11 GMT'});

test/commands/registration/mkd.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'mkdir').resolves();

test/commands/registration/mode.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/nlst.spec.js

@@ -15,7 +15,7 @@ describe(CMD, function () {
     },
     connector: {
       waitForConnection: () => Promise.resolve({}),
-      end: () => {}
+      end: () => Promise.resolve({})
     },
     commandSocket: {
       resume: () => {},
@@ -25,7 +25,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'get').resolves({

test/commands/registration/noop.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/opts.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });
@@ -29,7 +29,7 @@ describe(CMD, function () {
   it('BAD // unsuccessful', () => {
     return cmdFn({command: {arg: 'BAD', directive: CMD}})
     .then(() => {
-      expect(mockClient.reply.args[0][0]).to.equal(500);
+      expect(mockClient.reply.args[0][0]).to.equal(501);
     });
   });
 

test/commands/registration/pass.spec.js

@@ -15,7 +15,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient, 'login').resolves();

test/commands/registration/pbsz.spec.js

@@ -12,7 +12,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/port.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
     sandbox.stub(ActiveConnector.prototype, 'setupConnection').resolves();

test/commands/registration/prot.spec.js

@@ -12,7 +12,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/pwd.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'currentDirectory').resolves();

test/commands/registration/quit.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'close').resolves();
   });

test/commands/registration/rest.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/retr.spec.js

@@ -19,13 +19,13 @@ describe(CMD, function () {
       waitForConnection: () => Promise.resolve({
         resume: () => {}
       }),
-      end: () => {}
+      end: () => Promise.resolve({})
     }
   };
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.fs = {
       read: () => {}
@@ -87,7 +87,7 @@ describe(CMD, function () {
     });
 
     let errorEmitted = false;
-    emitter.once('RETR', err => {
+    emitter.once('RETR', (err) => {
       errorEmitted = !!err;
     });
 

test/commands/registration/rnfr.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.renameFrom = 'test';
     mockClient.fs = {

test/commands/registration/rnto.spec.js

@@ -1,16 +1,18 @@
 const Promise = require('bluebird');
 const {expect} = require('chai');
 const sinon = require('sinon');
+const EventEmitter = require('events');
 
 const CMD = 'RNTO';
 describe(CMD, function () {
   let sandbox;
   const mockLog = {error: () => {}};
+  let emitter;
   const mockClient = {reply: () => Promise.resolve()};
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.renameFrom = 'test';
     mockClient.fs = {
@@ -18,6 +20,9 @@ describe(CMD, function () {
       rename: () => Promise.resolve()
     };
 
+    emitter = new EventEmitter();
+    mockClient.emit = emitter.emit.bind(emitter);
+
     sandbox.spy(mockClient, 'reply');
     sandbox.spy(mockClient.fs, 'rename');
   });

test/commands/registration/site/chmod.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../../src/commands/registration/site/${CMD.toLowerCase()}`).bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.fs = {
       chmod: () => Promise.resolve()
@@ -23,7 +23,7 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('// unsuccessful | no file system', done => {
+  it('// unsuccessful | no file system', (done) => {
     delete mockClient.fs;
 
     cmdFn()
@@ -34,7 +34,7 @@ describe(CMD, function () {
     .catch(done);
   });
 
-  it('// unsuccessful | file system does not have functions', done => {
+  it('// unsuccessful | file system does not have functions', (done) => {
     mockClient.fs = {};
 
     cmdFn()
@@ -45,7 +45,7 @@ describe(CMD, function () {
     .catch(done);
   });
 
-  it('777 test // unsuccessful | file chmod fails', done => {
+  it('777 test // unsuccessful | file chmod fails', (done) => {
     mockClient.fs.chmod.restore();
     sandbox.stub(mockClient.fs, 'chmod').rejects(new Error('test'));
 
@@ -57,7 +57,7 @@ describe(CMD, function () {
     .catch(done);
   });
 
-  it('777 test // successful', done => {
+  it('777 test // successful', (done) => {
     cmdFn({log: mockLog, command: {arg: '777 test'}})
     .then(() => {
       expect(mockClient.fs.chmod.args[0]).to.eql(['test', 511]);

test/commands/registration/site/site.spec.js

@@ -17,7 +17,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.stub(mockClient, 'reply').resolves();
   });

test/commands/registration/size.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.fs = {
       get: () => Promise.resolve({size: 1})

test/commands/registration/stat.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.fs = {
       get: () => Promise.resolve({}),

test/commands/registration/stor.spec.js

@@ -19,13 +19,13 @@ describe(CMD, function () {
       waitForConnection: () => Promise.resolve({
         resume: () => {}
       }),
-      end: () => {}
+      end: () => Promise.resolve({})
     }
   };
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.fs = {
       write: () => {}
@@ -86,7 +86,7 @@ describe(CMD, function () {
     });
 
     let errorEmitted = false;
-    emitter.once('STOR', err => {
+    emitter.once('STOR', (err) => {
       errorEmitted = !!err;
     });
 

test/commands/registration/stou.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.fs = {
       get: () => Promise.resolve(),

test/commands/registration/stru.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/syst.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/type.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     mockClient.transferType = null;
     sandbox.spy(mockClient, 'reply');

test/commands/registration/user.spec.js

@@ -16,7 +16,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
     delete mockClient.username;
     mockClient.server.options = {};

test/connector/active.spec.js

@@ -6,58 +6,79 @@ const net = require('net');
 const tls = require('tls');
 
 const ActiveConnector = require('../../src/connector/active');
-const findPort = require('../../src/helpers/find-port');
+const {getNextPortFactory} = require('../../src/helpers/find-port');
 
 describe('Connector - Active //', function () {
+  const host = '127.0.0.1';
+  let getNextPort = getNextPortFactory(host, 1024);
   let PORT;
   let active;
-  let mockConnection = {};
+  let mockConnection = {
+    commandSocket: {
+      remoteAddress: '::ffff:127.0.0.1'
+    }
+  };
   let sandbox;
   let server;
 
-  before(() => {
+  beforeEach((done) => {
     active = new ActiveConnector(mockConnection);
-  });
-  beforeEach(done => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
 
-    findPort()
-    .then(port => {
+    getNextPort()
+    .then((port) => {
       PORT = port;
       server = net.createServer()
-      .on('connection', socket => socket.destroy())
+      .on('connection', (socket) => socket.destroy())
       .listen(PORT, () => done());
     });
   });
-  afterEach(done => {
+
+  afterEach(() => {
     sandbox.restore();
-    server.close(done);
+    server.close();
+    active.end();
+
   });
 
   it('sets up a connection', function () {
-    return active.setupConnection('127.0.0.1', PORT)
+    return active.setupConnection(host, PORT)
     .then(() => {
       expect(active.dataSocket).to.exist;
     });
   });
 
+  it('rejects alternative host', function () {
+    return active.setupConnection('123.45.67.89', PORT)
+    .catch((err) => {
+      expect(err.code).to.equal(500);
+      expect(err.message).to.equal('The given address is not yours');
+    })
+    .finally(() => {
+      expect(active.dataSocket).not.to.exist;
+    });
+  });
+
   it('destroys existing connection, then sets up a connection', function () {
-    const destroyFnSpy = sandbox.spy(active.dataSocket, 'destroy');
-
-    return active.setupConnection('127.0.0.1', PORT)
+    return active.setupConnection(host, PORT)
     .then(() => {
-      expect(destroyFnSpy.callCount).to.equal(1);
-      expect(active.dataSocket).to.exist;
+      const destroyFnSpy = sandbox.spy(active.dataSocket, 'destroy');
+
+      return active.setupConnection(host, PORT)
+      .then(() => {
+        expect(destroyFnSpy.callCount).to.equal(1);
+        expect(active.dataSocket).to.exist;
+      });
     });
   });
 
   it('waits for connection', function () {
-    return active.setupConnection('127.0.0.1', PORT)
+    return active.setupConnection(host, PORT)
     .then(() => {
       expect(active.dataSocket).to.exist;
       return active.waitForConnection();
     })
-    .then(dataSocket => {
+    .then((dataSocket) => {
       expect(dataSocket.connected).to.equal(true);
       expect(dataSocket instanceof net.Socket).to.equal(true);
       expect(dataSocket instanceof tls.TLSSocket).to.equal(false);
@@ -66,14 +87,18 @@ describe('Connector - Active //', function () {
 
   it('upgrades to a secure connection', function () {
     mockConnection.secure = true;
-    mockConnection.server = {_tls: {}};
+    mockConnection.server = {
+      options: {
+        tls: {}
+      }
+    };
 
-    return active.setupConnection('127.0.0.1', PORT)
+    return active.setupConnection(host, PORT)
     .then(() => {
       expect(active.dataSocket).to.exist;
       return active.waitForConnection();
     })
-    .then(dataSocket => {
+    .then((dataSocket) => {
       expect(dataSocket.connected).to.equal(true);
       expect(dataSocket instanceof net.Socket).to.equal(true);
       expect(dataSocket instanceof tls.TLSSocket).to.equal(true);

test/connector/passive.spec.js

@@ -7,87 +7,118 @@ const net = require('net');
 const bunyan = require('bunyan');
 
 const PassiveConnector = require('../../src/connector/passive');
+const {getNextPortFactory} = require('../../src/helpers/find-port');
 
 describe('Connector - Passive //', function () {
-  let passive;
+  const host = '127.0.0.1';
   let mockConnection = {
     reply: () => Promise.resolve({}),
     close: () => Promise.resolve({}),
     encoding: 'utf8',
     log: bunyan.createLogger({name: 'passive-test'}),
-    commandSocket: {},
-    server: {options: {}, url: {}}
+    commandSocket: {
+      remoteAddress: '::ffff:127.0.0.1'
+    },
+    server: {
+      url: '',
+      getNextPasvPort: getNextPortFactory(host, 1024)
+    }
   };
   let sandbox;
 
-  function shouldNotResolve() {
-    throw new Error('Should not resolve');
-  }
-
   before(() => {
-    passive = new PassiveConnector(mockConnection);
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
   });
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
 
+  beforeEach(() => {
     sandbox.spy(mockConnection, 'reply');
     sandbox.spy(mockConnection, 'close');
-
-    mockConnection.commandSocket.remoteAddress = '::ffff:127.0.0.1';
-    mockConnection.server.options.pasv_range = '8000';
   });
   afterEach(() => {
     sandbox.restore();
   });
 
-  it('cannot wait for connection with no server', function () {
-    return passive.waitForConnection()
-    .then(shouldNotResolve)
-    .catch(err => {
+  it('cannot wait for connection with no server', function (done) {
+    let passive = new PassiveConnector(mockConnection);
+    passive.waitForConnection()
+    .catch((err) => {
       expect(err.name).to.equal('ConnectorError');
+      done();
     });
   });
 
-  it('no pasv range provided', function () {
-    delete mockConnection.server.options.pasv_range;
+  describe('setup', function () {
+    before(function () {
+      sandbox.stub(mockConnection.server, 'getNextPasvPort').value(getNextPortFactory(host));
+    });
 
-    return passive.setupServer()
-    .then(shouldNotResolve)
-    .catch(err => {
-      expect(err.name).to.equal('ConnectorError');
+    it('no pasv range provided', function (done) {
+      let passive = new PassiveConnector(mockConnection);
+      passive.setupServer()
+      .catch((err) => {
+        try {
+          expect(err.name).to.contain('RangeError');
+          done();
+        } catch (ex) {
+          done(ex);
+        }
+      });
     });
   });
 
-  it('has invalid pasv range', function () {
-    mockConnection.server.options.pasv_range = -1;
+  describe('setup', function () {
+    let connection;
+    before(function () {
+      sandbox.stub(mockConnection.server, 'getNextPasvPort').value(getNextPortFactory(host, -1, -1));
 
-    return passive.setupServer()
-    .then(shouldNotResolve)
-    .catch(err => {
-      expect(err).to.be.instanceOf(RangeError);
+      connection = new PassiveConnector(mockConnection);
+    });
+
+    it('has invalid pasv range', function (done) {
+      connection.setupServer()
+      .catch((err) => {
+        expect(err.name).to.contain('RangeError');
+        done();
+      });
     });
   });
 
   it('sets up a server', function () {
+    let passive = new PassiveConnector(mockConnection);
     return passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;
+      return passive.end();
     });
   });
 
-  it('destroys existing server, then sets up a server', function () {
-    const closeFnSpy = sandbox.spy(passive.dataServer, 'close');
+  describe('setup', function () {
+    let passive;
+    let closeFnSpy;
+    beforeEach(function () {
+      passive = new PassiveConnector(mockConnection);
+      return passive.setupServer()
+      .then(() => {
+        closeFnSpy = sandbox.spy(passive.dataServer, 'close');
+      });
+    });
+    afterEach(function () {
+      return passive.end();
+    });
 
-    return passive.setupServer()
-    .then(() => {
-      expect(closeFnSpy.callCount).to.equal(1);
-      expect(passive.dataServer).to.exist;
+    it('destroys existing server, then sets up a server', function () {
+      return passive.setupServer()
+      .then(() => {
+        expect(closeFnSpy.callCount).to.equal(1);
+        expect(passive.dataServer).to.exist;
+      });
     });
   });
 
   it('refuses connection with different remote address', function (done) {
-    mockConnection.commandSocket.remoteAddress = 'bad';
+    sandbox.stub(mockConnection.commandSocket, 'remoteAddress').value('bad');
 
+    let passive = new PassiveConnector(mockConnection);
     passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;
@@ -98,6 +129,8 @@ describe('Connector - Passive //', function () {
         setTimeout(() => {
           expect(passive.connection.reply.callCount).to.equal(1);
           expect(passive.connection.reply.args[0][0]).to.equal(550);
+
+          passive.end();
           done();
         }, 100);
       });
@@ -106,6 +139,7 @@ describe('Connector - Passive //', function () {
   });
 
   it('accepts connection', function () {
+    let passive = new PassiveConnector(mockConnection);
     return passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;

test/fs.spec.js

@@ -1,7 +1,9 @@
 const {expect} = require('chai');
 const nodePath = require('path');
+const Promise = require('bluebird');
 
 const FileSystem = require('../src/fs');
+const errors = require('../src/errors');
 
 describe('FileSystem', function () {
   let fs;
@@ -13,11 +15,30 @@ describe('FileSystem', function () {
     });
   });
 
+  describe('extend', function () {
+    class FileSystemOV extends FileSystem {
+      chdir() {
+        throw new errors.FileSystemError('Not a valid directory');
+      }
+    }
+    let ovFs;
+    before(function () {
+      ovFs = new FileSystemOV({});
+    });
+
+    it('handles error', function () {
+      return Promise.try(() => ovFs.chdir())
+      .catch((err) => {
+        expect(err).to.be.instanceof(errors.FileSystemError);
+      });
+    });
+  });
+
   describe('#_resolvePath', function () {
     it('gets correct relative path', function () {
       const result = fs._resolvePath();
       expect(result).to.be.an('object');
-      expect(result.serverPath).to.equal(
+      expect(result.clientPath).to.equal(
         nodePath.normalize('/file/1/2/3'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/file/1/2/3'));
@@ -26,7 +47,7 @@ describe('FileSystem', function () {
     it('gets correct relative path', function () {
       const result = fs._resolvePath('..');
       expect(result).to.be.an('object');
-      expect(result.serverPath).to.equal(
+      expect(result.clientPath).to.equal(
         nodePath.normalize('/file/1/2'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/file/1/2'));
@@ -35,7 +56,7 @@ describe('FileSystem', function () {
     it('gets correct absolute path', function () {
       const result = fs._resolvePath('/other');
       expect(result).to.be.an('object');
-      expect(result.serverPath).to.equal(
+      expect(result.clientPath).to.equal(
         nodePath.normalize('/other'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/other'));
@@ -44,7 +65,7 @@ describe('FileSystem', function () {
     it('cannot escape root', function () {
       const result = fs._resolvePath('../../../../../../../../../../..');
       expect(result).to.be.an('object');
-      expect(result.serverPath).to.equal(
+      expect(result.clientPath).to.equal(
         nodePath.normalize('/'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv'));
@@ -53,7 +74,7 @@ describe('FileSystem', function () {
     it('resolves to file', function () {
       const result = fs._resolvePath('/cool/file.txt');
       expect(result).to.be.an('object');
-      expect(result.serverPath).to.equal(
+      expect(result.clientPath).to.equal(
         nodePath.normalize('/cool/file.txt'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/cool/file.txt'));

test/helpers/file-stat.spec.js

@@ -9,7 +9,7 @@ describe('helpers // file-stat', function () {
   let sandbox;
 
   before(function () {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
   });
   afterEach(function () {
     sandbox.restore();

test/helpers/find-port.spec.js

@@ -1,35 +1,55 @@
 /* eslint no-unused-expressions: 0 */
 const {expect} = require('chai');
-const {Server} = require('net');
-const sinon = require('sinon');
+const net = require('net');
 
-const findPort = require('../../src/helpers/find-port');
+const {getNextPortFactory, portNumberGenerator} = require('../../src/helpers/find-port');
 
-describe('helpers // find-port', function () {
-  let sandbox;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-
-    sandbox.spy(Server.prototype, 'listen');
-  });
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  it('finds a port', () => {
-    return findPort(1)
-    .then(port => {
-      expect(Server.prototype.listen.callCount).to.be.above(1);
-      expect(port).to.be.above(1);
+describe('getNextPortFactory', function () {
+  describe('portNumberGenerator', () => {
+    it('loops through given set of numbers', () => {
+      const nextNumber = portNumberGenerator(1, 5);
+      expect(nextNumber.next().value).to.equal(1);
+      expect(nextNumber.next().value).to.equal(2);
+      expect(nextNumber.next().value).to.equal(3);
+      expect(nextNumber.next().value).to.equal(4);
+      expect(nextNumber.next().value).to.equal(5);
+      expect(nextNumber.next().value).to.equal(1);
+      expect(nextNumber.next().value).to.equal(2);
     });
   });
 
-  it('does not find a port', () => {
-    return findPort(1, 2)
-    .then(() => expect(1).to.equal(2)) // should not happen
-    .catch(err => {
-      expect(err).to.exist;
+  describe('keeps trying new ports', () => {
+    let getNextPort;
+    let serverAlreadyRunning;
+    beforeEach((done) => {
+      getNextPort = getNextPortFactory('::', 8821);
+
+      serverAlreadyRunning = net.createServer();
+      serverAlreadyRunning.listen(8821, () => done());
+    });
+
+    afterEach((done) => {
+      serverAlreadyRunning.close(() => done());
+    });
+
+    it('test', () => {
+      return getNextPort()
+      .then((port) => {
+        expect(port).to.equal(8822);
+      });
+    });
+  });
+
+  it('finds ports concurrently', () => {
+    const portStart = 10000;
+    const getCount = 100;
+
+    const getNextPort = getNextPortFactory('::', portStart);
+    const portFinders = new Array(getCount).fill().map(() => getNextPort());
+    return Promise.all(portFinders)
+    .then((ports) => {
+      expect(ports.length).to.equal(getCount);
+      expect(ports).to.eql(new Array(getCount).fill().map((v, i) => i + portStart));
     });
   });
 });

test/helpers/resolve-host.spec.js

@@ -1,51 +0,0 @@
-const {expect} = require('chai');
-const sinon = require('sinon');
-const resolveHost = require('../../src/helpers/resolve-host');
-
-describe('helpers //resolve-host', function () {
-  this.timeout(4000);
-
-  let sandbox;
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-  });
-  afterEach(() => sandbox.restore());
-
-  it('fetches ip address', () => {
-    const hostname = '0.0.0.0';
-    return resolveHost(hostname)
-    .then(resolvedHostname => {
-      expect(resolvedHostname).to.match(/^\d+\.\d+\.\d+\.\d+$/);
-    });
-  });
-
-  it('fetches ip address', () => {
-    const hostname = null;
-    return resolveHost(hostname)
-    .then(resolvedHostname => {
-      expect(resolvedHostname).to.match(/^\d+\.\d+\.\d+\.\d+$/);
-    });
-  });
-
-  it('does nothing', () => {
-    const hostname = '127.0.0.1';
-    return resolveHost(hostname)
-    .then(resolvedHostname => {
-      expect(resolvedHostname).to.equal(hostname);
-    });
-  });
-
-  it('fails on getting hostname', () => {
-    sandbox.stub(require('http'), 'get').callsFake(function (url, cb) {
-      cb({
-        statusCode: 420
-      });
-    });
-
-    return resolveHost(null)
-    .then(() => expect(1).to.equal(2))
-    .catch(err => {
-      expect(err.code).to.equal(420);
-    });
-  });
-});

test/index.spec.js

@@ -22,10 +22,10 @@ describe('Integration', function () {
   const clientDirectory = `${process.cwd()}/test_tmp`;
 
   before(() => {
-    return startServer('ftp://127.0.0.1:8880');
+    return startServer({url: 'ftp://127.0.0.1:8880'});
   });
   beforeEach(() => {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.sandbox.create().usingPromise(Promise);
   });
   afterEach(() => sandbox.restore());
   after(() => server.close());
@@ -36,10 +36,20 @@ describe('Integration', function () {
   });
   after(() => directoryPurge(clientDirectory));
 
-  function startServer(url, options = {}) {
-    server = new FtpServer(url, _.assign({
+  function readFile(path) {
+    return new Promise((resolve, reject) => {
+      fs.readFile(path, 'utf8', (err, data) => {
+        if (err) reject(err);
+        else resolve(data);
+      });
+    });
+  }
+
+  function startServer(options = {}) {
+    server = new FtpServer(_.assign({
       log,
-      pasv_range: 8881,
+      pasv_url: '127.0.0.1',
+      pasv_min: 8881,
       greeting: ['hello', 'world'],
       anonymous: true
     }, options));
@@ -55,7 +65,7 @@ describe('Integration', function () {
     return new Promise((resolve, reject) => {
       client = new FtpClient();
       client.once('ready', () => resolve(client));
-      client.once('error', err => reject(err));
+      client.once('error', (err) => reject(err));
       client.connect(_.assign({
         host: server.url.hostname,
         port: server.url.port,
@@ -63,7 +73,7 @@ describe('Integration', function () {
         password: 'test'
       }, options));
     })
-    .then(instance => {
+    .then((instance) => {
       client = instance;
     });
   }
@@ -71,8 +81,8 @@ describe('Integration', function () {
   function closeClient() {
     return new Promise((resolve, reject) => {
       client.once('close', () => resolve());
-      client.once('error', err => reject(err));
-      client.logout(err => {
+      client.once('error', (err) => reject(err));
+      client.logout((err) => {
         expect(err).to.be.undefined;
       });
     });
@@ -83,7 +93,7 @@ describe('Integration', function () {
     if (!dirExists) return;
 
     const list = fs.readdirSync(dir);
-    list.map(item => nodePath.resolve(dir, item)).forEach(item => {
+    list.map((item) => nodePath.resolve(dir, item)).forEach((item) => {
       const itemExists = fs.existsSync(dir);
       if (!itemExists) return;
 
@@ -104,7 +114,7 @@ describe('Integration', function () {
 
     after(() => directoryPurge(`${clientDirectory}/${name}/`));
 
-    it('STAT', done => {
+    it('STAT', (done) => {
       client.status((err, status) => {
         expect(err).to.not.exist;
         expect(status).to.equal('Status OK');
@@ -112,7 +122,7 @@ describe('Integration', function () {
       });
     });
 
-    it('SYST', done => {
+    it('SYST', (done) => {
       client.system((err, os) => {
         expect(err).to.not.exist;
         expect(os).to.equal('UNIX');
@@ -120,7 +130,7 @@ describe('Integration', function () {
       });
     });
 
-    it('CWD ..', done => {
+    it('CWD ..', (done) => {
       client.cwd('..', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.equal('/');
@@ -128,7 +138,7 @@ describe('Integration', function () {
       });
     });
 
-    it(`CWD ${name}`, done => {
+    it(`CWD ${name}`, (done) => {
       client.cwd(`${name}`, (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.equal(`/${name}`);
@@ -136,7 +146,7 @@ describe('Integration', function () {
       });
     });
 
-    it('PWD', done => {
+    it('PWD', (done) => {
       client.pwd((err, data) => {
         expect(err).to.not.exist;
         expect(data).to.equal(`/${name}`);
@@ -144,7 +154,7 @@ describe('Integration', function () {
       });
     });
 
-    it('LIST .', done => {
+    it('LIST .', (done) => {
       client.list('.', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.be.an('array');
@@ -154,7 +164,7 @@ describe('Integration', function () {
       });
     });
 
-    it('LIST fake.txt', done => {
+    it('LIST fake.txt', (done) => {
       client.list('fake.txt', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.be.an('array');
@@ -164,37 +174,37 @@ describe('Integration', function () {
       });
     });
 
-    it('STOR fail.txt', done => {
+    it('STOR fail.txt', (done) => {
       const buffer = Buffer.from('test text file');
       const fsPath = `${clientDirectory}/${name}/fail.txt`;
 
       sandbox.stub(connection.fs, 'write').callsFake(function () {
-        const stream = fs.createWriteStream(fsPath, {flags: 'w+'});
+        const stream = fs.createWriteStream(fsPath, {flags: 'w+', autoClose: false});
         stream.on('error', () => fs.existsSync(fsPath) && fs.unlinkSync(fsPath));
         stream.on('close', () => stream.end());
         setImmediate(() => stream.emit('error', new Error('STOR fail test')));
         return stream;
       });
 
-      client.put(buffer, 'fail.txt', err => {
+      client.put(buffer, 'fail.txt', (err) => {
+        expect(err).to.exist;
         setImmediate(() => {
           const fileExists = fs.existsSync(fsPath);
-          expect(err).to.exist;
           expect(fileExists).to.equal(false);
           done();
         });
       });
     });
 
-    it('STOR tést.txt', done => {
+    it('STOR tést.txt', (done) => {
       const buffer = Buffer.from('test text file');
       const fsPath = `${clientDirectory}/${name}/tést.txt`;
 
-      connection.once('STOR', err => {
+      connection.once('STOR', (err) => {
         expect(err).to.not.exist;
       });
 
-      client.put(buffer, 'tést.txt', err => {
+      client.put(buffer, 'tést.txt', (err) => {
         expect(err).to.not.exist;
         setImmediate(() => {
           expect(fs.existsSync(fsPath)).to.equal(true);
@@ -207,10 +217,28 @@ describe('Integration', function () {
       });
     });
 
-    it('APPE tést.txt', done => {
+    it('STOR logo.png', (done) => {
+      const logo = `${__dirname}/../logo.png`;
+      const fsPath = `${clientDirectory}/${name}/logo.png`;
+
+      client.put(logo, 'logo.png', (err) => {
+        expect(err).to.not.exist;
+        setImmediate(() => {
+          expect(fs.existsSync(fsPath)).to.equal(true);
+
+          const logoContents = fs.readFileSync(logo);
+          const transferedContects = fs.readFileSync(fsPath);
+
+          expect(logoContents.equals(transferedContects));
+          done();
+        });
+      });
+    });
+
+    it('APPE tést.txt', (done) => {
       const buffer = Buffer.from(', awesome!');
       const fsPath = `${clientDirectory}/${name}/tést.txt`;
-      client.append(buffer, 'tést.txt', err => {
+      client.append(buffer, 'tést.txt', (err) => {
         expect(err).to.not.exist;
         setImmediate(() => {
           expect(fs.existsSync(fsPath)).to.equal(true);
@@ -223,15 +251,15 @@ describe('Integration', function () {
       });
     });
 
-    it('RETR tést.txt', done => {
-      connection.once('RETR', err => {
+    it('RETR tést.txt', (done) => {
+      connection.once('RETR', (err) => {
         expect(err).to.not.exist;
       });
 
       client.get('tést.txt', (err, stream) => {
         expect(err).to.not.exist;
         let text = '';
-        stream.on('data', data => {
+        stream.on('data', (data) => {
           text += data.toString();
         });
         stream.on('end', () => {
@@ -242,8 +270,8 @@ describe('Integration', function () {
       });
     });
 
-    it('RNFR tést.txt, RNTO awesome.txt', done => {
-      client.rename('tést.txt', 'awesome.txt', err => {
+    it('RNFR tést.txt, RNTO awesome.txt', (done) => {
+      client.rename('tést.txt', 'awesome.txt', (err) => {
         expect(err).to.not.exist;
         expect(fs.existsSync(`${clientDirectory}/${name}/tést.txt`)).to.equal(false);
         expect(fs.existsSync(`${clientDirectory}/${name}/awesome.txt`)).to.equal(true);
@@ -255,7 +283,7 @@ describe('Integration', function () {
       });
     });
 
-    it('SIZE awesome.txt', done => {
+    it('SIZE awesome.txt', (done) => {
       client.size('awesome.txt', (err, size) => {
         expect(err).to.not.exist;
         expect(size).to.be.a('number');
@@ -263,7 +291,7 @@ describe('Integration', function () {
       });
     });
 
-    it('MDTM awesome.txt', done => {
+    it('MDTM awesome.txt', (done) => {
       client.lastMod('awesome.txt', (err, modTime) => {
         expect(err).to.not.exist;
         expect(modTime).to.be.instanceOf(Date);
@@ -272,14 +300,14 @@ describe('Integration', function () {
       });
     });
 
-    it.skip('MLSD .', done => {
+    it.skip('MLSD .', (done) => {
       client.mlsd('.', () => {
         done();
       });
     });
 
-    it('SITE CHMOD 700 awesome.txt', done => {
-      client.site('CHMOD 600 awesome.txt', err => {
+    it('SITE CHMOD 700 awesome.txt', (done) => {
+      client.site('CHMOD 600 awesome.txt', (err) => {
         expect(err).to.not.exist;
         fs.stat(`${clientDirectory}/${name}/awesome.txt`, (fserr, stats) => {
           expect(fserr).to.not.exist;
@@ -290,27 +318,27 @@ describe('Integration', function () {
       });
     });
 
-    it('DELE awesome.txt', done => {
-      client.delete('awesome.txt', err => {
+    it('DELE awesome.txt', (done) => {
+      client.delete('awesome.txt', (err) => {
         expect(err).to.not.exist;
         expect(fs.existsSync(`${clientDirectory}/${name}/awesome.txt`)).to.equal(false);
         done();
       });
     });
 
-    it('MKD témp', done => {
+    it('MKD témp', (done) => {
       const path = `${clientDirectory}/${name}/témp`;
       if (fs.existsSync(path)) {
         fs.rmdirSync(path);
       }
-      client.mkdir('témp', err => {
+      client.mkdir('témp', (err) => {
         expect(err).to.not.exist;
         expect(fs.existsSync(path)).to.equal(true);
         done();
       });
     });
 
-    it('CWD témp', done => {
+    it('CWD témp', (done) => {
       client.cwd('témp', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.to.be.a('string');
@@ -318,29 +346,62 @@ describe('Integration', function () {
       });
     });
 
-    it('CDUP', done => {
-      client.cdup(err => {
+    it('CDUP', (done) => {
+      client.cdup((err) => {
         expect(err).to.not.exist;
         done();
       });
     });
 
-    it('RMD témp', done => {
-      client.rmdir('témp', err => {
+    it('RMD témp', (done) => {
+      client.rmdir('témp', (err) => {
         expect(err).to.not.exist;
         expect(fs.existsSync(`${clientDirectory}/${name}/témp`)).to.equal(false);
         done();
       });
     });
 
-    it('CDUP', done => {
-      client.cdup(err => {
+    it('CDUP', (done) => {
+      client.cdup((err) => {
         expect(err).to.not.exist;
         done();
       });
     });
   }
 
+  describe('Server events', function () {
+    const disconnect = sinon.spy();
+    const login = sinon.spy();
+
+    before(() => {
+      server.on('login', login);
+      server.on('disconnect', disconnect);
+      return connectClient({
+        host: server.url.hostname,
+        port: server.url.port,
+        user: 'test',
+        password: 'test'
+      });
+    });
+
+    after(() => {
+      server.off('login', login);
+      server.off('disconnect', disconnect);
+    })
+
+    it('should fire a login event on connect', () => {
+      expect(login.calledOnce).to.be.true;
+    });
+
+    it('should fire a close event on disconnect', (done) => {
+      client.end();
+      setTimeout(() => {
+        expect(disconnect.calledOnce).to.be.true;
+        done();
+      }, 100)
+    });
+  });
+
   describe('#ASCII', function () {
     before(() => {
       return connectClient({
@@ -353,8 +414,8 @@ describe('Integration', function () {
 
     after(() => closeClient(client));
 
-    it('TYPE A', done => {
-      client.ascii(err => {
+    it('TYPE A', (done) => {
+      client.ascii((err) => {
         expect(err).to.not.exist;
         done();
       });
@@ -375,8 +436,8 @@ describe('Integration', function () {
 
     after(() => closeClient(client));
 
-    it('TYPE I', done => {
-      client.binary(err => {
+    it('TYPE I', (done) => {
+      client.binary((err) => {
         expect(err).to.not.exist;
         done();
       });
@@ -385,15 +446,17 @@ describe('Integration', function () {
     runFileSystemTests('binary');
   });
 
-  describe.skip('#EXPLICIT', function () {
+  describe('#EXPLICIT', function () {
     before(() => {
       return server.close()
-      .then(() => startServer('ftp://127.0.0.1:8880', {
-        tls: {
-          key: `${process.cwd()}/test/cert/server.key`,
-          cert: `${process.cwd()}/test/cert/server.crt`,
-          ca: `${process.cwd()}/test/cert/server.csr`
-        }
+      .then(() => Promise.all([
+        readFile(`${process.cwd()}/test/cert/server.key`),
+        readFile(`${process.cwd()}/test/cert/server.crt`),
+        readFile(`${process.cwd()}/test/cert/server.csr`)
+      ]))
+      .then(([key, cert, ca]) => startServer({
+        url: 'ftp://127.0.0.1:8881',
+        tls: {key, cert, ca}
       }))
       .then(() => {
         return connectClient({
@@ -414,12 +477,14 @@ describe('Integration', function () {
   describe.skip('#IMPLICIT', function () {
     before(() => {
       return server.close()
-      .then(() => startServer('ftps://127.0.0.1:8880', {
-        tls: {
-          key: `${process.cwd()}/test/cert/server.key`,
-          cert: `${process.cwd()}/test/cert/server.crt`,
-          ca: `${process.cwd()}/test/cert/server.csr`
-        }
+      .then(() => Promise.all([
+        readFile(`${process.cwd()}/test/cert/server.key`),
+        readFile(`${process.cwd()}/test/cert/server.crt`),
+        readFile(`${process.cwd()}/test/cert/server.csr`)
+      ]))
+      .then(([key, cert, ca]) => startServer({
+        url: 'ftps://127.0.0.1:8882',
+        tls: {key, cert, ca}
       }))
       .then(() => {
         return connectClient({

test/start.js

@@ -1,18 +1,17 @@
-require('dotenv').load();
 const bunyan = require('bunyan');
-
+const fs = require('fs');
 const FtpServer = require('../src');
 
-const log = bunyan.createLogger({name: 'test'});
-log.level('trace');
-const server = new FtpServer('ftp://127.0.0.1:8880', {
-  log,
-  pasv_range: 8881,
+const server = new FtpServer({
+  log: bunyan.createLogger({name: 'test', level: 'trace'}),
+  url: 'ftp://127.0.0.1:8880',
+  pasv_url: '192.168.1.1',
+  pasv_min: 8881,
   greeting: ['Welcome', 'to', 'the', 'jungle!'],
   tls: {
-    key: `${process.cwd()}/test/cert/server.key`,
-    cert: `${process.cwd()}/test/cert/server.crt`,
-    ca: `${process.cwd()}/test/cert/server.csr`
+    key: fs.readFileSync(`${process.cwd()}/test/cert/server.key`),
+    cert: fs.readFileSync(`${process.cwd()}/test/cert/server.crt`),
+    ca: fs.readFileSync(`${process.cwd()}/test/cert/server.csr`)
   },
   file_format: 'ep',
   anonymous: 'sillyrabbit'