devise_pam_authenticatable2 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f9628d3cf2664bae5f639899ba105b4c7bbcfb2
-  data.tar.gz: b7be5e5d0e46c978b11952d5b760a13779c53493
+  metadata.gz: 5347bab4c20cffd89d87fecb5d7242d9d157fa20
+  data.tar.gz: 152e411c4a5fcfeba64fc9aff53433554f4e62e2
 SHA512:
-  metadata.gz: 2c3ba8094e16ece90da12a97d38ff4ea0b867fceb42a81293accdfe0c0fe20a1a1773ad4892e44ae75c445e068d5cdb9519f5b742a9ebe1536c4d0b784a91e36
-  data.tar.gz: 53bfd564175eb464ebadfc3e89baeabcf0e3a56eb4e38504df28faa73d82fbd2326f45c6ab7e149d742e4d600d0b13aee1a95cf5e196e6b20dcf45ed8bf628bc
+  metadata.gz: 7230c55e58db7b42d852d1f08b3aa25ab67041cce5ddafbd759243f7685906a70e79cce9f258fbe918355f45235456cef2889c23f939506e9bb5f85a349ba6b7
+  data.tar.gz: 077c2fbe42c87b3a4bd5e6eacd437e70432b9aab4c7fb40078ecc8d92d5fa1e0daf1780416761495b7ae55b29ec8ad2381df8288e253a80c50708ecd25f42211

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 [name of plugin creator]
+Copyright (c) 2017 Alexander Kaftan, James Wilson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -23,6 +23,14 @@ Or, to use the latest from github:
 
     gem "devise_pam_authenticatable2", :git => "git://github.com/devkral/devise_pam_authenticatable2.git"
 
+Important changes
+-----------------
+
+Versions before 4.0.0 are limitted compatible with database_authenticatable.
+Some removed code may can clash in earlier versions.
+
+Version 5.0.0 change method names. Check if everything is correct.
+
 Setup
 -----
 
@@ -61,5 +69,3 @@ References
 
 
 Released under the MIT license
-
-Copyright (c) 2011 James Wilson, LithiumCorp Pty Ltd

data/VERSION

@@ -1 +1 @@
-4.0.0
+5.0.0

data/devise_pam_authenticatable2.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise_pam_authenticatable2 4.0.0 ruby lib
+# stub: devise_pam_authenticatable2 5.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_pam_authenticatable2".freeze
-  s.version = "4.0.0"
+  s.version = "5.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["James Wilson".freeze, "Alexander Kaftan".freeze]
-  s.date = "2018-01-16"
+  s.date = "2018-01-17"
   s.description = "For authenticating against PAM (Pluggable Authentication Modules)".freeze
   s.email = "devkral@web.de".freeze
   s.extra_rdoc_files = [

data/lib/devise_pam_authenticatable/model.rb

@@ -14,13 +14,22 @@ module Devise
         ::Devise.pam_default_suffix
       end
 
-      def pam_on_filled_pw(_attributes)
-        # use blank password as discriminator between traditional login and pam login?
+      def on_pam_conflict(_attributes)
         # to disable login with pam return nil elsewise return a (different?) user object
-        # as default assume there is no conflict and return user object
+        # as default assume there is never a conflict and return user object
         self
       end
 
+      def is_pam_conflict
+        # use blank password as discriminator between traditional login and pam login?
+        is_pam_account && resource.respond_to?('password') && resource.password.present?
+      end
+
+      def is_pam_account
+        return false unless get_pam_name
+        Rpam2.account(get_service, get_pam_name)
+      end
+
       def pam_setup(attributes)
         return unless ::Devise.emailfield && ::Devise.usernamefield
         self[::Devise.emailfield] = Rpam2.getenv(get_service, get_pam_name, attributes[:password], 'email', false)
@@ -78,7 +87,7 @@ module Devise
           end
 
           # potential conflict detected
-          resource = resource.pam_on_filled_pw(attributes) if resource.respond_to?('password') && resource.password.present?
+          resource = resource.on_pam_conflict(attributes) if resource.is_pam_conflict
 
           return nil unless resource && resource.try(:valid_pam_authentication?, attributes[:password])
           if resource.new_record?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_pam_authenticatable2
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - James Wilson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise