RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-27 15:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
319f745ba0
haproxy/src/arg.c

318 lines
8.0 KiB
C
Raw Normal View History

MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
/*
* Functions used to parse typed argument lists
*
* Copyright 2012 Willy Tarreau <w@1wt.eu>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
*/
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <common/standard.h>
#include <proto/arg.h>
static const char *arg_type_names[ARGT_NBTYPES] = {
[ARGT_STOP] = "end of arguments",
[ARGT_UINT] = "unsigned integer",
[ARGT_SINT] = "signed integer",
[ARGT_STR] = "string",
[ARGT_IPV4] = "IPv4 address",
[ARGT_MSK4] = "IPv4 mask",
[ARGT_IPV6] = "IPv6 address",
[ARGT_MSK6] = "IPv6 mask",
[ARGT_TIME] = "delay",
[ARGT_SIZE] = "size",
[ARGT_FE] = "frontend",
[ARGT_BE] = "backend",
[ARGT_TAB] = "table",
[ARGT_SRV] = "server",
[ARGT_USR] = "user list",
/* Unassigned types must never happen. Better crash during parsing if they do. */
};
MEDIUM: sample: pass an empty list instead of a null for fetch args ACL and sample fetches use args list and it is really not convenient to check for null args everywhere. Now for empty args we pass a constant list of end of lists. It will allow us to remove many useless checks.
2012-10-19 17:49:09 +00:00
/* This dummy arg list may be used by default when no arg is found, it helps
* parsers by removing pointer checks.
*/
struct arg empty_arg_list[8] = { };
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
/* This function clones a struct arg_list template into a new one which is
* returned.
*/
struct arg_list *arg_list_clone(const struct arg_list *orig)
{
struct arg_list *new;
if ((new = calloc(1, sizeof(*new))) != NULL) {
/* ->list will be set by the caller when inserting the element.
* ->arg and ->arg_pos will be set by the caller.
*/
new->ctx = orig->ctx;
new->kw = orig->kw;
new->conv = orig->conv;
new->file = orig->file;
new->line = orig->line;
}
return new;
}
/* This function clones a struct <arg_list> template into a new one which is
* set to point to arg <arg> at pos <pos>, and which is returned if the caller
* wants to apply further changes.
*/
struct arg_list *arg_list_add(struct arg_list *orig, struct arg *arg, int pos)
{
struct arg_list *new;
new = arg_list_clone(orig);
new->arg = arg;
new->arg_pos = pos;
LIST_ADDQ(&orig->list, &new->list);
return new;
}
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
/* This function builds an argument list from a config line. It returns the
* number of arguments found, or <0 in case of any error. Everything needed
* it automatically allocated. A pointer to an error message might be returned
* in err_msg if not NULL, in which case it would be allocated and the caller
* will have to check it and free it. The output arg list is returned in argp
* which must be valid. The returned array is always terminated by an arg of
* type ARGT_STOP (0), unless the mask indicates that no argument is supported.
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
* Unresolved arguments are appended to arg list <al>, which also serves as a
* template to create new entries. The mask is composed of a number of
* mandatory arguments in its lower 4 bits, and a concatenation of each
* argument type in each subsequent 4-bit block. If <err_msg> is not NULL, it
* must point to a freeable or NULL pointer.
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
*/
int make_arg_list(const char *in, int len, unsigned int mask, struct arg **argp,
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
char **err_msg, const char **err_ptr, int *err_arg,
struct arg_list *al)
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
{
int nbarg;
int pos;
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
struct arg *arg;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
const char *beg;
char *word = NULL;
const char *ptr_err = NULL;
int min_arg;
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
*argp = NULL;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
min_arg = mask & 15;
mask >>= 4;
pos = 0;
/* find between 0 and 8 the max number of args supported by the mask */
for (nbarg = 0; nbarg < 8 && ((mask >> (nbarg * 4)) & 0xF); nbarg++);
if (!nbarg)
goto end_parse;
/* Note: an empty input string contains an empty argument if this argument
* is marked mandatory. Otherwise we can ignore it.
*/
if (!len && !min_arg)
goto end_parse;
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
arg = *argp = calloc(nbarg + 1, sizeof(*arg));
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
/* Note: empty arguments after a comma always exist. */
while (pos < nbarg) {
beg = in;
while (len && *in != ',') {
in++;
len--;
}
/* we have a new argument between <beg> and <in> (not included).
* For ease of handling, we copy it into a zero-terminated word.
* By default, the output argument will be the same type of the
* expected one.
*/
free(word);
word = my_strndup(beg, in - beg);
arg->type = (mask >> (pos * 4)) & 15;
switch (arg->type) {
case ARGT_SINT:
if (in == beg) // empty number
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
else if (*beg < '0' || *beg > '9') {
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
beg++;
arg->data.sint = read_uint(&beg, in);
if (beg < in)
goto parse_err;
if (*word == '-')
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
arg->data.sint = -arg->data.sint;
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
else if (*word != '+') // invalid first character
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
goto parse_err;
break;
}
arg->type = ARGT_UINT;
/* fall through ARGT_UINT if no sign is present */
case ARGT_UINT:
if (in == beg) // empty number
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
arg->data.uint = read_uint(&beg, in);
if (beg < in)
goto parse_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
break;
case ARGT_FE:
case ARGT_BE:
case ARGT_TAB:
case ARGT_SRV:
case ARGT_USR:
BUG/MEDIUM: ensure that unresolved arguments are freed exactly once When passing arguments to ACLs and samples, some types are stored as strings then resolved later after config parsing is done. Upon exit, the arguments need to be freed only if the string was not resolved yet. At the moment we can encounter double free during deinit() because some arguments (eg: userlists) are freed once as their own type and once as a string. The solution consists in adding an "unresolved" flag to the args to say whether the value is still held in the <str> part or is final. This could be debugged thanks to a useful bug report from Sander Klein.
2012-06-01 08:38:29 +00:00
/* These argument types need to be stored as strings during
* parsing then resolved later.
*/
arg->unresolved = 1;
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
arg_list_add(al, arg, pos);
BUG/MEDIUM: ensure that unresolved arguments are freed exactly once When passing arguments to ACLs and samples, some types are stored as strings then resolved later after config parsing is done. Upon exit, the arguments need to be freed only if the string was not resolved yet. At the moment we can encounter double free during deinit() because some arguments (eg: userlists) are freed once as their own type and once as a string. The solution consists in adding an "unresolved" flag to the args to say whether the value is still held in the <str> part or is final. This could be debugged thanks to a useful bug report from Sander Klein.
2012-06-01 08:38:29 +00:00
/* fall through */
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
case ARGT_STR:
/* all types that must be resolved are stored as strings
* during the parsing. The caller must at one point resolve
* them and free the string.
*/
arg->data.str.str = word;
arg->data.str.len = in - beg;
arg->data.str.size = arg->data.str.len + 1;
word = NULL;
break;
case ARGT_IPV4:
if (in == beg) // empty address
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
if (inet_pton(AF_INET, word, &arg->data.ipv4) <= 0)
goto parse_err;
break;
case ARGT_MSK4:
if (in == beg) // empty mask
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
if (!str2mask(word, &arg->data.ipv4))
goto parse_err;
arg->type = ARGT_IPV4;
break;
case ARGT_IPV6:
if (in == beg) // empty address
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
if (inet_pton(AF_INET6, word, &arg->data.ipv6) <= 0)
goto parse_err;
break;
case ARGT_MSK6: /* not yet implemented */
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto not_impl;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
case ARGT_TIME:
if (in == beg) // empty time
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
ptr_err = parse_time_err(word, &arg->data.uint, TIME_UNIT_MS);
if (ptr_err)
goto parse_err;
arg->type = ARGT_UINT;
break;
case ARGT_SIZE:
if (in == beg) // empty size
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto empty_err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
ptr_err = parse_size_err(word, &arg->data.uint);
if (ptr_err)
goto parse_err;
arg->type = ARGT_UINT;
break;
/* FIXME: other types need to be implemented here */
default:
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto not_impl;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
}
pos++;
arg++;
/* don't go back to parsing if we reached end */
if (!len || pos >= nbarg)
break;
/* skip comma */
in++; len--;
}
end_parse:
free(word); word = NULL;
if (pos < min_arg) {
/* not enough arguments */
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
memprintf(err_msg,
MINOR: arg: improve wording on error reporting We make the distinction between missing too many arguments and no arguments supported.
2013-12-12 23:38:47 +00:00
"missing arguments (got %d/%d), type '%s' expected",
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
pos, min_arg, arg_type_names[(mask >> (pos * 4)) & 15]);
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
goto err;
}
if (len) {
/* too many arguments, starting at <in> */
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
/* the caller is responsible for freeing this message */
word = my_strndup(in, len);
MINOR: arg: improve wording on error reporting We make the distinction between missing too many arguments and no arguments supported.
2013-12-12 23:38:47 +00:00
if (nbarg)
memprintf(err_msg, "end of arguments expected at position %d, but got '%s'",
pos + 1, word);
else
memprintf(err_msg, "no argument supported, but got '%s'", word);
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
free(word); word = NULL;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
goto err;
}
/* note that pos might be < nbarg and this is not an error, it's up to the
* caller to decide what to do with optional args.
*/
if (err_arg)
*err_arg = pos;
if (err_ptr)
*err_ptr = in;
return pos;
err:
free(word);
MAJOR: sample: maintain a per-proxy list of the fetch args to resolve While ACL args were resolved after all the config was parsed, it was not the case with sample fetch args because they're almost everywhere now. The issue is that ACLs now solely rely on sample fetches, so their args resolving doesn't work anymore. And many fetches involving a server, a proxy or a userlist don't work at all. The real issue is that at the bottom layers we have no information about proxies, line numbers, even ACLs in order to report understandable errors, and that at the top layers we have no visibility over the locations where fetches are referenced (think log node). After failing multiple unsatisfying solutions attempts, we now have a new concept of args list. The principle is that every proxy has a list head which contains a number of indications such as the config keyword, the context where it's used, the file and line number, etc... and a list of arguments. This list head is of the same type as the elements, so it serves as a template for adding new elements. This way, it is filled from top to bottom by the callers with the information they have (eg: line numbers, ACL name, ...) and the lower layers just have to duplicate it and add an element when they face an argument they cannot resolve yet. Then at the end of the configuration parsing, a loop passes over each proxy's list and resolves all the args in sequence. And this way there is all necessary information to report verbose errors. The first immediate benefit is that for the first time we got very precise location of issues (arg number in a keyword in its context, ...). Second, in order to do this we had to parse log-format and unique-id-format a bit earlier, so that was a great opportunity for doing so when the directives are encountered (unless it's a default section). This way, the recorded line numbers for these args are the ones of the place where the log format is declared, not the end of the file. Userlists report slightly more information now. They're the only remaining ones in the ACL resolving function.
2013-04-02 14:34:32 +00:00
free(*argp);
BUG/MEDIUM: args: fix double free on error path in argument expression parser William Lallemand reported a double free on the args parser used in fetches and ACLs. The cause is that the arg expression is not fully initialized nor deinitialized when killed and that one of the pointers was already freed once in certain error conditions. Simply set it to NULL after the first call to free(). The bug was apparently introduced in 1.5-dev9 with commit 2ac5718 (MEDIUM: add a new typed argument list parsing framework).
2013-12-06 14:30:05 +00:00
*argp = NULL;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
if (err_arg)
*err_arg = pos;
if (err_ptr)
*err_ptr = in;
return -1;
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
empty_err:
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
memprintf(err_msg, "expected type '%s' at position %d, but got nothing",
arg_type_names[(mask >> (pos * 4)) & 15], pos + 1);
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto err;
parse_err:
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
memprintf(err_msg, "failed to parse '%s' as type '%s' at position %d",
word, arg_type_names[(mask >> (pos * 4)) & 15], pos + 1);
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto err;
not_impl:
MINOR: standard: make memprintf() support a NULL destination Doing so removes many checks that were systematically made because the callees don't know if the caller passed a valid pointer.
2012-09-20 17:43:14 +00:00
memprintf(err_msg, "parsing for type '%s' was not implemented, please report this bug",
arg_type_names[(mask >> (pos * 4)) & 15]);
MINOR: arg: improve error reporting on invalid arguments It's important to report the faulty argument position and to distinguish between empty arguments and wrong ones. Integers were not properly tested either, now their parsing has been improved to report use of incorrect characters.
2012-04-27 14:32:26 +00:00
goto err;
MEDIUM: add a new typed argument list parsing framework make_arg_list() builds an array of typed arguments with their values, that the caller describes how to parse. This will be used to support multiple arguments for ACLs and patterns, which is currently problematic and prevents ACLs and patterns from being merged. Up to 7 arguments types may be enumerated in a single 32-bit word, including their number of mandatory parts. At the moment, these files are not used yet, they're only built. Note that the 4-bit encoding for the type has left only one unused type!
2012-04-19 13:24:50 +00:00
}
Reference in New Issue Copy Permalink