technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Introduced nxt_sockaddr_parse_optport() for addresses w/o ports.

Browse Source
This commit is contained in:
Oisin Canty
2021-08-12 08:23:09 +00:00
parent 9988569bea
commit 73ea6a1c3a
3 changed files with 120 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nxt_http_route_addr.c
View File

@@ -8,7 +8,6 @@
#include <nxt_http_route_addr.h> #include <nxt_http_route_addr.h>
static nxt_bool_t nxt_str_looks_like_ipv6(const nxt_str_t *str);
#if (NXT_INET6) #if (NXT_INET6)
static nxt_bool_t nxt_valid_ipv6_blocks(u_char *c, size_t len); static nxt_bool_t nxt_valid_ipv6_blocks(u_char *c, size_t len);
#endif #endif
@@ -57,7 +56,7 @@ nxt_http_route_addr_pattern_parse(nxt_mp_t *mp,
goto parse_port; goto parse_port;
} }
if (nxt_str_looks_like_ipv6(&addr)) { if (nxt_inet6_probe(&addr)) {
#if (NXT_INET6) #if (NXT_INET6)
u_char *end; u_char *end;
uint8_t i; uint8_t i;
@@ -304,22 +303,6 @@ parse_port:
} }
static nxt_bool_t
nxt_str_looks_like_ipv6(const nxt_str_t *str)
{
u_char *colon, *end;
colon = nxt_memchr(str->start, ':', str->length);
if (colon != NULL) {
end = str->start + str->length;
colon = nxt_memchr(colon + 1, ':', end - (colon + 1));
}
return (colon != NULL);
}
#if (NXT_INET6) #if (NXT_INET6)
static nxt_bool_t static nxt_bool_t

168
src/nxt_sockaddr.c
View File

@@ -605,10 +605,35 @@ nxt_sockaddr_parse(nxt_mp_t *mp, nxt_str_t *addr)
{ {
nxt_sockaddr_t *sa; nxt_sockaddr_t *sa;
sa = nxt_sockaddr_parse_optport(mp, addr);
if (sa != NULL
&& sa->u.sockaddr.sa_family != AF_UNIX
&& nxt_sockaddr_port_number(sa) == 0)
{
nxt_thread_log_error(NXT_LOG_ERR,
"The address \"%V\" must specify a port.", addr);
return NULL;
}
return sa;
}
nxt_sockaddr_t *
nxt_sockaddr_parse_optport(nxt_mp_t *mp, nxt_str_t *addr)
{
nxt_sockaddr_t *sa;
if (addr->length == 0) {
nxt_thread_log_error(NXT_LOG_ERR, "socket address cannot be empty");
return NULL;
}
if (addr->length > 6 && nxt_memcmp(addr->start, "unix:", 5) == 0) { if (addr->length > 6 && nxt_memcmp(addr->start, "unix:", 5) == 0) {
sa = nxt_sockaddr_unix_parse(mp, addr); sa = nxt_sockaddr_unix_parse(mp, addr);
} else if (addr->length != 0 && addr->start[0] == '[') { } else if (addr->start[0] == '[' || nxt_inet6_probe(addr)) {
sa = nxt_sockaddr_inet6_parse(mp, addr); sa = nxt_sockaddr_inet6_parse(mp, addr);
} else { } else {
@@ -703,44 +728,60 @@ nxt_sockaddr_inet6_parse(nxt_mp_t *mp, nxt_str_t *addr)
nxt_int_t ret, port; nxt_int_t ret, port;
nxt_sockaddr_t *sa; nxt_sockaddr_t *sa;
length = addr->length - 1; if (addr->start[0] == '[') {
start = addr->start + 1; length = addr->length - 1;
start = addr->start + 1;
end = nxt_memchr(start, ']', length); end = nxt_memchr(start, ']', length);
if (nxt_slow_path(end == NULL)) {
if (end != NULL) {
sa = nxt_sockaddr_alloc(mp, sizeof(struct sockaddr_in6),
NXT_INET6_ADDR_STR_LEN);
if (nxt_slow_path(sa == NULL)) {
return NULL; return NULL;
} }
ret = nxt_inet6_addr(&sa->u.sockaddr_in6.sin6_addr, start, end - start); p = end + 1;
if (nxt_fast_path(ret == NXT_OK)) { } else {
p = end + 1; length = addr->length;
length = (start + length) - p; start = addr->start;
end = addr->start + addr->length;
p = NULL;
}
if (length > 2 && *p == ':') { port = 0;
port = nxt_int_parse(p + 1, length - 1);
if (port > 0 && port < 65536) { if (p != NULL) {
sa->u.sockaddr_in6.sin6_port = htons((in_port_t) port); length = (start + length) - p;
sa->u.sockaddr_in6.sin6_family = AF_INET6;
return sa; if (length < 2 || *p != ':') {
} nxt_thread_log_error(NXT_LOG_ERR, "invalid IPv6 address in \"%V\"",
} addr);
return NULL;
}
port = nxt_int_parse(p + 1, length - 1);
if (port < 1 || port > 65535) {
nxt_thread_log_error(NXT_LOG_ERR, "invalid port in \"%V\"", addr); nxt_thread_log_error(NXT_LOG_ERR, "invalid port in \"%V\"", addr);
return NULL; return NULL;
} }
} }
nxt_thread_log_error(NXT_LOG_ERR, "invalid IPv6 address in \"%V\"", addr); sa = nxt_sockaddr_alloc(mp, sizeof(struct sockaddr_in6),
NXT_INET6_ADDR_STR_LEN);
if (nxt_slow_path(sa == NULL)) {
return NULL;
}
return NULL; ret = nxt_inet6_addr(&sa->u.sockaddr_in6.sin6_addr, start, end - start);
if (nxt_slow_path(ret != NXT_OK)) {
nxt_thread_log_error(NXT_LOG_ERR, "invalid IPv6 address in \"%V\"",
addr);
return NULL;
}
sa->u.sockaddr_in6.sin6_family = AF_INET6;
sa->u.sockaddr_in6.sin6_port = htons((in_port_t) port);
return sa;
#else /* !(NXT_INET6) */ #else /* !(NXT_INET6) */
@@ -763,41 +804,48 @@ nxt_sockaddr_inet_parse(nxt_mp_t *mp, nxt_str_t *addr)
p = nxt_memchr(addr->start, ':', addr->length); p = nxt_memchr(addr->start, ':', addr->length);
if (nxt_fast_path(p != NULL)) { if (p == NULL) {
inaddr = INADDR_ANY; length = addr->length;
} else {
length = p - addr->start; length = p - addr->start;
}
if (length != 1 || addr->start[0] != '*') { inaddr = INADDR_ANY;
inaddr = nxt_inet_addr(addr->start, length);
if (nxt_slow_path(inaddr == INADDR_NONE)) { if (length != 1 || addr->start[0] != '*') {
nxt_thread_log_error(NXT_LOG_ERR, "invalid address \"%V\"", inaddr = nxt_inet_addr(addr->start, length);
addr); if (nxt_slow_path(inaddr == INADDR_NONE)) {
return NULL; nxt_thread_log_error(NXT_LOG_ERR, "invalid address \"%V\"", addr);
} return NULL;
}
p++;
length = (addr->start + addr->length) - p;
port = nxt_int_parse(p, length);
if (port > 0 && port < 65536) {
sa = nxt_sockaddr_alloc(mp, sizeof(struct sockaddr_in),
NXT_INET_ADDR_STR_LEN);
if (nxt_fast_path(sa != NULL)) {
sa->u.sockaddr_in.sin_family = AF_INET;
sa->u.sockaddr_in.sin_port = htons((in_port_t) port);
sa->u.sockaddr_in.sin_addr.s_addr = inaddr;
}
return sa;
} }
} }
nxt_thread_log_error(NXT_LOG_ERR, "invalid port in \"%V\"", addr); port = 0;
return NULL; if (p != NULL) {
p++;
length = (addr->start + addr->length) - p;
port = nxt_int_parse(p, length);
if (port < 1 || port > 65535) {
nxt_thread_log_error(NXT_LOG_ERR, "invalid port in \"%V\"", addr);
return NULL;
}
}
sa = nxt_sockaddr_alloc(mp, sizeof(struct sockaddr_in),
NXT_INET_ADDR_STR_LEN);
if (nxt_slow_path(sa == NULL)) {
return NULL;
}
sa->u.sockaddr_in.sin_family = AF_INET;
sa->u.sockaddr_in.sin_addr.s_addr = inaddr;
sa->u.sockaddr_in.sin_port = htons((in_port_t) port);
return sa;
} }
@@ -1320,3 +1368,19 @@ nxt_inet6_addr(struct in6_addr *in6_addr, u_char *buf, size_t length)
} }
#endif #endif
nxt_bool_t
nxt_inet6_probe(nxt_str_t *str)
{
u_char *colon, *end;
colon = nxt_memchr(str->start, ':', str->length);
if (colon != NULL) {
end = str->start + str->length;
colon = nxt_memchr(colon + 1, ':', end - (colon + 1));
}
return (colon != NULL);
}

3
src/nxt_sockaddr.h
View File

@@ -91,12 +91,15 @@ NXT_EXPORT nxt_bool_t nxt_sockaddr_cmp(nxt_sockaddr_t *sa1,
NXT_EXPORT size_t nxt_sockaddr_ntop(nxt_sockaddr_t *sa, u_char *buf, NXT_EXPORT size_t nxt_sockaddr_ntop(nxt_sockaddr_t *sa, u_char *buf,
u_char *end, nxt_bool_t port); u_char *end, nxt_bool_t port);
NXT_EXPORT nxt_sockaddr_t *nxt_sockaddr_parse(nxt_mp_t *mp, nxt_str_t *addr); NXT_EXPORT nxt_sockaddr_t *nxt_sockaddr_parse(nxt_mp_t *mp, nxt_str_t *addr);
NXT_EXPORT nxt_sockaddr_t *nxt_sockaddr_parse_optport(nxt_mp_t *mp,
nxt_str_t *addr);
NXT_EXPORT void nxt_job_sockaddr_parse(nxt_job_sockaddr_parse_t *jbs); NXT_EXPORT void nxt_job_sockaddr_parse(nxt_job_sockaddr_parse_t *jbs);
NXT_EXPORT in_addr_t nxt_inet_addr(u_char *buf, size_t len); NXT_EXPORT in_addr_t nxt_inet_addr(u_char *buf, size_t len);
#if (NXT_INET6) #if (NXT_INET6)
NXT_EXPORT nxt_int_t nxt_inet6_addr(struct in6_addr *in6_addr, u_char *buf, NXT_EXPORT nxt_int_t nxt_inet6_addr(struct in6_addr *in6_addr, u_char *buf,
size_t len); size_t len);
#endif #endif
NXT_EXPORT nxt_bool_t nxt_inet6_probe(nxt_str_t *addr);
#define NXT_INET_ADDR_STR_LEN nxt_length("255.255.255.255:65535") #define NXT_INET_ADDR_STR_LEN nxt_length("255.255.255.255:65535")