From 2ea2af7d2a74ac971428a8d2394509240f9ea100 Mon Sep 17 00:00:00 2001 From: Hideki Nakamura Date: Wed, 20 Dec 2017 19:44:57 +0900 Subject: [PATCH] Use a fixed string instead of `os.hostname()` --- red/api/editor/sshkeys.js | 2 +- red/runtime/storage/localfilesystem/projects/Project.js | 2 +- red/runtime/storage/localfilesystem/sshkeys.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/red/api/editor/sshkeys.js b/red/api/editor/sshkeys.js index d1338e19f..08ae241ed 100644 --- a/red/api/editor/sshkeys.js +++ b/red/api/editor/sshkeys.js @@ -21,7 +21,7 @@ var settings; var needsPermission = require("../auth").needsPermission; function getUsername(userObj) { - var username = os.hostname(); + var username = '.default'; if ( userObj && userObj.name ) { username = userObj.name; } diff --git a/red/runtime/storage/localfilesystem/projects/Project.js b/red/runtime/storage/localfilesystem/projects/Project.js index 632390e2b..d2007fbf9 100644 --- a/red/runtime/storage/localfilesystem/projects/Project.js +++ b/red/runtime/storage/localfilesystem/projects/Project.js @@ -704,7 +704,7 @@ function createProject(user, metadata) { auth = authCache.get(project,originRemote.url,username); } else if (originRemote.hasOwnProperty("key_file") && originRemote.hasOwnProperty("passphrase")) { - var key_file_name = (username === '_') ? os.hostname() + '_' + originRemote.key_file : username + '_' + originRemote.key_file; + var key_file_name = (username === '_') ? '.default' + '_' + originRemote.key_file : username + '_' + originRemote.key_file; authCache.set(project,originRemote.url,username,{ // TODO: hardcoded remote name key_path: fspath.join(projectsDir, ".sshkeys", key_file_name), passphrase: originRemote.passphrase diff --git a/red/runtime/storage/localfilesystem/sshkeys.js b/red/runtime/storage/localfilesystem/sshkeys.js index fce84b469..4a5211cde 100644 --- a/red/runtime/storage/localfilesystem/sshkeys.js +++ b/red/runtime/storage/localfilesystem/sshkeys.js @@ -44,7 +44,7 @@ function listSSHKeys(username) { var ret = fns.sort() .filter(function(fn) { var fullPath = fspath.join(sshkeyDir,fn); - if (fn[0] != ".") { + if (fn.length > 2 || fn[0] != ".") { var stats = fs.lstatSync(fullPath); if (stats.isFile()) { return fn.startsWith(startStr);