gemirro 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ce407f251612fd3198509818414c754d97508355e1fc1a723a08448bfb369f
-  data.tar.gz: 669d4d88aa1db6241b7e8861934d12893accde19fad6454d829a9e143569622b
+  metadata.gz: 1129e2117ef615eddf786284610e84808bd3e2ddd2ab21e8fafc972d9b5923e5
+  data.tar.gz: 2c6325d376cf3be31e8f447549697dfb9df6811da7e6aab17654059bf2a1cae6
 SHA512:
-  metadata.gz: 3c49aa30264c21ca2fb840f5c4b2b6dd6058c5b587e94ff5ae4e94488a00d86f25e0a56de742c9ab8078a6350bb5f15d38119b69decfdd5088e0c8b0ff4dafa6
-  data.tar.gz: 96e25a3b96ca072f6823b8583626b9dd502048e444423af8d50ffcc9040a139daa5aa36314ce914edef2123c335015a6f8f1f758b18a62339fcfe60d3c006afa
+  metadata.gz: 9550ed8196a872207d6db5809e97223f190aba44704c2886b469066f57ff7c5f4ab9ab50c11d8a43f010eef88a718fc7a5f736c3aebbf6fc2fd2a702d9c9b5f3
+  data.tar.gz: '0951b6fd87d27b0c830e25c1774e13fe88e322bcd8277facf4950726da931c4b1de2ee6ad0b8ba71742c9567615a57c742bbffcfb2c69a0a0ef81b67cc7bb8d6'

data/Gemfile

@@ -3,3 +3,12 @@
 source 'https://rubygems.org/'
 
 gemspec
+
+group :development, :test do
+  gem 'fakefs', '~> 2'
+  gem 'rack-test', '~> 1.1'
+  gem 'rake', '~> 13'
+  gem 'rspec', '~> 3.10'
+  gem 'rubocop', '~> 1'
+  gem 'simplecov', '~> 0.21'
+end

data/MANIFEST

@@ -1,6 +1,5 @@
 .gitignore
 .rubocop.yml
-.travis.yml
 Gemfile
 LICENSE
 MANIFEST
@@ -62,9 +61,8 @@ template/public/dist/fonts/glyphicons-halflings-regular.ttf
 template/public/dist/fonts/glyphicons-halflings-regular.woff
 template/public/dist/fonts/glyphicons-halflings-regular.woff2
 template/public/dist/js/bootstrap.min.js
-template/public/dist/js/jquery.min.js
 template/public/gems/.gitkeep
 views/gem.erb
 views/index.erb
 views/layout.erb
-views/not_found.erb
+views/not_found.erb

data/README.md

@@ -29,7 +29,7 @@ This is done by running the `gemirro init` command.
 $ gemirro init /srv/http/mirror.com/
 ```
 
-Once created you can edit the main configuration file called `config.rb`.
+Once created you can edit the main configuration file called [config.rb](https://github.com/PierreRambaud/gemirro/blob/master/template/config.rb).
 This configuration file specifies what source to mirror, destination directory, server host and port, etc.
 
 Once configured and if you add gem in the `define_source`, you can pull them by running the following command:

data/gemirro.gemspec

@@ -18,20 +18,16 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'addressable', '~>2.5'
+  s.add_dependency 'addressable', '~>2.8'
   s.add_dependency 'builder', '~>3.2'
-  s.add_dependency 'confstruct', '~>1.0'
+  s.add_dependency 'confstruct', '~>1.1'
   s.add_dependency 'erubis', '~>2.7'
   s.add_dependency 'httpclient', '~>2.8'
-  s.add_dependency 'parallel', '~>1.20'
-  s.add_dependency 'sinatra', '~>2.0.1'
+  s.add_dependency 'parallel', '~>1.21'
+  s.add_dependency 'sinatra', '>=3.1', '<4.0'
   s.add_dependency 'slop', '~>3.6'
-  s.add_dependency 'thin', '~>1.7'
+  s.add_dependency 'stringio', '~> 3.1'
+  s.add_dependency 'thin', '~>1.8'
 
-  s.add_development_dependency 'fakefs', '~>1'
-  s.add_development_dependency 'rack-test', '~>1.1'
-  s.add_development_dependency 'rake', '~>13'
-  s.add_development_dependency 'rspec', '~>3.10'
-  s.add_development_dependency 'rubocop', '~>1'
-  s.add_development_dependency 'simplecov', '~>0.21'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/gemirro/cli/server.rb

@@ -42,9 +42,7 @@ Gemirro::CLI.options.command 'server' do
   $PROGRAM_NAME = 'gemirro'
 
   def create_pid
-    File.open(@pid_file, 'w') do |f|
-      f.write(Process.pid.to_s)
-    end
+    File.write(@pid_file, Process.pid.to_s)
   rescue Errno::EACCES
     $stdout.reopen @orig_stdout
     puts "Error: Can't write to #{@pid_file} - Permission denied"
@@ -76,7 +74,7 @@ Gemirro::CLI.options.command 'server' do
     puts "done! (PID is #{pid})\n"
     Gemirro::Server.run!
     destroy_pid
-    $stdout.reopen '/dev/null', 'a'
+    $stdout.reopen File::NULL, 'a'
   end
 
   def stop

data/lib/gemirro/http.rb

@@ -29,7 +29,34 @@ module Gemirro
     # @return [HTTPClient]
     #
     def self.client
-      @client ||= HTTPClient.new
+      client ||= HTTPClient.new
+      config = Utils.configuration
+      if defined?(config.upstream_user)
+        user = config.upstream_user
+        password = config.upstream_password
+        domain = config.upstream_domain
+        client.set_auth(domain, user, password)
+      end
+
+      if defined?(config.proxy)
+        proxy = config.proxy
+        client.proxy = (proxy)
+      end
+
+      # Use my own ca file for self signed cert
+      if defined?(config.rootca)
+        abort "The configuration file #{config.rootca} does not exist" unless File.file?(config.rootca)
+        client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        client.ssl_config.set_trust_ca(config.rootca)
+      elsif defined?(config.verify_mode)
+        client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE unless config.verify_mode
+      end
+
+      # Enforce base auth
+      if defined?(config.basic_auth) && config.basic_auth
+        client.www_auth.basic_auth.force_auth = (true)
+      end
+      @client = client
     end
   end
 end

data/lib/gemirro/indexer.rb

@@ -40,8 +40,8 @@ module Gemirro
 
       unless defined?(Builder::XChar)
         raise 'Gem::Indexer requires that the XML Builder ' \
-        'library be installed:' \
-        "\n\tgem install builder"
+              'library be installed:' \
+              "\n\tgem install builder"
       end
 
       options = { build_modern: true }.merge options
@@ -183,7 +183,7 @@ module Gemirro
     def map_gems_to_specs(gems)
       gems.map.with_index do |gemfile, index|
         Utils.logger.info("[#{index + 1}/#{gems.size}]: Processing #{gemfile.split('/')[-1]}")
-        if File.size(gemfile).zero?
+        if File.empty?(gemfile)
           Utils.logger.warn("Skipping zero-length gem: #{gemfile}")
           next
         end

data/lib/gemirro/server.rb

@@ -220,6 +220,8 @@ module Gemirro
         gem_collection.compact!
 
         Parallel.map(gem_collection, in_threads: 4) do |gem, spec|
+          next if spec.nil?
+
           dependencies = spec.dependencies.select do |d|
             d.type == :runtime
           end
@@ -259,7 +261,14 @@ module Gemirro
 
         File.open(spec_file, 'r') do |uz_file|
           uz_file.binmode
-          Marshal.load(::Gem.inflate(uz_file.read))
+          inflater = Zlib::Inflate.new
+          begin
+            inflate_data = inflater.inflate(uz_file.read)
+          ensure
+            inflater.finish
+            inflater.close
+          end
+          Marshal.load(inflate_data)
         end
       end
 

data/lib/gemirro/source.rb

@@ -46,8 +46,8 @@ module Gemirro
     #
     def fetch_prerelease_versions
       Utils.logger.info(
-        "Fetching #{Configuration.prerelease_versions_file}" \
-        " on #{@name} (#{@host})"
+        "Fetching #{Configuration.prerelease_versions_file} " \
+        "on #{@name} (#{@host})"
       )
       Http.get("#{host}/#{Configuration.prerelease_versions_file}").body
     end

data/lib/gemirro/version.rb

@@ -2,5 +2,5 @@
 
 # Gemirro Version
 module Gemirro
-  VERSION = '1.3.0'
+  VERSION = '1.5.0'
 end

data/lib/gemirro.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'builder'
 require 'confstruct'
 require 'digest/sha2'
 require 'fileutils'

data/spec/gemirro/http_spec.rb

@@ -2,34 +2,93 @@ require 'spec_helper'
 require 'httpclient'
 require 'gemirro/http'
 
-# Http tests
 module Gemirro
-  describe 'Http' do
-    it 'should return http client' do
-      expect(Http.client).to be_a(HTTPClient)
+  describe Http do
+    let(:config) { double('Configuration') }
+
+    before do
+      Http.instance_variable_set(:@client, nil)
+      allow(Utils).to receive(:configuration).and_return(config)
     end
 
-    it 'should raise error when get request failed' do
-      uri = 'http://github.com/PierreRambaud'
-      Struct.new('HTTPError', :status, :reason)
-      result = Struct::HTTPError.new(401, 'Unauthorized')
-      allow(Http.client).to receive(:get)
-        .once.with(uri, follow_redirect: true).and_return(result)
-      expect { Http.get(uri) }
-        .to raise_error HTTPClient::BadResponseError, 'Unauthorized'
+    describe '.client' do
+      it 'initializes a new HTTPClient' do
+        expect(Http.client).to be_a(HTTPClient)
+      end
+
+      context 'with proxy configuration' do
+        it 'sets proxy configuration' do
+          allow(config).to receive(:proxy).and_return('http://proxy.example.com:8080')
+
+          expect(Http.client.proxy.to_s).to eq('http://proxy.example.com:8080')
+        end
+      end
+
+      context 'with SSL configuration' do
+        context 'with invalid root CA path' do
+          before do
+            allow(config).to receive(:rootca).and_return('/nonexistent/ca.crt')
+            allow(File).to receive(:file?).with('/nonexistent/ca.crt').and_return(false)
+          end
+
+          it 'aborts with error message' do
+            expect { Http.client }.to raise_error(SystemExit)
+          end
+        end
+
+        context 'with verify_mode disabled' do
+          before do
+            allow(config).to receive(:verify_mode).and_return(false)
+          end
+
+          it 'sets SSL verify mode to VERIFY_NONE' do
+            expect(Http.client.ssl_config.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
+          end
+        end
+      end
+
+      context 'with basic auth forced' do
+        before do
+          allow(config).to receive(:basic_auth).and_return(true)
+        end
+
+        it 'forces basic authentication' do
+          expect(Http.client.www_auth.basic_auth.force_auth).to be true
+        end
+      end
     end
 
-    it 'should execute get request' do
-      uri = 'http://github.com/PierreRambaud'
-      Struct.new('HTTPResponse', :status, :body)
-      result = Struct::HTTPResponse.new(200, 'body content')
-      allow(Http.client).to receive(:get)
-        .once.with(uri, follow_redirect: true).and_return(result)
-
-      response = Http.get(uri)
-      expect(response).to be_a(Struct::HTTPResponse)
-      expect(response.body).to eq('body content')
-      expect(response.status).to eq(200)
+    describe '.get' do
+      let(:client) { instance_double(HTTPClient) }
+
+      before do
+        allow(Http).to receive(:client).and_return(client)
+      end
+
+      context 'with successful response' do
+        let(:response) { double('Response', status: 200, body: 'content') }
+
+        it 'returns response for successful request' do
+          allow(client).to receive(:get)
+            .with('http://example.com', follow_redirect: true)
+            .and_return(response)
+
+          expect(Http.get('http://example.com')).to eq(response)
+        end
+      end
+
+      context 'with error response' do
+        let(:response) { double('Response', status: 404, reason: 'Not Found') }
+
+        it 'raises BadResponseError for failed request' do
+          allow(client).to receive(:get)
+            .with('http://example.com', follow_redirect: true)
+            .and_return(response)
+
+          expect { Http.get('http://example.com') }
+            .to raise_error(HTTPClient::BadResponseError, 'Not Found')
+        end
+      end
     end
   end
-end
+end

data/spec/gemirro/indexer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'builder'
 require 'rubygems/indexer'
 require 'tempfile'
 require 'gemirro/source'
@@ -34,6 +35,8 @@ module Gemirro
     end
 
     it 'should install indices' do
+      allow(Gemirro.configuration).to receive(:destination).and_return('/tmp')
+
       dir = MirrorDirectory.new('/tmp')
       dir.add_directory('test')
       dir.add_directory('gem_generate_index/quick/Marshal.4.8')

data/template/config.rb

@@ -32,6 +32,24 @@ Gemirro.configuration.configure do
   #
   # fetch_gem false
 
+  # If upstream repository requires authentication
+  # upstream_user 'username'
+  # upstream_password 'password'
+  # upstream_domain 'https://internal.com'
+
+  # Enforce the the base_auth
+  # basic_auth true
+
+  # Set the proxy server if behind the firewall
+  # proxy 'http://proxy.internal.com:80'
+
+  # Root CA cert location if additional root ca is added
+  # This will overwrite verfiy_mode. use PEER as default
+  # rootca '/etc/root_ca.crt'
+
+  # Not verify certificate in case the proxy has self-signed cert
+  # verify_mode false
+
   # You must define a source which where gems will be downloaded.
   # All gem in the block will be downloaded with the update command.
   # Other gems will be downloaded with the server.