geminabox 0.13.13 → 0.13.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b298fb245a0113e417fcce0bf3db9a8d6542d7ba
-  data.tar.gz: 1acd400111d6463f9a1ae944f3b5606711504c19
+  metadata.gz: 949c1be5900c19f60e2929f4705f4fb52c374b9e
+  data.tar.gz: cb1cb0184aea7d40c538c85a336e1fa6a262218d
 SHA512:
-  metadata.gz: f59863f086947b6a209f20283f5da9d207ab85498678a372ec207523d1e6ac6d873435f9a67ee492ee5fba124c00fdc7af21b686c51a589bbc6036dd05a82357
-  data.tar.gz: a80ccb39df9ba3f1b741cc7d4d254aea8ba917d5526d5f09ef6829e17a0f26be8c090ae353ca054d30c71ab20515c27f677b2f06fd423d19c932debec765e5ed
+  metadata.gz: 3559801f8459985cd2e31d5ae93c1481c2eafa98b691edbb283b2ce45bc5d31f47c657e79eba102db234385824312901aa788bf4d8293fe0aa5e66cc342177c5
+  data.tar.gz: 9f568c7677a87ca39b4f6ed42fc26b05217080c60c614fb0a3b58714a5abad67313a756f2a20707de6e79a7e4b6b10d35222bd20d6b7076d6d6e475cb06bee2d

data/README.md

@@ -24,6 +24,15 @@ Create a config.ru as follows:
     require "geminabox"
 
     Geminabox.data = "/var/geminabox-data" # ... or wherever
+
+    # Use Rack::Protection to prevent XSS and CSRF vulnerability if your geminabox server is open public.
+    # Rack::Protection requires a session middleware, choose your favorite one such as Rack::Session::Memcache.
+    # This example uses Rack::Session::Pool for simplicity, but please note that:
+    # 1) Rack::Session::Pool is not available for multiprocess servers such as unicorn
+    # 2) Rack::Session::Pool causes memory leak (it does not expire stored `@pool` hash)
+    use Rack::Session::Pool, expire_after: 1000 # sec
+    use Rack::Protection
+
     run Geminabox::Server
 
 Start your gem server with 'rackup' to run WEBrick or hook up the config.ru as you normally would ([passenger](https://www.phusionpassenger.com/), [thin](http://code.macournoyer.com/thin/), [unicorn](https://bogomips.org/unicorn/), whatever floats your boat).

data/lib/geminabox.rb

@@ -52,7 +52,7 @@ module Geminabox
       :allow_remote_failure,
       :ruby_gems_url,
       :bundler_ruby_gems_url,
-      :allow_upload
+      :allow_upload,
     )
 
     def set_defaults(defaults)
@@ -87,7 +87,7 @@ module Geminabox
     allow_remote_failure:  false,
     ruby_gems_url:         'https://rubygems.org/',
     bundler_ruby_gems_url: 'https://bundler.rubygems.org/',
-    allow_upload:          true
+    allow_upload:          true,
   )
     
 end

data/lib/geminabox/gem_store.rb

@@ -91,7 +91,7 @@ module Geminabox
       yield temp_file
       temp_file.close
       File.rename(temp_file.path, file_name)
-      File.chmod(Geminabox::Server.gem_permissions, file_name)
+      File.chmod(Geminabox.gem_permissions, file_name)
     end
 
   end

data/lib/geminabox/hostess.rb

@@ -4,7 +4,7 @@ module Geminabox
 
   class Hostess < Sinatra::Base
     def serve
-      send_file(File.expand_path(File.join(Server.data, *request.path_info)), :type => response['Content-Type'])
+      send_file(File.expand_path(File.join(Gemianbox.data, *request.path_info)), :type => response['Content-Type'])
     end
 
     %w[/specs.4.8.gz

data/lib/geminabox/proxy/hostess.rb

@@ -9,7 +9,7 @@ module Geminabox
         if file_handler
           send_file file_handler.proxy_path
         else
-          send_file(File.expand_path(File.join(Server.data, *request.path_info)), :type => response['Content-Type'])
+          send_file(File.expand_path(File.join(Geminabox.data, *request.path_info)), :type => response['Content-Type'])
         end
       end
 
@@ -55,7 +55,7 @@ module Geminabox
       private
       def get_from_rubygems_if_not_local
 
-        file = File.expand_path(File.join(Server.data, *request.path_info))
+        file = File.expand_path(File.join(Geminabox.data, *request.path_info))
 
         unless File.exist?(file)
           ruby_gems_url = Geminabox.ruby_gems_url

data/lib/geminabox/server.rb

@@ -4,30 +4,10 @@ module Geminabox
 
   class Server < Sinatra::Base
     enable :static, :methodoverride
-    use Rack::Session::Pool, :expire_after => 2592000
-    use Rack::Protection
-
-    def self.delegate_to_geminabox(*delegate_methods)
-      delegate_methods.each{|m| set m, Geminabox.send(m)}
-    end
-
-    delegate_to_geminabox(
-      :public_folder,
-      :data,
-      :build_legacy,
-      :incremental_updates,
-      :views,
-      :allow_replace,
-      :gem_permissions,
-      :allow_delete,
-      :lockfile,
-      :retry_interval,
-      :rubygems_proxy,
-      :ruby_gems_url,
-      :allow_upload
-    )
-
-    if Server.rubygems_proxy
+    set :public_folder, Geminabox.public_folder
+    set :views, Geminabox.views
+
+    if Geminabox.rubygems_proxy
       use Proxy::Hostess
     else
       use Hostess
@@ -35,15 +15,15 @@ module Geminabox
 
     class << self
       def disallow_replace?
-        ! allow_replace
+        ! Geminabox.allow_replace
       end
 
       def allow_delete?
-        allow_delete
+        Geminabox.allow_delete
       end
 
       def allow_upload?
-        allow_upload
+        Geminabox.allow_upload
       end
 
       def fixup_bundler_rubygems!
@@ -54,7 +34,7 @@ module Geminabox
 
       def reindex(force_rebuild = false)
         fixup_bundler_rubygems!
-        force_rebuild = true unless incremental_updates
+        force_rebuild = true unless Geminabox.incremental_updates
         if force_rebuild
           indexer.generate_index
           dependency_cache.flush
@@ -78,15 +58,15 @@ module Geminabox
       end
 
       def indexer
-        Gem::Indexer.new(data, :build_legacy => build_legacy)
+        Gem::Indexer.new(Geminabox.data, :build_legacy => Geminabox.build_legacy)
       end
 
       def dependency_cache
-        @dependency_cache ||= Geminabox::DiskCache.new(File.join(data, "_cache"))
+        @dependency_cache ||= Geminabox::DiskCache.new(File.join(Geminabox.data, "_cache"))
       end
 
       def with_rlock(&block)
-        file_class.open(settings.lockfile, File::RDWR | File::CREAT) do |f|
+        file_class.open(Geminabox.lockfile, File::RDWR | File::CREAT) do |f|
           ReentrantFlock.synchronize(f, File::LOCK_EX | File::LOCK_NB, &block)
         end
       end
@@ -203,7 +183,7 @@ module Geminabox
     def serialize_update(&block)
       with_rlock(&block)
     rescue ReentrantFlock::AlreadyLocked
-      halt 503, { 'Retry-After' => settings.retry_interval }, 'Repository lock is held by another process'
+      halt 503, { 'Retry-After' => Geminabox.retry_interval }, 'Repository lock is held by another process'
     end
 
     def with_rlock(&block)
@@ -243,7 +223,7 @@ HTML
     end
 
     def file_path
-      File.expand_path(File.join(settings.data, *request.path_info))
+      File.expand_path(File.join(Geminabox.data, *request.path_info))
     end
 
     def dependency_cache
@@ -270,7 +250,7 @@ HTML
 
     def specs_files_paths
       specs_file_types.map do |specs_file_type|
-        File.join(settings.data, spec_file_name(specs_file_type))
+        File.join(Geminabox.data, spec_file_name(specs_file_type))
       end
     end
 
@@ -287,7 +267,7 @@ HTML
     end
 
     def gem_list
-      settings.rubygems_proxy ? combined_gem_list : local_gem_list
+      Geminabox.rubygems_proxy ? combined_gem_list : local_gem_list
     end
 
     def query_gems
@@ -322,7 +302,7 @@ HTML
       def spec_for(gem_name, version, platform = default_platform)
         filename = [gem_name, version]
         filename.push(platform) if platform != default_platform
-        spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{filename.join("-")}.gemspec.rz")
+        spec_file = File.join(Geminabox.data, "quick", "Marshal.#{Gem.marshal_version}", "#{filename.join("-")}.gemspec.rz")
         File::open(spec_file, 'r') do |unzipped_spec_file|
           unzipped_spec_file.binmode
           Marshal.load(Gem.inflate(unzipped_spec_file.read))

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.13.13' unless defined? VERSION
+  VERSION = '0.13.14' unless defined? VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.13.13
+  version: 0.13.14
 platform: ruby
 authors:
 - Tom Lea
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Really simple rubygem hosting