adauth 1.2.1 → 2.0.0pre

data/spec/adauth_ad_object_ou_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Adauth::AdObjects::OU do
+    it "should find Domain Controllers" do
+        default_config
+        domain_controllers.should be_a Adauth::AdObjects::OU
+    end
+    
+    it "should have members" do
+        default_config
+        domain_controllers.members.should be_a Array
+    end
+    
+    it "should have a computer as a member" do
+        default_config
+        domain_controllers.members.first.should be_a Adauth::AdObjects::Computer
+    end
+end

data/spec/adauth_ad_object_user_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Adauth::AdObjects::User do
+    it "should find administrator" do
+        default_config
+        user = administrator
+        user.login.should eq "Administrator"
+    end
+    
+    it "should authenticate a user" do
+        default_config
+        Adauth::AdObjects::User.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_true
+    end
+    
+    it "should find groups" do
+        default_config
+        user = administrator
+        user.groups.should be_a Array
+        user.groups.first.should be_a Adauth::AdObjects::Group
+    end
+    
+    it "should return true for member_of" do
+        default_config
+        user = administrator
+        user.member_of?("Domain Admins").should be_true
+    end
+end

data/spec/adauth_authenticate_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Adauth, "#authenticate" do
+    it "should return a user for authentication" do
+        default_config
+        Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_a Adauth::AdObjects::User
+    end
+    
+    it "should return false for failed authentication" do
+        default_config
+        Adauth.authenticate(test_data("domain", "query_user"), "foo").should be_false
+    end
+    
+    it "should reject a user if denied group is used" do
+        Adauth.configure do |c|
+            c.domain = test_data("domain", "domain")
+            c.port = test_data("domain", "port")
+            c.base = test_data("domain", "base")
+            c.server = test_data("domain", "server")
+            c.query_user = test_data("domain", "query_user")
+            c.query_password = test_data("domain", "query_password")
+            c.denied_groups = ["Administrators"]
+        end
+        Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_false
+    end
+    
+    it "should reject a user if denied ous is used" do
+        Adauth.configure do |c|
+            c.domain = test_data("domain", "domain")
+            c.port = test_data("domain", "port")
+            c.base = test_data("domain", "base")
+            c.server = test_data("domain", "server")
+            c.query_user = test_data("domain", "query_user")
+            c.query_password = test_data("domain", "query_password")
+            c.denied_ous = ["Users"]
+        end
+        Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_false
+    end
+end

data/spec/adauth_config_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Adauth::Config, :no_ad => true do
+    it "should default port to 389" do
+        config = Adauth::Config.new
+        config.port.should eq 389
+    end
+    
+    it "should calculate the default settings" do
+        config = Adauth::Config.new
+        config.domain = "example.com"
+        config.base.should eq "dc=example, dc=com"
+        config.server.should eq "example.com"
+    end
+end

data/spec/adauth_rails_model_bridge_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+class TestUserModel
+    include Adauth::Rails::ModelBridge
+    
+    attr_accessor :name
+    
+    AdauthMappings = {
+        :name => :name
+    }
+    
+    AdauthSearchField = [:name]
+    
+    def self.find_by_name(name)
+        TestUserModel.new
+    end
+    
+    def save
+        return true
+    end
+end
+
+describe Adauth::Rails::ModelBridge do
+    it "should extend", :no_ad => true do
+        TestUserModel.should respond_to :create_from_adauth
+    end
+    
+    it "should create the model" do
+        default_config
+        TestUserModel.create_from_adauth(administrator)
+    end
+    
+    it "should return and create the model" do
+        default_config
+        TestUserModel.return_and_create_from_adauth(administrator)
+    end
+end

data/spec/adauth_spec.rb

@@ -1,36 +1,8 @@
-require 'lib/adauth'
-require 'yaml'
+require 'spec_helper'
 
-describe Adauth, "#configure" do
+describe Adauth, :no_ad => true do
     it "should accept a block" do
         Adauth.configure do |c|
-            c.domain = "test.example.com"
         end
     end
-    
-    it "should correctly calculate the base" do
-        Adauth.config.base.should eq("dc=test, dc=example, dc=com")
-    end
-    
-    it "should set the server to the domain if not specified" do
-        Adauth.config.server.should eq("test.example.com")
-    end
-end
-
-describe Adauth, "#config" do
-    before :each do
-        Adauth.configure do |c|
-            c.domain = "example.com"
-            c.base = "dc=example, dc=com"
-            c.server = "127.0.0.1"
-        end
-    end
-    
-    it "should allow retrival of data" do
-        Adauth.config.domain.should == "example.com"
-    end
-    
-    it "should set port to 389 if not set" do
-        Adauth.config.port.should == 389
-    end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,34 @@
+require 'adauth'
+require 'yaml'
+
+def default_config
+    Adauth.configure do |c|
+        c.domain = test_data("domain", "domain")
+        c.port = test_data("domain", "port")
+        c.base = test_data("domain", "base")
+        c.server = test_data("domain", "server")
+        c.query_user = test_data("domain", "query_user")
+        c.query_password = test_data("domain", "query_password")
+    end
+end
+
+def test_data(set, key)
+    @yaml ||= YAML::load(File.open('spec/test_data.yml'))
+    @yaml[set][key]
+end
+
+def administrator
+    Adauth::AdObjects::User.where('sAMAccountName', "administrator").first
+end
+
+def domain_admins
+    Adauth::AdObjects::Group.where('name', 'Domain Admins').first
+end
+
+def domain_controllers
+    Adauth::AdObjects::OU.where('name', 'Domain Controllers').first
+end
+
+def pdc
+    domain_controllers.members.first
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: adauth
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  prerelease: true
   segments: 
-  - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 0
+  - 0pre
+  version: 2.0.0pre
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock
@@ -15,37 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 +00:00
+date: 2012-08-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: net-ldap
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ldap
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: 
 - gems@arcath.net
@@ -57,23 +64,25 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
-- Readme.rdoc
+- Readme.md
 - adauth.gemspec
 - lib/adauth.rb
-- lib/adauth/admin_connection.rb
+- lib/adauth/ad_object.rb
+- lib/adauth/ad_objects/computer.rb
+- lib/adauth/ad_objects/group.rb
+- lib/adauth/ad_objects/ou.rb
+- lib/adauth/ad_objects/user.rb
 - lib/adauth/authenticate.rb
 - lib/adauth/config.rb
 - lib/adauth/connection.rb
-- lib/adauth/group.rb
-- lib/adauth/helpers.rb
-- lib/adauth/user.rb
-- lib/adauth/user_model.rb
+- lib/adauth/rails.rb
+- lib/adauth/rails/helpers.rb
+- lib/adauth/rails/model_bridge.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
@@ -81,13 +90,15 @@ files:
 - 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/model.rb.erb
-- lib/generators/adauth/user_model/user_model_generator.rb
-- spec/adauth_group_spec.rb
+- spec/adauth_ad_object_computer_spec.rb
+- spec/adauth_ad_object_group_spec.rb
+- spec/adauth_ad_object_ou_spec.rb
+- spec/adauth_ad_object_user_spec.rb
+- spec/adauth_authenticate_spec.rb
+- spec/adauth_config_spec.rb
+- spec/adauth_rails_model_bridge_spec.rb
 - spec/adauth_spec.rb
-- spec/adauth_user_model_spec.rb
-- spec/adauth_user_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://adauth.arcath.net
 licenses: []
@@ -98,32 +109,35 @@ 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"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Provides Active Directory authentication for Rails
 test_files: 
-- spec/adauth_group_spec.rb
+- spec/adauth_ad_object_computer_spec.rb
+- spec/adauth_ad_object_group_spec.rb
+- spec/adauth_ad_object_ou_spec.rb
+- spec/adauth_ad_object_user_spec.rb
+- spec/adauth_authenticate_spec.rb
+- spec/adauth_config_spec.rb
+- spec/adauth_rails_model_bridge_spec.rb
 - spec/adauth_spec.rb
-- spec/adauth_user_model_spec.rb
-- spec/adauth_user_spec.rb
+- spec/spec_helper.rb

data/Readme.rdoc

@@ -1,66 +0,0 @@
-= {Adauth}[http://adauth.arcath.net/]
-
-Easy to use Active Directory Authentication for Rails.
-
-== Install
-
-Add the Adauth gem to your Gemfile:
-
-    gem 'adauth'
-
-and run a bundle install
-
-== Usage
-
-Adauth requires a config file which can be created by running the command
-
-     rails g adauth:config
-
-This creates a config file for _example.com_ with all the values present along with helpful comments for getting Adauth up and running.
-
-Thats enough to very basically run Adauth, and if you prefer complete control over how your authentication is handled you can use this method:
-
-    Adauth.authenticate(username, password)
-
-Which has 2 possible return values nil if the users details are wrong or an instance of Adauth::User if the details are correct.
-
-Adauth provides a lot of additional functionality which can be used to get your authentication up and running quickly. See the {wiki}[https://github.com/Arcath/Adauth/wiki] for more information.
-
-== Developing
-
-Obviously to test the AD functionality Adauth requires a working domain and a user to try logging in with. If you try running the tests without first creating the test_data.yml file then they will fail with this error:
-
-    Failure/Error: @yaml = YAML::load(File.open('spec/test_data.yml'))
-
-You need to create a yaml file that looks like this:
-
-    domain:
-      domain: example.com
-      server: 127.0.0.1
-      port: 389
-      base: "dc=example, dc=com"
-      pass_allowed_groups:
-        - group
-      fail_allowed_groups:
-        - no_group
-      pass_allowed_ous:
-        - ou
-      fail_allowed_ous:
-        - no_ou
-
-    user:
-      login: username
-      password: password
-      group: group
-      ou: ou_user_is_in
-      email: email_of_user_in_ad
-
-The domain portion of this file is pretty self explanatory, they are the same as the code above for creating a domain connection. ALL options need to be set here.
-
-The pass and fail allowed groups need to be an array with pass containing a group that the test user is a member of and fail containing a group that the test user isn't a member of. (The fail group doesn't have to exist)
-
-The user is a user capable of logging into the domain, you can use your account here or any account on the domain. The group attribute needs to be set to a group that you are a member of so that the tests can make sure that the correct groups are picked up from AD.
-
-Don't worry about this file making it into a pull request, it is in the .gitignore file so unless you remove it from there it wont be comitted.
-
-If you make any additions/changes please add some tests for them.