vagrant-junos 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a8b9343dcfd9927b32a4c24af87437c4ba52a3
-  data.tar.gz: e6daa5c8ee7634d102249d042e9c5a6e3213aee3
+  metadata.gz: 3690c9bfb9fea7a58f1e55f8b5deba1bab84abde
+  data.tar.gz: acbb2731f09c4403bfc20d281c9b9376e57acda7
 SHA512:
-  metadata.gz: 88809822a9710f05a892d1707cde9032263ee8ceee108b194596484502033cc5d82d75710571ce818784e17424a0dc9b99563d156626795c56088039c5f2548a
-  data.tar.gz: 91eb44a22182c370a35f4f2c3ec81fe32a44749215e5b9d6314071d007fa5068d0fd9f49d67b98a74646e758767b9364a65bceffc933e365e9c0eb7de5cc9e76
+  metadata.gz: 7b19eae76c4d1645d414140142e89a0be0fda06d1989bc39777b8ee5d40574eddf58dd805c7495c3e4ff74197eb1fa03662afc505d4033ed3f2674f7faaa2fda
+  data.tar.gz: 153c318ab24d73e2096bfdff7cb6c8dd8a22238aed233e082e34cc22cb92be1cf3f18afa67a2f47086d2c202cf8f7d7e65b1295ca3b02dee630780284d0e8d25

data/.gitignore

@@ -13,4 +13,7 @@
 *.a
 mkmf.log
 *.gem
-.swp
+.swp
+
+# stupid Macs
+.DS_Store

data/lib/vagrant-junos/cap/insert_public_key.rb

@@ -11,19 +11,18 @@ module VagrantPlugins
         include Vagrant::Util
 
         def self.insert_public_key(machine, contents)
-          contents = Vagrant::Util::Shellquote.escape(contents, "'")
+          contents = ShellQuote.escape(contents, "'")
           contents = contents.gsub("\n", "\\n")
 
           # render public key junos conf template, based on Vagrantfile, and upload
           public_key_module = TemplateRenderer.render('guest/junos/public_key',
-                                                      contents,
+                                                      contents: contents,
                                                       template_root: "#{Dir.home}/.vagrant.d/gems/gems/vagrant-junos-#{VagrantPlugins::GuestJunos::VERSION}/templates")
-          upload(machine, public_key_module, '/mfs/tmp/set_public_Key')
+          upload(machine, public_key_module, '/mfs/tmp/set_public_key')
 
           # set up us root's public key
           machine.communicate.tap do |comm|
             comm.execute('cli -f /mfs/tmp/set_public_key')
-            comm.execute('rm /mfs/tmp/set_public_key')
           end
         end
 

data/lib/vagrant-junos/cap/remove_public_key.rb

@@ -6,19 +6,36 @@ require 'vagrant/util/template_renderer'
 module VagrantPlugins
   module GuestJunos
     module Cap
-      # Completely dumb check for now - only one key per user
+      # remove vagrant insecure public key (or anything called)
       class RemovePublicKey
         include Vagrant::Util
 
         def self.remove_public_key(machine, contents)
           contents = contents.chomp
-          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+          contents = ShellQuote.escape(contents, "'")
 
+          # remove vagrant insecure public key (or anything called)
+          public_key_module = TemplateRenderer.render('guest/junos/remove_public_key',
+                                                      contents: contents,
+                                                      template_root: "#{Dir.home}/.vagrant.d/gems/gems/vagrant-junos-#{VagrantPlugins::GuestJunos::VERSION}/templates")
+          upload(machine, public_key_module, '/mfs/tmp/delete_public_key')
+
+          # delete a public key for root
           machine.communicate.tap do |comm|
-            comm.test("test -f ~/.ssh/authorized_keys")
-            comm.execute("cat #{contents}")
+            comm.execute('cli -f /mfs/tmp/delete_public_key')
           end
         end
+
+        # Upload a file.
+        def self.upload(machine, content, remote_temp)
+          local_temp = Tempfile.new('vagrant-upload')
+          local_temp.binmode
+          local_temp.write(content)
+          local_temp.close
+          machine.communicate.upload(local_temp.path, "#{remote_temp}")
+          local_temp.delete
+        end
+
       end
     end
   end

data/lib/vagrant-junos/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Junos guest gem + plugin version
   module GuestJunos
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/templates/guest/junos/public_key.erb

@@ -1,3 +1,3 @@
 configure
-set system root-password ssh-rsa <%= contents %>
+set system root-authentication ssh-rsa "<%= contents %>"
 commit and-quit

data/templates/guest/junos/remove_public_key.erb

@@ -0,0 +1,3 @@
+configure
+delete system root-authentication ssh-rsa "<%= contents %>"
+commit and-quit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-junos
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - John Deatherage
@@ -107,6 +107,7 @@ files:
 - templates/guest/junos/hostname.erb
 - templates/guest/junos/network.erb
 - templates/guest/junos/public_key.erb
+- templates/guest/junos/remove_public_key.erb
 - vagrant-junos.gemspec
 homepage: https://github.com/JNPRAutomate/vagrant-junos
 licenses: