Place migration files in the same directory as the original file to avoid cross-device file move problems

Author: jcoglan

lib/legacy/index.js

@@ -18,9 +18,10 @@ async function migrate (logger, pathname, password) {
   if (!stat.isFile()) return false
 
   message(
-    'It looks as though your config file (' + pathname + ') was created ' +
-    'with an old version of Vault. In order to continue, it needs to be ' +
-    'converted to a new format.')
+    'It looks as though your config file (' + pathname + ') was created with ' +
+    'old version of Vault. In order to continue, it needs to be converted to ' +
+    'a new format. You should back up your existing config file before ' +
+    'continuing.')
 
   await confirm('Would you like Vault to perform this conversion now?')
 

lib/legacy/migrator.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert')
 const fs = require('fs')
+const path = require('path')
 
 const crypto = require('../crypto')
 const escodb = require('../escodb')
@@ -10,8 +11,10 @@ const Reader = require('./reader')
 class Migrator {
   constructor ({ logger, pathname, password }) {
     this._logger = logger
-    this._filename = pathname
     this._password = password
+
+    this._pathname = pathname
+    this._dirname = path.dirname(pathname)
   };
 
   log (message) {
@@ -30,12 +33,12 @@ class Migrator {
   }
 
   _readInputFile () {
-    this.log('reading input file: ' + this._filename)
+    this.log('reading input file: ' + this._pathname)
 
     try {
-      this._content = fs.readFileSync(this._filename, 'utf8')
+      this._content = fs.readFileSync(this._pathname, 'utf8')
     } catch (error) {
-      throw new Error('file is unreadable: ' + this._filename)
+      throw new Error('file is unreadable: ' + this._pathname)
     }
   }
 
@@ -49,7 +52,7 @@ class Migrator {
   }
 
   async _createStore () {
-    this._storepath = '/tmp/vault-convert-' + random()
+    this._storepath = path.join(this._dirname, 'vault-convert-' + random())
     this.log('creating new storage target: ' + this._storepath)
 
     let adapter = escodb.createFileAdapter(this._storepath)
@@ -80,10 +83,10 @@ class Migrator {
   }
 
   _swapFiles () {
-    this._backuppath = '/tmp/vault-backup-' + random()
+    this._backuppath = path.join(this._dirname, 'vault-backup-' + random())
 
-    this._rename(this._filename, this._backuppath)
-    this._rename(this._storepath, this._filename)
+    this._rename(this._pathname, this._backuppath)
+    this._rename(this._storepath, this._pathname)
   }
 
   _rename (a, b) {