Improve logging to fix #16

HR · Oct 29, 2016 · ccb5881 · ccb5881
1 parent 0bcfb7b
commit ccb5881
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 35 deletions.
diff --git a/app/index.js b/app/index.js
@@ -9,14 +9,6 @@ const Db = require('./src/Db')
 const MasterPass = require('./src/MasterPass')
 const MasterPassKey = require('./src/MasterPassKey')
 const _ = require('lodash')
-const logger = require('./script/logger')
-// change exec path
-logger.info(`AppPath: ${app.getAppPath()}`)
-logger.info(`UseData Path: ${app.getPath('userData')}`)
-process.chdir(app.getAppPath())
-logger.info(`Changed cwd to: ${process.cwd()}`)
-logger.info(`Electron node v${process.versions.node}`)
-
 // adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')()
 
@@ -33,6 +25,14 @@ global.views = {
   setup: `file://${__dirname}/static/setup.html`,
   crypter: `file://${__dirname}/static/crypter.html`
 }
+const logger = require('./script/logger')
+
+// change exec path
+logger.info(`AppPath: ${app.getAppPath()}`)
+logger.info(`UseData Path: ${app.getPath('userData')}`)
+process.chdir(app.getAppPath())
+logger.info(`Changed cwd to: ${process.cwd()}`)
+logger.info(`Electron node v${process.versions.node}`)
 
 /**
  * Promisification of initialisation

diff --git a/app/script/logger.js b/app/script/logger.js
@@ -6,16 +6,16 @@
 const winston = require('winston')
 const moment = require('moment')
 const fs = require('fs-extra')
-const path = require('path')
 
-let debugDir = path.join(__dirname,'/debug')
+let debugDir = `${global.paths.userData}/debug`
 fs.ensureDirSync(debugDir)
 winston.emitErrs = true
 const fileTransport = new (winston.transports.File)({
   filename: `${debugDir}/CS_debug_${moment().format('DD.MM@HH:MM').trim()}.log`,
   handleExceptions: true,
   maxsize: 5242880, // 5MB
-  colorize: false
+  colorize: false,
+  level: 'verbose'
 })
 
 module.exports = (!process.env.TEST_RUN) ? new (winston.Logger)({

diff --git a/app/src/crypto.js b/app/src/crypto.js
@@ -7,7 +7,7 @@
 const fs = require('fs-extra')
 const path = require('path')
 const scrypto = require('crypto')
-const logger = require('../script/logger')
+const logger = require('winston')
 const Readable = require('stream').Readable
 const tar = require('tar-fs')
 const CRYPTER_REGEX = /^Crypter(.*)$/igm
@@ -28,7 +28,6 @@ exports.crypt = function (origpath, masterpass) {
     // Resolve the destination path for encrypted file
     exports.encrypt(origpath, masterpass)
       .then((creds) => {
-        logger.info(`Encrypt creds: ${JSON.stringify(creds)}`)
         resolve({
           op: 'Encrypted', // Crypter operation
           name: path.basename(origpath), // filename
@@ -62,7 +61,7 @@ exports.encrypt = function (origpath, mpkey) {
         fs.mkdirs(tempd, function (err) {
           if (err)
             reject(err)
-          logger.info(`Created ${tempd} successfully`)
+          logger.verbose(`Created ${tempd} successfully`)
           // readstream to read the (unencrypted) file
           const origin = fs.createReadStream(origpath)
           // create data and creds file
@@ -119,7 +118,7 @@ exports.encrypt = function (origpath, mpkey) {
                 if (err)
                   reject(err)
                 // return all the credentials and parameters used for encryption
-                logger.info('Successfully deleted tempd!')
+                logger.verbose('Successfully deleted tempd!')
                 resolve({
                   salt: dcreds.salt,
                   key: dcreds.key,
@@ -181,17 +180,15 @@ exports.decrypt = function (origpath, mpkey) {
             const iv = new Buffer(creds[1], 'hex')
             const authTag = new Buffer(creds[2], 'hex')
             const salt = new Buffer(creds[3], 'hex')
-            logger.info(`iv: ${iv}, authTag: ${authTag}, salt: ${salt}`)
+            logger.verbose(`Extracted data, iv: ${iv}, authTag: ${authTag}, salt: ${salt}`)
             // Read encrypted data stream
             const dataOrig = fs.createReadStream(dataOrigPath)
             // derive the original encryption key for the file
             exports.deriveKey(mpkey, salt, defaults.iterations)
               .then((dcreds) => {
                 try {
-                  logger.info(`Derived encryption key ${dcreds.key.toString('hex')}`)
                   let decipher = scrypto.createDecipheriv(defaults.algorithm, dcreds.key, iv)
                   decipher.setAuthTag(authTag)
-                  logger.info(`authTag: ${authTag.toString('hex')}`)
                   const dataDest = fs.createWriteStream(dataDestPath)
                   dataOrig.pipe(decipher).pipe(dataDest)
 

diff --git a/app/static/crypter.html b/app/static/crypter.html
@@ -21,7 +21,7 @@ <h1>Crypter</h1>
           <!-- TODO: Consider using <input class="fancy" type="file" name="name" value="selectfile"> -->
           <div id="fileInput" class="fancy">
             <p id="fileInputText">
-              Select a file
+              Select or drop file
             </p>
           </div>
         </div>
@@ -90,7 +90,7 @@ <h3>{{op}} {{name}}</h3>
       var dialog = remote.dialog
       var BrowserWindow = remote.BrowserWindow
       var paths = remote.getGlobal('paths')
-      var logger = require('../script/logger.js')
+      var logger = require('winston')
       var Handlebars = require('handlebars')
       var path = require('path')
       var errLabel = $('#errLabel')
@@ -111,7 +111,9 @@ <h3>{{op}} {{name}}</h3>
         fileInputD.ondragleave = fileInputD.ondragend = function () {
           return false
         }
+
         turnFileInputOn ()
+
         $('.navigationLink').each(function (index) {
           $(this).click(function () {
             navigate(this.getAttribute('data-target'))

diff --git a/app/static/styles/crypter.css b/app/static/styles/crypter.css