Skip to content

GitLab

T
tangled
Commit dd5b863b authored by Eric Orth's avatar Eric Orth Committed by Commit Bot
Browse files
Options

Remove dns_fuzz_stub 

Not sure what this is, and it has no documentation that I can find.
Looks like some sort of non-automated fuzzer, so I'm assuming it's a
legacy thing from before the current fuzzing support and deprecated in
favor of our many fuzzers covering HostResolver and DNS functionality.

Removing because it would otherwise need to be updated for the switch to
DnsResponseResultExtractor.

Change-Id: I5266d145baf5ba012dbad9ac7db44c35744c23b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536154Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Auto-Submit: Eric Orth <ericorth@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827103}
parent c73b5a65
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 240 deletions
BUILD.gn
View file @ dd5b863b
......@@ -529,7 +529,6 @@ group("gn_all") {
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
"//net:dns_fuzz_stub",
"//net:net_watcher", # TODO(GYP): This should be conditional on
# use_v8_in_net
"//net:run_testserver",
......@@ -1342,10 +1341,7 @@ if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) {
"//v8:d8",
]
if (!is_win) {
deps += [
"//net:dns_fuzz_stub",
"//skia:filter_fuzz_stub",
]
deps += [ "//skia:filter_fuzz_stub" ]
}
if (enable_ipc_fuzzer && !is_component_build) {
deps += [ "//tools/ipc_fuzzer:ipc_fuzzer_all" ]
......
net/BUILD.gn
View file @ dd5b863b
......@@ -2358,17 +2358,6 @@ if (!is_ios && !is_android) {
]
}
executable("dns_fuzz_stub") {
testonly = true
sources = [ "tools/dns_fuzz_stub/dns_fuzz_stub.cc" ]
deps = [
":net",
"//base",
"//build/win:default_exe_manifest",
]
}
executable("hpack_example_generator") {
testonly = true
sources = [ "spdy/fuzzing/hpack_example_generator.cc" ]
......
net/tools/dns_fuzz_stub/dns_fuzz_stub.cc deleted 100644 → 0
View file @ c73b5a65
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include <stdint.h>
#include <algorithm>
#include <limits>
#include <memory>
#include <sstream>
#include <string>
#include <vector>
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/optional.h"
#include "base/time/time.h"
#include "base/values.h"
#include "net/base/address_list.h"
#include "net/base/io_buffer.h"
#include "net/base/ip_endpoint.h"
#include "net/dns/dns_query.h"
#include "net/dns/dns_response.h"
#include "net/dns/dns_util.h"
#include "net/dns/public/dns_protocol.h"
namespace {
void CrashDoubleFree(void) {
// Cause memory corruption detectors to notice a double-free
void *p = malloc(1);
LOG(INFO) << "Allocated p=" << p << ". Double-freeing...";
free(p);
free(p);
}
void CrashNullPointerDereference(void) {
// Cause the program to segfault with a NULL pointer dereference
int* p = nullptr;
*p = 0;
}
bool FitsUint8(int num) {
return (num >= 0) && (num <= std::numeric_limits<uint8_t>::max());
}
bool FitsUint16(int num) {
return (num >= 0) && (num <= std::numeric_limits<uint16_t>::max());
}
bool ReadTestCase(const char* filename,
uint16_t* id,
std::string* qname,
uint16_t* qtype,
std::vector<char>* resp_buf,
bool* crash_test) {
base::FilePath filepath = base::FilePath::FromUTF8Unsafe(filename);
std::string json;
if (!base::ReadFileToString(filepath, &json)) {
LOG(ERROR) << filename << ": couldn't read file.";
return false;
}
std::unique_ptr<base::Value> value = base::JSONReader::ReadDeprecated(json);
if (!value.get()) {
LOG(ERROR) << filename << ": couldn't parse JSON.";
return false;
}
base::DictionaryValue* dict;
if (!value->GetAsDictionary(&dict)) {
LOG(ERROR) << filename << ": test case is not a dictionary.";
return false;
}
*crash_test = dict->HasKey("crash_test");
if (*crash_test) {
LOG(INFO) << filename << ": crash_test is set!";
return true;
}
int id_int;
if (!dict->GetInteger("id", &id_int)) {
LOG(ERROR) << filename << ": id is missing or not an integer.";
return false;
}
if (!FitsUint16(id_int)) {
LOG(ERROR) << filename << ": id is out of range.";
return false;
}
*id = static_cast<uint16_t>(id_int);
if (!dict->GetStringASCII("qname", qname)) {
LOG(ERROR) << filename << ": qname is missing or not a string.";
return false;
}
int qtype_int;
if (!dict->GetInteger("qtype", &qtype_int)) {
LOG(ERROR) << filename << ": qtype is missing or not an integer.";
return false;
}
if (!FitsUint16(qtype_int)) {
LOG(ERROR) << filename << ": qtype is out of range.";
return false;
}
*qtype = static_cast<uint16_t>(qtype_int);
base::ListValue* resp_list;
if (!dict->GetList("response", &resp_list)) {
LOG(ERROR) << filename << ": response is missing or not a list.";
return false;
}
size_t resp_size = resp_list->GetSize();
resp_buf->clear();
resp_buf->reserve(resp_size);
for (size_t i = 0; i < resp_size; i++) {
int resp_byte_int;
if ((!resp_list->GetInteger(i, &resp_byte_int))) {
LOG(ERROR) << filename << ": response[" << i << "] is not an integer.";
return false;
}
if (!FitsUint8(resp_byte_int)) {
LOG(ERROR) << filename << ": response[" << i << "] is out of range.";
return false;
}
resp_buf->push_back(static_cast<char>(resp_byte_int));
}
DCHECK(resp_buf->size() == resp_size);
LOG(INFO) << "Query: id=" << id_int << ", "
<< "qname=" << *qname << ", "
<< "qtype=" << qtype_int << ", "
<< "resp_size=" << resp_size;
return true;
}
void RunTestCase(uint16_t id,
std::string& qname,
uint16_t qtype,
std::vector<char>& resp_buf) {
net::DnsQuery query(id, qname, qtype);
net::DnsResponse response;
std::copy(resp_buf.begin(), resp_buf.end(), response.io_buffer()->data());
if (!response.InitParse(resp_buf.size(), query)) {
LOG(INFO) << "InitParse failed.";
return;
}
net::AddressList address_list;
base::Optional<base::TimeDelta> ttl;
net::DnsResponse::Result result = response.ParseToAddressList(
&address_list, &ttl);
if (result != net::DnsResponse::DNS_PARSE_OK) {
LOG(INFO) << "ParseToAddressList failed: " << result;
return;
}
// Print the response in one compact line.
std::stringstream result_line;
result_line << "Response: address_list={ ";
for (unsigned int i = 0; i < address_list.size(); i++)
result_line << address_list[i].ToString() << " ";
result_line << "}, ttl=" << ttl.value_or(base::TimeDelta()).InSeconds()
<< "s";
LOG(INFO) << result_line.str();
}
bool ReadAndRunTestCase(const char* filename) {
uint16_t id = 0;
std::string qname;
uint16_t qtype = 0;
std::vector<char> resp_buf;
bool crash_test = false;
LOG(INFO) << "Test case: " << filename;
// ReadTestCase will print a useful error message if it fails.
if (!ReadTestCase(filename, &id, &qname, &qtype, &resp_buf, &crash_test))
return false;
if (crash_test) {
LOG(INFO) << "Crashing.";
CrashDoubleFree();
// if we're not running under a memory corruption detector, that
// might not have worked
CrashNullPointerDereference();
NOTREACHED();
return true;
}
std::string qname_dns;
if (!net::DNSDomainFromDot(qname, &qname_dns)) {
LOG(ERROR) << filename << ": DNSDomainFromDot(" << qname << ") failed.";
return false;
}
RunTestCase(id, qname_dns, qtype, resp_buf);
return true;
}
} // anonymous namespace
int main(int argc, char** argv) {
int ret = 0;
for (int i = 1; i < argc; i++)
if (!ReadAndRunTestCase(argv[i]))
ret = 2;
// Cluster-Fuzz likes "#EOF" as the last line of output to help distinguish
// successful runs from crashes.
printf("#EOF\n");
return ret;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment