gitlab-grack 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf3609511e6c0a489c572a4add4f89af65bae4b
-  data.tar.gz: 8ad35782833f609c0dba191250746d5a2dfd20bc
+  metadata.gz: 25c3243797c8eb47ef7a3b23c51b158302e1a678
+  data.tar.gz: 7f61020402644b75ccd37b71b8685b2ffe2bb098
 SHA512:
-  metadata.gz: 4f506cdcc801556af8b5ab796d8ebf46585ef4025805307bc2cef094a653c5a3a2b3efa941bf61f48593def2696b99ba31c4a026e0195309d63e1ede3d70f0e9
-  data.tar.gz: 0c5bb7dd97d1d5f07e57d3642a0f27b3bdc3d65b00586780d0e23a435e16f2ff5fd2f2185b563070ad77cd0ff15e695471466498dc7868af04ba4416e4ebfbd1
+  metadata.gz: 111327afddbdd3c21e878264390031f3a8eec351402c044759dcaefe2403a2d17324e4d2351535dd116e9fa30a6039621f8ac19782c82e2ba2a802394725f3a9
+  data.tar.gz: dc300d7e110cef0d994943c309a3ad92ba91ee6e43432a11d8ba0df55685e5087c401b0edd38d7de951a3e615bbf4650dd34fafe9775cfe408eb5091a8ecbcf7

data/.gitignore

@@ -1,4 +1,5 @@
 coverage/
 examples/*.git
+tests/*.git
 pkg/
 *.gem

data/.travis.yml

@@ -5,10 +5,9 @@ branches:
   only:
     - 'master'
 rvm:
-  - 1.9.3-p327
   - 2.0.0
 before_script:
   - "bundle install"
-  - "git submodule init"
-  - "git submodule update"
+  - "git clone --bare git://github.com/schacon/simplegit.git tests/example.git"
+  - "cd tests/example.git && git repack && cd ../.."
 script: "bundle exec rake"

data/CHANGELOG

@@ -1,3 +1,6 @@
+2.0.1
+  Make sure child processes get reaped after popen, again.
+
 2.0.0
   - Use safer shell commands and avoid Dir.chdir
   - Restrict the environment for shell commands

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-grack (2.0.0.rc2)
+    gitlab-grack (2.0.1)
       rack (~> 1.5.1)
 
 GEM

data/Rakefile

@@ -5,9 +5,13 @@ task :default => :test
 
 desc "Run the tests."
 task :test do
+  system "git clone --bare git://github.com/schacon/simplegit.git tests/example.git"
+  # We could put this in a chdir block but we should keep it consistent with Travis
+  system "cd tests/example.git && git repack && cd ../.."
   Dir.glob("tests/*_test.rb").each do |f|
   	system "ruby #{f}"
   end
+  system "rm -rf tests/example.git"
 end
 
 desc "Run test coverage."

data/lib/grack/git.rb

@@ -16,7 +16,10 @@ module Grack
     end
 
     def capture(cmd)
-      IO.popen(popen_env, cmd, popen_options).read
+      # _Not_ the same as `IO.popen(...).read`
+      # By using a block we tell IO.popen to close (wait for) the child process
+      # after we are done reading its output.
+      IO.popen(popen_env, cmd, popen_options) { |p| p.read }
     end
 
     def execute(cmd)

data/lib/grack/server.rb

@@ -82,7 +82,8 @@ module Grack
           pipe.write(input)
           pipe.close_write
 
-          while block = pipe.read(8192)     # 8KB at a time
+          while !pipe.eof?
+            block = pipe.read(8192)     # 8KB at a time
             @res.write encode_chunk(block)  # stream it to the client
           end
 
@@ -102,13 +103,14 @@ module Grack
 
     def get_info_refs
       service_name = get_service_type
-      return dumb_info_refs unless has_access?(service_name)
+      return dumb_info_refs unless smart_http?(service_name)
+      return render_no_access unless has_access?(service_name)
 
       refs = git.execute([service_name, '--stateless-rpc', '--advertise-refs', git.repo])
 
       @res = Rack::Response.new
       @res.status = 200
-      @res["Content-Type"] = "application/x-git-%s-advertisement" % service_name
+      @res["Content-Type"] = "application/x-git-#{service_name}-advertisement"
       hdr_nocache
 
       @res.write(pkt_write("# service=git-#{service_name}\n"))
@@ -226,10 +228,13 @@ module Grack
       nil
     end
 
+    def smart_http?(rpc = @rpc)
+      @req.content_type ==  "application/x-git-#{rpc}-request"
+    end
+ 
     def has_access?(rpc, check_content_type = false)
       if check_content_type
-        conten_type = "application/x-git-%s-request" % rpc
-        return false unless @req.content_type == conten_type
+        return false unless smart_http?(rpc)
       end
 
       return false unless ['upload-pack', 'receive-pack'].include?(rpc)

data/lib/grack/version.rb

@@ -1,3 +1,3 @@
 module Grack
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/tests/main_test.rb

@@ -25,7 +25,7 @@ class GitHttpTest < Test::Unit::TestCase
   end
 
   def test_upload_pack_advertisement
-    get "/example/info/refs?service=git-upload-pack"
+    get "/example.git/info/refs?service=git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
     assert_equal 200, r.status
     assert_equal "application/x-git-upload-pack-advertisement", r.headers["Content-Type"]
     assert_equal "001e# service=git-upload-pack", r.body.split("\n").first
@@ -33,22 +33,22 @@ class GitHttpTest < Test::Unit::TestCase
   end
 
   def test_no_access_wrong_content_type_up
-    post "/example/git-upload-pack"
+    post "/example.git/git-upload-pack"
     assert_equal 403, r.status
   end
 
   def test_no_access_wrong_content_type_rp
-    post "/example/git-receive-pack"
+    post "/example.git/git-receive-pack"
     assert_equal 403, r.status
   end
 
   def test_no_access_wrong_method_rcp
-    get "/example/git-upload-pack"
+    get "/example.git/git-upload-pack"
     assert_equal 400, r.status
   end
 
   def test_no_access_wrong_command_rcp
-    post "/example/git-upload-packfile"
+    post "/example.git/git-upload-packfile"
     assert_equal 404, r.status
   end
 
@@ -61,13 +61,13 @@ class GitHttpTest < Test::Unit::TestCase
   def test_upload_pack_rpc
     Grack::Git.any_instance.stubs(:valid_repo?).returns(true)
     IO.stubs(:popen).returns(MockProcess.new)
-    post "/example/git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
+    post "/example.git/git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
     assert_equal 200, r.status
     assert_equal "application/x-git-upload-pack-result", r.headers["Content-Type"]
   end
 
   def test_receive_pack_advertisement
-    get "/example/info/refs?service=git-receive-pack"
+    get "/example.git/info/refs?service=git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
     assert_equal 200, r.status
     assert_equal "application/x-git-receive-pack-advertisement", r.headers["Content-Type"]
     assert_equal "001f# service=git-receive-pack", r.body.split("\n").first
@@ -79,25 +79,25 @@ class GitHttpTest < Test::Unit::TestCase
   def test_recieve_pack_rpc
     Grack::Git.any_instance.stubs(:valid_repo?).returns(true)
     IO.stubs(:popen).yields(MockProcess.new)
-    post "/example/git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
+    post "/example.git/git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
     assert_equal 200, r.status
     assert_equal "application/x-git-receive-pack-result", r.headers["Content-Type"]
   end
 
   def test_info_refs_dumb
-    get "/example/.git/info/refs"
+    get "/example.git/info/refs"
     assert_equal 200, r.status
   end
 
   def test_info_packs
-    get "/example/.git/objects/info/packs"
+    get "/example.git/objects/info/packs"
     assert_equal 200, r.status
     assert_match /P pack-(.*?).pack/, r.body
   end
 
   def test_loose_objects
     path, content = write_test_objects
-    get "/example/.git/objects/#{path}"
+    get "/example.git/objects/#{path}"
     assert_equal 200, r.status
     assert_equal content, r.body
     remove_test_objects
@@ -105,7 +105,7 @@ class GitHttpTest < Test::Unit::TestCase
 
   def test_pack_file
     path, content = write_test_objects
-    get "/example/.git/objects/pack/pack-#{content}.pack"
+    get "/example.git/objects/pack/pack-#{content}.pack"
     assert_equal 200, r.status
     assert_equal content, r.body
     remove_test_objects
@@ -113,44 +113,44 @@ class GitHttpTest < Test::Unit::TestCase
 
   def test_index_file
     path, content = write_test_objects
-    get "/example/.git/objects/pack/pack-#{content}.idx"
+    get "/example.git/objects/pack/pack-#{content}.idx"
     assert_equal 200, r.status
     assert_equal content, r.body
     remove_test_objects
   end
 
   def test_text_file
-    get "/example/.git/HEAD"
+    get "/example.git/HEAD"
     assert_equal 200, r.status
-    assert_equal 41, r.body.size  # submodules have detached head
+    assert_equal 23, r.body.size  # submodules have detached head
   end
 
   def test_no_size_avail
     File.stubs('size?').returns(false)
-    get "/example/.git/HEAD"
+    get "/example.git/HEAD"
     assert_equal 200, r.status
-    assert_equal 46, r.body.size  # submodules have detached head
+    assert_equal 28, r.body.size  # submodules have detached head
   end
 
   def test_config_upload_pack_off
     a1 = app
     a1.set_config_setting(:upload_pack, false)
     session = Rack::Test::Session.new(a1)
-    session.get "/example/info/refs?service=git-upload-pack"
-    assert_equal 404, session.last_response.status
+    session.get "/example.git/info/refs?service=git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
+    assert_equal 403, session.last_response.status
   end
 
   def test_config_receive_pack_off
     a1 = app
     a1.set_config_setting(:receive_pack, false)
     session = Rack::Test::Session.new(a1)
-    session.get "/example/info/refs?service=git-receive-pack"
-    assert_equal 404, session.last_response.status
+    session.get "/example.git/info/refs?service=git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
+    assert_equal 403, session.last_response.status
   end
 
   def test_config_bad_service
-    get "/example/info/refs?service=git-receive-packfile"
-    assert_equal 404, r.status
+    get "/example.git/info/refs?service=git-receive-packfile", {}, {"CONTENT_TYPE" => "application/x-git-receive-packfile-request"}
+    assert_equal 403, r.status
   end
 
   def test_git_config_receive_pack
@@ -159,16 +159,16 @@ class GitHttpTest < Test::Unit::TestCase
     session = Rack::Test::Session.new(app1)
     git = Grack::Git
     git.any_instance.stubs(:config).with('http.receivepack').returns('')
-    session.get "/example/info/refs?service=git-receive-pack"
-    assert_equal 404, session.last_response.status
+    session.get "/example.git/info/refs?service=git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
+    assert_equal 403, session.last_response.status
 
     git.any_instance.stubs(:config).with('http.receivepack').returns('true')
-    session.get "/example/info/refs?service=git-receive-pack"
+    session.get "/example.git/info/refs?service=git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
     assert_equal 200, session.last_response.status
 
     git.any_instance.stubs(:config).with('http.receivepack').returns('false')
-    session.get "/example/info/refs?service=git-receive-pack"
-    assert_equal 404, session.last_response.status
+    session.get "/example.git/info/refs?service=git-receive-pack", {}, {"CONTENT_TYPE" => "application/x-git-receive-pack-request"}
+    assert_equal 403, session.last_response.status
   end
 
   def test_git_config_upload_pack
@@ -177,16 +177,16 @@ class GitHttpTest < Test::Unit::TestCase
     session = Rack::Test::Session.new(app1)
     git = Grack::Git
     git.any_instance.stubs(:config).with('http.uploadpack').returns('')
-    session.get "/example/info/refs?service=git-upload-pack"
+    session.get "/example.git/info/refs?service=git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
     assert_equal 200, session.last_response.status
 
     git.any_instance.stubs(:config).with('http.uploadpack').returns('true')
-    session.get "/example/info/refs?service=git-upload-pack"
+    session.get "/example.git/info/refs?service=git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
     assert_equal 200, session.last_response.status
 
     git.any_instance.stubs(:config).with('http.uploadpack').returns('false')
-    session.get "/example/info/refs?service=git-upload-pack"
-    assert_equal 404, session.last_response.status
+    session.get "/example.git/info/refs?service=git-upload-pack", {}, {"CONTENT_TYPE" => "application/x-git-upload-pack-request"}
+    assert_equal 403, session.last_response.status
   end
 
   def test_send_file
@@ -215,7 +215,7 @@ class GitHttpTest < Test::Unit::TestCase
 
   def write_test_objects
     content = Digest::SHA1.hexdigest('gitrocks')
-    base = File.join(File.expand_path(File.dirname(__FILE__)), 'example', '.git', 'objects')
+    base = File.join(File.expand_path(File.dirname(__FILE__)), 'example.git', 'objects')
     obj = File.join(base, '20')
     Dir.mkdir(obj) rescue nil
     file = File.join(obj, content[0, 38])
@@ -229,7 +229,7 @@ class GitHttpTest < Test::Unit::TestCase
 
   def remove_test_objects
     content = Digest::SHA1.hexdigest('gitrocks')
-    base = File.join(File.expand_path(File.dirname(__FILE__)), 'example', '.git', 'objects')
+    base = File.join(File.expand_path(File.dirname(__FILE__)), 'example.git', 'objects')
     obj = File.join(base, '20')
     file = File.join(obj, content[0, 38])
     pack = File.join(base, 'pack', "pack-#{content}.pack")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -48,7 +48,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
 - ".travis.yml"
 - CHANGELOG
 - Gemfile
@@ -92,4 +91,3 @@ specification_version: 4
 summary: Ruby/Rack Git Smart-HTTP Server Handler
 test_files:
 - tests/main_test.rb
-has_rdoc: 

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "tests/example"]
-	path = tests/example
-	url = git://github.com/schacon/simplegit.git