luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gthreadedresolver: Don’t warn on unrecognised record types

Browse Source 
Otherwise the code isn’t forwards-compatible, and may be DOSed by
servers returning unknown records, if `G_DEBUG=fatal-warnings` is
enabled for some reason.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-03-18 15:52:18 +00:00
parent 51f70fe62e
commit 81193c5aac
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gthreadedresolver.c
View File

@ -780,7 +780,7 @@ g_resolver_records_from_res_query (const gchar *rrname,
record = parse_res_txt (answer, p + rdlength, &p);
break;
default:
g_warn_if_reached ();
g_debug ("Unrecognised DNS record type %u", rrtype);
record = NULL;
break;
}

37
gio/tests/resolver-parsing.c
View File

@ -146,6 +146,42 @@ test_invalid_header (void)
}
}
static void
test_unknown_record_type (void)
{
#ifndef HAVE_DN_COMP
g_test_skip ("The dn_comp() function was not available.");
return;
#else
GByteArray *answer = NULL;
GList *records = NULL;
GError *local_error = NULL;
const guint type_id = 20; /* ISDN, not supported anywhere */
/* An answer with an unsupported type chosen from
* https://en.wikipedia.org/wiki/List_of_DNS_record_types#[1]_Obsolete_record_types */
answer = dns_header ();
dns_builder_add_domain (answer, "example.org");
dns_builder_add_uint16 (answer, type_id);
dns_builder_add_uint16 (answer, 1); /* qclass=C_IN */
dns_builder_add_uint32 (answer, 0); /* ttl (ignored) */
dns_builder_add_uint16 (answer, 0); /* rdlength */
records = g_resolver_records_from_res_query ("example.org",
type_id,
answer->data,
answer->len,
0,
&local_error);
g_assert_error (local_error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND);
g_assert_null (records);
g_clear_error (&local_error);
g_byte_array_free (answer, TRUE);
#endif
}
int
main (int argc,
char *argv[])
@ -153,6 +189,7 @@ main (int argc,
g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gresolver/invalid-header", test_invalid_header);
g_test_add_func ("/gresolver/unknown-record-type", test_unknown_record_type);
return g_test_run ();
}