sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/ldap: - updated with comments received from Victor Pascual

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: 870ae982996067ac14572f87f82e4ea21597b9c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=870ae98… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Jun 25 08:12:06 2008 +0000 - updated with comments received from Victor Pascual --- modules/db_ldap/standards.txt | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/modules/db_ldap/standards.txt b/modules/db_ldap/standards.txt index e24244d..7bfeb8b 100644 --- a/modules/db_ldap/standards.txt +++ b/modules/db_ldap/standards.txt @@ -3,25 +3,45 @@ List of relevant standards and RFCs RFC2307: An Approach for Using LDAP as a Network Information Service + This document is experimental and based on RFC2251, which has been obsoleted + by RFC 4510, RFC 4511, RFC 4513, RFC 4512 and updated by RFC 3377 and RFC + 3771. Anyhow, AFAIK RFC 2307 is not obsoleted. + RFC2256: A summary of the X.500(96) user Schema for use with LDAPv3 - This rfc contains a collection of attribute types and object - classes collected from various ITU documents. Attribute types - such as objectClass or cn are defined here. + + This rfc contains a collection of attribute types and object classes + collected from various ITU documents. Attribute types such as objectClass or + cn are defined here. + + This document has been obsoleted by RFC 4510 and updated by RFC 4512, RFC + 4517 and RFC 4519. + RFC2587: Internet X.509 Public Key Infrastructure LDAPv2 Schema + This document has been obsoleted by RFC 4523. + + RFC1274: The COSINE and Internet X.500 Schema + This document has been obsoleted by RFC 4524. + RFC2798: Definition of the inetOrgPerson LDAP Object Class + This document has been updated by RFC 3698, RFC 4519 and RFC 4524. + RFC4515: Lightweight Directory Access Protocol (LDAP): String Representation of Search Filters RFC4530: LDAP entryUUID Operational Attribute - This RFC defines the entryUUID operational attribute which can be - used by the server to assign unique identifiers to objects in the - directory. Such identifiers can be used to identify the object even - when the dn of the object changes. Unfortunately the entryUUID attribute - cannot by modified by the user and thus it is not directly usable for us. + + This RFC defines the entryUUID operational attribute which can be used by + the server to assign unique identifiers to objects in the directory. Such + identifiers can be used to identify the object even when the dn of the + object changes. Unfortunately the entryUUID attribute cannot by modified by + the user and thus it is not directly usable for us. RFC2252 LDAPv3: Attribute Syntax Definitions + + This document has been obsoleted by RFC 4510, RFC 4517, RFC 4523, RFC 4512 + and updated by RFC 3377

16 years

git:janakj/ldap: the processing of connection table of ldap configuration added

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: a3cc95e27013a27abec7f64b5e0850c6f22bcecf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3cc95e… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Wed Jun 11 15:45:37 2008 +0000 the processing of connection table of ldap configuration added --- modules/db_ldap/ld_cfg.c | 83 +++++++++++++++++++++++++++--------------- modules/db_ldap/ld_cfg.h | 7 +++- modules/db_ldap/ld_uri.c | 89 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 142 insertions(+), 37 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a3c…

16 years

git:janakj/ldap: credentials table name fixed, example for connection table added

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: b0b6f180c8f668c999be10aa682f304f8128863f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0b6f18… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Wed Jun 11 15:40:26 2008 +0000 credentials table name fixed, example for connection table added --- modules/db_ldap/ldap.cfg | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/db_ldap/ldap.cfg b/modules/db_ldap/ldap.cfg index edb92e2..6cd3613 100644 --- a/modules/db_ldap/ldap.cfg +++ b/modules/db_ldap/ldap.cfg @@ -15,10 +15,16 @@ # * Float # +[connection:ldap_server1] +host=127.0.0.1 +port=389 +username=ser +password=heslo + # # Table credentials contains SIP digest authentication credentials. # -[credentials] +[table:credentials] # In our LDAP directory we store SIP digest credentials under # "Digest Credentials" organization unit so this is where searches for digest

16 years

git:janakj/ldap: - updated with the last changes in the cfg parser

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: e9288fc9406c874f8ca5c4afd1d339c66b62e395 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9288fc… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Jun 11 11:13:53 2008 +0000 - updated with the last changes in the cfg parser - support for connection information in the configuration file - format of the config file slightly changed --- modules/db_ldap/ld_cfg.c | 175 ++++++++++++++++++++++++++++++++++++---------- modules/db_ldap/ld_cfg.h | 6 ++ modules/db_ldap/ldap.cfg | 4 +- 3 files changed, 145 insertions(+), 40 deletions(-) diff --git a/modules/db_ldap/ld_cfg.c b/modules/db_ldap/ld_cfg.c index 2c7b392..eea1402 100644 --- a/modules/db_ldap/ld_cfg.c +++ b/modules/db_ldap/ld_cfg.c @@ -38,11 +38,20 @@ #include <libgen.h> -static struct ld_cfg* cfg; +enum section_type { + LDAP_CON_SECTION = 0, + LDAP_TABLE_SECTION +}; + + +static struct ld_cfg* cfg = NULL; + +static struct ld_con_info* con = NULL; void ld_cfg_free(void) { + struct ld_con_info* c; struct ld_cfg* ptr; int i; @@ -62,6 +71,17 @@ void ld_cfg_free(void) if (ptr->attr) pkg_free(ptr->attr); if (ptr->syntax) pkg_free(ptr->syntax); } + + while (con) { + c = con; + con = con->next; + + if (c->id.s) pkg_free(c->id.s); + if (c->host.s) pkg_free(c->host.s); + + pkg_free(c); + } + } @@ -83,7 +103,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) cfg_option_t* syntax; - if (cfg_eat_equal(st)) return -1; + if (cfg_eat_equal(st, flags)) return -1; if (!(ptr = pkg_realloc(cfg->field, sizeof(str) * (cfg->n + 1)))) { ERR("ldap:%s:%d:%d Out of memory\n", st->file, st->line, st->col); @@ -110,7 +130,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) ret = cfg_get_token(&t, st, 0); if (ret < 0) return -1; - if (ret == 0) { + if (ret > 0) { ERR("ldap:%s:%d:%d: Database field name expected\n", st->file, st->line, st->col); return -1; @@ -132,7 +152,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) ret = cfg_get_token(&t, st, 0); if (ret < 0) return -1; - if (ret == 0) { + if (ret > 0) { ERR("ldap:%s:%d:%d: Delimiter ':' missing\n", st->file, st->line, st->col); return -1; @@ -145,7 +165,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) ret = cfg_get_token(&t, st, 0); if (ret < 0) return -1; - if (ret == 0) { + if (ret > 0) { ERR("ldap:%s:%d:%d: LDAP Attribute syntax or name expected\n", st->file, st->line, st->col); return -1; @@ -154,7 +174,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) if (t.type == '(') { ret = cfg_get_token(&t, st, 0); if (ret < 0) return -1; - if (ret == 0) { + if (ret > 0) { ERR("ldap:%s:%d:%d: LDAP Attribute Syntax expected\n", st->file, st->line, st->col); return -1; @@ -175,7 +195,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) ret = cfg_get_token(&t, st, 0); if (ret < 0) return -1; - if (ret == 0) { + if (ret > 0) { ERR("ldap:%s:%d:%d: Closing ')' missing in attribute syntax\n", st->file, st->line, st->col); return -1; @@ -189,7 +209,7 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) ret = cfg_get_token(&t, st, 0); if (ret < 0) return -1; - if (ret == 0) { + if (ret > 0) { ERR("ldap:%s:%d:%d: LDAP Attribute name expected\n", st->file, st->line, st->col); return -1; @@ -208,7 +228,8 @@ static int parse_field_map(void* param, cfg_parser_t* st, unsigned int flags) return -1; } cfg->attr[cfg->n - 1].len = t.val.len; - + + if (cfg_eat_eol(st, flags)) return -1; return 0; } @@ -226,49 +247,127 @@ static cfg_option_t scope_values[] = { }; -static cfg_option_t ldap_options[] = { - {"scope", .param = scope_values, .f = cfg_parse_enum_val}, +static cfg_option_t ldap_tab_options[] = { + {"scope", .param = scope_values, .f = cfg_parse_enum_opt}, {"field_map", .f = parse_field_map}, - {"filter", .f = cfg_parse_str_val, .flags = CFG_STR_PKGMEM}, - {"base", .f = cfg_parse_str_val, .flags = CFG_STR_PKGMEM}, + {"filter", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {"base", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, {0} }; -static int parse_table(void* param, cfg_parser_t* st, unsigned int flags) +static cfg_option_t ldap_con_options[] = { + {"host", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {0} +}; + + +static cfg_option_t section_types[] = { + {"connection", .val = LDAP_CON_SECTION}, + {"con", .val = LDAP_CON_SECTION}, + {"table", .val = LDAP_TABLE_SECTION}, + {0} +}; + + +static int parse_section(void* param, cfg_parser_t* st, unsigned int flags) { - int i; - str name, tab; - struct ld_cfg* ptr; + cfg_token_t t; + int ret, type, i; + cfg_option_t* opt; + str* id; + struct ld_cfg* tab; + struct ld_con_info* cinfo; + + ret = cfg_get_token(&t, st, 0); + if (ret < 0) return -1; + if (ret > 0) { + ERR("%s:%d:%d: Section type missing\n", + st->file, st->line, st->col); + return -1; + } + + if (t.type != CFG_TOKEN_ALPHA || + ((opt = cfg_lookup_token(section_types, &t.val)) == NULL)) { + ERR("%s:%d:%d: Invalid section type %d:'%.*s'\n", + st->file, t.start.line, t.start.col, t.type, STR_FMT(&t.val)); + return -1; + } + type = opt->val; - if (cfg_parse_section(&name, st, 0)) return -1; + if (type == LDAP_TABLE_SECTION) { + if ((tab = pkg_malloc(sizeof(*tab))) == NULL) { + ERR("ldap:%s:%d: Out of memory\n", st->file, st->line); + return -1; + } + memset(tab, '\0', sizeof(*tab)); + tab->next = cfg; + cfg = tab; + + cfg_set_options(st, ldap_tab_options); + ldap_tab_options[2].param = &cfg->filter; + ldap_tab_options[3].param = &cfg->base; + for(i = 0; scope_values[i].name; i++) { + scope_values[i].param = &cfg->scope; + } + } else if (type == LDAP_CON_SECTION) { + if ((cinfo = pkg_malloc(sizeof(*cinfo))) == NULL) { + ERR("ldap:%s:%d: Out of memory\n", st->file, st->line); + return -1; + } + memset(cinfo, '\0', sizeof(*cinfo)); + cinfo->next = con; + con = cinfo; + + cfg_set_options(st, ldap_con_options); + ldap_con_options[0].param = &con->host; + } else { + BUG("%s:%d:%d: Unsupported section type %c\n", + st->file, t.start.line, t.start.col, t.type); + return -1; + } - if ((tab.s = as_asciiz(&name)) == NULL) { - ERR("ldap:%s:%d: Out of memory\n", st->file, st->line); + ret = cfg_get_token(&t, st, 0); + if (ret < 0) return -1; + if (ret > 0) { + ERR("%s:%d:%d: Delimiter ':' expected.\n", + st->file, st->line, st->col); return -1; } - tab.len = name.len;; - if ((ptr = (struct ld_cfg*)pkg_malloc(sizeof(*ptr))) == NULL) { - ERR("ldap:%s:%d: Out of memory\n", st->file, st->line); - goto error; + if (type == LDAP_TABLE_SECTION) { + id = &cfg->table; + } else if (type == LDAP_CON_SECTION) { + id = &con->id; + } else { + BUG("%s:%d:%d: Invalid section type %d\n", st->file, + st->line, st->col, type); } - memset(ptr, '\0', sizeof(*ptr)); - ptr->table = tab; - ptr->next = cfg; - cfg = ptr; - - cfg_set_options(st, ldap_options); - ldap_options[2].param = &cfg->filter; - ldap_options[3].param = &cfg->base; - for(i = 0; scope_values[i].name; i++) { - scope_values[i].param = &cfg->scope; + + ret = cfg_parse_str(id, st, CFG_STR_PKGMEM); + if (ret < 0) return -1; + if (ret > 0) { + ERR("%s:%d:%d: Section identifier expected\n", + st->file, st->line, st->col); + return -1; } + + ret = cfg_get_token(&t, st, 0); + if (ret < 0) return ret; + if (ret > 0) { + ERR("%s:%d:%d: Missing closing ']'.\n", + st->file, st->line, st->col); + return -1; + } + if (t. type != ']') { + ERR("%s:%d:%d: Syntax error, ']' expected.\n", + st->file, t.start.line, t.start.col); + return -1; + } + + if (cfg_eat_eol(st, flags)) return -1; return 0; - error: - if (tab.s) pkg_free(tab.s); - return -1; } @@ -312,7 +411,7 @@ int ld_load_cfg(str* filename) return -1; } - cfg_section_parser(parser, parse_table, NULL); + cfg_section_parser(parser, parse_section, NULL); if (cfg_parse(parser)) { if (cfg == NULL) { diff --git a/modules/db_ldap/ld_cfg.h b/modules/db_ldap/ld_cfg.h index 1ad8fe8..e63a09c 100644 --- a/modules/db_ldap/ld_cfg.h +++ b/modules/db_ldap/ld_cfg.h @@ -42,6 +42,12 @@ struct ld_cfg { struct ld_cfg* next; /**< The next table in the list */ }; +struct ld_con_info { + str id; + str host; + struct ld_con_info* next; +}; + struct ld_cfg* ld_find_cfg(str* table); char* ld_find_attr_name(enum ld_syntax* syntax, struct ld_cfg* cfg, char* fld_name); diff --git a/modules/db_ldap/ldap.cfg b/modules/db_ldap/ldap.cfg index 1f134b2..edb92e2 100644 --- a/modules/db_ldap/ldap.cfg +++ b/modules/db_ldap/ldap.cfg @@ -45,7 +45,7 @@ field_map = flags : (BitString) serFlags # # Domain table stores information about virtual domains # -[domain] +[table:domain] # Objects mapping domain IDs to domain names and vice versa are stored # in the subtree with the following root: @@ -65,7 +65,7 @@ field_map = flags : (BitString) serFlags # Table domain_attrs contains domain attributes, domain attributes store # extra information about virtual domains. # -[domain_attrs] +[table:domain_attrs] base = "ou=Domains, dc=iptel,dc=org" scope = subtree

16 years

git:janakj/ldap: - simple authentication is done

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: 49db0edd28ee8889cd918fd2f0a85fbb4d090af2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49db0ed… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Jun 5 08:06:43 2008 +0000 - simple authentication is done --- modules/db_ldap/todo.txt | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/db_ldap/todo.txt b/modules/db_ldap/todo.txt index 8a82bde..20f230b 100644 --- a/modules/db_ldap/todo.txt +++ b/modules/db_ldap/todo.txt @@ -1,10 +1,14 @@ -* Authentication Support +X Simple Authentication + + Implement support for simple LDAP authentication with username and + password. This will take a change in the URI parser because the one provided + by libldap (which we use to parse the URI right now) does not support + embedded usernames and passwords in the URI. + +* SASL Authentication Support The driver supports no authentication method at the moment, we should include support for simple authentication at least, but better SASL. - This will take a change in the URI parser because the one provided - by libldap (which we use to parse the URI right now) does not support - embedded usernames and passwords in the URI. * TLS/SSL Support

16 years

git:janakj/ldap: simple user authentication mechanism added

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: 6bbe8456d8ddf3e999d16d694d58719fe41b5121 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6bbe845… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Wed Jun 4 21:43:27 2008 +0000 simple user authentication mechanism added --- modules/db_ldap/ld_con.c | 25 +++--- modules/db_ldap/ld_uri.c | 194 ++++++++++++++++++++++++++++++++++++++++------ modules/db_ldap/ld_uri.h | 8 +- 3 files changed, 187 insertions(+), 40 deletions(-) diff --git a/modules/db_ldap/ld_con.c b/modules/db_ldap/ld_con.c index 32a0db9..21df896 100644 --- a/modules/db_ldap/ld_con.c +++ b/modules/db_ldap/ld_con.c @@ -23,10 +23,10 @@ */ /** \addtogroup ldap - * @{ + * @{ */ -/** \file +/** \file * Functions related to connections to LDAP servers. */ @@ -62,12 +62,12 @@ static void ld_con_free(db_con_t* con, struct ld_con* payload) * to it in the connection pool */ if (db_pool_remove((db_pool_entry_t*)payload) == 0) return; - + db_pool_entry_free(&payload->gen); if (payload->con) { ret = ldap_unbind_ext_s(payload->con, NULL, NULL); if (ret != LDAP_SUCCESS) { - ERR("ldap: Error while unbinding from %s: %s\n", + ERR("ldap: Error while unbinding from %s: %s\n", luri->uri, ldap_err2string(ret)); } } @@ -129,10 +129,10 @@ int ld_con_connect(db_con_t* con) struct ld_con* lcon; struct ld_uri* luri; int ret, version = 3; - + lcon = DB_GET_PAYLOAD(con); luri = DB_GET_PAYLOAD(con->uri); - + /* Do not reconnect already connected connections */ if (lcon->flags & LD_CONNECTED) return 0; @@ -141,7 +141,7 @@ int ld_con_connect(db_con_t* con) if (lcon->con) { ret = ldap_unbind_ext_s(lcon->con, NULL, NULL); if (ret != LDAP_SUCCESS) { - ERR("ldap: Error while unbinding from %s: %s\n", + ERR("ldap: Error while unbinding from %s: %s\n", luri->uri, ldap_err2string(ret)); } } @@ -155,15 +155,14 @@ int ld_con_connect(db_con_t* con) ret = ldap_set_option(lcon->con, LDAP_OPT_PROTOCOL_VERSION, &version); if (ret != LDAP_OPT_SUCCESS) { - ERR("ldap: Error while setting protocol version 3: %s\n", + ERR("ldap: Error while setting protocol version 3: %s\n", ldap_err2string(ret)); goto error; } - /* FIXME: Currently only anonymous binds are supported */ - ret = ldap_simple_bind_s(lcon->con, NULL, NULL); + ret = ldap_simple_bind_s(lcon->con, luri->username, luri->password); if (ret != LDAP_SUCCESS) { - ERR("ldap: Bind to %s failed: %s\n", + ERR("ldap: Bind to %s failed: %s\n", luri->uri, ldap_err2string(ret)); goto error; } @@ -176,7 +175,7 @@ int ld_con_connect(db_con_t* con) if (lcon->con) { ret = ldap_unbind_ext_s(lcon->con, NULL, NULL); if (ret) { - ERR("ldap: Error while unbinding from %s: %s\n", + ERR("ldap: Error while unbinding from %s: %s\n", luri->uri, ldap_err2string(ret)); } } @@ -201,7 +200,7 @@ void ld_con_disconnect(db_con_t* con) if (lcon->con) { ret = ldap_unbind_ext_s(lcon->con, NULL, NULL); if (ret) { - ERR("ldap: Error while unbinding from %s: %s\n", + ERR("ldap: Error while unbinding from %s: %s\n", luri->uri, ldap_err2string(ret)); } } diff --git a/modules/db_ldap/ld_uri.c b/modules/db_ldap/ld_uri.c index 2911b28..ee36918 100644 --- a/modules/db_ldap/ld_uri.c +++ b/modules/db_ldap/ld_uri.c @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * LDAP Database Driver for SER * @@ -18,15 +18,15 @@ * details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., + * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ /** \addtogroup ldap - * @{ + * @{ */ -/** \file +/** \file * The implementation of parser parsing ldap:.. URIs. */ @@ -39,7 +39,7 @@ /** compare s1 & s2 with a function f (which should return 0 if ==); * s1 & s2 can be null - * return 0 if match, 1 if not + * return 0 if match, 1 if not */ #define cmpstr(s1, s2, f) \ ((s1)!=(s2)) && ((s1)==0 || (s2)==0 || (f)((s1), (s2))!=0) @@ -63,18 +63,178 @@ static unsigned char ld_uri_cmp(db_uri_t* uri1, db_uri_t* uri2) luri2 = DB_GET_PAYLOAD(uri2); if (luri1->ldap_url->lud_port != luri2->ldap_url->lud_port) return 0; - if (cmpstr(luri1->ldap_url->lud_host, - luri2->ldap_url->lud_host, strcasecmp)) + if (cmpstr(luri1->ldap_url->lud_host, + luri2->ldap_url->lud_host, strcasecmp)) return 0; return 1; } +/** Duplicate a string + */ +static int dupl_string(char** dst, const char* begin, const char* end) +{ + if (*dst) pkg_free(*dst); + + *dst = pkg_malloc(end - begin + 1); + if ((*dst) == NULL) { + return -1; + } + + memcpy(*dst, begin, end - begin); + (*dst)[end - begin] = '\0'; + return 0; +} + +/* + * Parse ldap URI of form + * //[username[:password]@]hostname[:port] + * + * Returns 0 if parsing was successful and -1 otherwise + */ +int parse_ldap_uri(struct ld_uri* res, str* scheme, str* uri) +{ +#define SHORTEST_DB_URL "a" +#define SHORTEST_DB_URL_LEN (sizeof(SHORTEST_DB_URL) - 1) + + enum state { + ST_BEGIN, /* First state */ + ST_SECTTITLE, /* Config section title */ + ST_SLASH2, /* Second slash */ + ST_USER_HOST, /* Username or hostname */ + ST_PASS_PORT, /* Password or port part */ + ST_HOST_PORT /* Hostname and port part */ + }; + enum state st; + int i, ldapurllen; + const char* begin; + const char* ldapbegin; + char* prev_token; + + prev_token = 0; + + if (!res || !scheme || !uri) { + goto err; + } + + if (uri->len < SHORTEST_DB_URL_LEN) { + goto err; + } + + st = ST_BEGIN; + ldapbegin = begin = uri->s; + + for(i = 0; i < uri->len; i++) { + switch(st) { + case ST_BEGIN: + switch(uri->s[i]) { + case '/': + st = ST_SLASH2; + break; + + default: + st = ST_SECTTITLE; + } + break; + + case ST_SECTTITLE: + break; + + case ST_SLASH2: + switch(uri->s[i]) { + case '/': + st = ST_USER_HOST; + ldapbegin = begin = uri->s + i + 1; + break; + + default: + goto err; + } + break; + + case ST_USER_HOST: + switch(uri->s[i]) { + case '@': + st = ST_HOST_PORT; + if (dupl_string(&res->username, begin, uri->s + i) < 0) goto err; + ldapbegin = begin = uri->s + i + 1; + break; + + case ':': + st = ST_PASS_PORT; + if (dupl_string(&prev_token, begin, uri->s + i) < 0) goto err; + begin = uri->s + i + 1; + break; + } + break; + + case ST_PASS_PORT: + switch(uri->s[i]) { + case '@': + st = ST_HOST_PORT; + res->username = prev_token; + if (dupl_string(&res->password, begin, uri->s + i) < 0) goto err; + ldapbegin = begin = uri->s + i + 1; + break; + } + break; + + case ST_HOST_PORT: + break; + } + } + + switch(st) { + case ST_PASS_PORT: + case ST_USER_HOST: + case ST_HOST_PORT: + ldapurllen = uri->len - (int)(ldapbegin - uri->s); + // +3 for the '://' ldap url snippet + res->uri = pkg_malloc(scheme->len + 3 + ldapurllen + 1); + if (res->uri== NULL) { + ERR("ldap: No memory left\n"); + goto err; + } + memcpy(res->uri, scheme->s, scheme->len); + res->uri[scheme->len] = ':'; + res->uri[scheme->len + 1] = '/'; + res->uri[scheme->len + 2] = '/'; + memcpy(res->uri + scheme->len + 3, ldapbegin, ldapurllen); + res->uri[scheme->len + 3 + ldapurllen] = '\0'; + + if (ldap_url_parse(res->uri, &res->ldap_url) != 0) { + ERR("ldap: Error while parsing URL '%s'\n", res->uri); + goto err; + } + break; + case ST_SECTTITLE: + /* haven't supported yet */ + default: + goto err; + } + + return 0; + + err: + if (prev_token) pkg_free(prev_token); + if (res == NULL) return -1; + if (res->username) { + pkg_free(res->username); + res->username = NULL; + } + if (res->password) { + pkg_free(res->password); + res->password = NULL; + } + return -1; +} static void ld_uri_free(db_uri_t* uri, struct ld_uri* payload) { if (payload == NULL) return; if (payload->ldap_url) ldap_free_urldesc(payload->ldap_url); if (payload->uri) pkg_free(payload->uri); + if (payload->username) pkg_free(payload->username); + if (payload->password) pkg_free(payload->password); db_drv_free(&payload->drv); pkg_free(payload); } @@ -91,21 +251,7 @@ int ld_uri(db_uri_t* uri) } memset(luri, '\0', sizeof(struct ld_uri)); if (db_drv_init(&luri->drv, ld_uri_free) < 0) goto error; - - luri->uri = pkg_malloc(uri->scheme.len + 1 + uri->body.len + 1); - if (luri->uri== NULL) { - ERR("ldap: No memory left\n"); - goto error; - } - memcpy(luri->uri, uri->scheme.s, uri->scheme.len); - luri->uri[uri->scheme.len] = ':'; - memcpy(luri->uri + uri->scheme.len + 1, uri->body.s, uri->body.len); - luri->uri[uri->scheme.len + 1 + uri->body.len] = '\0'; - - if (ldap_url_parse(luri->uri, &luri->ldap_url) != 0) { - ERR("ldap: Error while parsing URL '%s'\n", luri->uri); - goto error; - } + if (parse_ldap_uri(luri, &uri->scheme, &uri->body) < 0) goto error; DB_SET_PAYLOAD(uri, luri); uri->cmp = ld_uri_cmp; @@ -118,7 +264,7 @@ int ld_uri(db_uri_t* uri) db_drv_free(&luri->drv); pkg_free(luri); } - return -1; + return -1; } diff --git a/modules/db_ldap/ld_uri.h b/modules/db_ldap/ld_uri.h index d6886c0..f125767 100644 --- a/modules/db_ldap/ld_uri.h +++ b/modules/db_ldap/ld_uri.h @@ -26,10 +26,10 @@ #define _LD_URI_H /** \addtogroup ldap - * @{ + * @{ */ -/** \file +/** \file * The functions parsing and interpreting ldap: URIs. */ @@ -41,11 +41,13 @@ /** LDAP driver specific payload to attach to db_uri structures. * This is the LDAP specific structure that will be attached - * to generic db_uri structures in the database API in SER. The + * to generic db_uri structures in the database API in SER. The * structure contains parsed elements of the ldap: URI. */ struct ld_uri { db_drv_t drv; + char* username; + char* password; char* uri; /**< The whole URI, including scheme */ LDAPURLDesc* ldap_url; /**< URI parsed by the ldap client library */ };

16 years

git:janakj/ldap: - license text reformatted

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: f67f7ee2f12f9a2e7a25f5732badcbf9991e51df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f67f7ee… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Jun 1 09:35:48 2008 +0000 - license text reformatted - changed header field order in ld_uri.c --- modules/db_ldap/ld_cmd.c | 10 +++------- modules/db_ldap/ld_cmd.h | 10 +++------- modules/db_ldap/ld_con.c | 10 +++------- modules/db_ldap/ld_con.h | 14 ++++---------- modules/db_ldap/ld_config.c | 28 +++++++++++----------------- modules/db_ldap/ld_config.h | 30 ++++++++++++------------------ modules/db_ldap/ld_fld.c | 10 +++------- modules/db_ldap/ld_fld.h | 10 +++------- modules/db_ldap/ld_mod.c | 10 +++------- modules/db_ldap/ld_mod.h | 10 +++------- modules/db_ldap/ld_res.c | 10 +++------- modules/db_ldap/ld_res.h | 10 +++------- modules/db_ldap/ld_uri.c | 13 ++++--------- modules/db_ldap/ld_uri.h | 10 +++------- 14 files changed, 61 insertions(+), 124 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f67…

16 years

git:janakj/ldap: - fixed wrong comment

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: a55a847eb2e376c36347e9e35a36205abf560b9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a55a847… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri May 23 15:06:45 2008 +0000 - fixed wrong comment --- modules/db_ldap/ld_con.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_ldap/ld_con.c b/modules/db_ldap/ld_con.c index 6691768..fb6a763 100644 --- a/modules/db_ldap/ld_con.c +++ b/modules/db_ldap/ld_con.c @@ -106,7 +106,7 @@ int ld_con(db_con_t* con) DBG("ldap: Preparing new connection to %s\n", luri->uri); - /* Put the newly created postgres connection into the pool */ + /* Put the newly created LDAP connection into the pool */ db_pool_put((struct db_pool_entry*)lcon); DBG("ldap: Connection stored in connection pool\n");

16 years

git:janakj/ldap: Filter query string assembling fixed

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: c332f344d4174e12634eb1090517e6be9ff0b269 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c332f34… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Thu May 29 15:21:59 2008 +0000 Filter query string assembling fixed --- modules/db_ldap/ld_fld.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_ldap/ld_fld.c b/modules/db_ldap/ld_fld.c index 85bdd7d..26e06c7 100644 --- a/modules/db_ldap/ld_fld.c +++ b/modules/db_ldap/ld_fld.c @@ -627,7 +627,7 @@ int ld_fld2ldap(char** filter, db_fld_t* fld, str* add) rv |= sb_add(&buf, "(", 1); lfld = DB_GET_PAYLOAD(fld + i); - if ((fld[i].flags & DB_NULL) == 0) { + if (fld[i].flags & DB_NULL) { rv |= sb_add(&buf, lfld->attr.s, lfld->attr.len); rv |= sb_add(&buf, "=", 1); goto skip;

16 years

git:janakj/ldap: Compilation warning fixed

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: cbd3af6c856767a7899c1abfa6db7798bab30a8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbd3af6… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Thu May 29 15:17:49 2008 +0000 Compilation warning fixed --- modules/db_ldap/ld_res.c | 2 ++ modules/db_ldap/ld_uri.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/db_ldap/ld_res.c b/modules/db_ldap/ld_res.c index 5f9e877..37aba0a 100644 --- a/modules/db_ldap/ld_res.c +++ b/modules/db_ldap/ld_res.c @@ -34,6 +34,8 @@ * Functions working with result structures received from LDAP servers. */ +#include <string.h> + #include "ld_res.h" #include "ld_cmd.h" diff --git a/modules/db_ldap/ld_uri.c b/modules/db_ldap/ld_uri.c index b2ffead..c76ab13 100644 --- a/modules/db_ldap/ld_uri.c +++ b/modules/db_ldap/ld_uri.c @@ -34,6 +34,8 @@ * The implementation of parser parsing ldap:.. URIs. */ +#include <string.h> + #include "ld_uri.h" #include "../../mem/mem.h"

16 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009