gisha 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b0594a1fe45986e9e48148b14493568fcab357
-  data.tar.gz: d2f52e5418b300d44d8468583b3dc1ea85f8e1fc
+  metadata.gz: 23a165dc20f07b0389d63be595b0573ba241e6a1
+  data.tar.gz: a4db26b3058f4f56efaae71118e6d4a399980242
 SHA512:
-  metadata.gz: dcf47888df6efdc9c70412f592e0393065ba09ddb3e5f96b326b371b8897d441b40c555ca0d5569357ffd065f0b08b431394ebfcf981ee0ecfe792c914b52f14
-  data.tar.gz: 7e383d45f7a4fa7352da5c860559b1be6e30548a1a78da2f366537e767ea41f5f91bcac5ba1f1d9c621f47023a335193374e038b4f01f3475c34da0ed81d48c1
+  metadata.gz: a898671ee83df216bac2019253323ed84845db5007e7a0a2150e2bbb9a4017c6962a780fdf74d5670ae045c59c0c27991a00bd98ef046344eca015ed3801b171
+  data.tar.gz: 17c96c31904d9674bfd1e02d01a7bff0a2aa3c7c1704b33b9854b584f32f48f6bb5215fd4e2deab71ddc5df6bdd26e55824bb02de2526714d102f2f3e37ee13c

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gisha.gemspec
 gemspec
+
+group :development, :test do
+  gem 'coveralls', require: false
+  gem 'rspec'
+  gem 'webmock'
+  gem 'vcr'
+end

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+task default: :spec

data/gisha.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'clamp'
+  spec.add_dependency 'rugged'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'

data/lib/gisha.rb

@@ -1,5 +1,11 @@
 require 'gisha/version'
 
 module Gisha
+
+  module Commands
+    autoload 'Receive', 'gisha/commands/receive'
+    autoload 'Key',     'gisha/commands/key'
+  end
+
   autoload 'CLI', 'gisha/cli'
 end

data/lib/gisha/cli.rb

@@ -1,29 +1,63 @@
 require 'clamp'
+require 'tempfile'
+require 'shellwords'
+
+require 'rugged'
 
 module Gisha
 
-  class AuthCommand < Clamp::Command
-    parameter 'USER', 'username that was provided to the server'
+  class ReceiveCommand < Clamp::Command
+    parameter 'KEY_ID', 'id to identify the key'
+
+    def execute
+      Commands::Receive.new(key_id).exec
+    end
+  end
+
+  class AddKeyCommand < Clamp::Command
+    parameter 'ID', 'id to identify the key'
     parameter 'KEY', 'public key that was provided to the server'
+    parameter 'AUTH_FILE', 'file containing public keys for public key authentication;'
 
     def execute
-      puts "authenticate #{user} with  #{key}"
+      Commands::Key.new(auth_file, id, key).add
     end
 
   end
 
-  class ReceiveCommand < Clamp::Command
-    parameter 'PATH', 'path of the repo that was pushed to'
-    parameter 'COMMIT', 'SHA of the commit that was pushed to master'
+  class DeleleteKeyCommand < Clamp::Command
+    parameter 'ID', 'id to identify the key'
+    parameter 'AUTH_FILE', 'file containing public keys for public key authentication;'
+
+    def execute
+      Commands::Key.new(auth_file, id).del
+    end
+  end
+
+  class CreateRepositoryCommand < Clamp::Command
+    parameter 'PATH', 'path to create repository'
+
+    def execute
+      Rugged::Repository.init_at(path, :bare)
+    end
+  end
+
+  class DeleteRepositoryCommand < Clamp::Command
+    parameter 'PATH', 'path to delete repository'
 
     def execute
-      puts "received #{commit} for repository #{path}"
+      puts "delete repository #{path}"
     end
   end
 
   class CLI < Clamp::Command
-    subcommand 'auth', 'Authenticate user', AuthCommand
-    subcommand 'receive', 'Receive what is pushed into the repository', ReceiveCommand
+    subcommand 'keys:add', 'add new key', AddKeyCommand
+    subcommand 'keys:del', 'delete key', DeleleteKeyCommand
+
+    subcommand 'repositories:create', 'create repository', CreateRepositoryCommand
+    subcommand 'repositories:delete', 'delete repository', DeleteRepositoryCommand
+
+    subcommand 'receive', 'receive what is pushed into the repository', ReceiveCommand
   end
 
 end

data/lib/gisha/commands/key.rb

@@ -0,0 +1,54 @@
+module Gisha
+  class Commands::Key
+    attr_reader :auth_file, :id, :key
+
+    def initialize(auth_file, id, key = nil)
+      @auth_file = auth_file
+      @id = id
+      @key = key
+    end
+
+    def add
+      lock do
+        open(auth_file, 'a') { |file| file.puts(key_line) }
+      end
+    end
+
+    def del
+      lock do
+        Tempfile.open('authorized_keys') do |temp|
+          open(auth_file, 'r+') do |current|
+            current.each do |line|
+              temp.puts(line) unless line.include?("gisha receive key-#{id}")
+            end
+          end
+          temp.close
+          FileUtils.cp(temp.path, auth_file)
+        end
+      end
+    end
+
+
+    private
+
+    def key_line
+      auth_line = "command=\"gisha receive key-#{id}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty #{key}"
+    end
+
+    def lock(timeout = 10)
+      File.open(lock_file, "w+") do |f|
+        begin
+          f.flock File::LOCK_EX
+          Timeout::timeout(timeout) { yield }
+        ensure
+          f.flock File::LOCK_UN
+        end
+      end
+    end
+
+    def lock_file
+      @lock_file ||= auth_file + '.lock'
+    end
+
+  end
+end

data/lib/gisha/commands/receive.rb

@@ -0,0 +1,63 @@
+module Gisha
+  class Commands::Receive
+    class DisallowedCommandError < StandardError; end
+
+    attr_accessor :key_id, :repo_name, :git_cmd, :repos_path, :repo_name
+
+    def initialize(key_id)
+      @key_id = key_id
+    end
+
+    def exec
+      if origin_cmd
+        parse_cmd
+        if git_cmds.include?(git_cmd)
+          process_cmd
+        else
+          raise DisallowedCommandError
+        end
+      end
+    end
+
+    def repos_path
+      @repos_path ||= File.join(ENV['HOME'], "repositories")
+    end
+
+    private
+
+    def process_cmd
+      repo_full_path = File.join(repos_path, repo_name)
+      exec_cmd(@git_cmd, repo_full_path)
+    end
+
+    def exec_cmd(*args)
+      Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'KEY_ID' => key_id}, *args, unsetenv_others: true)
+    end
+
+    def parse_cmd
+      args = Shellwords.shellwords(origin_cmd)
+      raise DisallowedCommandError unless args.count == 2
+      @git_cmd = args[0]
+      @repo_name = escape_path(args[1])
+    end
+
+    def origin_cmd
+      @origin_cmd ||= ENV['SSH_ORIGINAL_COMMAND']
+    end
+
+    def git_cmds
+      %w(git-upload-pack git-receive-pack git-upload-archive)
+    end
+
+    def escape_path(path)
+      full_repo_path = File.join(repos_path, path)
+
+      if File.absolute_path(full_repo_path) == full_repo_path
+        path
+      else
+        abort "Wrong repository path"
+      end
+    end
+
+  end
+end

data/lib/gisha/version.rb

@@ -1,3 +1,3 @@
 module Gisha
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/gisha/commands/receive_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Gisha::Commands::Receive do
+  let(:key_id) { "key-#{rand(100) + 100}" }
+
+  subject do
+    Gisha::Commands::Receive.new(key_id).tap do |receive|
+      allow(receive).to receive_messages(exec_cmd: :exec_called)
+    end
+  end
+
+  describe :initialize do
+    before { ssh_cmd 'git-receive-pack' }
+
+    it { expect(subject.key_id).to be_eql(key_id) }
+  end
+
+
+  describe :parse_cmd do
+    context 'w/o namespace' do
+      before do
+        ssh_cmd 'git-upload-pack gisha.git'
+        subject.send :parse_cmd
+      end
+
+      it { expect(subject.repo_name).to be_eql('gisha.git') }
+      it { expect(subject.git_cmd).to be_eql('git-upload-pack') }
+
+    end
+
+    context 'namespace' do
+      before do
+        ssh_cmd 'git-upload-pack algonauti/gisha.git'
+        subject.send :parse_cmd
+      end
+
+      it { expect(subject.repo_name).to be_eql('algonauti/gisha.git') }
+      it { expect(subject.git_cmd).to be_eql('git-upload-pack') }
+    end
+
+    context 'with an invalid number of arguments' do
+      before { ssh_cmd 'foobar' }
+
+      it "should raise an DisallowedCommandError" do
+        expect { subject.send :parse_cmd }.to raise_error(Gisha::Commands::Receive::DisallowedCommandError)
+      end
+    end
+  end
+
+  describe :exec do
+    context 'git-upload-pack' do
+      before { ssh_cmd 'git-upload-pack gitlab-ci.git' }
+      after { subject.exec }
+
+      it "should process the command" do
+        allow(subject).to receive_messages(process_cmd: :process_cmd_called)
+      end
+    end
+  end
+
+
+  def ssh_cmd(cmd)
+    ENV['SSH_ORIGINAL_COMMAND'] = cmd
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'vcr'
+require 'webmock'
+
+require 'gisha'
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/vcr_cassettes'
+  c.hook_into :webmock
+  c.configure_rspec_metadata!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gisha
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Salvatore Ferrucci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,8 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,7 +83,11 @@ files:
 - gisha.gemspec
 - lib/gisha.rb
 - lib/gisha/cli.rb
+- lib/gisha/commands/key.rb
+- lib/gisha/commands/receive.rb
 - lib/gisha/version.rb
+- spec/lib/gisha/commands/receive_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/algonauti/gisha
 licenses:
 - MIT
@@ -96,4 +112,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily accept and handle arbitrary git pushes
-test_files: []
+test_files:
+- spec/lib/gisha/commands/receive_spec.rb
+- spec/spec_helper.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-gisha

data/.ruby-version

@@ -1 +0,0 @@
-2.1.0