mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
dc07e765f2
This commit includes many changes. All changes compile under NT but have not been tested under UNIX. A Summary of changes (likely incomplete): NT changes: Removed lint. Clean up configuration support for "Debug", "Release", "SDebug", and "SRelease" configurations. Share output directories for clients, libraries, and slapd. (maybe they should be combined further and moved to build/{,S}{Debug,Release}). Enable threading when _MT is defined. Enable debuging when _DEBUG is defined. Disable setting of NDEBUG under Release/SRelease. Asserts are disabled in <ac/assert.h> when LDAP_DEBUG is not defined. Added 'build/main.dsp' Master project. Removed non-slapd projects from slapd.dsp (see main.dsp). Removed replaced many uses of _WIN32 macro with feature based macros. ldap_cdefs.h changes #define LDAP_CONST const (see below) #define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST To allow specifiers to be added before and after the type declaration. (For DLL handling) LBER/LDAP changes Namespace changes: s/lber_/ber_/ for here and there. s/NAME_ERROR/LDAP_NAME_ERROR/g Deleted NULLMSG and other NULL* macros for namespace reasons. "const" libraries. Installed headers (ie: lber.h, ldap.h) use LDAP_CONST macro. Normally set to 'const' when __STDC__. Can be set externally to enable/disable 'constification' of external interface. Internal interface always uses 'const'. Did not fix warnings in -lldif (in lieu of new LDIF parser). Added _ext API implementations (excepting search and bind). Need to implement ldap_int_get_controls() for reponses with controls. Added numberous assert() checks. LDAP_R _MT defines HAVE_NT_THREADS Added numberous assert() checks. Changed ldap_pthread_t back to unsigned long. Used cast to HANDLE in _join(). LDBM Replaced _WIN32 with HAVE_SYSLOG ud Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). slapd Made connection sockbuf field a pointer to a sockbuf. This removed slap.h dependency on lber-int.h. lber-int.h now only included by those files needing to mess with the sockbuf. Used ber_* functions/macros to access sockbuf internals whenever possible. Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). Removed FD_SET unsigned lint slapd/tools Used EXEEXT to added ".exe" to routines. Need to define EXEEXT under UNIX. ldappasswd Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand(). nt_debug Minor cleanup. Added "portable.h" include and used <ac/*.h> where appropriate. Added const to char* format argument.
324 lines
7.3 KiB
C
324 lines
7.3 KiB
C
/* line64.c - routines for dealing with the slapd line format */
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <ctype.h>
|
|
|
|
#include <ac/string.h>
|
|
#include <ac/socket.h>
|
|
#include <ac/time.h>
|
|
|
|
int ldif_debug = 0;
|
|
|
|
#include "ldap_log.h"
|
|
#include "lber_pvt.h"
|
|
#include "ldif.h"
|
|
|
|
#define RIGHT2 0x03
|
|
#define RIGHT4 0x0f
|
|
#define CONTINUED_LINE_MARKER '\001'
|
|
|
|
static const char nib2b64[0x40f] =
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
|
|
|
static const unsigned char b642nib[0x80] = {
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
|
|
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
|
|
0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
|
|
0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
|
|
0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
|
|
0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
|
|
0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
|
|
0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
|
|
0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff
|
|
};
|
|
|
|
/*
|
|
* ldif_parse_line - takes a line of the form "type:[:] value" and splits it
|
|
* into components "type" and "value". if a double colon separates type from
|
|
* value, then value is encoded in base 64, and parse_line un-decodes it
|
|
* (in place) before returning.
|
|
*/
|
|
|
|
int
|
|
ldif_parse_line(
|
|
LDAP_CONST char *line,
|
|
char **type,
|
|
char **value,
|
|
int *vlen
|
|
)
|
|
{
|
|
char *p, *s, *d, *byte, *stop;
|
|
char nib;
|
|
int i, b64;
|
|
|
|
/* skip any leading space */
|
|
while ( isspace( (unsigned char) *line ) ) {
|
|
line++;
|
|
}
|
|
*type = line;
|
|
|
|
for ( s = line; *s && *s != ':'; s++ )
|
|
; /* NULL */
|
|
if ( *s == '\0' ) {
|
|
ber_pvt_log_printf( LDAP_DEBUG_PARSE, ldif_debug,
|
|
"ldif_parse_line missing ':'\n");
|
|
return( -1 );
|
|
}
|
|
|
|
/* trim any space between type and : */
|
|
for ( p = s - 1; p > line && isspace( (unsigned char) *p ); p-- ) {
|
|
*p = '\0';
|
|
}
|
|
*s++ = '\0';
|
|
|
|
/* check for double : - indicates base 64 encoded value */
|
|
if ( *s == ':' ) {
|
|
s++;
|
|
b64 = 1;
|
|
|
|
/* single : - normally encoded value */
|
|
} else {
|
|
b64 = 0;
|
|
}
|
|
|
|
/* skip space between : and value */
|
|
while ( isspace( (unsigned char) *s ) ) {
|
|
s++;
|
|
}
|
|
|
|
/* if no value is present, error out */
|
|
if ( *s == '\0' ) {
|
|
ber_pvt_log_printf( LDAP_DEBUG_PARSE, ldif_debug,
|
|
"ldif_parse_line missing value\n");
|
|
return( -1 );
|
|
}
|
|
|
|
/* check for continued line markers that should be deleted */
|
|
for ( p = s, d = s; *p; p++ ) {
|
|
if ( *p != CONTINUED_LINE_MARKER )
|
|
*d++ = *p;
|
|
}
|
|
*d = '\0';
|
|
|
|
*value = s;
|
|
if ( b64 ) {
|
|
stop = strchr( s, '\0' );
|
|
byte = s;
|
|
for ( p = s, *vlen = 0; p < stop; p += 4, *vlen += 3 ) {
|
|
for ( i = 0; i < 4; i++ ) {
|
|
if ( p[i] != '=' && (p[i] & 0x80 ||
|
|
b642nib[ p[i] & 0x7f ] > 0x3f) ) {
|
|
ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
|
|
"ldif_parse_line: invalid base 64 encoding char (%c) 0x%x\n",
|
|
p[i], p[i] );
|
|
return( -1 );
|
|
}
|
|
}
|
|
|
|
/* first digit */
|
|
nib = b642nib[ p[0] & 0x7f ];
|
|
byte[0] = nib << 2;
|
|
/* second digit */
|
|
nib = b642nib[ p[1] & 0x7f ];
|
|
byte[0] |= nib >> 4;
|
|
byte[1] = (nib & RIGHT4) << 4;
|
|
/* third digit */
|
|
if ( p[2] == '=' ) {
|
|
*vlen += 1;
|
|
break;
|
|
}
|
|
nib = b642nib[ p[2] & 0x7f ];
|
|
byte[1] |= nib >> 2;
|
|
byte[2] = (nib & RIGHT2) << 6;
|
|
/* fourth digit */
|
|
if ( p[3] == '=' ) {
|
|
*vlen += 2;
|
|
break;
|
|
}
|
|
nib = b642nib[ p[3] & 0x7f ];
|
|
byte[2] |= nib;
|
|
|
|
byte += 3;
|
|
}
|
|
s[ *vlen ] = '\0';
|
|
} else {
|
|
*vlen = (int) (d - s);
|
|
}
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
/*
|
|
* ldif_getline - return the next "line" (minus newline) of input from a
|
|
* string buffer of lines separated by newlines, terminated by \n\n
|
|
* or \0. this routine handles continued lines, bundling them into
|
|
* a single big line before returning. if a line begins with a white
|
|
* space character, it is a continuation of the previous line. the white
|
|
* space character (nb: only one char), and preceeding newline are changed
|
|
* into CONTINUED_LINE_MARKER chars, to be deleted later by the
|
|
* str_parse_line() routine above.
|
|
*
|
|
* it takes a pointer to a pointer to the buffer on the first call,
|
|
* which it updates and must be supplied on subsequent calls.
|
|
*/
|
|
|
|
char *
|
|
ldif_getline( char **next )
|
|
{
|
|
char *l;
|
|
|
|
if ( *next == NULL || **next == '\n' || **next == '\0' ) {
|
|
return( NULL );
|
|
}
|
|
|
|
l = *next;
|
|
while ( (*next = strchr( *next, '\n' )) != NULL ) {
|
|
unsigned char c = *(*next + 1);
|
|
if ( isspace( c ) && c != '\n' ) {
|
|
**next = CONTINUED_LINE_MARKER;
|
|
*(*next+1) = CONTINUED_LINE_MARKER;
|
|
} else {
|
|
*(*next)++ = '\0';
|
|
break;
|
|
}
|
|
(*next)++;
|
|
}
|
|
|
|
return( l );
|
|
}
|
|
|
|
void
|
|
ldif_put_type_and_value(
|
|
char **out,
|
|
LDAP_CONST char *t,
|
|
LDAP_CONST char *val,
|
|
int vlen )
|
|
{
|
|
unsigned char *byte, *p, *stop;
|
|
unsigned char buf[3];
|
|
unsigned long bits;
|
|
char *save;
|
|
int i, b64, pad, len, savelen;
|
|
len = 0;
|
|
|
|
/* put the type + ": " */
|
|
for ( p = (unsigned char *) t; *p; p++, len++ ) {
|
|
*(*out)++ = *p;
|
|
}
|
|
*(*out)++ = ':';
|
|
len++;
|
|
save = *out;
|
|
savelen = len;
|
|
*(*out)++ = ' ';
|
|
b64 = 0;
|
|
|
|
stop = (unsigned char *) (val + vlen);
|
|
if ( isascii( val[0] ) && (isspace( val[0] ) || val[0] == ':') ) {
|
|
b64 = 1;
|
|
} else {
|
|
for ( byte = (unsigned char *) val; byte < stop;
|
|
byte++, len++ ) {
|
|
if ( !isascii( *byte ) || !isprint( *byte ) ) {
|
|
b64 = 1;
|
|
break;
|
|
}
|
|
if ( len > LDIF_LINE_WIDTH ) {
|
|
*(*out)++ = '\n';
|
|
*(*out)++ = ' ';
|
|
len = 1;
|
|
}
|
|
*(*out)++ = *byte;
|
|
}
|
|
}
|
|
if ( b64 ) {
|
|
*out = save;
|
|
*(*out)++ = ':';
|
|
*(*out)++ = ' ';
|
|
len = savelen + 2;
|
|
/* convert to base 64 (3 bytes => 4 base 64 digits) */
|
|
for ( byte = (unsigned char *) val; byte < stop - 2;
|
|
byte += 3 ) {
|
|
bits = (byte[0] & 0xff) << 16;
|
|
bits |= (byte[1] & 0xff) << 8;
|
|
bits |= (byte[2] & 0xff);
|
|
|
|
for ( i = 0; i < 4; i++, len++, bits <<= 6 ) {
|
|
if ( len > LDIF_LINE_WIDTH ) {
|
|
*(*out)++ = '\n';
|
|
*(*out)++ = ' ';
|
|
len = 1;
|
|
}
|
|
|
|
/* get b64 digit from high order 6 bits */
|
|
*(*out)++ = nib2b64[ (bits & 0xfc0000L) >> 18 ];
|
|
}
|
|
}
|
|
|
|
/* add padding if necessary */
|
|
if ( byte < stop ) {
|
|
for ( i = 0; byte + i < stop; i++ ) {
|
|
buf[i] = byte[i];
|
|
}
|
|
for ( pad = 0; i < 3; i++, pad++ ) {
|
|
buf[i] = '\0';
|
|
}
|
|
byte = buf;
|
|
bits = (byte[0] & 0xff) << 16;
|
|
bits |= (byte[1] & 0xff) << 8;
|
|
bits |= (byte[2] & 0xff);
|
|
|
|
for ( i = 0; i < 4; i++, len++, bits <<= 6 ) {
|
|
if ( len > LDIF_LINE_WIDTH ) {
|
|
*(*out)++ = '\n';
|
|
*(*out)++ = ' ';
|
|
len = 1;
|
|
}
|
|
|
|
if( i + pad < 4 ) {
|
|
/* get b64 digit from low order 6 bits */
|
|
*(*out)++ = nib2b64[ (bits & 0xfc0000L) >> 18 ];
|
|
} else {
|
|
*(*out)++ = '=';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
*(*out)++ = '\n';
|
|
}
|
|
|
|
|
|
char *
|
|
ldif_type_and_value( LDAP_CONST char *type, LDAP_CONST char *val, int vlen )
|
|
/*
|
|
* return malloc'd, zero-terminated LDIF line
|
|
*/
|
|
{
|
|
char *buf, *p;
|
|
int tlen;
|
|
|
|
tlen = strlen( type );
|
|
if (( buf = (char *) malloc( LDIF_SIZE_NEEDED( tlen, vlen ) + 1 ))
|
|
== NULL )
|
|
{
|
|
ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
|
|
"ldif_type_and_value: malloc failed!" );
|
|
return NULL;
|
|
}
|
|
|
|
p = buf;
|
|
ldif_put_type_and_value( &p, type, val, vlen );
|
|
*p = '\0';
|
|
|
|
return( buf );
|
|
}
|