gollum-auth 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbd79ba09fbb336544e7ef52c1000a385b748c2
-  data.tar.gz: d6a259ada4ef14639d287edeaefeb8e9dad93b38
+  metadata.gz: 2332f8bd41813aec6b0160d881a45938a7cd09ea
+  data.tar.gz: 0c670cedc7983d9408c5aa6d773ba0d88031d7e3
 SHA512:
-  metadata.gz: adae779482ba1f8b3e5698591658078086132bf1c28d6c5b71cafe9604256f4b984379285940c19c001ab1be29b0fcb26ecc4dd8cade1470955b59285786ec4f
-  data.tar.gz: f42ee673c27678a7aadaa42bee5e64ba659dd46f4a02886205cfdeb27c75e15976a6acab34213a7918a208e8b74716a3300b2745a610321ea345c0419e6d8118
+  metadata.gz: ffdc89c8f9a2b0164d134b2fd6e9c007e562da21595bec50e58755250809ee90c4d7a7d3f360bf164ed74131004b261bc680dbe41be16db8704d19d08ccf9af1
+  data.tar.gz: 20b0807e3131edb0306b1b1f19ee9e34b063a186433aad2306b87228c9edbfea6d44cd08668ed88f5e614e3889bebbbbceb35af10a6e29560a39b4d79501d6b3

data/README.md

@@ -47,6 +47,10 @@ require 'gollum/app'
 
 # Define list of authorized users.
 # Each user must have a username, password, name and email.
+#
+# Instead of a password you can also define a password_digest, which is the
+# SHA-256 hash of a password.
+#
 # Example:
 users = YAML.load %q{
 ---
@@ -55,7 +59,7 @@ users = YAML.load %q{
   name: Rick Sanchez
   email: rick@example.com
 - username: morty
-  password: 12345
+  password_digest: 5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5
   name: Morty Smith
   email: morty@example.com
 }

data/lib/gollum/auth.rb

@@ -1,3 +1,4 @@
+require 'digest'
 require 'rack'
 require 'active_model'
 require 'gollum/auth/version'
@@ -21,15 +22,10 @@ module Gollum
         request = Request.new(env)
         if request.needs_authentication?(@opts[:allow_guests])
           auth = Rack::Auth::Basic::Request.new(env)
-          if auth.provided? && auth.basic? && valid?(auth.credentials)
-            user = User.find(auth.credentials.first)
+          if auth.provided? && auth.basic? && user = User.find_by_credentials(auth.credentials)
             request.store_author_in_session(user)
           else
-            return [
-              401,
-              { 'Content-Type' => 'text/plain', 'WWW-Authenticate' => 'Basic realm="Gollum Wiki"' },
-              [ 'Not authorized' ]
-            ]
+            return not_authorized
           end
         end
         @app.call(env)
@@ -37,14 +33,15 @@ module Gollum
 
       private
 
-      def valid?(credentials)
-        username, password = credentials
-        current_user = User.find(username)
-        current_user && current_user.valid_password?(password)
-      end
-
-      def users
-        User.all
+      def not_authorized
+        [
+          401,
+          {
+            'Content-Type'     => 'text/plain',
+            'WWW-Authenticate' => 'Basic realm="Gollum Wiki"'
+          },
+          [ 'Not authorized' ]
+        ]
       end
     end
   end

data/lib/gollum/auth/user.rb

@@ -5,12 +5,19 @@ module Gollum::Auth
   class User
     include ActiveModel::Model
 
-    attr_accessor :username, :password, :name, :email
+    attr_accessor :username, :password_digest, :name, :email
 
-    validates_presence_of :username, :password, :name, :email
+    validates_presence_of :username, :password_digest, :name, :email
     validates_format_of :username, with: /\A[\w\.-]+\Z/
+    validates_format_of :password_digest, with: /\A[0-9a-f]{64}\Z/
 
     class << self
+      def find_by_credentials(credentials)
+        username, password = credentials
+        user = find(username)
+        user if user && user.valid_password?(password)
+      end
+
       def find(username)
         all.select { |u| u.username == username }.first
       end
@@ -18,6 +25,10 @@ module Gollum::Auth
       def all
         @all ||= []
       end
+
+      def delete_all
+        @all = []
+      end
     end
 
     def save!
@@ -25,15 +36,23 @@ module Gollum::Auth
     end
 
     def save
-      (self.class.all << self; self) if valid?
+      valid? ? (self.class.all << self; true) : false
     end
 
-    def valid_password?(other)
-      password == other
+    def valid_password?(password)
+      password_digest == build_digest(password)
+    end
+
+    def password=(password)
+      self.password_digest = build_digest(password) if password
     end
 
     private
 
+    def build_digest(password)
+      Digest::SHA256.hexdigest(password)
+    end
+
     def error_message
       errors.full_messages.join(', ')
     end

data/lib/gollum/auth/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Auth
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-auth
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Björn Albers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -168,5 +168,5 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: gollum-auth-0.5.0
+summary: gollum-auth-0.6.0
 test_files: []