adauth 0.1.0 → 1.0.0pre

data/lib/adauth.rb

@@ -10,6 +10,9 @@ module Adauth
         if @config.allowed_groups != []
             user = Adauth::User.authenticate(login, pass)
             (user && @config.allowed_groups != (@config.allowed_groups - user.groups)) ? user : nil
+        elsif @config.denied_groups != []
+            user = Adauth::User.authenticate(login, pass)
+            (user && @config.denied_groups == (@config.denied_groups - user.groups)) ? user : nil
         else
             Adauth::User.authenticate(login, pass)
         end

data/lib/adauth/config.rb

@@ -1,10 +1,11 @@
 module Adauth
     class Config
-        attr_accessor :domain, :port, :base, :server, :allowed_groups
+        attr_accessor :domain, :port, :base, :server, :allowed_groups, :denied_groups
         
         def initialize
            @port = 389
            @allowed_groups = []
+           @denied_groups = []
         end
     end
 end

data/lib/adauth/user_model.rb

@@ -8,9 +8,17 @@ module Adauth
     	   group_strings.split(", ") 
 	    end
 	    
+	    def update_from_adauth(adauth_user)
+	        self.group_strings = adauth_user.groups.join(", ")
+	        self.name = adauth_user.name
+	        self.save
+        end
+	    
 	    module ClassMethods
 	        def return_and_create_with_adauth(adauth_user)
-                find_by_login(adauth_user.login) || create_user_with_adauth(adauth_user)
+                user = (find_by_login(adauth_user.login) || create_user_with_adauth(adauth_user))
+                user.update_from_adauth(adauth_user)
+                return user
             end
 
             def create_user_with_adauth(adauth_user)

data/lib/adauth/version.rb

@@ -1,3 +1,3 @@
 module Adauth
-    Version = "0.1.0"
+    Version = "1.0.0pre"
 end

data/lib/generators/adauth/all/USAGE

@@ -0,0 +1,5 @@
+Description:
+  Runs all the adauth generators with defaults.
+
+Example:
+  rails g adauth:all

data/lib/generators/adauth/all/all_generator.rb

@@ -0,0 +1,11 @@
+module Adauth
+    module Generators
+        class AllGenerator < Rails::Generators::Base
+            def all_generators
+                generate "adauth:config"
+                generate "adauth:user_model"
+                generate "adauth:sessions"
+            end
+        end
+    end
+end

data/lib/generators/adauth/sessions/USAGE

@@ -0,0 +1,7 @@
+Description:
+  Creates a controller for sessions.
+
+Example:
+  rails g adauth:sessions user
+
+  rails g adauth:sessions employee

data/lib/generators/adauth/sessions/sessions_generator.rb

@@ -0,0 +1,23 @@
+module Adauth
+    module Generators
+        class SessionsGenerator < Rails::Generators::Base
+            source_root File.expand_path('../templates', __FILE__)
+            argument :model_name, :type => :string, :default => "user"
+            
+            def generate_sessions
+                template "sessions_controller.rb.erb", "app/controllers/sessions_controller.rb"
+                template "new.html.erb", "app/views/sessions/new.html.erb"
+                route "resources :sessions"
+                route "match \"/adauth\" => \"sessions#create\""
+                route "match \"/signout\" => \"sessions#destroy\""
+                puts "       extra  Add this code to your ApplicationController"
+                puts ""
+                puts "              helper_method :current_user"
+                puts ""
+                puts "              def current_user"
+                puts "                  @current_user ||= User.find(session[:user_id]) if session[:user_id]"
+                puts "              end"
+            end
+        end
+    end
+end

data/lib/generators/adauth/sessions/templates/new.html.erb

@@ -0,0 +1,3 @@
+<h1>Login</h1>
+
+<%%= default_adauth_form %>

data/lib/generators/adauth/sessions/templates/sessions_controller.rb.erb

@@ -0,0 +1,21 @@
+class SessionsController < ApplicationController
+	def new
+		redirect_to root_path if current_user
+	end
+
+	def create
+		ldap_user = Adauth.authenticate(params[:username], params[:password])
+		if ldap_user
+        	user = <%= model_name.camelize %>.return_and_create_with_adauth(ldap_user)
+        	session[:user_id] = user.id
+        	redirect_to root_path
+    	else
+        	redirect_to root_path, :error => "Invalid Login"
+    	end
+	end
+
+	def destroy
+		session[:user_id] = nil
+		redirect_to root_path
+	end
+end

data/lib/generators/adauth/user_model/user_model_generator.rb

@@ -7,7 +7,7 @@ module Adauth
             
             def generate_user_model
                 template "model.rb.erb", "app/models/#{file_name}.rb"
-                template "migration.rb.erb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_#{migration_name_for_array}.rb"
+                generate "migration", "#{migration_name_for_array}", "login:string", "group_strings:string", "name:string"
             end
             
             private

data/spec/adauth_spec.rb

@@ -60,6 +60,16 @@ describe Adauth, "#authenticate" do
        Adauth.config.allowed_groups = @yaml["domain"]["fail_allowed_groups"]
        Adauth.authenticate(@yaml["user"]["login"], @yaml["user"]["password"]).should be_nil
     end
+    
+    it "should dis-allow users who are in a denied group" do
+        Adauth.config.denied_groups = @yaml["domain"]["pass_allowed_groups"]
+        Adauth.authenticate(@yaml["user"]["login"], @yaml["user"]["password"]).should be_nil
+    end
+    
+    it "should dis-allow users who are in a denied group" do
+        Adauth.config.denied_groups = @yaml["domain"]["fail_allowed_groups"]
+        Adauth.authenticate(@yaml["user"]["login"], @yaml["user"]["password"]).should be_a Adauth::User
+    end
 end
 
 describe Adauth::User do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: adauth
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 961915988
+  prerelease: 5
   segments: 
-  - 0
   - 1
   - 0
-  version: 0.1.0
+  - 0
+  - pre
+  version: 1.0.0pre
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 +01:00
+date: 2011-07-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,11 +69,16 @@ files:
 - lib/adauth/user.rb
 - lib/adauth/user_model.rb
 - lib/adauth/version.rb
+- lib/generators/adauth/all/USAGE
+- lib/generators/adauth/all/all_generator.rb
 - lib/generators/adauth/config/USAGE
 - lib/generators/adauth/config/config_generator.rb
 - lib/generators/adauth/config/templates/config.rb.erb
+- lib/generators/adauth/sessions/USAGE
+- lib/generators/adauth/sessions/sessions_generator.rb
+- lib/generators/adauth/sessions/templates/new.html.erb
+- lib/generators/adauth/sessions/templates/sessions_controller.rb.erb
 - lib/generators/adauth/user_model/USAGE
-- lib/generators/adauth/user_model/templates/migration.rb.erb
 - lib/generators/adauth/user_model/templates/model.rb.erb
 - lib/generators/adauth/user_model/user_model_generator.rb
 - spec/adauth_spec.rb
@@ -97,12 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/generators/adauth/user_model/templates/migration.rb.erb

@@ -1,14 +0,0 @@
-class <%= migration_name_for_array.camelize %>
-	def self.up
-		create_table :<%= model_name.pluralize %> do |t|
-			t.string :login
-			t.string :group_strings
-			t.string :name
-			t.timestamps
-		end
-	end
-	
-	def self.down
-		drop_table :<%= model_name.pluralize %>
-	end
-end