dory 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728ff696590cecbe3c4a340d55e4c7bf1ffba8d8
-  data.tar.gz: 3579c8d0f9270e0a57d7cf964728371ab890f14c
+  metadata.gz: 24ed2be8a0779c79e065254bb945ec059a634311
+  data.tar.gz: 72ff9651d83a7c410e4da03c57b66aae256aab2c
 SHA512:
-  metadata.gz: 57821f82dbe7f75ce71bb6d8f023301a9d4f288cf6bd9513471e9d95c2ff76d12e8f80468eb5ea28b76aaa82325cb8c814d6feced4a8a5bc017b2b24392bcdeb
-  data.tar.gz: 5766c5e38ba39d3c05abd9fc28aa958c8aa574fbc6dfe2dedd4ab5ed82363e949524ffca8c5c9b4b688dcf34c8b7a2dc0ce1adf29906a5613c31ca7420d88f46
+  metadata.gz: ec1f1020ece19da5c743020935467144bbdbc82f88f5e691f00776a3756093f1e5164b8417f9e2c502b6ac82bf729abd239ccc14b40decbe68ee8ff720da3a50
+  data.tar.gz: 56942f8bfaaa25e2acf542a8b48f477b2ae348959bddff4585fb6585e51990701c693aba36d1026d87aedd8fa53e4fba6cd590eacfe1b0a4859d4d9607310bf3

data/lib/dory/dnsmasq.rb

@@ -21,8 +21,9 @@ module Dory
     end
 
     def self.run_cmd(domain = self.domain, addr = self.addr)
-      "docker run -d -p 53:53/tcp -p 53:53/udp --name=#{self.container_name} " \
-      "--cap-add=NET_ADMIN #{self.dnsmasq_image_name} #{self.domain} #{self.addr}"
+      "docker run -d -p 53:53/tcp -p 53:53/udp --name=#{Shellwords.escape(self.container_name)} " \
+      "--cap-add=NET_ADMIN #{Shellwords.escape(self.dnsmasq_image_name)} " \
+      "#{Shellwords.escape(self.domain)} #{Shellwords.escape(self.addr)}"
     end
   end
 end

data/lib/dory/docker_service.rb

@@ -3,7 +3,7 @@ module Dory
     def start
       unless self.running?
         success = if self.container_exists?
-                    Sh.run_command("docker start #{self.container_name}")
+                    Sh.run_command("docker start #{Shellwords.escape(self.container_name)}")
                   else
                     Sh.run_command(self.run_cmd).success?
                   end
@@ -39,14 +39,14 @@ module Dory
     end
 
     def stop(container_name = self.container_name)
-      Sh.run_command("docker kill #{container_name}") if self.running?
+      Sh.run_command("docker kill #{Shellwords.escape(container_name)}") if self.running?
       !self.running?
     end
 
     def delete(container_name = self.container_name)
       if self.container_exists?
         self.stop if self.running?
-        Sh.run_command("docker rm #{container_name}")
+        Sh.run_command("docker rm #{Shellwords.escape(container_name)}")
       end
       !self.container_exists?
     end

data/lib/dory/proxy.rb

@@ -14,8 +14,9 @@ module Dory
 
     def self.run_cmd
       "docker run -d -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock -e " \
-      "'CONTAINER_NAME=#{self.container_name}' --name " \
-      "'#{self.container_name}' #{dinghy_http_proxy_image_name}"
+        "'CONTAINER_NAME=#{Shellwords.escape(self.container_name)}' --name " \
+        "'#{Shellwords.escape(self.container_name)}' " \
+        "#{Shellwords.escape(dinghy_http_proxy_image_name)}"
     end
   end
 end

data/lib/dory/resolv.rb

@@ -69,7 +69,7 @@ module Dory
     def self.write_to_file(contents)
       # have to use this hack cuz we don't run as root :-(
       puts "Requesting sudo to write to #{self.resolv_file}".green
-      Bash.run_command("echo -e '#{contents}' | sudo tee #{self.resolv_file} >/dev/null")
+      Bash.run_command("echo -e '#{contents}' | sudo tee #{Shellwords.escape(self.resolv_file)} >/dev/null")
     end
 
     def self.resolv_file_contents

data/lib/dory/version.rb

@@ -1,3 +1,3 @@
 module Dory
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize