ruby-ldap 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: b6924c44fe913f0e2f2886a6d867e315a4c4d1d2
-  data.tar.gz: 78eb5ced76910731afc0ef06aed0f47440f5e943
-SHA512:
-  metadata.gz: e8550110a3097ed2c36dc787dfe392de3c6b7bec9de5887729cff903ca390e82d34a3dd403098684d61f0db056ce637837a968ae1507f91467e705221daa3858
-  data.tar.gz: 3bff7856fbeec9d8b091d94571b9b396f110dfcfa8ed931fd26ef6e24d3db2ff4daa3bc43591b9221e0fbce3bdc582ee67dfab52b5baa0d8375b250b9a43d835
+--- 
+SHA512: 
+  metadata.gz: fbdef63d5618e4f8a8500c7afff630ba9622436f23ef7b5a7e16717d44aaf175f6932e90ca95afc8c5a5e2ff4e1a028a8e1e8ca4909260a9f563d8e33b42dc1e
+  data.tar.gz: 337ea5de70b3d724077e34700510f7c18f6bf574bdfa099c73507368a6883164ff25eecfa43cdc67c8340ad04229d1c2ec8fe1ea48ac7a7a0e60e9f0a300881a
+SHA1: 
+  metadata.gz: d7de5be007d5104fd3cfd75aeaee5170c5f8c5b4
+  data.tar.gz: e0fcbbcfce4ec9a65a213550e6c7228eafd27b2b

data/ChangeLog

@@ -1,3 +1,8 @@
+Mon Jun 20 14:30:52 UTC 2016 Alexey Chebotar <alexey.chebotar@gmail.com>
+  * Version 0.9.19
+  * Fixed parsing of LDIF with CR LF line separators (GH-38).
+    Thanks to doppelreim.
+
 Fri Mar  4 11:17:21 UTC 2016 Alexey Chebotar <alexey.chebotar@gmail.com>
   * Version 0.9.18
   * backout issue32 to compile for ruby-1.8.x.

data/NOTES

@@ -1,3 +1,9 @@
+0.9.19
+-----
+* Fixed parsing of LDIF with CR LF line separators (GH-38).
+  Thanks to doppelreim.
+
+
 0.9.18
 -----
 * backout issue32 to compile for ruby-1.8.x.

data/TODO

@@ -3,9 +3,6 @@
 To-do list
 ----------
 
-- Running tests:
-./test/test.sh /Users/bearded/.rvm/rubies/ruby-1.8.7-head/bin/ruby openldap2 /usr/libexec/slapd /etc/openldap/schema/
-
 - Support for more LDAPv3 controls and extensions.
 
 - DSML support.

data/extconf.rb

@@ -235,7 +235,6 @@ for l in [$libcrypto, $libssl, $libnsl, $libpthread, $libresolv,
 end
 
 have_func("ldap_init", 'ldap.h')
-have_func('rb_hash_dup')
 have_func("ldap_set_option")
 have_func("ldap_get_option")
 have_func("ldap_start_tls_s") if $use_openldap2
@@ -261,12 +260,12 @@ $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
 create_makefile("ldap")
 
 
-$slapd = ldap_with_config("slapd") || File.join("/usr","libexec","slapd")
+$slapd = ldap_with_config("slapd") || File.join($ldap_dir,"libexec","slapd")
 $schema_dir = ldap_with_config("schema-dir")
 if( !$schema_dir )
-  $schema_dir = File.join("/etc","openldap","schema")
+  $schema_dir = File.join($ldap_dir,"etc","openldap","schema")
   if( !File.exist?($schema_dir) )
-    $schema_dir = File.join("/etc","openldap")
+    $schema_dir = File.join($ldap_dir,"etc","openldap")
   end
 end
 

data/lib/ldap/ldif.rb

@@ -185,28 +185,27 @@ module LDAP
       mod_type = nil
 
       lines.each do |line|
+        _line = line.chomp
         # Skip (continued) comments.
-        if line =~ /^#/ || ( comment && line[0..0] == ' ' )
+        if _line =~ /^#/ || ( comment && _line[0..0] == ' ' )
           comment = true
           next
         end
 
         # Skip blank lines.
-        next if line =~ /^$/
+        next if _line =~ /^$/
 
         # Reset mod type if this entry has more than one mod to make.
         # A '-' continuation is only valid if we've already had a
         # 'changetype: modify' line.
-        if line =~ /^-$/ && change_type == LDAP_MOD_REPLACE
+        if _line =~ /^-$/ && change_type == LDAP_MOD_REPLACE
           next
         end
 
-        line.chomp!
-
         # N.B. Attributes and values can be separated by one or two colons,
         # or one colon and a '<'. Either of these is then followed by zero
         # or one spaces.
-        if md = line.match( /^[^ ].*?((:[:<]?) ?)/ )
+        if md = _line.match( /^[^ ].*?((:[:<]?) ?)/ )
 
           # If previous value was Base64-encoded and is not continued,
           # we need to decode it now.
@@ -222,7 +221,7 @@ module LDAP
           end
 
           # Found a attr/value line.
-          attr, val = line.split( md[1], 2 )
+          attr, val = _line.split( md[1], 2 )
           attr.downcase!
 
           # Attribute must be ldap-oid / (ALPHA *(attr-type-chars))
@@ -331,21 +330,21 @@ module LDAP
           # continuation line must be indented. If a comment makes it this
           # far, that's also an error.
           #
-          if sep == ':' && line[0..0] != ' ' || comment
-            raise LDIFError, "Improperly continued line: #{line}"
+          if sep == ':' && _line[0..0] != ' ' || comment
+            raise LDIFError, "Improperly continued line: #{_line}"
           end
 
           # OK; this is a valid continuation line.
 
           # Append line except for initial space.
-          line[0] = '' if line[0..0] == ' '
+          _line[0] = '' if _line[0..0] == ' '
 
           if change_type == LDAP_MOD_REPLACE
             # Append to last value of current mod type.
-            mods[mod_type][attr][-1] << line
+            mods[mod_type][attr][-1] << _line
           else
             # Append to last value.
-            hash[attr][-1] << line
+            hash[attr][-1] << _line
           end
         end
 

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 18
-#define RB_LDAP_VERSION "0.9.18"
+#define RB_LDAP_PATCH_VERSION 19
+#define RB_LDAP_VERSION "0.9.19"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 

data/test/add.rb

@@ -1,8 +1,9 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-require './ldap'
-require './test/conf'
+$test = File.dirname($0)
+require "#{$test}/conf"
+require "./ldap"
 
 conn = LDAP::Conn.new($HOST, $PORT)
 conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){

data/test/add2.rb

@@ -1,8 +1,9 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-require './ldap'
-require './test/conf'
+$test = File.dirname($0)
+require "#{$test}/conf"
+require "./ldap"
 
 conn = LDAP::Conn.new($HOST, $PORT)
 conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){

data/test/add3.rb

@@ -1,8 +1,9 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-require './ldap'
-require './test/conf'
+$test = File.dirname($0)
+require "#{$test}/conf"
+require "./ldap"
 
 $KCODE = "UTF8"
 

data/test/compare.rb

@@ -1,13 +1,15 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-require './ldap'
-require './test/conf'
+$test = File.dirname($0)
+require "#{$test}/conf"
+require "./ldap"
 
 LDAP::Conn.new($HOST, $PORT).bind{|conn|
   conn.perror("bind")
   begin
-    conn.compare("cn=Takaaki Tateishi, dc=localhost, dc=localdomain", "cn", "Takaaki Tateishi")
+    conn.compare("cn=Takaaki Tateishi, dc=localhost, dc=localdomain",
+		 "cn", "Takaaki Tateishi")
   rescue LDAP::ResultError
     exit(0)
   end

data/test/conf.rb

@@ -1,5 +1,7 @@
 # -*- ruby -*-
 
+require './ldap'
+
 $HOST = 'localhost'
 begin
   $PORT = ARGV[0].to_i || LDAP::LDAP_PORT

data/test/openldap_tests/progs/ldif-filter.c

@@ -0,0 +1,256 @@
+/* ldif-filter -- clean up LDIF testdata from stdin */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2009-2016 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+#include <ac/ctype.h>
+#include <ac/stdlib.h>
+#include <ac/string.h>
+#include <ac/unistd.h>
+#ifdef _WIN32
+#include <fcntl.h>
+#endif
+
+#define DEFAULT_SPECS "ndb=a,null=n"
+
+typedef struct { char   *val; size_t len, alloc; } String;
+typedef struct { String	*val; size_t len, alloc; } Strings;
+
+/* Flags and corresponding program options */
+enum { SORT_ATTRS = 1, SORT_ENTRIES = 2, NO_OUTPUT = 4, DUMMY_FLAG = 8 };
+static const char spec_options[] = "aen"; /* option index = log2(enum flag) */
+
+static const char *progname = "ldif-filter";
+static const String null_string = { NULL, 0, 0 };
+
+static void
+usage( void )
+{
+	fprintf( stderr, "\
+Usage: %s [-b backend] [-s spec[,spec]...]\n\
+Filter standard input by first <spec> matching '[<backend>]=[a][e][n]':\n\
+  - Remove LDIF comments.\n\
+  - 'a': Sort attributes in entries.\n\
+  - 'e': Sort any entries separated by just one empty line.\n\
+  - 'n': Output nothing.\n\
+<backend> defaults to the $BACKEND environment variable.\n\
+Use specs '%s' if no spec on the command line applies.\n",
+		progname, DEFAULT_SPECS );
+	exit( EXIT_FAILURE );
+}
+
+/* Return flags from "backend=flags" in spec; nonzero if backend found */
+static unsigned
+get_flags( const char *backend, const char *spec )
+{
+	size_t len = strlen( backend );
+	unsigned flags = DUMMY_FLAG;
+	const char *end, *tmp;
+
+	for ( ;; spec = end + ( *end != '\0' )) {
+		if ( !*spec )
+			return 0;
+		end = spec + strcspn( spec, "," );
+		if ( !(tmp = memchr( spec, '=', end-spec )))
+			break;
+		if ( tmp-spec == len && !memcmp( spec, backend, len )) {
+			spec = tmp+1;
+			break;
+		}
+	}
+
+	for ( ; spec < end; spec++ ) {
+		if ( (tmp = strchr( spec_options, *spec )) == NULL ) {
+			usage();
+		}
+		flags |= 1U << (tmp - spec_options);
+	}
+	return flags;
+}
+
+#define APPEND(s /* String or Strings */, data, count, isString) do { \
+	size_t slen = (s)->len, salloc = (s)->alloc, sz = sizeof *(s)->val; \
+	if ( salloc <= slen + (count) ) { \
+		(s)->alloc = salloc += salloc + ((count)|7) + 1; \
+		(s)->val   = xrealloc( (s)->val, sz * salloc ); \
+	} \
+	memcpy( (s)->val + slen, data, sz * ((count) + !!(isString)) ); \
+	(s)->len = slen + (count); \
+} while (0)
+
+static void *
+xrealloc( void *ptr, size_t len )
+{
+	if ( (ptr = realloc( ptr, len )) == NULL ) {
+		perror( progname );
+		exit( EXIT_FAILURE );
+	}
+	return ptr;
+}
+
+static int
+cmp( const void *s, const void *t )
+{
+	return strcmp( ((const String *) s)->val, ((const String *) t)->val );
+}
+
+static void
+sort_strings( Strings *ss, size_t offset )
+{
+	qsort( ss->val + offset, ss->len - offset, sizeof(*ss->val), cmp );
+}
+
+/* Build entry ss[n] from attrs ss[n...], and free the attrs */
+static void
+build_entry( Strings *ss, size_t n, unsigned flags, size_t new_len )
+{
+	String *vals = ss->val, *e = &vals[n];
+	size_t end = ss->len;
+	char *ptr;
+
+	if ( flags & SORT_ATTRS ) {
+		sort_strings( ss, n + 1 );
+	}
+	e->val = xrealloc( e->val, e->alloc = new_len + 1 );
+	ptr = e->val + e->len;
+	e->len = new_len;
+	ss->len = ++n;
+	for ( ; n < end; free( vals[n++].val )) {
+		ptr = strcpy( ptr, vals[n].val ) + vals[n].len;
+	}
+	assert( ptr == e->val + new_len );
+}
+
+/* Flush entries to stdout and free them */
+static void
+flush_entries( Strings *ss, const char *sep, unsigned flags )
+{
+	size_t i, end = ss->len;
+	const char *prefix = "";
+
+	if ( flags & SORT_ENTRIES ) {
+		sort_strings( ss, 0 );
+	}
+	for ( i = 0; i < end; i++, prefix = sep ) {
+		if ( printf( "%s%s", prefix, ss->val[i].val ) < 0 ) {
+			perror( progname );
+			exit( EXIT_FAILURE );
+		}
+		free( ss->val[i].val );
+	}
+	ss->len = 0;
+}
+
+static void
+filter_stdin( unsigned flags )
+{
+	char line[256];
+	Strings ss = { NULL, 0, 0 };	/* entries + attrs of partial entry */
+	size_t entries = 0, attrs_totlen = 0, line_len;
+	const char *entry_sep = "\n", *sep = "";
+	int comment = 0, eof = 0, eol, prev_eol = 1;	/* flags */
+	String *s;
+
+	/* LDIF = Entries ss[..entries-1] + sep + attrs ss[entries..] + line */
+	for ( ; !eof || ss.len || *sep; prev_eol = eol ) {
+		if ( eof || (eof = !fgets( line, sizeof(line), stdin ))) {
+			strcpy( line, prev_eol ? "" : *sep ? sep : "\n" );
+		}
+		line_len = strlen( line );
+		eol = (line_len == 0 || line[line_len - 1] == '\n');
+
+		if ( *line == ' ' ) {		/* continuation line? */
+			prev_eol = 0;
+		} else if ( prev_eol ) {	/* start of logical line? */
+			comment = (*line == '#');
+		}
+		if ( comment || (flags & NO_OUTPUT) ) {
+			continue;
+		}
+
+		/* Collect attrs for partial entry in ss[entries...] */
+		if ( !prev_eol && attrs_totlen != 0 ) {
+			goto grow_attr;
+		} else if ( line_len > (*line == '\r' ? 2 : 1) ) {
+			APPEND( &ss, &null_string, 1, 0 ); /* new attr */
+		grow_attr:
+			s = &ss.val[ss.len - 1];
+			APPEND( s, line, line_len, 1 ); /* strcat to attr */
+			attrs_totlen += line_len;
+			continue;
+		}
+
+		/* Empty line - consume sep+attrs or entries+sep */
+		if ( attrs_totlen != 0 ) {
+			entry_sep = sep;
+			if ( entries == 0 )
+				fputs( sep, stdout );
+			build_entry( &ss, entries++, flags, attrs_totlen );
+			attrs_totlen = 0;
+		} else {
+			flush_entries( &ss, entry_sep, flags );
+			fputs( sep, stdout );
+			entries = 0;
+		}
+		sep = "\r\n" + 2 - line_len;	/* sep = copy(line) */
+	}
+
+	free( ss.val );
+}
+
+int
+main( int argc, char **argv )
+{
+	const char *backend = getenv( "BACKEND" ), *specs = "", *tmp;
+	unsigned flags;
+	int i;
+
+	if ( argc > 0 ) {
+		progname = (tmp = strrchr( argv[0], '/' )) ? tmp+1 : argv[0];
+	}
+
+	while ( (i = getopt( argc, argv, "b:s:" )) != EOF ) {
+		switch ( i ) {
+		case 'b':
+			backend = optarg;
+			break;
+		case 's':
+			specs = optarg;
+			break;
+		default:
+			usage();
+		}
+	}
+	if ( optind < argc ) {
+		usage();
+	}
+	if ( backend == NULL ) {
+		backend = "";
+	}
+
+#ifdef _WIN32
+	_setmode(1, _O_BINARY);	/* don't convert \n to \r\n on stdout */
+#endif
+	flags = get_flags( backend, specs );
+	filter_stdin( flags ? flags : get_flags( backend, DEFAULT_SPECS ));
+	if ( fclose( stdout ) == EOF ) {
+		perror( progname );
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}