denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

host: Ignore spaces around - when parsing ranges

Browse Source
This commit is contained in:
Tobias Brunner
2014-10-30 12:32:45 +01:00
parent e0cd3bad3d
commit cd67cd70c8
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/networking/host.c
+14 -6
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2012 Tobias Brunner * Copyright (C) 2006-2014 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
@@ -530,19 +530,27 @@ host_t *host_create_from_chunk(int family, chunk_t address, u_int16_t port)
*/ */
bool host_create_from_range(char *string, host_t **from, host_t **to) bool host_create_from_range(char *string, host_t **from, host_t **to)
{ {
char *pos; char *sep, *pos;
pos = strchr(string, '-'); sep = strchr(string, '-');
if (!pos) if (!sep)
{ {
return FALSE; return FALSE;
} }
*to = host_create_from_string(pos + 1, 0); for (pos = sep+1; *pos && *pos == ' '; pos++)
{
/* trim spaces before to address*/
}
*to = host_create_from_string(pos, 0);
if (!*to) if (!*to)
{ {
return FALSE; return FALSE;
} }
pos = strndup(string, pos - string); for (pos = sep-1; pos > string && *pos == ' '; pos--)
{
/* trim spaces behind from address */
}
pos = strndup(string, pos - string + 1);
*from = host_create_from_string_and_family(pos, (*to)->get_family(*to), 0); *from = host_create_from_string_and_family(pos, (*to)->get_family(*to), 0);
free(pos); free(pos);
if (!*from) if (!*from)
src/libstrongswan/networking/host.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2009 Tobias Brunner * Copyright (C) 2006-2014 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2008 Martin Willi * Copyright (C) 2005-2008 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
src/libstrongswan/tests/suites/test_host.c
+8 -2
View File
@@ -438,14 +438,17 @@ START_TEST(test_create_from_range_v4)
verify_range("192.168.0.1-192.168.0.1", AF_INET, addr_v4, addr_v4); verify_range("192.168.0.1-192.168.0.1", AF_INET, addr_v4, addr_v4);
verify_range("192.168.0.1-192.168.0.5", AF_INET, addr_v4, addr_v4_to); verify_range("192.168.0.1-192.168.0.5", AF_INET, addr_v4, addr_v4_to);
verify_range("192.168.0.1- 192.168.0.5", AF_INET, addr_v4, addr_v4_to);
verify_range("192.168.0.1 -192.168.0.5", AF_INET, addr_v4, addr_v4_to);
verify_range("192.168.0.1 - 192.168.0.5", AF_INET, addr_v4, addr_v4_to);
verify_range("192.168.0.5-192.168.0.1", AF_INET, addr_v4_to, addr_v4); verify_range("192.168.0.5-192.168.0.1", AF_INET, addr_v4_to, addr_v4);
verify_range("192.168.0.1", 0, chunk_empty, chunk_empty); verify_range("192.168.0.1", 0, chunk_empty, chunk_empty);
verify_range("192.168.0.1-", 0, chunk_empty, chunk_empty); verify_range("192.168.0.1-", 0, chunk_empty, chunk_empty);
verify_range("-192.168.0.1", 0, chunk_empty, chunk_empty);
verify_range("192.168.0.1-192", 0, chunk_empty, chunk_empty); verify_range("192.168.0.1-192", 0, chunk_empty, chunk_empty);
verify_range("192.168.0.1-192.168", 0, chunk_empty, chunk_empty); verify_range("192.168.0.1-192.168", 0, chunk_empty, chunk_empty);
verify_range("192.168.0.1-192.168.0", 0, chunk_empty, chunk_empty); verify_range("192.168.0.1-192.168.0", 0, chunk_empty, chunk_empty);
verify_range("192.168.0.1 - 192.168.0.5", 0, chunk_empty, chunk_empty);
verify_range("foo.b.a.r", 0, chunk_empty, chunk_empty); verify_range("foo.b.a.r", 0, chunk_empty, chunk_empty);
verify_range("foo.b.a.r-b.a.r.f", 0, chunk_empty, chunk_empty); verify_range("foo.b.a.r-b.a.r.f", 0, chunk_empty, chunk_empty);
} }
@@ -463,12 +466,15 @@ START_TEST(test_create_from_range_v6)
verify_range("fec1::1-fec1::1", AF_INET6, addr_v6, addr_v6); verify_range("fec1::1-fec1::1", AF_INET6, addr_v6, addr_v6);
verify_range("fec1::1-fec1::5", AF_INET6, addr_v6, addr_v6_to); verify_range("fec1::1-fec1::5", AF_INET6, addr_v6, addr_v6_to);
verify_range("fec1::1- fec1::5", AF_INET6, addr_v6, addr_v6_to);
verify_range("fec1::1 -fec1::5", AF_INET6, addr_v6, addr_v6_to);
verify_range("fec1::1 - fec1::5", AF_INET6, addr_v6, addr_v6_to);
verify_range("fec1::5-fec1::1", AF_INET6, addr_v6_to, addr_v6); verify_range("fec1::5-fec1::1", AF_INET6, addr_v6_to, addr_v6);
verify_range("fec1::1", 0, chunk_empty, chunk_empty); verify_range("fec1::1", 0, chunk_empty, chunk_empty);
verify_range("fec1::1-", 0, chunk_empty, chunk_empty); verify_range("fec1::1-", 0, chunk_empty, chunk_empty);
verify_range("-fec1::1", 0, chunk_empty, chunk_empty);
verify_range("fec1::1-fec1", 0, chunk_empty, chunk_empty); verify_range("fec1::1-fec1", 0, chunk_empty, chunk_empty);
verify_range("fec1::1 - fec1::5", 0, chunk_empty, chunk_empty);
verify_range("foo::bar", 0, chunk_empty, chunk_empty); verify_range("foo::bar", 0, chunk_empty, chunk_empty);
verify_range("foo::bar-bar::foo", 0, chunk_empty, chunk_empty); verify_range("foo::bar-bar::foo", 0, chunk_empty, chunk_empty);