Skip to content

Fix/cannot edit entries of ssh config #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryu-sato wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Fix/cannot edit entries of ssh config #7

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20f25d5
fix: enable to append ssh-config on win
ryu-sato Jun 30, 2020
f86030a
enable to discard stdout and stderr on windows
ryu-sato Jul 1, 2020
cb84ec0
close FileIO after read SSH config before next file access
ryu-sato Jul 2, 2020
47eb43d
wait for a while when ShellExecute is called
ryu-sato Jul 2, 2020
bc8a3e8
sudo on Windows return always true because ShellExecuted return nothing
ryu-sato Jul 2, 2020
49fdb61
update comment
ryu-sato Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions lib/vagrant-mutagen/Mutagen.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
module VagrantPlugins
module Mutagen
module Mutagen
DISCARD_STDOUT = Vagrant::Util::Platform.windows? ? '>nul' : '>/dev/null'
DISCARD_STDERR = Vagrant::Util::Platform.windows? ? '2>nul' : '2>/dev/null'

if ENV['VAGRANT_MUTAGEN_SSH_CONFIG_PATH']
@@ssh_user_config_path = ENV['VAGRANT_MUTAGEN_SSH_CONFIG_PATH']
else
Expand All @@ -19,8 +22,7 @@ def addConfigEntries
newconfig = ''

# Read contents of SSH config file
file = File.open(@@ssh_user_config_path, "rb")
configContents = file.read
configContents = File.read(@@ssh_user_config_path)
# Check for existing entry for hostname in config
entryPattern = configEntryPattern(hostname, name, uuid)
if configContents.match(/#{entryPattern}/)
Expand Down Expand Up @@ -52,9 +54,10 @@ def addToSSHConfig(content)
uuid = @machine.id || @machine.config.mutagen.id
tmpPath = File.join(Dir.tmpdir, 'hosts-' + uuid + '.cmd')
File.open(tmpPath, "w") do |tmpFile|
tmpFile.puts(">>\"#{@@ssh_user_config_path}\" echo #{content}")
cmd_content = content.lines.map {|line| ">>\"#{@@ssh_user_config_path}\" echo #{line}" }.join
tmpFile.puts(cmd_content)
end
sudo(tmpPath)
sudo(tmpPath, true)
File.delete(tmpPath)
else
content = "\n" + content + "\n"
Expand Down Expand Up @@ -89,8 +92,7 @@ def removeConfigEntries
@ui.info "[vagrant-mutagen] No machine id, nothing removed from #@@ssh_user_config_path"
return
end
file = File.open(@@ssh_user_config_path, "rb")
configContents = file.read
configContents = File.read(@@ssh_user_config_path)
uuid = @machine.id || @machine.config.mutagen.id
hashedId = Digest::MD5.hexdigest(uuid)
if configContents.match(/#{hashedId}/)
Expand Down Expand Up @@ -134,14 +136,16 @@ def signature(name, uuid = self.uuid)
%Q(# VAGRANT: #{hashedId} (#{name}) / #{uuid})
end

def sudo(command)
def sudo(command, wait = false)
return if !command
if Vagrant::Util::Platform.windows?
require 'win32ole'
args = command.split(" ")
command = args.shift
sh = WIN32OLE.new('Shell.Application')
sh.ShellExecute(command, args.join(" "), '', 'runas', 0)
sleep 3 if wait # Wait a while because ShellExecute does not wait for the command to exit.
return true
else
return system("sudo #{command}")
end
Expand All @@ -157,7 +161,7 @@ def mutagen_enabled()

def startOrchestration()
daemonCommand = "mutagen daemon start"
projectStartedCommand = "mutagen project list >/dev/null 2>/dev/null"
projectStartedCommand = "mutagen project list #{DISCARD_STDOUT} #{DISCARD_STDERR}"
projectStartCommand = "mutagen project start"
projectStatusCommand = "mutagen project list"
if !system(daemonCommand)
Expand All @@ -173,9 +177,9 @@ def startOrchestration()
end

def terminateOrchestration()
projectStartedCommand = "mutagen project list >/dev/null 2>/dev/null"
projectStartedCommand = "mutagen project list #{DISCARD_STDOUT} #{DISCARD_STDERR}"
projectTerminateCommand = "mutagen project terminate"
projectStatusCommand = "mutagen project list 2>/dev/null"
projectStatusCommand = "mutagen project list #{DISCARD_STDERR}"
if system(projectStartedCommand) # mutagen project list returns 1 on error when no project is started
@ui.info "[vagrant-mutagen] Stopping mutagen project orchestration"
if !system(projectTerminateCommand)
Expand Down