init

Author: brainfoolong

config.template.js

@@ -21,7 +21,7 @@ let config = {
   /**
    * Set to true to get more information for errors and stuff like that
    */
-  'debug': false
+  'development': false
 }
 
 module.exports = config

lang/en.json

@@ -53,15 +53,15 @@
   "mtime": "Last modified",
   "no": "No",
   "password": "Password",
-  "password.description": "Leave empty if you don't want to change it",
+  "password.description": "Leave empty if you don't want to change it. Notice: The password will be stored as cleartext in db. However, somebody must have access to the server disk to read this.",
   "permissions": "Permissions",
   "progress": "Progress",
   "save.edited": "Save edited",
   "saved": "Saved",
   "server": "Server",
   "server.add": "Add new server",
   "server.auth": "Authentication",
-  "server.auth.keyfile": "PPK Keyfile (Not yet implemented)",
+  "server.auth.keyfile": "PPK Keyfile",
   "server.auth.normal": "Username + Password",
   "server.connect": "Connect",
   "server.encryption": "Encryption",
@@ -102,5 +102,11 @@
   "user.add": "Add new user",
   "usermanager": "Usermanager",
   "username": "Username",
-  "yes": "Yes"
+  "yes": "Yes",
+  "server.auth.keyfile.passphrase": "Keyfile password",
+  "server.auth.keyfile.description": "Paste the contents of the file in here",
+  "update.available" : "Update available",
+  "update.available.modal" : "There is a new release for this application. You have {currentVersion} and the newest release is {latestVersion}. Make sure to always have a backup before applying any update. With the click on the accept button the application will shut down, downloading the update, apply the update and restart the application automatically. However, if something goes wrong you should have access to the command line to fix the issues per hand.",
+  "coreupdate.started" : "Update started, application will restart automatically when all is done",
+  "coreupdate.error" : "Cannot execute automatic update. OS doesn't support this method or development mode is enabled"
 }

public/scripts/src/form.js

@@ -62,6 +62,9 @@ gl.form.create = function (container, formName, fields, onSubmit, onCancel, valu
           $input.val(currentValue)
         }
         break
+      case 'file':
+        $input = $('<input type="file" class="form-control" name="' + fieldName + '">')
+        break
       case 'select':
         let name = fieldName
         if (field.multiple) name += '[]'
@@ -119,7 +122,7 @@ gl.form.create = function (container, formName, fields, onSubmit, onCancel, valu
       }
     }
   }
-  const $btn = $('<div><span data-name="save" data-translate="save" class="btn btn-info submit-form"></span></div>')
+  const $btn = $('<div><span data-name="save" data-translate="save" class="btn btn-info submit-form btn-accept"></span></div>')
   if (Object.keys(values).length) {
     $btn.children().attr('data-translate', 'save.edited')
     $btn.append('&nbsp;<span data-translate="cancel.edit" class="btn btn-default cancel"></span>')
@@ -148,5 +151,6 @@ gl.form.create = function (container, formName, fields, onSubmit, onCancel, valu
       }
     })
   }).trigger('change')
+  gl.textareaAutoheight($form)
   return $form
 }

public/scripts/src/global.js

@@ -85,7 +85,7 @@ gl.modal = function (header, body, footer, closeCallback) {
 gl.modalConfirm = function (body, callback) {
   const $footer = $('<div>')
   $footer
-    .append('<span class="btn btn-info accept" data-translate="modal.confirm.accept"></span>')
+    .append('<span class="btn btn-info accept btn-accept" data-translate="modal.confirm.accept"></span>')
     .append('<span class="btn btn-primary cancel" data-translate="modal.confirm.cancel"></span>')
   $footer.find('.accept').on('click', function () {
     callback(true)
@@ -172,6 +172,19 @@ gl.humanFilesize = function (bytes) {
   return bytes.toFixed(2) + map[i]
 }
 
+/**
+ * Initialize all textarea autoheights
+ * @param {JQuery} container
+ */
+gl.textareaAutoheight = function (container) {
+  container.find('textarea.autoheight').each(function () {
+    this.setAttribute('style', 'height:' + (Math.max(20, this.scrollHeight)) + 'px;overflow-y:hidden;')
+  }).addClass('autoheight-activated').off('input.ah focus.ah').on('input.ah focus.ah', function () {
+    this.style.height = 'auto'
+    this.style.height = (Math.max(20, this.scrollHeight)) + 'px'
+  }).triggerHandler('input')
+}
+
 // on document ready
 $(function () {
   gl.lang.setLanguageByNavigator()

public/stylesheets/src/page.scss

@@ -16,7 +16,7 @@ html {
     margin: 0;
 }
 
-form .submit-form {
+.btn-accept {
     &:before {
         @include glyphicon;
         content: "\e013";

public/tpl/menu-top.html

@@ -22,6 +22,9 @@
 <div class="inline-block">
     <a class="btn btn-default dropdown-toggle btn-sm" href="https://www.paypal.me/brainfoolong" target="_blank"><span data-translate="donate" data-translate-property="data-tooltip,donate.tooltip"></span></a>
 </div>
+<div class="inline-block require-admin update-available hidden">
+    <button class="btn btn-success btn-sm" type="button"><span data-translate="update.available"></span></button>
+</div>
 <div class="inline-block">
     <button class="btn btn-default dropdown-toggle btn-sm template-load-trigger" type="button" data-template="logout" data-container="#wrapper"><span data-translate="logout"></span></button>
 </div>

public/tpl/servermanager.html

@@ -15,6 +15,6 @@
     </div>
 </div>
 <div class="center"></div>
-<div class="right">
+<div class="right require-admin">
     <div class="form form-general overflow-auto"></div>
 </div>

public/tpl/src/menu-top.js

@@ -1,4 +1,34 @@
 'use strict';
 (function () {
+  const $tpl = $('.template-menu-top')
+  let systemStatus = null
 
+  // interval to check for new version
+  const getSystemStatus = function () {
+    gl.socket.send('getSystemStatus', null, function (data) {
+      if (data.latestVersion) {
+        systemStatus = data
+        if (data.latestVersion !== data.currentVersion) {
+          $tpl.find('.update-available').removeClass('hidden')
+        }
+      }
+    })
+  }
+  getSystemStatus()
+  setInterval(getSystemStatus, 10 * 1000)
+
+  $tpl.on('click', '.update-available', function () {
+    gl.modalConfirm(gl.t('update.available.modal', systemStatus, true), function (result) {
+      if (result === true) {
+        gl.note('coreupdate.started')
+        gl.socket.send('doCoreUpdate', null, function (result) {
+          if (result === true) {
+
+          } else {
+            gl.note('coreupdate.error')
+          }
+        })
+      }
+    })
+  })
 })()

public/tpl/src/servermanager.js

@@ -36,16 +36,30 @@
       'username': {
         'type': 'text',
         'label': 'username',
-        'showIf': function (fields) {
-          return fields.auth.val() === 'normal'
-        }
+        'required': true
       },
       'password': {
         'type': 'password',
         'label': 'password',
         'showIf': function (fields) {
           return fields.auth.val() === 'normal'
         }
+      },
+      'keyfile': {
+        'type': 'textarea',
+        'label': 'server.auth.keyfile',
+        'description': 'server.auth.keyfile.description',
+        'showIf': function (fields) {
+          return fields.auth.val() === 'keyfile'
+        }
+      },
+      'keyfile_passphrase': {
+        'type': 'password',
+        'label': 'server.auth.keyfile.passphrase',
+        'description': 'password.description',
+        'showIf': function (fields) {
+          return fields.auth.val() === 'keyfile'
+        }
       }
     }
   }

src/actions/doCoreUpdate.js

@@ -0,0 +1,33 @@
+'use strict'
+
+const path = require('path')
+const os = require('os')
+const exec = require('child_process').exec
+const config = require(path.join(__dirname, '../config'))
+
+const action = {}
+
+/**
+ * Require admin
+ * @type {boolean}
+ */
+action.requireAdmin = true
+
+/**
+ * Execute the action
+ * @param {WebSocketUser} user
+ * @param {*} message
+ * @param {function} callback
+ */
+action.execute = function (user, message, callback) {
+  if (os.platform() !== 'linux' || config.development) {
+    callback(false)
+    return
+  }
+  const dir = path.join(__dirname, '../..')
+  exec('cd ' + dir + ' && ./wfc stop && node src/main.js update-core && ./wfc start', null, function () {
+    callback(true)
+  })
+}
+
+module.exports = action

src/actions/getServers.js

@@ -18,7 +18,15 @@ action.requireUser = true
  * @param {function} callback
  */
 action.execute = function (user, message, callback) {
-  callback(db.get('servers').cloneDeep().value())
+  const servers = db.get('servers').cloneDeep().value()
+  // strip out sensible data
+  if (servers) {
+    for (let i in servers) {
+      delete servers[i].keyfile_passphrase
+      delete servers[i].password
+    }
+  }
+  callback(servers)
 }
 
 module.exports = action

src/actions/getSystemStatus.js

@@ -20,7 +20,9 @@ action.requireUser = false
 action.execute = function (user, message, callback) {
   callback({
     'installed': db.get('users').size().value() > 0,
-    'version': require(path.join(__dirname, '../core')).latestVersion
+    'latestVersion': require(path.join(__dirname, '../core')).latestVersion,
+    'currentVersion': require(path.join(__dirname, '../../package')).version,
+    'development': require(path.join(__dirname, '../config')).development
   })
 }
 

src/actions/servermanagerFormSubmit.js

@@ -31,6 +31,12 @@ action.execute = function (user, message, callback) {
         'id': db.getNextId()
       }
     }
+    if (formData.password.length <= 0) {
+      delete formData.password
+    }
+    if (formData.keyfile_passphrase.length <= 0) {
+      delete formData.keyfile_passphrase
+    }
     // simply merging data from form into data object
     extend(true, storedData, formData)
     Server.get(storedData.id).setServerData(storedData)

src/config.js

@@ -10,7 +10,7 @@ const fs = require('fs')
 let config = {
   'host': null,
   'port': 4340,
-  'debug': false
+  'development': false
 }
 
 // load config.js if exist

src/core.js

@@ -1,27 +1,44 @@
 'use strict'
 
 const request = require('request')
+const path = require('path')
 
 /**
  * Core
  * @type {object}
  */
 const core = {}
 
-/** @type {string} */
-core.latestVersion = ''
+/** @type {string|null} */
+core.latestVersion = null
+
+/** @type {string|null} */
+core.latestVersionZip = null
 
 /**
  * Fetch latest version for the core
+ * @param {function=} callback
  */
-core.fetchLatestVersion = function () {
-  request('https://raw.githubusercontent.com/brainfoolong/web-ftp-client/master/package.json', function (error, response, body) {
+core.fetchLatestVersion = function (callback) {
+  const pkg = require(path.join(__dirname, '../package'))
+  request({
+    url: 'https://api.github.com/repos/brainfoolong/' + pkg.rame + '/releases',
+    headers: {
+      'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36'
+    }
+  }, function (error, response, body) {
     if (!error) {
-      const manifest = JSON.parse(body)
-      if (manifest && manifest.version) {
-        core.latestVersion = manifest.version
+      const releases = JSON.parse(body)
+      if (releases) {
+        releases.sort(function (a, b) {
+          return a.id < b.id
+        })
+        const release = releases.shift()
+        core.latestVersion = release.tag_name
+        core.latestVersionZip = release.zipball_url
       }
     }
+    callback()
   })
 }
 

src/ftpServer.js

@@ -68,6 +68,22 @@ function FtpServer (id) {
       })
     }
     if (serverData.protocol === 'sftp') {
+      const connectData = {
+        host: serverData.host,
+        port: serverData.port
+      }
+      if (typeof serverData.username !== 'undefined' && serverData.username.length > 0) {
+        connectData.username = serverData.username
+      }
+      if (typeof serverData.password !== 'undefined' && serverData.password.length > 0) {
+        connectData.password = serverData.password
+      }
+      if (typeof serverData.keyfile !== 'undefined' && serverData.keyfile.trim().length > 0) {
+        connectData.privateKey = serverData.keyfile.trim()
+      }
+      if (typeof serverData.keyfile_passphrase !== 'undefined' && serverData.keyfile_passphrase.length > 0) {
+        connectData.passphrase = serverData.keyfile_passphrase
+      }
       self.sshClient = new SshClient()
       self.sshClient.on('ready', function () {
         self.server.log('log.ftpserver.ready')
@@ -88,12 +104,7 @@ function FtpServer (id) {
         self.server.logError(err)
       }).on('end', function () {
         self.disconnect()
-      }).connect({
-        host: serverData.host,
-        port: serverData.port,
-        username: serverData.username,
-        password: serverData.password
-      })
+      }).connect(connectData)
     }
   }
   /**

src/logs.js

@@ -55,7 +55,7 @@ logs.log = function (server, message, params, type) {
 logs.logError = function (server, err) {
   const e = new Error(err.message)
   let msg = e.message
-  if (require(path.join(__dirname, 'config.js')).debug) {
+  if (require(path.join(__dirname, 'config.js')).development) {
     msg += ' | STACK: ' + e.stack
   }
   logs.log(server, msg, null, 'error')

src/main.js

@@ -24,24 +24,31 @@ if (mode === 'start') {
 if (mode === 'update-core') {
   const request = require('request')
   const fs = require('fs')
-  const fstools = require(path.join(__dirname, 'fstools'))
+  const fstools = require(path.join(__dirname, 'src/fstools'))
   const unzip = require('unzip')
   const dir = path.resolve(__dirname, '..')
-  request('https://codeload.github.com/brainfoolong/web-ftp-client/zip/master', function () {
-    fs.createReadStream(dir + '/master.zip').pipe(unzip.Parse()).on('entry', function (entry) {
-      const fileName = entry.path.split('/').slice(1).join('/')
-      if (!fileName.length) return
-      const path = dir + '/' + fileName
-      if (entry.type === 'Directory') {
-        if (!fs.existsSync(path)) fs.mkdirSync(path, fstools.defaultMask)
-        entry.autodrain()
-      } else {
-        entry.pipe(fs.createWriteStream(path, {'mode': fstools.defaultMask}))
-      }
-    }).on('close', function () {
-      process.stdout.write('Application successfully updated\n')
-      fs.unlinkSync(dir + '/master.zip')
-      process.exit(0)
-    })
-  }).pipe(fs.createWriteStream(dir + '/master.zip'))
+  const localZipFile = path.join(dir, path.dirname(dir) + '.zip')
+  const core = require(path.join(__dirname, 'src/core'))
+
+  core.fetchLatestVersion(function () {
+    request(core.latestVersionZip, function () {
+      fs.createReadStream(localZipFile).pipe(unzip.Parse()).on('entry', function (entry) {
+        const fileName = entry.path
+        if (!fileName.length) return
+        const filepath = path.join(dir, fileName)
+        if (filepath === '') {
+          if (entry.type === 'Directory') {
+            if (!fs.existsSync(filepath)) fs.mkdirSync(filepath, fstools.defaultMask)
+            entry.autodrain()
+          } else {
+            entry.pipe(fs.createWriteStream(filepath, {'mode': fstools.defaultMask}))
+          }
+        }
+      }).on('close', function () {
+        process.stdout.write('Application successfully updated\n')
+        fs.unlinkSync(dir + '/master.zip')
+        process.exit(0)
+      })
+    }).pipe(fs.createWriteStream(localZipFile))
+  })
 }