omniauth-pam 1.0.0 → 1.1.0

data/README.md

@@ -6,14 +6,25 @@ Allows you to authenticate against PAM using OmniAuth.
 
     use OmniAuth:Strategies::PAM
 
-There are no configuration options. It's been tested under Debian 6.0 and Ruby 1.9.3-p0, but there's no reason why it won't work anywhere which doesn't have PAM correctly configured.
+There are no configuration options. It's been tested under Debian 6.0 (Squeeze) 
+and Ruby 1.9.3, but there's no reason why it won't work anywhere which doesn't 
+have PAM correctly configured. 
+_Note: The above is assumed for Sinatra, check the OmniAuth docs for Rails, et. al. usage._
 
 Then navigate to '/auth/pam'.
 
-On Debian/Ubuntu you will need the `libpam0g-dev` package to compile the [rpam](https://github.com/canweriotnow/rpam-ruby19) gem.Others, I don't know.
+On Debian/Ubuntu you will need the `libpam0g-dev` package to compile the [rpam][] 
+gem. YMMV with others.
 
-This strategy only supports Ruby 1.9. [Read here about 1.8 support](http://nickcharlton.net/post/pam-for-omniauth).
+This strategy only supports Ruby 1.9. [Read here about 1.8 support][oldruby].
 
-## Author / License
+## Credits
+
+Originally hacked together by [Nick Charlton][nick], with modifications by 
+[Jaakko Kantojärvi][jaakko] for GitLab support. Licensed under the MIT license.
+
+[rpam]: https://github.com/canweriotnow/rpam-ruby19
+[oldruby]: http://nickcharlton.net/post/pam-for-omniauth
+[nick]: https://github.com/nickcharlton
+[jaakko]: https://github.com/raphendyr
 
-Copyright Nick Charlton 2012. Licensed under the MIT license.

data/lib/omniauth-pam.rb

@@ -1,6 +1,7 @@
-# depends upon rpam
+# depends upon rpam and etc
 require "rpam"
+require "etc"
 
 # then the rest of the strategy
 require "omniauth-pam/version"
-require "omniauth/pam"
+require "omniauth/strategies/pam"

data/lib/omniauth-pam/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module PAM
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/omniauth/{stategies → strategies}/pam.rb

@@ -6,6 +6,9 @@ module OmniAuth
       option :fields, [:username]
       option :uid_field, :username
 
+      # this map is used to return gecos in info
+      option :gecos_map, [:name, :location, :phone, :home_phone, :description]
+
       def request_phase
         OmniAuth::Form.build(
           :title => (options[:title] || "Authenticate"), 
@@ -17,16 +20,38 @@ module OmniAuth
       end
 
       def callback_phase
-        unless Rpam.auth(request['username'], request['password'])
+        rpam_opts = Hash.new
+        rpam_opts[:service] = options[:service] unless options[:service].nil?
+
+        unless Rpam.auth(request['username'], request['password'], rpam_opts)
           return fail!(:invalid_credentials)
         end
 
         super
       end
 
+      def parse_gecos
+        if options[:gecos_map].kind_of?(Array)
+          begin
+            gecos = Etc.getpwnam(uid).gecos.split(',')
+            Hash[options[:gecos_map].zip(gecos)].delete_if { |k, v| v.nil? }
+          rescue
+          end
+        end
+      end
+
       uid do
         request['username']
       end
+
+      info do
+        {
+          :nickname => uid,
+          :name => uid
+        }.merge!(parse_gecos)
+      end
     end
   end
 end
+
+OmniAuth.config.add_camelization 'pam', 'PAM'

data/omniauth-pam.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "omniauth", '~> 1.0'
-  s.add_runtime_dependency "rpam-ruby19"
+  s.add_runtime_dependency "rpam-ruby19", '~> 1.2.1'
+  s.add_runtime_dependency "etc"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-pam
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nick Charlton
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 +00:00
+date: 2013-02-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: omniauth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -37,16 +34,28 @@ dependencies:
   name: rpam-ruby19
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: etc
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: A PAM strategy for OmniAuth.
 email: 
 - hello@nickcharlton.net
@@ -63,7 +72,7 @@ files:
 - Rakefile
 - lib/omniauth-pam.rb
 - lib/omniauth-pam/version.rb
-- lib/omniauth/stategies/pam.rb
+- lib/omniauth/strategies/pam.rb
 - omniauth-pam.gemspec
 has_rdoc: true
 homepage: https://github.com/nickcharlton/omniauth-pam
@@ -75,27 +84,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: omniauth-pam
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A PAM strategy for OmniAuth.