github-safegem 0.1.3 → 0.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 1
-:patch: 3
+:minor: 2
+:patch: 0

data/bin/safegem

@@ -7,20 +7,36 @@ require 'rubygems/specification'
 require 'sinatra'
 require 'timeout'
 require 'yaml'
+require 'net/http'
+require 'safegem/exception'
+require 'json'
+require 'base64'
+require 'zlib'
+
+def time
+  t1 = Time.now
+  yield
+  Time.now - t1
+end
 
 post '/' do
+  puts "-> #{params.merge('data' => params[:data].size).inspect}"
   r, w = IO.pipe
 
   pid = nil
   begin
-    repo   = params[:repo]
-    data   = params[:data]
-    tmpdir = "tmp/#{repo}"
-    spec = nil
+    repo     = params[:repo]
+    data     = params[:data]
+    callback = params[:callback]
+    token    = params[:token]
+    tmpdir   = "tmp/#{repo}"
+    spec     = nil
 
-    Timeout::timeout(30) do
-      `git clone --depth 1 git://github.com/#{repo} #{tmpdir}`
+    Timeout::timeout(300) do
+      t = time { `git clone --depth 1 git://github.com/#{repo} #{tmpdir}` }
+      puts "-- cloned #{repo} in #{t}s"
 
+      t1 = Time.now
       pid = fork do
         begin
           r.close
@@ -60,26 +76,52 @@ post '/' do
             spec.validate
           end
 
-          w.write YAML.dump(spec)
+          payload = Base64.encode64(Zlib::Deflate.deflate(YAML.dump(spec)))
+          w.write payload
+          w.close
         rescue Object
-          puts $!,$@
+          puts $!, $@
 
           w.write "ERROR: #$!"
+          w.close
         end
       end
+
       w.close
+      Process.wait(pid)
+      yaml = r.read
+      r.close
+      puts "-- converted to yaml in #{Time.now - t1}s"
 
-      Process.wait pid
-      r.read
-    end
-  rescue Exception
-    Process.kill 9, pid
-    puts $!,$@
+      res = nil
+      t = time do
+        payload = {'token' => token, 'yaml' => yaml}
+        puts "<- [#{callback}] #{payload.merge('yaml' => payload['yaml'].size).inspect}"
+        res = Net::HTTP.post_form(URI.parse(callback), payload)
+      end
+      puts "-> #{res.body.inspect} in #{t}s"
 
-    "ERROR: #$!"
+      # uri = URI.parse(callback)
+      # http = Net::HTTP.new(uri.host)
+      # http.set_debug_output $stdout
+      # http.start do |http|
+      #   req = Net::HTTP::Post.new(uri.path)
+      #   payload = {'token' => token, 'yaml' => yaml}
+      #   req.set_form_data(payload)
+      #   res = http.request(req)
+      #   p res.value
+      # end
+
+      packet = {'result' => "Successfully converted #{repo} gemspec to YAML.", 'error' => nil}
+      puts "<- #{packet.inspect}"
+      packet.to_json
+    end
+  rescue Exception => e
+    Process.kill(9, pid) rescue nil
+    packet = {'error' => e.to_hash}
+    puts "<- #{packet.inspect}"
+    packet.to_json
   ensure
-    `rm -rf #{tmpdir}`  if tmpdir
+    `rm -rf #{tmpdir}` if tmpdir
   end
-end
-
-Sinatra::Application.run!
+end

data/lib/safegem/exception.rb

@@ -0,0 +1,10 @@
+RACK_ENV = 'development'
+
+class Exception
+  def to_hash(extra = nil)
+    h = { 'message' => message }
+    h = h.merge('backtrace' => backtrace) if %w{development staging test}.include?(RACK_ENV)
+    h = h.merge(extra) if extra
+    h
+  end
+end

data/lib/safegem/security.rb

@@ -45,16 +45,15 @@ class String
   end
 end
 
-
-
 # Bug in ruby doesn't check taint when an array of globs is passed
 class << Dir
-  # we need to track $SAFE level manually because define_method captures the $SAFE level
-  # of the current scope, as it would a local varaible, and of course the current scope has a $SAFE of 0
+  # we need to track $SAFE level manually because define_method captures the
+  # $SAFE level of the current scope, as it would a local varaible, and of
+  # course the current scope has a $SAFE of 0
   @@safe_level = 0
 
-  # since this method is defined with def instead of define_method, $SAFE will be taken from
-  # the calling scope which is what we want
+  # since this method is defined with def instead of define_method, $SAFE will
+  # be taken from the calling scope which is what we want
   def set_safe_level
     @@safe_level = $SAFE
   end
@@ -63,7 +62,7 @@ class << Dir
     m = instance_method method_name
     define_method method_name do |*args|
       $SAFE = @@safe_level
-      raise SecurityError  if $SAFE >= 3 and args.flatten.any? {|a| a.tainted? }
+      raise SecurityError if $SAFE >= 3 and args.flatten.any? {|a| a.tainted? }
 
       m.bind(self).call(*args)
     end

data/lib/safegem.rb

@@ -1,2 +1,2 @@
 require 'safegem/lazy_dir'
-require 'safegem/security'
+require 'safegem/security'

data/test/safegem_test.rb

@@ -5,14 +5,18 @@ require 'cgi'
 require 'fileutils'
 require 'open4'
 
-OUTPUT = !!ENV['SERVER_OUTPUT']
-puts "safegem server output disabled, set SERVER_OUTPUT=1 to enable" if ! OUTPUT
+OUTPUT = !!ENV['OUTPUT']
+puts "safegem output disabled, set OUTPUT=1 to enable" if ! OUTPUT
 
 def mv(a, b)
   here = File.dirname(__FILE__)
   FileUtils.mv(File.join(here, a), File.join(here, b))
 end
 
+def log(x)
+  puts x if OUTPUT
+end
+
 # ensure git_mock is in place before running any of these tests
 mv('git', 'git_mock') rescue nil
 
@@ -24,8 +28,10 @@ class SafeGemTest < Test::Unit::TestCase
     mv('git_mock', 'git')
 
     # construct the safegem command
-    cmd = "PATH=#{here}:$PATH ruby #{here}/../bin/safegem.rb"
+    cmd = "PATH=#{here}:$PATH ruby #{here}/../bin/safegem"
     cmd += " > /dev/null 2>&1" unless OUTPUT
+    
+    log(cmd)
 
     # run safegem
     @pid, _, _, _ = Open4::popen4(cmd)
@@ -35,7 +41,9 @@ class SafeGemTest < Test::Unit::TestCase
       begin
         TCPSocket.open('localhost', 4567) {}
         server_started = true
+        log 'good'
       rescue Errno::ECONNREFUSED
+        log 'err'
         server_started = false
         sleep 0.1
         retry
@@ -44,9 +52,11 @@ class SafeGemTest < Test::Unit::TestCase
   end
 
   def teardown
+    log "Killing #{@pid}"
     Process.kill("SIGHUP", @pid)
     mv('git', 'git_mock')
     sleep(0.5) # to let sinatra unbind the socket
+    log "Teardown complete"
   end
 
   def test_access_to_untainted_locals
@@ -55,24 +65,24 @@ class SafeGemTest < Test::Unit::TestCase
     end
   end
 
-  def test_timeout
-    puts "\ntesting 15s timeout"
-    begin
-      timeout(17) do
-        s = req <<-EOS
-          def forever
-            loop{}
-          ensure
-            forever
-          end
-          forever
-        EOS
-        assert_equal "ERROR: execution expired", s
-      end
-    rescue Timeout::Error
-      fail "timed out! no good!"
-    end
-  end
+  # def test_timeout
+  #   puts "\ntesting 30s timeout"
+  #   begin
+  #     timeout(32) do
+  #       s = req <<-EOS
+  #         def forever
+  #           loop{}
+  #         ensure
+  #           forever
+  #         end
+  #         forever
+  #       EOS
+  #       assert_equal "ERROR: execution expired", s
+  #     end
+  #   rescue Timeout::Error
+  #     fail "timed out! no good!"
+  #   end
+  # end
 
   def test_legit_gemspec_works
     gemspec = <<-EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: github-safegem
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - PJ Hyett
@@ -10,10 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-03-29 00:00:00 -07:00
 default_executable: safegem
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.9.1
+    version: 
 description: GitHub's safe gem eval web service
 email: tom@mojombo.com
 executables: 
@@ -26,6 +45,7 @@ files:
 - VERSION.yml
 - bin/safegem
 - lib/safegem
+- lib/safegem/exception.rb
 - lib/safegem/lazy_dir.rb
 - lib/safegem/security.rb
 - lib/safegem.rb