mirror of
https://github.com/curl/curl.git
synced 2026-04-23 08:42:12 +03:00
The issues found fell into these categories, with the applied fixes:
- const was accidentally stripped.
Adjust code to not cast or cast with const.
- const/volatile missing from arguments, local variables.
Constify arguments or variables, adjust/delete casts. Small code
changes in a few places.
- const must be stripped because an API dependency requires it.
Strip `const` with `CURL_UNCONST()` macro to silence the warning out
of our control. These happen at API boundaries. Sometimes they depend
on dependency version, which this patch handles as necessary. Also
enable const support for the zlib API, using `ZLIB_CONST`. Supported
by zlib 1.2.5.2 and newer.
- const must be stripped because a curl API requires it.
Strip `const` with `CURL_UNCONST()` macro to silence the warning out
of our immediate control. For example we promise to send a non-const
argument to a callback, though the data is const internally.
- other cases where we may avoid const stripping by code changes.
Also silenced with `CURL_UNCONST()`.
- there are 3 places where `CURL_UNCONST()` is cast again to const.
To silence this type of warning:
```
lib/vquic/curl_osslq.c:1015:29: error: to be safe all intermediate
pointers in cast from 'unsigned char **' to 'const unsigned char **'
must be 'const' qualified [-Werror=cast-qual]
lib/cf-socket.c:734:32: error: to be safe all intermediate pointers in
cast from 'char **' to 'const char **' must be 'const' qualified
[-Werror=cast-qual]
```
There may be a better solution, but I couldn't find it.
These cases are handled in separate subcommits, but without further
markup.
If you see a `-Wcast-qual` warning in curl, we appreciate your report
about it.
Closes #16142
297 lines
9.5 KiB
C
297 lines
9.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
#include "doh.h"
|
|
#include "dynbuf.h"
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
|
|
}
|
|
|
|
#ifndef CURL_DISABLE_DOH
|
|
#define DNS_PREAMBLE "\x00\x00\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00"
|
|
#define LABEL_TEST "\x04\x74\x65\x73\x74"
|
|
#define LABEL_HOST "\x04\x68\x6f\x73\x74"
|
|
#define LABEL_NAME "\x04\x6e\x61\x6d\x65"
|
|
#define DNSA_TYPE "\x01"
|
|
#define DNSAAAA_TYPE "\x1c"
|
|
#define DNSA_EPILOGUE "\x00\x00" DNSA_TYPE "\x00\x01"
|
|
#define DNSAAAA_EPILOGUE "\x00\x00" DNSAAAA_TYPE "\x00\x01"
|
|
|
|
#define DNS_Q1 DNS_PREAMBLE LABEL_TEST LABEL_HOST LABEL_NAME DNSA_EPILOGUE
|
|
#define DNS_Q2 DNS_PREAMBLE LABEL_TEST LABEL_HOST LABEL_NAME DNSAAAA_EPILOGUE
|
|
|
|
struct dohrequest {
|
|
/* input */
|
|
const char *name;
|
|
DNStype type;
|
|
|
|
/* output */
|
|
const char *packet;
|
|
size_t size;
|
|
DOHcode rc;
|
|
};
|
|
|
|
|
|
static const struct dohrequest req[] = {
|
|
{"test.host.name", DNS_TYPE_A, DNS_Q1, sizeof(DNS_Q1)-1, DOH_OK },
|
|
{"test.host.name", DNS_TYPE_AAAA, DNS_Q2, sizeof(DNS_Q2)-1, DOH_OK },
|
|
{"zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
|
|
".host.name",
|
|
DNS_TYPE_AAAA, NULL, 0, DOH_DNS_BAD_LABEL }
|
|
};
|
|
|
|
struct dohresp {
|
|
/* input */
|
|
const char *packet;
|
|
size_t size;
|
|
DNStype type;
|
|
|
|
/* output */
|
|
DOHcode rc;
|
|
const char *out;
|
|
};
|
|
|
|
#define DNS_FOO_EXAMPLE_COM \
|
|
"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x03\x66\x6f\x6f" \
|
|
"\x07\x65\x78\x61\x6d\x70\x6c\x65\x03\x63\x6f\x6d\x00\x00\x01\x00" \
|
|
"\x01\xc0\x0c\x00\x01\x00\x01\x00\x00\x00\x37\x00\x04\x7f\x00\x00" \
|
|
"\x01"
|
|
|
|
static const char full49[] = DNS_FOO_EXAMPLE_COM;
|
|
|
|
static const struct dohresp resp[] = {
|
|
{"\x00\x00", 2, DNS_TYPE_A, DOH_TOO_SMALL_BUFFER, NULL },
|
|
{"\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01", 12,
|
|
DNS_TYPE_A, DOH_DNS_BAD_ID, NULL },
|
|
{"\x00\x00\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01", 12,
|
|
DNS_TYPE_A, DOH_DNS_BAD_RCODE, NULL },
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x03\x66\x6f\x6f", 16,
|
|
DNS_TYPE_A, DOH_DNS_OUT_OF_RANGE, NULL },
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x03\x66\x6f\x6f\x00", 17,
|
|
DNS_TYPE_A, DOH_DNS_OUT_OF_RANGE, NULL },
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x03\x66\x6f\x6f\x00"
|
|
"\x00\x01\x00\x01", 21,
|
|
DNS_TYPE_A, DOH_DNS_OUT_OF_RANGE, NULL },
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x03\x66\x6f\x6f\x00"
|
|
"\x00\x01\x00\x01"
|
|
"\x04", 18,
|
|
DNS_TYPE_A, DOH_DNS_OUT_OF_RANGE, NULL },
|
|
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x04\x63\x75\x72"
|
|
"\x6c\x04\x63\x75\x72\x6c\x00\x00\x05\x00\x01\xc0\x0c\x00\x05\x00"
|
|
"\x01\x00\x00\x00\x37\x00\x11\x08\x61\x6e\x79\x77\x68\x65\x72\x65"
|
|
"\x06\x72\x65\x61\x6c\x6c\x79\x00", 56,
|
|
DNS_TYPE_A, DOH_OK, "anywhere.really "},
|
|
|
|
{DNS_FOO_EXAMPLE_COM, 49, DNS_TYPE_A, DOH_OK, "127.0.0.1 "},
|
|
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x04\x61\x61\x61"
|
|
"\x61\x07\x65\x78\x61\x6d\x70\x6c\x65\x03\x63\x6f\x6d\x00\x00\x1c"
|
|
"\x00\x01\xc0\x0c\x00\x1c\x00\x01\x00\x00\x00\x37\x00\x10\x20\x20"
|
|
"\x20\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x20", 62,
|
|
DNS_TYPE_AAAA, DOH_OK,
|
|
"2020:2020:0000:0000:0000:0000:0000:2020 " },
|
|
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x00\x04\x63\x75\x72"
|
|
"\x6c\x04\x63\x75\x72\x6c\x00\x00\x05\x00\x01\xc0\x0c\x00\x05\x00"
|
|
"\x01\x00\x00\x00\x37\x00"
|
|
"\x07\x03\x61\x6e\x79\xc0\x27\x00", 46,
|
|
DNS_TYPE_A, DOH_DNS_LABEL_LOOP, NULL},
|
|
|
|
/* packet with NSCOUNT == 1 */
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x01\x00\x00\x04\x61\x61\x61"
|
|
"\x61\x07\x65\x78\x61\x6d\x70\x6c\x65\x03\x63\x6f\x6d\x00\x00\x1c"
|
|
"\x00\x01\xc0\x0c\x00\x1c\x00\x01\x00\x00\x00\x37\x00\x10\x20\x20"
|
|
"\x20\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x20"
|
|
LABEL_TEST LABEL_HOST LABEL_NAME DNSAAAA_EPILOGUE "\x00\x00\x00\x01"
|
|
"\00\x04\x01\x01\x01\x01", /* RDDATA */
|
|
|
|
62 + 30,
|
|
DNS_TYPE_AAAA, DOH_OK,
|
|
"2020:2020:0000:0000:0000:0000:0000:2020 " },
|
|
|
|
/* packet with ARCOUNT == 1 */
|
|
{"\x00\x00\x01\x00\x00\x01\x00\x01\x00\x00\x00\x01\x04\x61\x61\x61"
|
|
"\x61\x07\x65\x78\x61\x6d\x70\x6c\x65\x03\x63\x6f\x6d\x00\x00\x1c"
|
|
"\x00\x01\xc0\x0c\x00\x1c\x00\x01\x00\x00\x00\x37\x00\x10\x20\x20"
|
|
"\x20\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x20"
|
|
LABEL_TEST LABEL_HOST LABEL_NAME DNSAAAA_EPILOGUE "\x00\x00\x00\x01"
|
|
"\00\x04\x01\x01\x01\x01", /* RDDATA */
|
|
|
|
62 + 30,
|
|
DNS_TYPE_AAAA, DOH_OK,
|
|
"2020:2020:0000:0000:0000:0000:0000:2020 " },
|
|
|
|
};
|
|
|
|
UNITTEST_START
|
|
{
|
|
size_t size = 0;
|
|
unsigned char buffer[256];
|
|
size_t i;
|
|
unsigned char *p;
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(req); i++) {
|
|
DOHcode rc = doh_req_encode(req[i].name, req[i].type,
|
|
buffer, sizeof(buffer), &size);
|
|
if(rc != req[i].rc) {
|
|
fprintf(stderr, "req %zu: Expected return code %d got %d\n", i,
|
|
req[i].rc, rc);
|
|
abort_if(rc != req[i].rc, "return code");
|
|
}
|
|
if(size != req[i].size) {
|
|
fprintf(stderr, "req %zu: Expected size %zu got %zu\n", i,
|
|
req[i].size, size);
|
|
fprintf(stderr, "DNS encode made: %s\n", hexdump(buffer, size));
|
|
abort_if(size != req[i].size, "size");
|
|
}
|
|
if(req[i].packet && memcmp(req[i].packet, buffer, size)) {
|
|
fprintf(stderr, "DNS encode made: %s\n", hexdump(buffer, size));
|
|
fprintf(stderr, "... instead of: %s\n",
|
|
hexdump((const unsigned char *)req[i].packet, size));
|
|
abort_if(req[i].packet && memcmp(req[i].packet, buffer, size),
|
|
"contents");
|
|
}
|
|
}
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(resp); i++) {
|
|
struct dohentry d;
|
|
DOHcode rc;
|
|
char *ptr;
|
|
size_t len;
|
|
int u;
|
|
de_init(&d);
|
|
rc = doh_resp_decode((const unsigned char *)resp[i].packet, resp[i].size,
|
|
resp[i].type, &d);
|
|
if(rc != resp[i].rc) {
|
|
fprintf(stderr, "resp %zu: Expected return code %d got %d\n", i,
|
|
resp[i].rc, rc);
|
|
abort_if(rc != resp[i].rc, "return code");
|
|
}
|
|
len = sizeof(buffer);
|
|
ptr = (char *)buffer;
|
|
for(u = 0; u < d.numaddr; u++) {
|
|
size_t o;
|
|
struct dohaddr *a;
|
|
a = &d.addr[u];
|
|
if(resp[i].type == DNS_TYPE_A) {
|
|
p = &a->ip.v4[0];
|
|
msnprintf(ptr, len, "%u.%u.%u.%u ", p[0], p[1], p[2], p[3]);
|
|
o = strlen(ptr);
|
|
len -= o;
|
|
ptr += o;
|
|
}
|
|
else {
|
|
int j;
|
|
for(j = 0; j < 16; j += 2) {
|
|
size_t l;
|
|
msnprintf(ptr, len, "%s%02x%02x", j?":":"", a->ip.v6[j],
|
|
a->ip.v6[j + 1]);
|
|
l = strlen(ptr);
|
|
len -= l;
|
|
ptr += l;
|
|
}
|
|
msnprintf(ptr, len, " ");
|
|
len--;
|
|
ptr++;
|
|
}
|
|
}
|
|
for(u = 0; u < d.numcname; u++) {
|
|
size_t o;
|
|
msnprintf(ptr, len, "%s ", Curl_dyn_ptr(&d.cname[u]));
|
|
o = strlen(ptr);
|
|
len -= o;
|
|
ptr += o;
|
|
}
|
|
de_cleanup(&d);
|
|
if(resp[i].out && strcmp((char *)buffer, resp[i].out)) {
|
|
fprintf(stderr, "resp %zu: Expected %s got %s\n", i,
|
|
resp[i].out, buffer);
|
|
abort_if(resp[i].out && strcmp((char *)buffer, resp[i].out), "content");
|
|
}
|
|
}
|
|
|
|
/* pass all sizes into the decoder until full */
|
|
for(i = 0; i < sizeof(full49)-1; i++) {
|
|
struct dohentry d;
|
|
DOHcode rc;
|
|
memset(&d, 0, sizeof(d));
|
|
rc = doh_resp_decode((const unsigned char *)full49, i, DNS_TYPE_A, &d);
|
|
if(!rc) {
|
|
/* none of them should work */
|
|
fprintf(stderr, "%zu: %d\n", i, rc);
|
|
abort_if(!rc, "error rc");
|
|
}
|
|
}
|
|
|
|
/* and try all pieces from the other end of the packet */
|
|
for(i = 1; i < sizeof(full49); i++) {
|
|
struct dohentry d;
|
|
DOHcode rc;
|
|
memset(&d, 0, sizeof(d));
|
|
rc = doh_resp_decode((const unsigned char *)&full49[i], sizeof(full49)-i-1,
|
|
DNS_TYPE_A, &d);
|
|
if(!rc) {
|
|
/* none of them should work */
|
|
fprintf(stderr, "2 %zu: %d\n", i, rc);
|
|
abort_if(!rc, "error rc");
|
|
}
|
|
}
|
|
|
|
{
|
|
DOHcode rc;
|
|
struct dohentry d;
|
|
struct dohaddr *a;
|
|
memset(&d, 0, sizeof(d));
|
|
rc = doh_resp_decode((const unsigned char *)full49, sizeof(full49)-1,
|
|
DNS_TYPE_A, &d);
|
|
fail_if(d.numaddr != 1, "missing address");
|
|
a = &d.addr[0];
|
|
p = &a->ip.v4[0];
|
|
msnprintf((char *)buffer, sizeof(buffer),
|
|
"%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
|
|
if(rc || strcmp((char *)buffer, "127.0.0.1")) {
|
|
fprintf(stderr, "bad address decoded: %s, rc == %d\n", buffer, rc);
|
|
abort_if(rc || strcmp((char *)buffer, "127.0.0.1"), "bad address");
|
|
}
|
|
fail_if(d.numcname, "bad cname counter");
|
|
}
|
|
}
|
|
UNITTEST_STOP
|
|
|
|
#else /* CURL_DISABLE_DOH */
|
|
UNITTEST_START
|
|
/* nothing to do, just succeed */
|
|
UNITTEST_STOP
|
|
|
|
|
|
#endif
|