devise_pam_authenticatable2 9.0.0 → 9.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Rakefile +1 -1
- data/VERSION +1 -1
- data/devise_pam_authenticatable2.gemspec +6 -6
- data/lib/devise_pam_authenticatable/model.rb +9 -3
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 56cb77f404bc5d32a123bdaea880909fcdac8e50b7f66d7288bde77cc43d4cd0
|
|
4
|
+
data.tar.gz: 761a17df931637c5d4984c1fef6bb47d0bca86c347becef5459a55836a4a04cd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 04d2b020a01a224968907a211cf8707bb23af5d92abe7a4ef88d2a04a037c05e6301fc565279e5886c3e44c76a9e61fdb7ba57b1dedad9f52818e548f435cbf2
|
|
7
|
+
data.tar.gz: a2679852f5609cb0fa358feea1314a9ec4b0c57846e8a5467e26547339e95a6bf43e0db4fe17524523966368dc8cf0b72225743a288c457c35c988ba7f9fd411
|
data/Rakefile
CHANGED
|
@@ -33,7 +33,7 @@ begin
|
|
|
33
33
|
gemspec.license = "MIT"
|
|
34
34
|
gemspec.authors = ["James Wilson", "Alexander Kaftan"]
|
|
35
35
|
gemspec.add_runtime_dependency "devise", ">= 4.0.0"
|
|
36
|
-
gemspec.add_runtime_dependency "rpam2", "~>
|
|
36
|
+
gemspec.add_runtime_dependency "rpam2", "~> 4.0"
|
|
37
37
|
end
|
|
38
38
|
Jeweler::GemcutterTasks.new
|
|
39
39
|
rescue LoadError
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
9.
|
|
1
|
+
9.1.0
|
|
@@ -2,16 +2,16 @@
|
|
|
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 9.
|
|
5
|
+
# stub: devise_pam_authenticatable2 9.1.0 ruby lib
|
|
6
6
|
|
|
7
7
|
Gem::Specification.new do |s|
|
|
8
8
|
s.name = "devise_pam_authenticatable2".freeze
|
|
9
|
-
s.version = "9.
|
|
9
|
+
s.version = "9.1.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]
|
|
13
13
|
s.authors = ["James Wilson".freeze, "Alexander Kaftan".freeze]
|
|
14
|
-
s.date = "2018-03-
|
|
14
|
+
s.date = "2018-03-23"
|
|
15
15
|
s.description = "For authenticating against PAM (Pluggable Authentication Modules)".freeze
|
|
16
16
|
s.email = "devkral@web.de".freeze
|
|
17
17
|
s.extra_rdoc_files = [
|
|
@@ -38,14 +38,14 @@ Gem::Specification.new do |s|
|
|
|
38
38
|
|
|
39
39
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
40
40
|
s.add_runtime_dependency(%q<devise>.freeze, [">= 4.0.0"])
|
|
41
|
-
s.add_runtime_dependency(%q<rpam2>.freeze, ["~>
|
|
41
|
+
s.add_runtime_dependency(%q<rpam2>.freeze, ["~> 4.0"])
|
|
42
42
|
else
|
|
43
43
|
s.add_dependency(%q<devise>.freeze, [">= 4.0.0"])
|
|
44
|
-
s.add_dependency(%q<rpam2>.freeze, ["~>
|
|
44
|
+
s.add_dependency(%q<rpam2>.freeze, ["~> 4.0"])
|
|
45
45
|
end
|
|
46
46
|
else
|
|
47
47
|
s.add_dependency(%q<devise>.freeze, [">= 4.0.0"])
|
|
48
|
-
s.add_dependency(%q<rpam2>.freeze, ["~>
|
|
48
|
+
s.add_dependency(%q<rpam2>.freeze, ["~> 4.0"])
|
|
49
49
|
end
|
|
50
50
|
end
|
|
51
51
|
|
|
@@ -78,9 +78,15 @@ module Devise
|
|
|
78
78
|
|
|
79
79
|
if resource.blank?
|
|
80
80
|
resource = new
|
|
81
|
-
if ::Devise.check_at_sign &&
|
|
82
|
-
|
|
83
|
-
|
|
81
|
+
if ::Devise.check_at_sign && !attributes[:email].index('@')
|
|
82
|
+
if ::Devise.usernamefield
|
|
83
|
+
# use email as username
|
|
84
|
+
resource[::Devise.usernamefield] = attributes[:email]
|
|
85
|
+
end
|
|
86
|
+
if (email = Rpam2.getenv(resource.find_pam_service, attributes[:email], attributes[:password], 'email', false))
|
|
87
|
+
# set email if found in pam
|
|
88
|
+
resource[::Devise.emailfield] = email
|
|
89
|
+
end
|
|
84
90
|
else
|
|
85
91
|
resource[::Devise.emailfield] = attributes[:email]
|
|
86
92
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: devise_pam_authenticatable2
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 9.
|
|
4
|
+
version: 9.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- James Wilson
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2018-03-
|
|
12
|
+
date: 2018-03-23 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: devise
|
|
@@ -31,14 +31,14 @@ dependencies:
|
|
|
31
31
|
requirements:
|
|
32
32
|
- - "~>"
|
|
33
33
|
- !ruby/object:Gem::Version
|
|
34
|
-
version: '
|
|
34
|
+
version: '4.0'
|
|
35
35
|
type: :runtime
|
|
36
36
|
prerelease: false
|
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
|
38
38
|
requirements:
|
|
39
39
|
- - "~>"
|
|
40
40
|
- !ruby/object:Gem::Version
|
|
41
|
-
version: '
|
|
41
|
+
version: '4.0'
|
|
42
42
|
description: For authenticating against PAM (Pluggable Authentication Modules)
|
|
43
43
|
email: devkral@web.de
|
|
44
44
|
executables: []
|
|
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
75
75
|
version: '0'
|
|
76
76
|
requirements: []
|
|
77
77
|
rubyforge_project:
|
|
78
|
-
rubygems_version: 2.7.
|
|
78
|
+
rubygems_version: 2.7.6
|
|
79
79
|
signing_key:
|
|
80
80
|
specification_version: 4
|
|
81
81
|
summary: Devise PAM authentication module using rpam2
|