socialcast 1.0.1 → 1.0.2

data/lib/socialcast/cli.rb

@@ -149,13 +149,16 @@ module Socialcast
                   end
 
                   memberships = entry[membership_attribute]
-                  if memberships.include?(permission_mappings['account_types']['external'])
+                  external_ldap_group = permission_mappings.fetch('account_types', {})['external']
+                  if external_ldap_group && memberships.include?(external_ldap_group)
                     user.tag! 'account-type', 'external'
                   else
                     user.tag! 'account-type', 'member'
-                    user.tag! 'roles', :type => 'array' do |roles|
-                      permission_mappings['roles'].each_pair do |socialcast_role, ldap_role|
-                        roles.role socialcast_role if entry[membership_attribute].include?(ldap_role)
+                    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 entry[membership_attribute].include?(ldap_group)
+                        end
                       end
                     end
                   end

data/lib/socialcast/version.rb

@@ -1,3 +1,3 @@
 module Socialcast
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/cli_spec.rb

@@ -2,6 +2,27 @@ require 'spec_helper'
 
 describe Socialcast::CLI do
   describe '#provision' do
+    context 'with ldap.yml configuration excluding permission_mappings' do
+      before do
+        @entry = Net::LDAP::Entry.new("dc=example,dc=com")
+        @entry[:mail] = 'ryan@example.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_without_permission_mappings.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 'excludes roles element' do
+        @result.should_not =~ %r{roles}
+      end
+    end
     context 'with external group member' do
       before do
         @entry = Net::LDAP::Entry.new("dc=example,dc=com")

data/spec/fixtures/ldap_without_permission_mappings.yml

@@ -0,0 +1,53 @@
+--- 
+# 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"
+#   roles:
+#     tenant_admin: "cn=Admins,dc=example,dc=com"
+#     sbi_admin: "cn=SbiAdmins,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
+  # optional setting if script must connect to Socialcast server through a proxy
+  # proxy: "http://username:password@proxy.company.com:3128"
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -159,6 +159,7 @@ files:
 - spec/cli_spec.rb
 - spec/fixtures/credentials.yml
 - spec/fixtures/ldap.yml
+- spec/fixtures/ldap_without_permission_mappings.yml
 - spec/spec_helper.rb
 homepage: http://github.com/wireframe/socialcast-command-line
 licenses: []
@@ -197,4 +198,5 @@ test_files:
 - spec/cli_spec.rb
 - spec/fixtures/credentials.yml
 - spec/fixtures/ldap.yml
+- spec/fixtures/ldap_without_permission_mappings.yml
 - spec/spec_helper.rb