socialcast 1.0.6 → 1.0.7

data/lib/ext/array_ext.rb

@@ -0,0 +1,11 @@
+class Array
+  def self.wrap(object)
+    if object.nil?
+      []
+    elsif object.respond_to?(:to_ary)
+      object.to_ary
+    else
+      [object]
+    end
+  end
+end

data/lib/socialcast.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'fileutils'
+require File.join(File.dirname(__FILE__), 'ext', 'array_ext') unless Array.respond_to?(:wrap)
 
 module Socialcast
   class << self

data/lib/socialcast/net_ldap_ext.rb

@@ -36,15 +36,20 @@ class Net::LDAP::Entry
 
     membership_attribute = permission_mappings.fetch 'attribute_name', 'memberof'
     memberships = self[membership_attribute]
-    external_ldap_group = permission_mappings.fetch('account_types', {})['external']
-    if external_ldap_group && memberships.include?(external_ldap_group)
+    external_ldap_groups = Array.wrap(permission_mappings.fetch('account_types', {})['external'])
+    if external_ldap_groups.any? { |external_ldap_group| memberships.include?(external_ldap_group) }
       user.tag! 'account-type', 'external'
     else
       user.tag! 'account-type', 'member'
       if permission_roles_mappings = permission_mappings['roles']
         user.tag! 'roles', :type => 'array' do |roles|
-          permission_roles_mappings.each_pair do |socialcast_role, ldap_group|
-            roles.role socialcast_role if memberships.include?(ldap_group)
+          permission_roles_mappings.each_pair do |socialcast_role, ldap_groups|
+            Array.wrap(ldap_groups).each do |ldap_group|
+              if memberships.include?(ldap_group)
+                roles.role socialcast_role
+                break
+              end
+            end
           end
         end
       end

data/lib/socialcast/version.rb

@@ -1,3 +1,3 @@
 module Socialcast
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/cli_spec.rb

@@ -64,6 +64,28 @@ describe Socialcast::CLI do
         @result.should =~ %r{<account-type>external</account-type>}
       end
     end
+    context 'with multiple possible external group member' do
+      before do
+        @entry = Net::LDAP::Entry.new("dc=example,dc=com")
+        @entry[:mail] = 'ryan@example.com'
+        @entry[:isMemberOf] = 'cn=Contractor,dc=example,dc=com'
+
+        Net::LDAP.any_instance.stub(:search).and_yield(@entry)
+
+        @result = ''
+        Zlib::GzipWriter.stub(:open).and_yield(@result)
+        File.stub(:open).with(/ldap.yml/).and_yield(File.read(File.join(File.dirname(__FILE__), 'fixtures', 'ldap_with_array_permission_mapping.yml')))
+        File.stub(:open).with(/users.xml.gz/, anything).and_yield(@result)
+        File.stub(:open).with(/credentials.yml/).and_yield(File.read(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
+
+        RestClient::Resource.any_instance.stub(:post)
+
+        Socialcast::CLI.start ['provision', '-c', 'spec/fixtures/ldap.yml']
+      end
+      it 'sets account-type to external' do
+        @result.should =~ %r{<account-type>external</account-type>}
+      end
+    end
 
     context 'with tenant_admin group member' do
       before do
@@ -90,5 +112,55 @@ describe Socialcast::CLI do
         @result.should =~ %r{<role>tenant_admin</role>}
       end
     end
+    context 'entry isMemberOf Marketing group' do
+      before do
+        @entry = Net::LDAP::Entry.new("dc=example,dc=com")
+        @entry[:mail] = 'ryan@example.com'
+        @entry[:isMemberOf] = 'cn=Marketing,dc=example,dc=com'
+
+        Net::LDAP.any_instance.stub(:search).and_yield(@entry)
+
+        @result = ''
+        Zlib::GzipWriter.stub(:open).and_yield(@result)
+        File.stub(:open).with(/ldap.yml/).and_yield(File.read(File.join(File.dirname(__FILE__), 'fixtures', 'ldap_with_array_permission_mapping.yml')))
+        File.stub(:open).with(/users.xml.gz/, anything).and_yield(@result)
+        File.stub(:open).with(/credentials.yml/).and_yield(File.read(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
+
+        RestClient::Resource.any_instance.stub(:post)
+
+        Socialcast::CLI.start ['provision', '-c', 'spec/fixtures/ldap.yml']
+      end
+      it 'sets account-type to member' do
+        @result.should =~ %r{<account-type>member</account-type>}
+      end
+      it 'adds sbi_admin role' do
+        @result.should =~ %r{<role>sbi_admin</role>}
+      end
+    end
+    context 'entry isMemberOf Engineering group' do
+      before do
+        @entry = Net::LDAP::Entry.new("dc=example,dc=com")
+        @entry[:mail] = 'ryan@example.com'
+        @entry[:isMemberOf] = 'cn=Engineering,dc=example,dc=com'
+
+        Net::LDAP.any_instance.stub(:search).and_yield(@entry)
+
+        @result = ''
+        Zlib::GzipWriter.stub(:open).and_yield(@result)
+        File.stub(:open).with(/ldap.yml/).and_yield(File.read(File.join(File.dirname(__FILE__), 'fixtures', 'ldap_with_array_permission_mapping.yml')))
+        File.stub(:open).with(/users.xml.gz/, anything).and_yield(@result)
+        File.stub(:open).with(/credentials.yml/).and_yield(File.read(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
+
+        RestClient::Resource.any_instance.stub(:post)
+
+        Socialcast::CLI.start ['provision', '-c', 'spec/fixtures/ldap.yml']
+      end
+      it 'sets account-type to member' do
+        @result.should =~ %r{<account-type>member</account-type>}
+      end
+      it 'adds sbi_admin role' do
+        @result.should =~ %r{<role>sbi_admin</role>}
+      end
+    end
   end
 end

data/spec/fixtures/ldap_with_array_permission_mapping.yml

@@ -0,0 +1,50 @@
+--- 
+# LDAP connections
+connections:
+  example_connection_1:
+    username: "cn=Directory Manager"
+    password: "test"
+    host: localhost
+    port: 1389
+    basedn: "dc=example,dc=com"
+    filter: "(mail=*)"
+
+
+# LDAP attribute mappings
+mappings: 
+  first_name: givenName
+  last_name: sn
+  email: mail
+  # only use employee_number if the email is unknown
+  # employee_number: emp_id
+  # only use unique_identifier if you do not wish to use email as the main user identification method
+  # unique_identifier: samaccountname
+
+
+# Map LDAP Group Memberships to Socialcast Permissions
+permission_mappings:
+  # configure LDAP field for group memberships (ex: memberof, isMemberOf, etc)
+  attribute_name: isMemberOf
+  account_types:
+    external: ["cn=External,dc=example,dc=com", "cn=Contractor,dc=example,dc=com"]
+  roles:
+    tenant_admin: "cn=Admins,dc=example,dc=com"
+    sbi_admin: ["cn=Marketing,dc=example,dc=com", "cn=Engineering,dc=example,dc=com"]
+    reach_admin: "cn=ReachAdmins,dc=example,dc=com"
+    town_hall_admin: "cn=TownHallAdmins,dc=example,dc=com"
+
+
+# general script options
+options:
+  # cleanup the extracted ldap data file after run is complete
+  delete_users_file: false
+  # skip sending emails to newly activated users
+  skip_emails: true
+  # do not actually provision accounts
+  # useful during testing
+  test: true
+
+
+# http options for connecting to Socialcast servers
+http:
+  timeout: 660

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-09-13 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -151,6 +152,7 @@ files:
 - Rakefile
 - bin/socialcast
 - config/ldap.yml
+- lib/ext/array_ext.rb
 - lib/socialcast.rb
 - lib/socialcast/cli.rb
 - lib/socialcast/message.rb
@@ -160,8 +162,10 @@ files:
 - spec/cli_spec.rb
 - spec/fixtures/credentials.yml
 - spec/fixtures/ldap.yml
+- spec/fixtures/ldap_with_array_permission_mapping.yml
 - spec/fixtures/ldap_without_permission_mappings.yml
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/wireframe/socialcast-command-line
 licenses: []
 
@@ -191,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: socialcast
-rubygems_version: 1.8.5
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: command line interface to socialcast api
@@ -199,5 +203,6 @@ test_files:
 - spec/cli_spec.rb
 - spec/fixtures/credentials.yml
 - spec/fixtures/ldap.yml
+- spec/fixtures/ldap_with_array_permission_mapping.yml
 - spec/fixtures/ldap_without_permission_mappings.yml
 - spec/spec_helper.rb