upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let the caller decide how liberal the schema parsing routines will be.

Browse source 
Most flags do nothing yet.
This commit is contained in:
Julio Sánchez Fernández 2000-05-28 22:45:56 +00:00
parent 13daacdbda
commit 3e3acf87c8
5 changed files with 56 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/ldap_schema.h
View file

@ -40,6 +40,7 @@ typedef struct ldap_schema_extension_item {
typedef struct ldap_syntax { typedef struct ldap_syntax {
char *syn_oid; /* REQUIRED */ char *syn_oid; /* REQUIRED */
char **syn_names; /* OPTIONAL */
char *syn_desc; /* OPTIONAL */ char *syn_desc; /* OPTIONAL */
LDAP_SCHEMA_EXTENSION_ITEM **syn_extensions; /* OPTIONAL */ LDAP_SCHEMA_EXTENSION_ITEM **syn_extensions; /* OPTIONAL */
} LDAP_SYNTAX; } LDAP_SYNTAX;
@ -96,6 +97,16 @@ typedef struct ldap_objectclass {
#define LDAP_SCHEMA_STRUCTURAL 1 #define LDAP_SCHEMA_STRUCTURAL 1
#define LDAP_SCHEMA_AUXILIARY 2 #define LDAP_SCHEMA_AUXILIARY 2
/*
* Flags that control how liberal the parsing routines are.
*/
#define LDAP_SCHEMA_ALLOW_NONE 0x00 /* Strict parsing */
#define LDAP_SCHEMA_ALLOW_NO_OID 0x01 /* Allow missing oid */
#define LDAP_SCHEMA_ALLOW_QUOTED 0x02 /* Allow bogus extra quotes */
#define LDAP_SCHEMA_ALLOW_DESCR 0x04 /* Allow descr instead of OID */
#define LDAP_SCHEMA_ALLOW_DESCR_PREFIX 0x08 /* Allow descr as OID prefix */
#define LDAP_SCHEMA_ALLOW_ALL 0x0f /* Be very liberal in parsing */
LIBLDAP_F( LDAP_CONST char * ) LIBLDAP_F( LDAP_CONST char * )
ldap_syntax2name LDAP_P(( ldap_syntax2name LDAP_P((
LDAP_SYNTAX * syn )); LDAP_SYNTAX * syn ));
@ -132,25 +143,29 @@ LIBLDAP_F( LDAP_OBJECT_CLASS * )
ldap_str2objectclass LDAP_P(( ldap_str2objectclass LDAP_P((
LDAP_CONST char * s, LDAP_CONST char * s,
int * code, int * code,
LDAP_CONST char ** errp )); LDAP_CONST char ** errp,
LDAP_CONST int flags ));
LIBLDAP_F( LDAP_ATTRIBUTE_TYPE * ) LIBLDAP_F( LDAP_ATTRIBUTE_TYPE * )
ldap_str2attributetype LDAP_P(( ldap_str2attributetype LDAP_P((
LDAP_CONST char * s, LDAP_CONST char * s,
int * code, int * code,
LDAP_CONST char ** errp )); LDAP_CONST char ** errp,
LDAP_CONST int flags ));
LIBLDAP_F( LDAP_SYNTAX * ) LIBLDAP_F( LDAP_SYNTAX * )
ldap_str2syntax LDAP_P(( ldap_str2syntax LDAP_P((
LDAP_CONST char * s, LDAP_CONST char * s,
int * code, int * code,
LDAP_CONST char ** errp )); LDAP_CONST char ** errp,
LDAP_CONST int flags ));
LIBLDAP_F( LDAP_MATCHING_RULE * ) LIBLDAP_F( LDAP_MATCHING_RULE * )
ldap_str2matchingrule LDAP_P(( ldap_str2matchingrule LDAP_P((
LDAP_CONST char * s, LDAP_CONST char * s,
int * code, int * code,
LDAP_CONST char ** errp )); LDAP_CONST char ** errp,
LDAP_CONST int flags ));
LIBLDAP_F( char *) LIBLDAP_F( char *)
ldap_objectclass2str LDAP_P(( ldap_objectclass2str LDAP_P((

52
libraries/libldap/schema.c
View file

@ -21,7 +21,6 @@
#include <ldap_schema.h> #include <ldap_schema.h>
static LDAP_CONST char * static LDAP_CONST char *
choose_name( char *names[], LDAP_CONST char *fallback ) choose_name( char *names[], LDAP_CONST char *fallback )
{ {
@ -680,7 +679,7 @@ parse_whsp(const char **sp)
/* Parse a sequence of dot-separated decimal strings */ /* Parse a sequence of dot-separated decimal strings */
static char * static char *
parse_numericoid(const char **sp, int *code, const int allow_quoted) parse_numericoid(const char **sp, int *code, const int flags)
{ {
char * res; char * res;
const char * start = *sp; const char * start = *sp;
@ -688,7 +687,7 @@ parse_numericoid(const char **sp, int *code, const int allow_quoted)
int quoted = 0; int quoted = 0;
/* Netscape puts the SYNTAX value in quotes (incorrectly) */ /* Netscape puts the SYNTAX value in quotes (incorrectly) */
if ( allow_quoted && **sp == '\'' ) { if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'' ) {
quoted = 1; quoted = 1;
(*sp)++; (*sp)++;
start++; start++;
@ -720,7 +719,7 @@ parse_numericoid(const char **sp, int *code, const int allow_quoted)
} }
strncpy(res,start,len); strncpy(res,start,len);
res[len] = '\0'; res[len] = '\0';
if ( allow_quoted && quoted ) { if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted ) {
if ( **sp == '\'' ) { if ( **sp == '\'' ) {
(*sp)++; (*sp)++;
} else { } else {
@ -1025,11 +1024,12 @@ ldap_syntax_free( LDAP_SYNTAX * syn )
} }
LDAP_SYNTAX * LDAP_SYNTAX *
ldap_str2syntax( const char * s, int * code, const char ** errp ) ldap_str2syntax( const char * s, int * code, const char ** errp, const int flags )
{ {
int kind; int kind;
const char * ss = s; const char * ss = s;
char * sval; char * sval;
int seen_name = 0;
int seen_desc = 0; int seen_desc = 0;
LDAP_SYNTAX * syn; LDAP_SYNTAX * syn;
char ** ext_vals; char ** ext_vals;
@ -1080,7 +1080,24 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
return syn; return syn;
case TK_BAREWORD: case TK_BAREWORD:
if ( !strcmp(sval,"DESC") ) { if ( !strcmp(sval,"NAME") ) {
LDAP_FREE(sval);
if ( seen_name ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_syntax_free(syn);
return(NULL);
}
seen_name = 1;
syn->syn_names = parse_qdescrs(&ss,code);
if ( !syn->syn_names ) {
if ( *code != LDAP_SCHERR_OUTOFMEM )
*code = LDAP_SCHERR_BADNAME;
*errp = ss;
ldap_syntax_free(syn);
return NULL;
}
} else if ( !strcmp(sval,"DESC") ) {
LDAP_FREE(sval); LDAP_FREE(sval);
if ( seen_desc ) { if ( seen_desc ) {
*code = LDAP_SCHERR_DUPOPT; *code = LDAP_SCHERR_DUPOPT;
@ -1146,12 +1163,11 @@ ldap_matchingrule_free( LDAP_MATCHING_RULE * mr )
} }
LDAP_MATCHING_RULE * LDAP_MATCHING_RULE *
ldap_str2matchingrule( const char * s, int * code, const char ** errp ) ldap_str2matchingrule( const char * s, int * code, const char ** errp, const int flags )
{ {
int kind; int kind;
const char * ss = s; const char * ss = s;
char * sval; char * sval;
int be_liberal = 1; /* Future additional argument */
int seen_name = 0; int seen_name = 0;
int seen_desc = 0; int seen_desc = 0;
int seen_obsolete = 0; int seen_obsolete = 0;
@ -1184,9 +1200,9 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
parse_whsp(&ss); parse_whsp(&ss);
savepos = ss; savepos = ss;
mr->mr_oid = parse_numericoid(&ss,code,be_liberal); mr->mr_oid = parse_numericoid(&ss,code,flags);
if ( !mr->mr_oid ) { if ( !mr->mr_oid ) {
if ( be_liberal ) { if ( flags & LDAP_SCHEMA_ALLOW_NO_OID ) {
/* Backtracking */ /* Backtracking */
ss = savepos; ss = savepos;
kind = get_token(&ss,&sval); kind = get_token(&ss,&sval);
@ -1285,7 +1301,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
seen_syntax = 1; seen_syntax = 1;
parse_whsp(&ss); parse_whsp(&ss);
mr->mr_syntax_oid = mr->mr_syntax_oid =
parse_numericoid(&ss,code,be_liberal); parse_numericoid(&ss,code,flags);
if ( !mr->mr_syntax_oid ) { if ( !mr->mr_syntax_oid ) {
*errp = ss; *errp = ss;
ldap_matchingrule_free(mr); ldap_matchingrule_free(mr);
@ -1342,12 +1358,11 @@ ldap_attributetype_free(LDAP_ATTRIBUTE_TYPE * at)
} }
LDAP_ATTRIBUTE_TYPE * LDAP_ATTRIBUTE_TYPE *
ldap_str2attributetype( const char * s, int * code, const char ** errp ) ldap_str2attributetype( const char * s, int * code, const char ** errp, const int flags )
{ {
int kind; int kind;
const char * ss = s; const char * ss = s;
char * sval; char * sval;
int be_liberal = 1; /* Future additional argument */
int seen_name = 0; int seen_name = 0;
int seen_desc = 0; int seen_desc = 0;
int seen_obsolete = 0; int seen_obsolete = 0;
@ -1394,7 +1409,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
savepos = ss; savepos = ss;
at->at_oid = parse_numericoid(&ss,code,0); at->at_oid = parse_numericoid(&ss,code,0);
if ( !at->at_oid ) { if ( !at->at_oid ) {
if ( be_liberal ) { if ( flags & LDAP_SCHEMA_ALLOW_NO_OID ) {
/* Backtracking */ /* Backtracking */
ss = savepos; ss = savepos;
kind = get_token(&ss,&sval); kind = get_token(&ss,&sval);
@ -1564,7 +1579,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
parse_noidlen(&ss, parse_noidlen(&ss,
code, code,
&at->at_syntax_len, &at->at_syntax_len,
be_liberal); flags);
if ( !at->at_syntax_oid ) { if ( !at->at_syntax_oid ) {
*errp = ss; *errp = ss;
ldap_attributetype_free(at); ldap_attributetype_free(at);
@ -1688,12 +1703,11 @@ ldap_objectclass_free(LDAP_OBJECT_CLASS * oc)
} }
LDAP_OBJECT_CLASS * LDAP_OBJECT_CLASS *
ldap_str2objectclass( const char * s, int * code, const char ** errp ) ldap_str2objectclass( const char * s, int * code, const char ** errp, const int flags )
{ {
int kind; int kind;
const char * ss = s; const char * ss = s;
char * sval; char * sval;
int be_liberal = 1; /* Future additional argument */
int seen_name = 0; int seen_name = 0;
int seen_desc = 0; int seen_desc = 0;
int seen_obsolete = 0; int seen_obsolete = 0;
@ -1738,7 +1752,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
savepos = ss; savepos = ss;
oc->oc_oid = parse_numericoid(&ss,code,0); oc->oc_oid = parse_numericoid(&ss,code,0);
if ( !oc->oc_oid ) { if ( !oc->oc_oid ) {
if ( be_liberal ) { if ( flags & LDAP_SCHEMA_ALLOW_ALL ) {
/* Backtracking */ /* Backtracking */
ss = savepos; ss = savepos;
kind = get_token(&ss,&sval); kind = get_token(&ss,&sval);
@ -1841,7 +1855,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
seen_sup = 1; seen_sup = 1;
oc->oc_sup_oids = parse_oids(&ss, oc->oc_sup_oids = parse_oids(&ss,
code, code,
be_liberal); flags);
if ( !oc->oc_sup_oids ) { if ( !oc->oc_sup_oids ) {
*errp = ss; *errp = ss;
ldap_objectclass_free(oc); ldap_objectclass_free(oc);

2
servers/slapd/mr.c
View file

@ -169,7 +169,7 @@ register_matching_rule(
return -1; return -1;
} }
mr = ldap_str2matchingrule( desc, &code, &err); mr = ldap_str2matchingrule( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
if ( !mr ) { if ( !mr ) {
Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n", Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n",
ldap_scherr2str(code), err, desc ); ldap_scherr2str(code), err, desc );

4
servers/slapd/schemaparse.c
View file

@ -273,7 +273,7 @@ parse_oc(
const char *err; const char *err;
char *oid = NULL; char *oid = NULL;
oc = ldap_str2objectclass(line,&code,&err); oc = ldap_str2objectclass(line,&code,&err,LDAP_SCHEMA_ALLOW_ALL);
if ( !oc ) { if ( !oc ) {
fprintf( stderr, "%s: line %d: %s before %s\n", fprintf( stderr, "%s: line %d: %s before %s\n",
fname, lineno, ldap_scherr2str(code), err ); fname, lineno, ldap_scherr2str(code), err );
@ -398,7 +398,7 @@ parse_at(
break; break;
} }
} }
at = ldap_str2attributetype(line,&code,&err); at = ldap_str2attributetype(line,&code,&err,LDAP_SCHEMA_ALLOW_ALL);
if ( !at ) { if ( !at ) {
fprintf( stderr, "%s: line %d: %s before %s\n", fprintf( stderr, "%s: line %d: %s before %s\n",
fname, lineno, ldap_scherr2str(code), err ); fname, lineno, ldap_scherr2str(code), err );

2
servers/slapd/syntax.c
View file

@ -148,7 +148,7 @@ register_syntax(
int code; int code;
const char *err; const char *err;
syn = ldap_str2syntax( desc, &code, &err); syn = ldap_str2syntax( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
if ( !syn ) { if ( !syn ) {
Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n", Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
ldap_scherr2str(code), err, desc ); ldap_scherr2str(code), err, desc );