gitlab-grack 2.0.0.rc1 → 2.0.0.rc2

data/lib/grack/version.rb

@@ -0,0 +1,3 @@
+module Grack
+  VERSION = "2.0.0.rc2"
+end

data/tests/main_test.rb

@@ -0,0 +1,255 @@
+require 'rack'
+require 'rack/test'
+require 'test/unit'
+require 'mocha'
+require 'digest/sha1'
+
+require_relative '../lib/grack/server.rb'
+require 'pp'
+
+class GitHttpTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def example
+    File.expand_path(File.dirname(__FILE__))
+  end
+
+  def app
+    config = {
+      :project_root => example,
+      :upload_pack => true,
+      :receive_pack => true,
+    }
+    Grack::Server.new(config)
+  end
+
+  def test_upload_pack_advertisement
+    get "/example/info/refs?service=git-upload-pack"
+    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
+    assert_match 'multi_ack_detailed', r.body
+  end
+
+  def test_no_access_wrong_content_type_up
+    post "/example/git-upload-pack"
+    assert_equal 403, r.status
+  end
+
+  def test_no_access_wrong_content_type_rp
+    post "/example/git-receive-pack"
+    assert_equal 403, r.status
+  end
+
+  def test_no_access_wrong_method_rcp
+    get "/example/git-upload-pack"
+    assert_equal 400, r.status
+  end
+
+  def test_no_access_wrong_command_rcp
+    post "/example/git-upload-packfile"
+    assert_equal 404, r.status
+  end
+
+  def test_no_access_wrong_path_rcp
+    post "/example-wrong/git-upload-pack"
+    assert_equal 404, r.status
+  end
+
+  def test_upload_pack_rpc
+    IO.stubs(:popen).returns(MockProcess.new)
+    post "/example/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"
+    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
+    assert_match 'report-status', r.body
+    assert_match 'delete-refs', r.body
+    assert_match 'ofs-delta', r.body
+  end
+
+  def test_recieve_pack_rpc
+    IO.stubs(:popen).yields(MockProcess.new)
+    post "/example/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"
+    assert_equal 200, r.status
+  end
+
+  def test_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}"
+    assert_equal 200, r.status
+    assert_equal content, r.body
+    remove_test_objects
+  end
+
+  def test_pack_file
+    path, content = write_test_objects
+    get "/example/.git/objects/pack/pack-#{content}.pack"
+    assert_equal 200, r.status
+    assert_equal content, r.body
+    remove_test_objects
+  end
+
+  def test_index_file
+    path, content = write_test_objects
+    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"
+    assert_equal 200, r.status
+    assert_equal 41, r.body.size  # submodules have detached head
+  end
+
+  def test_no_size_avail
+    File.stubs('size?').returns(false)
+    get "/example/.git/HEAD"
+    assert_equal 200, r.status
+    assert_equal 46, 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
+  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
+  end
+
+  def test_config_bad_service
+    get "/example/info/refs?service=git-receive-packfile"
+    assert_equal 404, r.status
+  end
+
+  def test_git_config_receive_pack
+    app1 = Grack::Server.new({:project_root => example})
+    session = Rack::Test::Session.new(app1)
+
+    app1.stubs(:get_git_config).with('http.receivepack').returns('')
+    session.get "/example/info/refs?service=git-receive-pack"
+    assert_equal 404, session.last_response.status
+
+    app1.stubs(:get_git_config).with('http.receivepack').returns('true')
+    session.get "/example/info/refs?service=git-receive-pack"
+    assert_equal 200, session.last_response.status
+
+    app1.stubs(:get_git_config).with('http.receivepack').returns('false')
+    session.get "/example/info/refs?service=git-receive-pack"
+    assert_equal 404, session.last_response.status
+  end
+
+  def test_git_config_upload_pack
+    app1 = Grack::Server.new({:project_root => example})
+    session = Rack::Test::Session.new(app1)
+
+    app1.stubs(:get_git_config).with('http.uploadpack').returns('')
+    session.get "/example/info/refs?service=git-upload-pack"
+    assert_equal 200, session.last_response.status
+
+    app1.stubs(:get_git_config).with('http.uploadpack').returns('true')
+    session.get "/example/info/refs?service=git-upload-pack"
+    assert_equal 200, session.last_response.status
+
+    app1.stubs(:get_git_config).with('http.uploadpack').returns('false')
+    session.get "/example/info/refs?service=git-upload-pack"
+    assert_equal 404, session.last_response.status
+  end
+
+  def test_send_file
+    app1 = app
+    app1.instance_variable_set(:@dir, Dir.pwd)
+    # Reject path traversal
+    assert_equal 404, app1.send_file('tests/../tests', 'text/plain').first
+    # Reject paths starting with '|', avoid File.read('|touch /tmp/pawned; ls /tmp')
+    assert_equal 404, app1.send_file('|tests', 'text/plain').first
+  end
+
+  def test_get_git_dir
+    # Guard against non-existent directories
+    assert_equal false, app.get_git_dir('foobar')
+    # Guard against path traversal
+    assert_equal false, app.get_git_dir('/../tests')
+  end
+
+  private
+
+  def r
+    last_response
+  end
+
+  def write_test_objects
+    content = Digest::SHA1.hexdigest('gitrocks')
+    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])
+    File.open(file, 'w') { |f| f.write(content) }
+    pack = File.join(base, 'pack', "pack-#{content}.pack")
+    File.open(pack, 'w') { |f| f.write(content) }
+    idx = File.join(base, 'pack', "pack-#{content}.idx")
+    File.open(idx, 'w') { |f| f.write(content) }
+    ["20/#{content[0,38]}", content]
+  end
+
+  def remove_test_objects
+    content = Digest::SHA1.hexdigest('gitrocks')
+    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")
+    idx = File.join(base, 'pack', "pack-#{content}.idx")
+    File.unlink(file)
+    File.unlink(pack)
+    File.unlink(idx)
+  end
+
+end
+
+class MockProcess
+  def initialize
+    @counter = 0
+  end
+
+  def write(data)
+  end
+
+  def read(data)
+  end
+
+  def eof?
+    @counter += 1
+    @counter > 1 ? true : false
+  end
+
+  def close_write
+    true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grack
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -46,27 +46,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ssh/.gitkeep"
+- ".gitmodules"
+- ".travis.yml"
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
-- Makefile
-- Procfile.example
 - README.md
-- Vagrantfile
-- database.yml.example
-- gitlab-openldap/.gitignore
-- gitlab-openldap/Makefile
-- gitlab-openldap/README.md
-- gitlab-openldap/bootstrap.ldif
-- gitlab-openldap/frontend.alt.example.com.ldif
-- gitlab-openldap/frontend.example.com.ldif
-- gitlab-openldap/run-slapd
-- gitlab-openldap/run-slapd-alt
-- gitlab-satellites/.gitkeep
-- redis/redis.conf.example
-- redis/resque.yml.example
-- repositories/.gitkeep
-- support/edit-gitlab.yml
+- Rakefile
+- examples/dispatch.fcgi
+- grack.gemspec
+- install.txt
+- lib/grack.rb
+- lib/grack/auth.rb
+- lib/grack/bundle.rb
+- lib/grack/server.rb
+- lib/grack/version.rb
+- tests/main_test.rb
 homepage: https://github.com/gitlabhq/grack
 licenses: []
 metadata: {}
@@ -86,8 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby/Rack Git Smart-HTTP Server Handler
-test_files: []
+test_files:
+- tests/main_test.rb

data/Makefile

@@ -1,153 +0,0 @@
-gitlab_repo = https://gitlab.com/gitlab-org/gitlab-ce.git
-gitlab_shell_repo = https://gitlab.com/gitlab-org/gitlab-shell.git
-gitlab_ci_repo = https://gitlab.com/gitlab-org/gitlab-ci.git
-gitlab_runner_repo = https://gitlab.com/gitlab-org/gitlab-ci-runner.git
-gitlab_development_root = $(shell pwd)
-postgres_bin_dir = $(shell pg_config --bindir)
-
-all: gitlab-setup gitlab-shell-setup gitlab-ci-setup gitlab-runner-setup support-setup
-
-# Set up the GitLab Rails app
-
-gitlab-setup: gitlab/.git gitlab-config gitlab/.bundle
-
-gitlab/.git:
-	git clone ${gitlab_repo} gitlab
-
-gitlab-config: gitlab/config/gitlab.yml gitlab/config/database.yml gitlab/config/unicorn.rb gitlab/config/resque.yml
-
-gitlab/config/gitlab.yml:
-	sed -e "s|/home/git|${gitlab_development_root}|"\
-	 gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
-	support/edit-gitlab.yml gitlab/config/gitlab.yml
-
-gitlab/config/database.yml:
-	sed "s|/home/git|${gitlab_development_root}|" database.yml.example > gitlab/config/database.yml
-
-gitlab/config/unicorn.rb:
-	cp gitlab/config/unicorn.rb.example.development gitlab/config/unicorn.rb
-
-gitlab/config/resque.yml:
-	sed "s|/home/git|${gitlab_development_root}|" redis/resque.yml.example > $@
-
-gitlab/.bundle:
-	cd ${gitlab_development_root}/gitlab && bundle install --without mysql production --jobs 4
-
-# Set up gitlab-shell
-
-gitlab-shell-setup: gitlab-shell/.git gitlab-shell/config.yml gitlab-shell/.bundle
-
-gitlab-shell/.git:
-	git clone ${gitlab_shell_repo} gitlab-shell
-
-gitlab-shell/config.yml:
-	sed -e "s|/home/git|${gitlab_development_root}|"\
-	  -e "s|:8080/|:3000|"\
-	  -e "s|/usr/bin/redis-cli|$(shell which redis-cli)|"\
-	  -e "s|^  socket: .*|  socket: ${gitlab_development_root}/redis/redis.socket|"\
-	  gitlab-shell/config.yml.example > gitlab-shell/config.yml
-
-gitlab-shell/.bundle:
-	cd ${gitlab_development_root}/gitlab-shell && bundle install --without production --jobs 4
-
-# Set up gitlab-ci
-gitlab-ci-setup: gitlab-ci/.git gitlab-ci-config gitlab-ci/.bundle
-
-gitlab-ci/.git:
-	git clone ${gitlab_ci_repo} gitlab-ci
-
-gitlab-ci-config: gitlab-ci/config/application.yml gitlab-ci/config/database.yml gitlab-ci/config/resque.yml gitlab-ci/config/unicorn.rb
-
-gitlab-ci/config/application.yml:
-	cp gitlab-ci/config/application.yml.example.development $@
-
-gitlab-ci/config/database.yml:
-	sed -e "s|gitlabhq|gitlabci|"\
-		-e "s|/home/git|${gitlab_development_root}|"\
-		database.yml.example > $@
-
-gitlab-ci/config/resque.yml:
-	sed "s|/home/git|${gitlab_development_root}|" redis/resque.yml.example > $@
-
-gitlab-ci/config/unicorn.rb:
-	cp gitlab-ci/config/unicorn.rb.example.development $@
-
-gitlab-ci/.bundle:
-	cd ${gitlab_development_root}/gitlab-ci && bundle install --without mysql production --jobs 4
-
-gitlab-ci-clean:
-	rm -rf gitlab-ci
-
-# Set up gitlab-runner
-gitlab-runner-setup: gitlab-runner/.git gitlab-runner/.bundle
-
-gitlab-runner/.git:
-	git clone ${gitlab_runner_repo} gitlab-runner
-
-gitlab-runner/.bundle:
-	cd ${gitlab_development_root}/gitlab-runner && bundle install --jobs 4
-
-gitlab-runner-clean:
-	rm -rf gitlab-runner
-
-# Update gitlab, gitlab-shell, gitlab-ci and gitlab-runner
-
-update: gitlab-update gitlab-shell-update gitlab-ci-update gitlab-runner-update
-
-gitlab-update: gitlab/.git/pull
-	cd ${gitlab_development_root}/gitlab && \
-	bundle install --without mysql production --jobs 4 && \
-	bundle exec rake db:migrate
-
-gitlab-shell-update: gitlab-shell/.git/pull
-	cd ${gitlab_development_root}/gitlab-shell && \
-	bundle install --without production --jobs 4
-
-gitlab-ci-update: gitlab-ci/.git/pull
-	cd ${gitlab_development_root}/gitlab-ci && \
-		bundle install --without mysql production --jobs 4 && \
-		bundle exec rake db:migrate
-
-gitlab-runner-update: gitlab-runner/.git/pull
-	cd ${gitlab_development_root}/gitlab-runner && \
-	bundle install
-
-gitlab/.git/pull:
-	cd ${gitlab_development_root}/gitlab && git pull --ff-only
-
-gitlab-shell/.git/pull:
-	cd ${gitlab_development_root}/gitlab-shell && git pull --ff-only
-
-gitlab-ci/.git/pull:
-	cd ${gitlab_development_root}/gitlab-ci && git pull --ff-only
-
-gitlab-runner/.git/pull:
-	cd ${gitlab_development_root}/gitlab-runner && git pull --ff-only
-
-# Set up supporting services
-
-support-setup: Procfile redis postgresql .bundle
-	@echo ""
-	@echo "*********************************************"
-	@echo "************** Setup finished! **************"
-	@echo "*********************************************"
-	sed -n '/^### Post-installation/,/^END Post-installation/p' README.md
-	@echo "*********************************************"
-
-Procfile:
-	sed -e "s|/home/git|${gitlab_development_root}|g"\
-	  -e "s|postgres |${postgres_bin_dir}/postgres |"\
-	  $@.example > $@
-
-redis: redis/redis.conf
-
-redis/redis.conf:
-	sed "s|/home/git|${gitlab_development_root}|" $@.example > $@
-
-postgresql: postgresql/data/PG_VERSION
-
-postgresql/data/PG_VERSION:
-	${postgres_bin_dir}/initdb -E utf-8 postgresql/data
-
-.bundle:
-	bundle install --jobs 4