puavo_authentication 0.2.2 → 0.2.3

data/app/controllers/sessions_controller.rb

@@ -13,6 +13,13 @@ class SessionsController < ApplicationController
     redirect_back_or_default root_path
   end
 
+  def auth
+    
+    respond_to do |format|
+      format.json { render :json => true.to_json }
+    end
+  end
+
   def show
     @user = current_user
     respond_to do |format|

data/lib/puavo/authentication.rb

@@ -182,6 +182,10 @@ module Puavo
       dn.rdns[1]["ou"] == "System Accounts"
     end
 
+    def server?
+      dn.rdns[1]["ou"] == "Servers"
+    end
+
     def oauth_client_server?
       dn.rdns.first.keys.first == "puavoOAuthClientId"
     end
@@ -225,6 +229,12 @@ module Puavo
         return @authorized = true
       end
 
+      # Authorize servers
+      if server?
+        logger.info "Authorization ok: Server #{ dn }"
+        return @authorized = true
+      end
+
       raise AuthorizationFailed, "Unauthorized access for #{ dn }"
     end
 

data/lib/puavo_authentication/controllers/helpers.rb

@@ -39,6 +39,7 @@ module PuavoAuthentication
         #  * OAuth Client Server ID & Secrect
         #  * External Service UID & password
         #  * User UID & password
+        #  * Server dn & password
         authenticate_with_http_basic do |username, password|
           logger.debug "Using basic authentication with #{ username }"
 
@@ -65,6 +66,17 @@ module PuavoAuthentication
 
           end
 
+          # Authenticate with server's distinguished name and password
+          if (server_dn = ActiveLdap::DistinguishedName.parse(username) rescue nil)
+            if server_dn.parent.rdns.first["ou"] == "Servers"
+              return {
+                :dn => server_dn,
+                :organisation_key => organisation_key_from_host,
+                :password => password,
+              }
+            end
+          end
+
           return {
             :uid => username,
             :organisation_key => organisation_key_from_host,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puavo_authentication
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jouni Korhonen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-17 00:00:00 +02:00
+date: 2012-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: []