mirror of
https://github.com/curl/curl.git
synced 2026-04-15 01:05:56 +08:00
255aac56f9
Move curlx_ functions into its own subdir. The idea is to use the curlx_ prefix proper on these functions, and use these same function names both in tool, lib and test suite source code. Stop the previous special #define setup for curlx_ names. The printf defines are now done for the library alone. Tests no longer use the printf defines. The tool code sets its own defines. The printf functions are not curlx, they are publicly available. The strcase defines are not curlx_ functions and should not be used by tool or server code. dynbuf, warnless, base64, strparse, timeval, timediff are now proper curlx functions. When libcurl is built statically, the functions from the library can be used as-is. The key is then that the functions must work as-is, without having to be recompiled for use in tool/tests. This avoids symbol collisions - when libcurl is built statically, we use those functions directly when building the tool/tests. When libcurl is shared, we build/link them separately for the tool/tests. Assisted-by: Jay Satiro Closes #17253
152 lines
4.4 KiB
C
152 lines
4.4 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"
|
|
|
|
/* copied from urlapi.c */
|
|
extern int dedotdotify(const char *input, size_t clen, char **out);
|
|
|
|
#include "memdebug.h"
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
|
|
}
|
|
|
|
struct dotdot {
|
|
const char *input;
|
|
const char *output;
|
|
};
|
|
|
|
UNITTEST_START
|
|
|
|
unsigned int i;
|
|
int fails = 0;
|
|
const struct dotdot pairs[] = {
|
|
{ "%2f%2e%2e%2f/../a", "%2f%2e%2e%2f/a" },
|
|
{ "%2f%2e%2e%2f/../", "%2f%2e%2e%2f/" },
|
|
{ "%2f%2e%2e%2f/.", "%2f%2e%2e%2f/" },
|
|
{ "%2f%2e%2e%2f/", "%2f%2e%2e%2f/" },
|
|
{ "%2f%2e%2e%2f", "%2f%2e%2e%2f" },
|
|
{ "%2f%2e%2e%2", "%2f%2e%2e%2" },
|
|
{ "%2f%2e%2e%", "%2f%2e%2e%" },
|
|
{ "%2f%2e%2e", "%2f%2e%2e" },
|
|
{ "%2f%2e%2", "%2f%2e%2" },
|
|
{ "%2f%2e%", "%2f%2e%" },
|
|
{ "%2f%2e", "%2f%2e" },
|
|
{ "%2f%2", "%2f%2" },
|
|
{ "%2f%", "%2f%" },
|
|
{ "%2f", "%2f" },
|
|
{ "%2", "%2" },
|
|
{ "%", NULL },
|
|
{ "2", NULL },
|
|
{ "e", NULL },
|
|
{ ".", NULL },
|
|
{ "./", "" },
|
|
{ "..", "" },
|
|
{ "../", "" },
|
|
{ "../a", "a" },
|
|
{ "///moo.", "///moo." },
|
|
{ ".///moo.", "//moo." },
|
|
{ "./moo..", "moo.." },
|
|
{ "./moo../", "moo../" },
|
|
{ "./moo../.m", "moo../.m" },
|
|
{ "./moo", "moo" },
|
|
{ "../moo", "moo" },
|
|
{ "../moo?", "moo?" },
|
|
{ "../moo?#", "moo?#" },
|
|
{ "../moo?#?..", "moo?#?.." },
|
|
{ "/../moo/..", "/" },
|
|
{ "/a/c/%2e%2E/b", "/a/b" },
|
|
{ "/a/%2e/g", "/a/g" },
|
|
{ "/a/b/c/./g", "/a/b/c/g" },
|
|
{ "/a/c/../b", "/a/b" },
|
|
{ "/a/b/c/./../../g", "/a/g" },
|
|
{ "/a/b/c/./%2e%2E/../g", "/a/g" },
|
|
{ "/a/b/c/./../%2e%2E/g", "/a/g" },
|
|
{ "/a/b/c/%2E/%2e%2E/%2e%2E/g", "/a/g" },
|
|
{ "mid/content=5/../6", "mid/6" },
|
|
{ "/hello/../moo", "/moo" },
|
|
{ "/1/../1", "/1" },
|
|
{ "/1/./1", "/1/1" },
|
|
{ "/1/%2e/1", "/1/1" },
|
|
{ "/1/%2E/1", "/1/1" },
|
|
{ "/1/..", "/" },
|
|
{ "/1/.", "/1/" },
|
|
{ "/1/%2e", "/1/" },
|
|
{ "/1/%2E", "/1/" },
|
|
{ "/1/./..", "/" },
|
|
{ "/1/%2e/.%2E", "/" },
|
|
{ "/1/./%2e.", "/" },
|
|
{ "/1/./../2", "/2" },
|
|
{ "/hello/1/./../2", "/hello/2" },
|
|
{ "test/this", "test/this" },
|
|
{ "test/this/../now", "test/now" },
|
|
{ "/1../moo../foo", "/1../moo../foo"},
|
|
{ "/../../moo", "/moo"},
|
|
{ "/../../moo?", "/moo?"},
|
|
{ "/123?", "/123?" },
|
|
{ "/", NULL },
|
|
{ "", NULL },
|
|
{ "/.../", "/.../" },
|
|
{ "/.", "/" },
|
|
{ "/..", "/" },
|
|
{ "/moo/..", "/" },
|
|
{ "/..", "/" },
|
|
{ "/.", "/" },
|
|
};
|
|
|
|
for(i = 0; i < CURL_ARRAYSIZE(pairs); i++) {
|
|
char *out;
|
|
int err = dedotdotify(pairs[i].input, strlen(pairs[i].input), &out);
|
|
abort_unless(err == 0, "returned error");
|
|
abort_if(err && out, "returned error with output");
|
|
|
|
if(out && pairs[i].output && strcmp(out, pairs[i].output)) {
|
|
curl_mfprintf(stderr, "Test %u: '%s' gave '%s' instead of '%s'\n",
|
|
i, pairs[i].input, out, pairs[i].output);
|
|
fail("Test case output mismatched");
|
|
fails++;
|
|
}
|
|
else if((!out && pairs[i].output) ||
|
|
(out && !pairs[i].output)) {
|
|
curl_mfprintf(stderr, "Test %u: '%s' gave '%s' instead of '%s'\n",
|
|
i, pairs[i].input, out ? out : "(null)",
|
|
pairs[i].output ? pairs[i].output : "(null)");
|
|
fail("Test case output mismatched");
|
|
fails++;
|
|
}
|
|
else
|
|
curl_mfprintf(stderr, "Test %u: OK\n", i);
|
|
free(out);
|
|
}
|
|
|
|
fail_if(fails, "output mismatched");
|
|
|
|
UNITTEST_STOP
|