mirror of
git://git.gnupg.org/gnupg.git
synced 2024-09-07 12:56:21 +02:00
![Werner Koch](/assets/img/avatar_default.png)
* dirmngr/http.h (struct parsed_uri_s): Add flag is_ldap. * dirmngr/http.c (do_parse_uri): Set flag. Do not error out for a missing slashes in an http scheme if NO_SCHEME_CHECK is active. * dirmngr/t-http.c (main): Print new flag. * dirmngr/ks-engine-ldap.c (ks_ldap_help): Use flag instead of checking the scheme. * dirmngr/ldap-parse-uri.c (ldap_uri_p): Re-implement using http_parse_uri. * dirmngr/t-ldap-parse-uri.c (main): Add option --verbose. -- This patch merely remove the separate parser for checking for an LDAP scheme. It is better to let our generic URI parser handle this. Also fixes this bug || url[4] == 'i' || url[4] == 'i') to make the rarely used ldapi scheme case-insensitive. More changes to the LDAP code are planned. Signed-off-by: Werner Koch <wk@gnupg.org>
304 lines
7.2 KiB
C
304 lines
7.2 KiB
C
/* t-ldap-parse-uri.c - Regression tests for ldap-parse-uri.c.
|
||
* Copyright (C) 2015 g10 Code GmbH
|
||
*
|
||
* This file is part of GnuPG.
|
||
*
|
||
* GnuPG is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 3 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* GnuPG is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
||
*/
|
||
|
||
#include <config.h>
|
||
|
||
#include "ldap-parse-uri.h"
|
||
#include "t-support.h"
|
||
|
||
#define PGM "t-ldap-parse-uri"
|
||
|
||
static int verbose;
|
||
|
||
|
||
struct test_ldap_uri_p
|
||
{
|
||
const char *uri;
|
||
int result;
|
||
};
|
||
|
||
void
|
||
check_ldap_uri_p (int test_count, struct test_ldap_uri_p *test)
|
||
{
|
||
int result;
|
||
|
||
if (verbose)
|
||
fprintf (stderr, PGM ": checking '%s'\n", test->uri);
|
||
result = ldap_uri_p (test->uri);
|
||
if (result != test->result)
|
||
{
|
||
printf ("'%s' is %san LDAP schema, but ldap_uri_p says opposite.\n",
|
||
test->uri, test->result ? "" : "not ");
|
||
fail(1000 * test_count);
|
||
}
|
||
}
|
||
|
||
static void
|
||
test_ldap_uri_p (void)
|
||
{
|
||
struct test_ldap_uri_p tests[] = {
|
||
{ "ldap://foo", 1 },
|
||
{ "ldap://", 1 },
|
||
{ "ldap:", 1 },
|
||
{ "ldap", 0 },
|
||
{ "ldapfoobar", 0 },
|
||
|
||
{ "ldaps://foo", 1 },
|
||
{ "ldaps://", 1 },
|
||
{ "ldaps:", 1 },
|
||
{ "ldaps", 0 },
|
||
{ "ldapsfoobar", 0 },
|
||
|
||
{ "ldapi://foo", 1 },
|
||
{ "ldapi://", 1 },
|
||
{ "ldapi:", 1 },
|
||
{ "ldapi", 0 },
|
||
{ "ldapifoobar", 0 },
|
||
|
||
{ "LDAP://FOO", 1 },
|
||
{ "LDAP://", 1 },
|
||
{ "LDAP:", 1 },
|
||
{ "LDAP", 0 },
|
||
{ "LDAPFOOBAR", 0 }
|
||
};
|
||
|
||
int test_count;
|
||
for (test_count = 1;
|
||
test_count <= sizeof (tests) / sizeof (tests[0]);
|
||
test_count ++)
|
||
check_ldap_uri_p (test_count, &tests[test_count - 1]);
|
||
}
|
||
|
||
struct test_ldap_parse_uri
|
||
{
|
||
const char *uri;
|
||
const char *scheme;
|
||
const char *host;
|
||
const int port;
|
||
const int use_tls;
|
||
const char *path; /* basedn. */
|
||
const char *auth; /* binddn. */
|
||
const char *password; /* query[1]. */
|
||
};
|
||
|
||
static int
|
||
cmp (const char *a, const char *b)
|
||
{
|
||
if (! a)
|
||
a = "";
|
||
if (! b)
|
||
b = "";
|
||
|
||
return strcmp (a, b) == 0;
|
||
}
|
||
|
||
void
|
||
check_ldap_parse_uri (int test_count, struct test_ldap_parse_uri *test)
|
||
{
|
||
gpg_error_t err;
|
||
parsed_uri_t puri;
|
||
|
||
if (verbose)
|
||
fprintf (stderr, PGM ": parsing '%s'\n", test->uri);
|
||
err = ldap_parse_uri (&puri, test->uri);
|
||
if (err)
|
||
{
|
||
printf ("Parsing '%s' failed (%d).\n", test->uri, err);
|
||
fail (test_count * 1000 + 0);
|
||
}
|
||
|
||
if (! cmp(test->scheme, puri->scheme))
|
||
{
|
||
printf ("scheme mismatch: got '%s', expected '%s'.\n",
|
||
puri->scheme, test->scheme);
|
||
fail (test_count * 1000 + 1);
|
||
}
|
||
|
||
if (! cmp(test->host, puri->host))
|
||
{
|
||
printf ("host mismatch: got '%s', expected '%s'.\n",
|
||
puri->host, test->host);
|
||
fail (test_count * 1000 + 2);
|
||
}
|
||
|
||
if (test->port != puri->port)
|
||
{
|
||
printf ("port mismatch: got '%d', expected '%d'.\n",
|
||
puri->port, test->port);
|
||
fail (test_count * 1000 + 3);
|
||
}
|
||
|
||
if (test->use_tls != puri->use_tls)
|
||
{
|
||
printf ("use_tls mismatch: got '%d', expected '%d'.\n",
|
||
puri->use_tls, test->use_tls);
|
||
fail (test_count * 1000 + 4);
|
||
}
|
||
|
||
if (! cmp(test->path, puri->path))
|
||
{
|
||
printf ("path mismatch: got '%s', expected '%s'.\n",
|
||
puri->path, test->path);
|
||
fail (test_count * 1000 + 5);
|
||
}
|
||
|
||
if (! cmp(test->auth, puri->auth))
|
||
{
|
||
printf ("auth mismatch: got '%s', expected '%s'.\n",
|
||
puri->auth, test->auth);
|
||
fail (test_count * 1000 + 6);
|
||
}
|
||
|
||
if (! test->password && ! puri->query)
|
||
/* Ok. */
|
||
;
|
||
else if (test->password && ! puri->query)
|
||
{
|
||
printf ("password mismatch: got NULL, expected '%s'.\n",
|
||
test->auth);
|
||
fail (test_count * 1000 + 7);
|
||
}
|
||
else if (! test->password && puri->query)
|
||
{
|
||
printf ("password mismatch: got something, expected NULL.\n");
|
||
fail (test_count * 1000 + 8);
|
||
}
|
||
else if (! (test->password && puri->query
|
||
&& puri->query->name && puri->query->value
|
||
&& strcmp (puri->query->name, "password") == 0
|
||
&& cmp (puri->query->value, test->password)))
|
||
{
|
||
printf ("password mismatch: got '%s:%s', expected 'password:%s'.\n",
|
||
puri->query->name, puri->query->value,
|
||
test->password);
|
||
fail (test_count * 1000 + 9);
|
||
}
|
||
|
||
http_release_parsed_uri (puri);
|
||
}
|
||
|
||
static void
|
||
test_ldap_parse_uri (void)
|
||
{
|
||
struct test_ldap_parse_uri tests[] = {
|
||
{ "ldap://", "ldap", NULL, 389, 0, NULL, NULL, NULL },
|
||
{ "ldap://host", "ldap", "host", 389, 0, NULL, NULL, NULL },
|
||
{ "ldap://host:100", "ldap", "host", 100, 0, NULL, NULL, NULL },
|
||
{ "ldaps://host", "ldaps", "host", 636, 1, NULL, NULL, NULL },
|
||
{ "ldap://host/ou%3DPGP%20Keys%2Cdc%3DEXAMPLE%2Cdc%3DORG",
|
||
"ldap", "host", 389, 0, "ou=PGP Keys,dc=EXAMPLE,dc=ORG" },
|
||
{ "ldap://host/????bindname=uid%3Duser%2Cou%3DPGP%20Users%2Cdc%3DEXAMPLE%2Cdc%3DORG,password=foobar",
|
||
"ldap", "host", 389, 0, "",
|
||
"uid=user,ou=PGP Users,dc=EXAMPLE,dc=ORG", "foobar" }
|
||
};
|
||
|
||
int test_count;
|
||
for (test_count = 1;
|
||
test_count <= sizeof (tests) / sizeof (tests[0]);
|
||
test_count ++)
|
||
check_ldap_parse_uri (test_count, &tests[test_count - 1]);
|
||
}
|
||
|
||
struct test_ldap_escape_filter
|
||
{
|
||
const char *filter;
|
||
const char *result;
|
||
};
|
||
|
||
static void
|
||
check_ldap_escape_filter (int test_count, struct test_ldap_escape_filter *test)
|
||
{
|
||
char *result = ldap_escape_filter (test->filter);
|
||
|
||
if (strcmp (result, test->result) != 0)
|
||
{
|
||
printf ("Filter: '%s'. Escaped: '%s'. Expected: '%s'.\n",
|
||
test->filter, result, test->result);
|
||
fail (test_count * 1000);
|
||
}
|
||
|
||
xfree (result);
|
||
}
|
||
|
||
static void
|
||
test_ldap_escape_filter (void)
|
||
{
|
||
struct test_ldap_escape_filter tests[] = {
|
||
{ "foobar", "foobar" },
|
||
{ "", "" },
|
||
{ "(foo)", "%28foo%29" },
|
||
{ "* ( ) \\ /", "%2a %28 %29 %5c %2f" }
|
||
};
|
||
|
||
int test_count;
|
||
for (test_count = 1;
|
||
test_count <= sizeof (tests) / sizeof (tests[0]);
|
||
test_count ++)
|
||
check_ldap_escape_filter (test_count, &tests[test_count - 1]);
|
||
}
|
||
|
||
|
||
|
||
int
|
||
main (int argc, char **argv)
|
||
{
|
||
int last_argc = -1;
|
||
|
||
if (argc)
|
||
{ argc--; argv++; }
|
||
while (argc && last_argc != argc )
|
||
{
|
||
last_argc = argc;
|
||
if (!strcmp (*argv, "--"))
|
||
{
|
||
argc--; argv++;
|
||
break;
|
||
}
|
||
else if (!strcmp (*argv, "--help"))
|
||
{
|
||
fputs ("usage: " PGM "\n"
|
||
"Options:\n"
|
||
" --verbose print timings etc.\n",
|
||
stdout);
|
||
exit (0);
|
||
}
|
||
else if (!strcmp (*argv, "--verbose"))
|
||
{
|
||
verbose++;
|
||
argc--; argv++;
|
||
}
|
||
else if (!strncmp (*argv, "--", 2))
|
||
{
|
||
fprintf (stderr, PGM ": unknown option '%s'\n", *argv);
|
||
exit (1);
|
||
}
|
||
}
|
||
if (argc)
|
||
{
|
||
fprintf (stderr, PGM ": no argumenst are expected\n");
|
||
exit (1);
|
||
}
|
||
|
||
test_ldap_uri_p ();
|
||
test_ldap_parse_uri ();
|
||
test_ldap_escape_filter ();
|
||
|
||
return 0;
|
||
}
|