devise_pam_authenticatable2 6.1.1 → 7.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/VERSION +1 -1
- data/devise_pam_authenticatable2.gemspec +2 -2
- data/lib/devise_pam_authenticatable/model.rb +7 -12
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 966160894cd8d15cd2e1bc0ebcb139cd278a37711920678a5b9d8502abaea7ca
|
4
|
+
data.tar.gz: 6b200c6f8a5c925b43b3a1b5de7a217ae916c56a42329847cdbf91058e0e66cf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8ac0af36a708b480290686ffba144019c27dcc130a9ceb67d964bba768aba20cf7f9095ff850081dccc0c08b0fa36a37dac7e5efa05b3b1b3b43286525dd1b54
|
7
|
+
data.tar.gz: 55b4a51494f4e595c76d63bbc063dcd279741bf84ecb76a6d764b21b161cdea2d01db62e8270f81b7fd40a961d145bfb852bfd689a28ec836e10f24ecd3fae26
|
data/README.md
CHANGED
@@ -29,7 +29,7 @@ Important changes
|
|
29
29
|
Versions before 4.0.0 are limitted compatible with database_authenticatable.
|
30
30
|
Some removed code may can clash in earlier versions.
|
31
31
|
|
32
|
-
Version
|
32
|
+
Version 7.0.0 (and 5, 6) change method names. Check if everything is correct.
|
33
33
|
|
34
34
|
Setup
|
35
35
|
-----
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
7.0.0
|
@@ -2,11 +2,11 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: devise_pam_authenticatable2
|
5
|
+
# stub: devise_pam_authenticatable2 7.0.0 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "devise_pam_authenticatable2".freeze
|
9
|
-
s.version = "
|
9
|
+
s.version = "7.0.0"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib".freeze]
|
@@ -4,12 +4,12 @@ module Devise
|
|
4
4
|
module Models
|
5
5
|
module PamAuthenticatable
|
6
6
|
|
7
|
-
def
|
7
|
+
def get_pam_service
|
8
8
|
return self.class.pam_service if self.class.instance_variable_defined?('@pam_service')
|
9
9
|
::Devise.pam_default_service
|
10
10
|
end
|
11
11
|
|
12
|
-
def
|
12
|
+
def get_pam_suffix
|
13
13
|
return self.class.pam_suffix if self.class.instance_variable_defined?('@pam_suffix')
|
14
14
|
::Devise.pam_default_suffix
|
15
15
|
end
|
@@ -29,24 +29,19 @@ module Devise
|
|
29
29
|
|
30
30
|
def is_pam_account?
|
31
31
|
return false unless get_pam_name
|
32
|
-
Rpam2.account(
|
32
|
+
Rpam2.account(get_pam_service, get_pam_name)
|
33
33
|
end
|
34
34
|
|
35
35
|
def pam_setup(attributes)
|
36
36
|
return unless ::Devise.emailfield && ::Devise.usernamefield
|
37
|
-
self[::Devise.emailfield] = Rpam2.getenv(
|
37
|
+
self[::Devise.emailfield] = Rpam2.getenv(get_pam_service, get_pam_name, attributes[:password], 'email', false)
|
38
38
|
self[::Devise.emailfield] = attributes[::Devise.emailfield] if self[::Devise.emailfield].nil?
|
39
|
-
self[::Devise.emailfield] = "#{self[::Devise.usernamefield]}@#{
|
40
|
-
end
|
41
|
-
|
42
|
-
def password_required?
|
43
|
-
false
|
39
|
+
self[::Devise.emailfield] = "#{self[::Devise.usernamefield]}@#{get_pam_suffix}" if self[::Devise.emailfield].nil? && get_pam_suffix
|
44
40
|
end
|
45
41
|
|
46
42
|
def get_pam_name
|
47
43
|
return self[::Devise.usernamefield] if ::Devise.usernamefield && self[::Devise.usernamefield]
|
48
|
-
suffix =
|
49
|
-
return nil unless suffix && ::Devise.emailfield
|
44
|
+
return nil unless ::Devise.emailfield && (suffix = get_pam_suffix)
|
50
45
|
email = "#{self[::Devise.emailfield]}\n"
|
51
46
|
pos = email.index("@#{suffix}\n")
|
52
47
|
return nil unless pos
|
@@ -56,7 +51,7 @@ module Devise
|
|
56
51
|
# Checks if a resource is valid upon authentication.
|
57
52
|
def valid_pam_authentication?(pw)
|
58
53
|
return nil unless get_pam_name
|
59
|
-
Rpam2.auth(
|
54
|
+
Rpam2.auth(get_pam_service, get_pam_name, pw)
|
60
55
|
end
|
61
56
|
|
62
57
|
module ClassMethods
|