mars_nwe/mars-tinyldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search Filter bugs fixed (thx Simon Rettberg)

Browse Source
This commit is contained in:
leitner
2017-06-02 08:51:22 +00:00
parent 11536f5b2b
commit e122a756a1
3 changed files with 98 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fmt_ldapsearchfilter.c
View File

@@ -51,7 +51,7 @@ size_t fmt_ldapsearchfilter(char* dest,const struct Filter* f) {
}
break;
case PRESENT:
return fmt_asn1string(dest,PRIVATE,PRIMITIVE,(enum asn1_tag)f->type,f->ava.desc.s,f->ava.desc.l);
sum=fmt_asn1string(dest,PRIVATE,PRIMITIVE,(enum asn1_tag)f->type,f->ava.desc.s,f->ava.desc.l);
break;
default: return 0;
}
@@ -62,6 +62,9 @@ size_t fmt_ldapsearchfilter(char* dest,const struct Filter* f) {
else sum+=fmt_ldapsearchfilter(dest,f->next);
}
if (f->type==PRESENT)
return sum;
tmp=fmt_asn1length(0,savesum);
if (!dest) return sum+tmp+1;
if (dest) byte_copyr(dest+tmp+1,sum,dest);

148
fmt_ldapsearchfilterstring.c
View File

@@ -3,67 +3,105 @@
#include <libowfat/str.h>
#include "ldap.h"
size_t fmt_escapesearchfilterstring(char* dest,const char* s,size_t len) {
size_t i,j;
for (i=j=0; i<len; ++i,++j) {
switch (s[i]) {
case '*': case '\\': case '(': case ')': case 0: // RFC4515
if (dest) {
dest[j]='\\';
dest[j+1]=fmt_tohex((unsigned char)(s[i])>>4);
dest[j+2]=fmt_tohex(s[i]&0xf);
}
j+=2;
break;
default:
if (dest)
dest[j]=s[i];
}
}
return j;
}
size_t fmt_ldapsearchfilterstring(char* dest,const struct Filter* f) {
size_t len;
len = fmt_str(dest,"(");
switch (f->type) {
case AND: case OR: case NOT:
if (dest) dest[len]="&|!"[f->type];
++len;
len += fmt_ldapsearchfilterstring(dest?dest+len:0,f->x);
break;
case EQUAL: case GREATEQUAL: case LESSEQUAL: case APPROX:
if (dest) {
byte_copy(dest+len,f->ava.desc.l,f->ava.desc.s);
len += f->ava.desc.l;
if (f->type!=EQUAL) {
dest[len]="><~"[f->type-GREATEQUAL];
++len;
do {
switch (f->type) {
case AND: case OR: case NOT:
if (dest) dest[len]="&|!"[f->type];
++len;
len += fmt_ldapsearchfilterstring(dest?dest+len:0,f->x);
break;
case EQUAL: case GREATEQUAL: case LESSEQUAL: case APPROX:
if (dest) {
len += fmt_escapesearchfilterstring(dest+len,f->ava.desc.s,f->ava.desc.l);
// byte_copy(dest+len,f->ava.desc.l,f->ava.desc.s);
// len += f->ava.desc.l;
if (f->type!=EQUAL) {
dest[len]="><~"[f->type-GREATEQUAL];
++len;
}
dest[len]='='; ++len;
len += fmt_escapesearchfilterstring(dest+len,f->ava.value.s,f->ava.value.l);
// byte_copy(dest+len,f->ava.value.l,f->ava.value.s);
// len += f->ava.value.l;
} else
len += fmt_escapesearchfilterstring(NULL,f->ava.desc.s,f->ava.desc.l) +
fmt_escapesearchfilterstring(NULL,f->ava.value.s,f->ava.value.l) +
1 + (f->type>EQUAL);
break;
case SUBSTRING:
{
struct Substring* x=f->substrings;
while (x) {
if (dest) {
len += fmt_escapesearchfilterstring(dest+len,f->ava.desc.s,f->ava.desc.l);
// byte_copy(dest+len,f->ava.desc.l,f->ava.desc.s);
// len += f->ava.desc.l;
dest[len]='='; ++len;
if (x->substrtype != prefix) {
dest[len]='*'; ++len;
}
len += fmt_escapesearchfilterstring(dest+len,x->s.s,x->s.l);
// byte_copy(dest+len,x->s.l,x->s.s);
// len += x->s.l;
if (x->substrtype != suffix) {
dest[len]='*'; ++len;
}
if (x->next) {
dest[len]=')';
dest[len+1]='(';
len+=2;
}
} else
len += f->ava.desc.l + 1 + x->s.l + 1 + (x->substrtype==any) + (x->next?2:0);
x=x->next;
}
}
dest[len]='='; ++len;
byte_copy(dest+len,f->ava.value.l,f->ava.value.s);
len += f->ava.value.l;
} else
len += f->ava.desc.l + f->ava.value.l + 1 + (f->type>EQUAL);
break;
case SUBSTRING:
{
struct Substring* x=f->substrings;
while (x) {
if (dest) {
byte_copy(dest+len,f->ava.desc.l,f->ava.desc.s);
len += f->ava.desc.l;
dest[len]='='; ++len;
if (x->substrtype != prefix) {
dest[len]='*'; ++len;
}
byte_copy(dest+len,x->s.l,x->s.s);
len += x->s.l;
if (x->substrtype != suffix) {
dest[len]='*'; ++len;
}
if (x->next) {
dest[len]=')';
dest[len+1]='(';
len+=2;
}
} else
len += f->ava.desc.l + 1 + x->s.l + 1 + (x->substrtype==any) + (x->next?2:0);
x=x->next;
break;
case PRESENT:
if (dest) {
len += fmt_escapesearchfilterstring(dest+len,f->ava.desc.s,f->ava.desc.l);
// byte_copy(dest+len,f->ava.desc.l,f->ava.desc.s);
dest[len]='=';
dest[len+1]='*';
} else
len += fmt_escapesearchfilterstring(NULL,f->ava.desc.s,f->ava.desc.l);
len += 2;
break;
default:
return -1;
}
f=f->next;
if (f) {
if (dest) {
dest[len]=')';
dest[len+1]='(';
}
len+=2;
}
break;
case PRESENT:
if (dest) {
byte_copy(dest+len,f->ava.desc.l,f->ava.desc.s);
dest[len+f->ava.desc.l]='=';
dest[len+f->ava.desc.l+1]='*';
}
len += f->ava.desc.l+2;
break;
default:
return -1;
}
} while (f);
if (dest) dest[len]=')';
return len+1;
}

2
scan_ldapsearchfilterstring.c
View File

@@ -46,7 +46,7 @@ scan_filterlist:
if (*(++s)=='*') {
if (*(++s)==')') {
(*f)->type=PRESENT;
return s-src;
return s-src+1;
}
(*f)->type=SUBSTRING;
substring: