gollum-auth 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f11124c0363460f5a500d9826d59a6aef5113d7
-  data.tar.gz: 8995f52afaeb8882d9bbc25a7b5dc5ea78b77a67
+  metadata.gz: 8ffe32ffcc69a484479b80d7ab04e63c25cfcfa8
+  data.tar.gz: 67fcf09d1b7823c3a6c3dda80270bc4ac84f6825
 SHA512:
-  metadata.gz: 1b86349eec083d811492ba09c7a622e5b04cd25d4c414acb7447ba25f583606dd40695e716e6e454117250ba2ddf4444555dc9d77e291f48561cf845f70635b9
-  data.tar.gz: 889a48bd66f3f0a92a1868077128e13a710b7d6b21ec9870ff3d560923c7f7ec60d4999f4fe167a22f1c8a999f905f151246471015ee831b1e69641b7a71443d
+  metadata.gz: 8ad20010ba4dc43508b272a11d00d1b61aeacbc63593b7c0f1b3e4171eff522af71e0181374cb384bd2d836256ee19aec8e8bc88b77b9c8a238b9a9e66a39054
+  data.tar.gz: c9f4e1cb96772a9090e967338b1b64eb48b5d3df60dd5d99ab096bda803c01799e1623e9c368b3fa250ddcb1310ed8a94e2b4de1aa8ecaba4df50ea7fa20c49e

data/README.md

@@ -13,6 +13,7 @@ to gollum so that only authenticated users have access to your wiki.
 Optionally you can allow readonly-access for unauthenticated guests.
 Also the current user's name and e-mail are passed to gollum (via session key
 `gollum.author`) to see who changed what.
+It works with Gollum 4 and Gollum 5.
 
 
 ## Installation
@@ -65,7 +66,7 @@ users = YAML.load %q{
 }
 
 # Allow unauthenticated users to read the wiki (disabled by default).
-options = { allow_guests: true }
+options = { allow_unauthenticated_readonly: true }
 
 # Allow only authenticated users to change the wiki.
 # (NOTE: This must be loaded *before* Precious::App!)

data/gollum-auth.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rack', '~> 1.6'
+  spec.add_dependency 'rack'
   spec.add_dependency 'activemodel', '~> 4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/lib/gollum/auth.rb

@@ -15,12 +15,12 @@ module Gollum
       def initialize(app, users, opts = { })
         @app = app
         users.each { |args| User.new(args).save! }
-        @opts = { allow_guests: false }.merge(opts)
+        @opts = { allow_unauthenticated_readonly: false }.merge(opts)
       end
 
       def call(env)
         request = Request.new(env)
-        if request.needs_authentication?(@opts[:allow_guests])
+        if request.requires_authentication?(@opts[:allow_unauthenticated_readonly])
           auth = Rack::Auth::Basic::Request.new(env)
           if auth.provided? && auth.basic? && user = User.find_by_credentials(auth.credentials)
             request.store_author_in_session(user)

data/lib/gollum/auth/request.rb

@@ -1,7 +1,13 @@
 module Gollum::Auth
   class Request < Rack::Request
-    def needs_authentication?(allow_guests)
-      !allow_guests || is_change_request?
+    WRITE_PATH_RE = %r{
+      ^/
+      (gollum/)? # This path prefix was introduced in Gollum 5
+      (create/|edit/|delete/|rename/|revert/|uploadFile$|upload_file$)
+    }x
+
+    def requires_authentication?(allow_unauthenticated_readonly)
+      !allow_unauthenticated_readonly || is_write_path?
     end
 
     def store_author_in_session(user)
@@ -10,10 +16,9 @@ module Gollum::Auth
 
     private
 
-    # Returns true if the request includes a path that would result in a change
-    # of the wiki.
-    def is_change_request?
-      !!(path_info =~ /^\/(create|edit|delete|rename|revert|uploadFile)(\/.*)?$/)
+    # Returns true if path is a write path that would change the wiki.
+    def is_write_path?
+      !!(path_info =~ WRITE_PATH_RE)
     end
   end
 end

data/lib/gollum/auth/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Auth
-    VERSION = '0.6.2'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-auth
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Björn Albers
@@ -14,16 +14,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -168,5 +168,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: gollum-auth-0.6.2
+summary: gollum-auth-0.7.0
 test_files: []