nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of trailing dot

Browse Source
This commit is contained in:
rl1987 2018-02-12 22:21:10 +01:00 committed by Nick Mathewson
parent db850fec3a
commit 4413e52f9e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/util.c
View File

@ -1106,24 +1106,33 @@ int
string_is_valid_hostname(const char *string)
{
int result = 1;
int has_trailing_dot;
char *last_label;
smartlist_t *components;
if (!string || strlen(string) == 0)
return 0;
components = smartlist_new();
smartlist_split_string(components,string,".",0,0);
/* Allow a single terminating '.' used rarely to indicate domains
* are FQDNs rather than relative. */
last_label = (char *)smartlist_get(components, smartlist_len(components) - 1);
has_trailing_dot = (last_label[0] == '\0');
if (has_trailing_dot) {
smartlist_pop_last(components);
tor_free(last_label);
last_label = NULL;
}
SMARTLIST_FOREACH_BEGIN(components, char *, c) {
if ((c[0] == '-') || (*c == '_')) {
result = 0;
break;
}
/* Allow a single terminating '.' used rarely to indicate domains
* are FQDNs rather than relative. */
if ((c_sl_idx > 0) && (c_sl_idx + 1 == c_sl_len) && !*c) {
continue;
}
if (c_sl_idx == c_sl_len - 1) {
do {
result = TOR_ISALPHA(*c);