From c3dce46c5f7cad6bc3cc91cc2c711ac089f25923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 8 May 2026 11:53:45 +0200 Subject: New upstream version 1.0.1+dfsg --- fuzz/COPYING | 202 ++++++++++++++++++++++++++++++++++++++ fuzz/DissectQueryMallocFuzzer.cpp | 62 ++++++++++++ fuzz/FreeFuzzer.cpp | 30 ++++++ fuzz/FuzzingUtils.h | 44 +++++++++ fuzz/ParseFuzzer.cpp | 125 +++++++++++++++++++++++ 5 files changed, 463 insertions(+) create mode 100644 fuzz/COPYING create mode 100644 fuzz/DissectQueryMallocFuzzer.cpp create mode 100644 fuzz/FreeFuzzer.cpp create mode 100644 fuzz/FuzzingUtils.h create mode 100644 fuzz/ParseFuzzer.cpp (limited to 'fuzz') diff --git a/fuzz/COPYING b/fuzz/COPYING new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/fuzz/COPYING @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/fuzz/DissectQueryMallocFuzzer.cpp b/fuzz/DissectQueryMallocFuzzer.cpp new file mode 100644 index 0000000..e31e4a3 --- /dev/null +++ b/fuzz/DissectQueryMallocFuzzer.cpp @@ -0,0 +1,62 @@ +// Copyright 2020 Google LLC +// Copyright 2025 Mikhail Khachaiants +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "uriparser/Uri.h" +#include "FuzzingUtils.h" +#include +#include +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size) { + FuzzedDataProvider fdp(data, size); + const UriString query = consumeRemainingBytesAsString(fdp); + + URI_TYPE(QueryList) * query_list = nullptr; + int item_count = -1; + + const URI_CHAR * query_start = query.c_str(); + const URI_CHAR * query_end = query_start + query.size(); + + // Break a query like "a=b&2=3" into key/value pairs. + int result = + URI_FUNC(DissectQueryMalloc)(&query_list, &item_count, query_start, query_end); + + if (query_list == nullptr || result != URI_SUCCESS || item_count < 0) { + return 0; + } + + int chars_required = 0; + if (URI_FUNC(ComposeQueryCharsRequired)(query_list, &chars_required) != URI_SUCCESS) { + return 0; + } + + if (!chars_required) { + URI_FUNC(FreeQueryList)(query_list); + return 0; + } + + // URI_FUNC(ComposeQuery) requires number of characters including terminator + const int buf_size = chars_required + 1; + + std::vector buf(buf_size, 0); + int written = -1; + + // Reverse the process of uriDissectQueryMallocA. + result = URI_FUNC(ComposeQuery)(buf.data(), query_list, buf_size, &written); + + URI_FUNC(FreeQueryList)(query_list); + return 0; +} diff --git a/fuzz/FreeFuzzer.cpp b/fuzz/FreeFuzzer.cpp new file mode 100644 index 0000000..1eeb94f --- /dev/null +++ b/fuzz/FreeFuzzer.cpp @@ -0,0 +1,30 @@ +// Copyright 2020 Google LLC +// Copyright 2025 Mikhail Khachaiants +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "uriparser/Uri.h" +#include "FuzzingUtils.h" +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size) { + FuzzedDataProvider fdp(data, size); + UriString fuzz_uri = consumeRemainingBytesAsString(fdp); + URI_TYPE(ParserState) state; + URI_TYPE(Uri) uriA; + state.uri = &uriA; + URI_FUNC(ParseUri)(&state, fuzz_uri.c_str()); + URI_FUNC(FreeUriMembers)(&uriA); + return 0; +} diff --git a/fuzz/FuzzingUtils.h b/fuzz/FuzzingUtils.h new file mode 100644 index 0000000..74d27d3 --- /dev/null +++ b/fuzz/FuzzingUtils.h @@ -0,0 +1,44 @@ +// Copyright 2025 Mikhail Khachaiants +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef URI_FUZZING_UTILS_H +# define URI_FUZZING_UTILS_H 1 + +# include "uriparser/Uri.h" +# include +# include + +using UriString = std::basic_string; + +inline UriString tryConsumeBytesAsString(FuzzedDataProvider & fdp, size_t chars) { + UriString str(chars, 0); + const size_t bytes = fdp.ConsumeData(str.data(), chars * sizeof(URI_CHAR)); + // FuzzedDataProvider may provide less data than requested if the input is + // insufficiently long. We need to adjust the string length accordingly. + str.resize(bytes / sizeof(URI_CHAR)); + return str; +} + +inline UriString consumeRandomLengthString(FuzzedDataProvider & fdp) { + const size_t max_chars = fdp.remaining_bytes() / sizeof(URI_CHAR); + const size_t chars = fdp.ConsumeIntegralInRange(0, max_chars); + return tryConsumeBytesAsString(fdp, chars); +} + +inline UriString consumeRemainingBytesAsString(FuzzedDataProvider & fdp) { + const size_t chars = fdp.remaining_bytes() / sizeof(URI_CHAR); + return tryConsumeBytesAsString(fdp, chars); +} + +#endif /* URI_FUZZING_UTILS_H */ diff --git a/fuzz/ParseFuzzer.cpp b/fuzz/ParseFuzzer.cpp new file mode 100644 index 0000000..adb83d7 --- /dev/null +++ b/fuzz/ParseFuzzer.cpp @@ -0,0 +1,125 @@ +// Copyright 2020 Google LLC +// Copyright 2025 Mikhail Khachaiants +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "uriparser/Uri.h" +#include "uriparser/UriIp4.h" +#include "FuzzingUtils.h" +#include +#include +#include + +class UriHolder { +public: + UriHolder() { + memset((void *)&uri_, 0, sizeof(uri_)); + } + + ~UriHolder() { + URI_FUNC(FreeUriMembers)(&uri_); + } + + URI_TYPE(Uri) * get() { + return &uri_; + } + +private: + URI_TYPE(Uri) uri_; +}; + +void Escapes(const UriString & uri) { + const URI_CHAR * first = uri.c_str(); + // Up to 6 bytes per character with normalizeBreaks enabled (\n -> %0D%0A) + std::vector buf1(uri.size() * 6 + 1); + // and up to 3 bytes per character otherwise + std::vector buf2(uri.size() * 3 + 1); + + URI_FUNC(Escape)(first, &buf1[0], URI_TRUE, URI_TRUE); + URI_FUNC(Escape)(first, &buf1[0], URI_FALSE, URI_TRUE); + if (buf1.data()) { + URI_FUNC(UnescapeInPlace)(&buf1[0]); + } + + URI_FUNC(Escape)(first, &buf2[0], URI_TRUE, URI_FALSE); + URI_FUNC(Escape)(first, &buf2[0], URI_FALSE, URI_FALSE); + if (buf2.data()) { + URI_FUNC(UnescapeInPlace)(&buf2[0]); + } +} + +void FileNames(const UriString & uri) { + const size_t size = 8 + 3 * uri.size() + 1; + std::vector buf(size); + + URI_FUNC(UnixFilenameToUriString)(uri.c_str(), &buf[0]); + URI_FUNC(WindowsFilenameToUriString)(uri.c_str(), &buf[0]); + URI_FUNC(UriStringToUnixFilename)(uri.c_str(), &buf[0]); + URI_FUNC(UriStringToWindowsFilename)(uri.c_str(), &buf[0]); +} + +void Ipv4(const UriString & s) { + const URI_CHAR * cstr = s.c_str(); + unsigned char result[4] = {}; + URI_FUNC(ParseIpFourAddress)(result, cstr, &cstr[s.size()]); +} + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size) { + FuzzedDataProvider stream(data, size); + bool domainRelative = stream.ConsumeBool(); + + const UriString uri1 = consumeRandomLengthString(stream); + const UriString uri2 = consumeRemainingBytesAsString(stream); + + Escapes(uri1); + Escapes(uri2); + + FileNames(uri1); + FileNames(uri2); + + Ipv4(uri1); + Ipv4(uri2); + + UriHolder uriHolder1; + URI_TYPE(ParserState) state1; + state1.uri = uriHolder1.get(); + if (URI_FUNC(ParseUri)(&state1, uri1.c_str()) != URI_SUCCESS) { + return 0; + } + + URI_CHAR buf[1024 * 8] = {0}; + int written = 0; + URI_FUNC(ToString)(buf, state1.uri, sizeof(buf) / sizeof(buf[0]), &written); + + UriHolder uriHolder2; + if (URI_FUNC(ParseSingleUri)(uriHolder2.get(), uri2.c_str(), nullptr) + != URI_SUCCESS) { + return 0; + } + + URI_FUNC(EqualsUri)(state1.uri, uriHolder2.get()); + + unsigned int mask = 0; + URI_FUNC(NormalizeSyntaxMaskRequiredEx)(state1.uri, &mask); + URI_FUNC(NormalizeSyntax)(state1.uri); + + URI_TYPE(Uri) absUri; + URI_FUNC(AddBaseUri)(&absUri, state1.uri, uriHolder2.get()); + URI_FUNC(FreeUriMembers)(&absUri); + + URI_TYPE(Uri) relUri; + URI_FUNC(RemoveBaseUri)(&relUri, state1.uri, uriHolder2.get(), domainRelative); + URI_FUNC(FreeUriMembers)(&relUri); + + return 0; +} -- cgit v1.2.3