ruby-ldap 0.9.11 → 0.9.12

data/lib/ldap/schema.rb

@@ -15,9 +15,9 @@ module LDAP
 
     def initialize(entry)
       if( entry )
-	entry.each{|key,vals|
-	  self[key] = vals
-	}
+        entry.each do |key, vals|
+          self[key] = vals
+        end
       end
     end
 
@@ -32,14 +32,15 @@ module LDAP
     # +at+. +at+ may be the string *MUST*, *MAY* or *SUP*.
     #
     def attr(oc,at)
-      self['objectClasses'].each{|s|
-	if( s =~ /NAME\s+'#{oc}'/ )
-	  case s
-	  when /#{at}\s+\(([\w\d_\-\s\$]+)\)/i then return $1.split("$").collect{|attr| attr.strip}
-	  when /#{at}\s+([\w\d_\-]+)/i then return $1.split("$").collect{|attr| attr.strip}
-	  end
-	end
-      }
+      self['objectClasses'].each do |s|
+        if( s =~ /NAME\s+'#{oc}'/ )
+          case s
+          when /#{at}\s+\(([\w\d_\-\s\$]+)\)/i then return $1.split("$").collect{|attr| attr.strip}
+          when /#{at}\s+([\w\d_\-]+)/i then return $1.split("$").collect{|attr| attr.strip}
+          end
+        end
+      end
+
       return nil
     end
 
@@ -62,6 +63,7 @@ module LDAP
     def sup(oc)
       attr(oc, "SUP")
     end
+
   end
 
   class Conn
@@ -76,23 +78,24 @@ module LDAP
     #
     # +sec+ and +usec+ can be used to specify a time-out for the search in
     # seconds and microseconds, respectively.
-    # 
+    #
     def schema(base = nil, attrs = nil, sec = 0, usec = 0)
       attrs ||= [
-	'objectClasses',
-	'attributeTypes',
-	'matchingRules',
-	'matchingRuleUse',
-	'dITStructureRules',
-	'dITContentRules',
-	'nameForms',
-	'ldapSyntaxes',
+        'objectClasses',
+        'attributeTypes',
+        'matchingRules',
+        'matchingRuleUse',
+        'dITStructureRules',
+        'dITContentRules',
+        'nameForms',
+        'ldapSyntaxes',
       ]
       base ||= root_dse(['subschemaSubentry'], sec, usec)[0]['subschemaSubentry'][0]
       base ||= 'cn=schema'
-      ent = search2(base, LDAP_SCOPE_BASE, '(objectClass=subschema)',
-		    attrs, false, sec, usec)
-      return Schema.new(ent[0])
+      entries = search2(base, LDAP_SCOPE_BASE, '(objectClass=subschema)',
+        attrs, false, sec, usec)
+
+      return Schema.new(entries[0])
     end
 
     # Fetch the root DSE (DSA-specific Entry) for the connection. DSA stands
@@ -110,20 +113,23 @@ module LDAP
     #
     def root_dse(attrs = nil, sec = 0, usec = 0)
       attrs ||= [
-	'subschemaSubentry',
-	'namingContexts',
-	'monitorContext',
-	'altServer',
-	'supportedControl',
-	'supportedExtension',
-	'supportedFeatures',
-	'supportedSASLMechanisms',
-	'supportedLDAPVersion',
+        'subschemaSubentry',
+        'namingContexts',
+        'monitorContext',
+        'altServer',
+        'supportedControl',
+        'supportedExtension',
+        'supportedFeatures',
+        'supportedSASLMechanisms',
+        'supportedLDAPVersion',
       ]
 
       entries = search2('', LDAP_SCOPE_BASE, '(objectClass=*)',
-			attrs, false, sec, usec)
+        attrs, false, sec, usec)
+
       return entries
     end
+
   end
+
 end

data/mod.c

@@ -18,6 +18,7 @@ rb_ldap_mod_free (RB_LDAPMOD_DATA * data)
       char **svals;
       int i;
 
+      xfree(data->mod->mod_type);
       if (data->mod->mod_op & LDAP_MOD_BVALUES)
 	{
 	  bvals = data->mod->mod_vals.modv_bvals;
@@ -38,6 +39,7 @@ rb_ldap_mod_free (RB_LDAPMOD_DATA * data)
 	}
       xfree (data->mod);
     }
+    xfree (data);
 }
 
 static LDAPMod *
@@ -52,7 +54,8 @@ rb_ldap_new_mod (int mod_op, char *mod_type, char **modv_strvals)
 
   mod = ALLOC_N (LDAPMod, 1);
   mod->mod_op = mod_op;
-  mod->mod_type = mod_type;
+  mod->mod_type = ALLOC_N(char,strlen(mod_type) + 1);
+  strcpy(mod->mod_type, mod_type);
   mod->mod_vals.modv_strvals = modv_strvals;
 
   return mod;
@@ -83,7 +86,8 @@ rb_ldap_new_mod2 (int mod_op, char *mod_type, struct berval **modv_bvals)
 
   mod = ALLOC_N (LDAPMod, 1);
   mod->mod_op = mod_op;
-  mod->mod_type = mod_type;
+  mod->mod_type = ALLOC_N(char,strlen(mod_type) + 1);
+  strcpy(mod->mod_type, mod_type);
   mod->mod_vals.modv_bvals = modv_bvals;
 
   return mod;
@@ -148,7 +152,7 @@ rb_ldap_mod_initialize (int argc, VALUE argv[], VALUE self)
     return Qnil;
 
   mod_op = NUM2INT (op);
-  mod_type = StringValueCStr (type);
+  mod_type = RSTRING_PTR(type);
   Check_Type (vals, T_ARRAY);
 
   if (mod_op & LDAP_MOD_BVALUES)

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 11
-#define RB_LDAP_VERSION "0.9.11"
+#define RB_LDAP_PATCH_VERSION 12
+#define RB_LDAP_VERSION "0.9.12"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 
@@ -140,13 +140,13 @@ VALUE rb_ldap_mod_vals (VALUE);
 };
 
 #define Check_LDAP_Result(err) { \
-  if( err != LDAP_SUCCESS && err != LDAP_SIZELIMIT_EXCEEDED ){ \
+  if( (err) != LDAP_SUCCESS && (err) != LDAP_SIZELIMIT_EXCEEDED ){ \
     rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
   } \
 }
 
 #define Check_LDAP_OPT_Result(err) { \
-  if( err != LDAP_OPT_SUCCESS ){ \
+  if( (err) != LDAP_OPT_SUCCESS ){ \
     rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
   } \
 }
@@ -162,16 +162,18 @@ VALUE rb_ldap_mod_vals (VALUE);
   RB_LDAPENTRY_DATA *ptr; \
   Data_Get_Struct(obj, struct rb_ldapmsg_data, ptr); \
   if( ! ptr->msg ){ \
+    VALUE value = rb_inspect(obj); \
     rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \
-	     STR2CSTR(rb_inspect(obj))); \
+	     StringValuePtr(value)); \
   }; \
 }
 
 #define GET_LDAPENTRY_DATA(obj,ptr) { \
   Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \
   if( ! ptr->msg ){ \
+    VALUE value = rb_inspect(obj); \
     rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \
-	     STR2CSTR(rb_inspect(obj))); \
+	     StringValuePtr(value)); \
   }; \
 }
 

data/test/cookbooks/apt/metadata.rb

@@ -0,0 +1,13 @@
+maintainer        "Opscode, Inc."
+maintainer_email  "cookbooks@opscode.com"
+license           "Apache 2.0"
+description       "Configures apt and apt services and an LWRP for managing apt repositories"
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version           "1.2.0"
+recipe            "apt", "Runs apt-get update during compile phase and sets up preseed directories"
+recipe            "apt::cacher", "Set up an APT cache"
+recipe            "apt::cacher-client", "Client for the apt::cacher server"
+
+%w{ ubuntu debian }.each do |os|
+  supports os
+end

data/test/cookbooks/apt/providers/repository.rb

@@ -0,0 +1,73 @@
+#
+# Cookbook Name:: apt
+# Provider:: repository
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+action :add do
+  unless ::File.exists?("/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list")
+    Chef::Log.info "Adding #{new_resource.repo_name} repository to /etc/apt/sources.list.d/#{new_resource.repo_name}-source.list"
+    # add key
+    if new_resource.keyserver && new_resource.key
+      execute "install-key #{new_resource.key}" do
+        command "apt-key adv --keyserver #{new_resource.keyserver} --recv #{new_resource.key}"
+        action :nothing
+      end.run_action(:run)
+    elsif new_resource.key && (new_resource.key =~ /http/)
+      key_name = new_resource.key.split(/\//).last
+      remote_file "#{Chef::Config[:file_cache_path]}/#{key_name}" do
+        source new_resource.key
+        mode "0644"
+        action :nothing
+      end.run_action(:create_if_missing)
+      execute "install-key #{key_name}" do
+        command "apt-key add #{Chef::Config[:file_cache_path]}/#{key_name}"
+        action :nothing
+      end.run_action(:run)
+    end
+    # build our listing
+    repository = "deb"
+    repository = "deb-src" if new_resource.deb_src
+    repository = "# Created by the Chef apt_repository LWRP\n" + repository
+    repository += " #{new_resource.uri}"
+    repository += " #{new_resource.distribution}"
+    new_resource.components.each {|component| repository += " #{component}"}
+    # write out the file, replace it if it already exists
+    file "/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list" do
+      owner "root"
+      group "root"
+      mode 0644
+      content repository + "\n"
+      action :nothing
+    end.run_action(:create)
+    execute "update package index" do
+      command "apt-get update"
+      ignore_failure true
+      action :nothing
+    end.run_action(:run)
+    new_resource.updated_by_last_action(true)
+  end
+end
+
+action :remove do
+  if ::File.exists?("/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list")
+    Chef::Log.info "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/"
+    file "/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list" do
+      action :delete
+    end
+    new_resource.updated_by_last_action(true)
+  end
+end

data/test/cookbooks/apt/recipes/cacher-client.rb

@@ -0,0 +1,44 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher-client
+#
+# Copyright 2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#remove Acquire::http::Proxy lines from /etc/apt/apt.conf since we use 01proxy
+#these are leftover from preseed installs
+execute "Remove proxy from /etc/apt/apt.conf" do
+  command "sed --in-place '/^Acquire::http::Proxy/d' /etc/apt/apt.conf"
+  only_if "grep Acquire::http::Proxy /etc/apt/apt.conf"
+end
+
+servers = search(:node, 'recipes:apt\:\:cacher') || []
+if servers.length > 0
+  Chef::Log.info("apt-cacher server found on #{servers[0]}.")
+  proxy = "Acquire::http::Proxy \"http://#{servers[0].ipaddress}:3142\";\n"
+  file "/etc/apt/apt.conf.d/01proxy" do
+    owner "root"
+    group "root"
+    mode "0644"
+    content proxy
+    action :create
+  end
+else
+  Chef::Log.info("No apt-cacher server found.")
+  file "/etc/apt/apt.conf.d/01proxy" do
+    action :delete
+    only_if {File.exists?("/etc/apt/apt.conf.d/01proxy")}
+  end
+end

data/test/cookbooks/apt/recipes/cacher.rb

@@ -0,0 +1,45 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher
+#
+# Copyright 2008-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+package "apt-cacher" do
+  action :install
+end
+
+service "apt-cacher" do
+  supports :restart => true, :status => false
+  action [ :enable, :start ]
+end
+
+cookbook_file "/etc/apt-cacher/apt-cacher.conf" do
+  source "apt-cacher.conf"
+  owner "root"
+  group "root"
+  mode 0644
+  notifies :restart, resources(:service => "apt-cacher")
+end
+
+cookbook_file "/etc/default/apt-cacher" do
+  source "apt-cacher"
+  owner "root"
+  group "root"
+  mode 0644
+  notifies :restart, resources(:service => "apt-cacher")
+end
+
+#this will help seed the proxy
+include_recipe "apt::cacher-client"

data/test/cookbooks/apt/recipes/default.rb

@@ -0,0 +1,50 @@
+#
+# Cookbook Name:: apt
+# Recipe:: default
+#
+# Copyright 2008-2011, Opscode, Inc.
+# Copyright 2009, Bryan McLellan <btm@loftninjas.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Run apt-get update to create the stamp file
+execute "apt-get-update" do
+  command "apt-get update"
+  ignore_failure true
+  not_if do ::File.exists?('/var/lib/apt/periodic/update-success-stamp') end
+  action :nothing
+end
+
+# provides /var/lib/apt/periodic/update-success-stamp on apt-get update
+package "update-notifier-common" do
+  notifies :run, resources(:execute => "apt-get-update"), :immediately
+end
+
+execute "apt-get-update-periodic" do
+  command "apt-get update"
+  ignore_failure true
+  only_if do
+    File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
+    File.mtime('/var/lib/apt/periodic/update-success-stamp') < Time.now - 86400
+  end
+end
+
+%w{/var/cache/local /var/cache/local/preseeding}.each do |dirname|
+  directory dirname do
+    owner "root"
+    group "root"
+    mode  0644
+    action :create
+  end
+end

data/test/cookbooks/apt/resources/repository.rb

@@ -0,0 +1,30 @@
+#
+# Cookbook Name:: apt
+# Resource:: repository
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :add, :remove
+
+#name of the repo, used for source.list filename
+attribute :repo_name, :kind_of => String, :name_attribute => true
+attribute :uri, :kind_of => String
+attribute :distribution, :kind_of => String
+attribute :components, :kind_of => Array, :default => []
+#whether or not to add the repository as a source repo as well
+attribute :deb_src, :default => false
+attribute :keyserver, :kind_of => String, :default => nil
+attribute :key, :kind_of => String, :default => nil