puavo_authentication 0.0.17 → 0.0.18

data/lib/puavo_authentication/controllers/helpers.rb

@@ -7,7 +7,12 @@ module PuavoAuthentication
             return @current_user
           else
             begin
-              return @current_user = User.find(session[:dn]) # REST/OAuth?
+              if session[:dn].to_s.match(/ou=People/)
+                return @current_user = User.find(session[:dn])
+              else
+                # If user is ExternalService return nil
+                logger.info "current_user is ExternalServier user:  #{session[:dn]}"
+              end
             rescue
               logger.info "Session's user not found! User is removed from ldap server."
               logger.info "session[:dn]: #{session[:dn]}"
@@ -96,6 +101,13 @@ module PuavoAuthentication
       def set_authorization_user
         Puavo::Authorization.current_user = current_user if current_user
       end
+
+      def remove_authorization_user
+        if Puavo::Authorization.current_user
+          logger.debug "Remove authorization user: " + Puavo::Authorization.current_user.dn.inspect
+        end
+        Puavo::Authorization.current_user = nil
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puavo_authentication
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Jouni Korhonen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-27 00:00:00 +03:00
+date: 2012-09-21 00:00:00 +02:00
 default_executable: 
 dependencies: []