From af754e596a8dbb05ed8580c342e7fe02e08b28e0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 16:11:00 +0200 Subject: Adding upstream version 3.2.3+dfsg. Signed-off-by: Daniel Baumann --- src/modules/rlm_unpack/README.md | 9 + src/modules/rlm_unpack/all.mk | 2 + src/modules/rlm_unpack/rlm_unpack.c | 422 ++++++++++++++++++++++++++++++++++++ 3 files changed, 433 insertions(+) create mode 100644 src/modules/rlm_unpack/README.md create mode 100644 src/modules/rlm_unpack/all.mk create mode 100644 src/modules/rlm_unpack/rlm_unpack.c (limited to 'src/modules/rlm_unpack') diff --git a/src/modules/rlm_unpack/README.md b/src/modules/rlm_unpack/README.md new file mode 100644 index 0000000..7cc8d1b --- /dev/null +++ b/src/modules/rlm_unpack/README.md @@ -0,0 +1,9 @@ +# rlm_unpack +## Metadata +
+
category
policy
+
+ +## Summary + +Unpacks binary data from octets type attributes into individual attributes. diff --git a/src/modules/rlm_unpack/all.mk b/src/modules/rlm_unpack/all.mk new file mode 100644 index 0000000..e569fbe --- /dev/null +++ b/src/modules/rlm_unpack/all.mk @@ -0,0 +1,2 @@ +TARGET := rlm_unpack.a +SOURCES := rlm_unpack.c diff --git a/src/modules/rlm_unpack/rlm_unpack.c b/src/modules/rlm_unpack/rlm_unpack.c new file mode 100644 index 0000000..dfdc81a --- /dev/null +++ b/src/modules/rlm_unpack/rlm_unpack.c @@ -0,0 +1,422 @@ +/* + * This program is 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * $Id$ + * @file rlm_unpack.c + * @brief Unpack binary data + * + * @copyright 2014 The FreeRADIUS server project + * @copyright 2014 Alan DeKok + */ +RCSID("$Id$") + +#include +#include +#include + +#define PW_CAST_BASE (1850) + +#define GOTO_ERROR do { REDEBUG("Unexpected text at '%s'", p); goto error;} while (0) + +/** Unpack data + * + * Example: %{unpack:&Class 0 integer} + * + * Expands Class, treating octet at offset 0 (bytes 0-3) as an "integer". + */ +static ssize_t unpack_xlat(UNUSED void *instance, REQUEST *request, char const *fmt, + char *out, size_t outlen) +{ + char *data_name, *data_size, *data_type; + char *p; + size_t len, input_len; + int offset; + PW_TYPE type; + DICT_ATTR const *da; + VALUE_PAIR *vp, *cast; + uint8_t const *input; + char buffer[256]; + uint8_t blob[256]; + + /* + * FIXME: copy only the fields here, as we parse them. + */ + strlcpy(buffer, fmt, sizeof(buffer)); + + p = buffer; + while (isspace((uint8_t) *p)) p++; /* skip leading spaces */ + + data_name = p; + + while (*p && !isspace((uint8_t) *p)) p++; + + if (!*p) { + error: + REDEBUG("Format string should be ' ' e.g. '&Class 1 integer'"); + nothing: + *out = '\0'; + return -1; + } + + while (isspace((uint8_t) *p)) *(p++) = '\0'; + if (!*p) GOTO_ERROR; + + data_size = p; + + while (*p && !isspace((uint8_t) *p)) p++; + if (!*p) GOTO_ERROR; + + while (isspace((uint8_t) *p)) *(p++) = '\0'; + if (!*p) GOTO_ERROR; + + data_type = p; + + while (*p && !isspace((uint8_t) *p)) p++; + if (*p) GOTO_ERROR; /* anything after the type is an error */ + + /* + * Attribute reference + */ + if (*data_name == '&') { + if (radius_get_vp(&vp, request, data_name) < 0) goto nothing; + + if ((vp->da->type != PW_TYPE_OCTETS) && + (vp->da->type != PW_TYPE_STRING)) { + REDEBUG("unpack requires the input attribute to be 'string' or 'octets'"); + goto nothing; + } + input = vp->vp_octets; + input_len = vp->vp_length; + + } else if ((data_name[0] == '0') && (data_name[1] == 'x')) { + /* + * Hex data. + */ + len = strlen(data_name + 2); + if ((len & 0x01) != 0) { + RDEBUG("Invalid hex string in '%s'", data_name); + goto nothing; + } + input = blob; + input_len = fr_hex2bin(blob, sizeof(blob), data_name + 2, len); + vp = NULL; + + } else { + GOTO_ERROR; + } + + offset = (int) strtoul(data_size, &p, 10); + if (*p) { + REDEBUG("unpack requires a decimal number, not '%s'", data_size); + goto nothing; + } + + if ((size_t) offset >= input_len) { + REDEBUG("Offset is larger then the input."); + goto nothing; + } + + /* + * Allow for string(4) or octets(4), which says "take 4 + * bytes from the thing. + */ + p = strchr(data_type, '('); + if (p) { + char *end; + unsigned long to_copy; + + *p = '\0'; + + /* + * Allow the caller to say "get me everything + * else" + */ + if (p[1] == ')') { + to_copy = input_len - offset; + end = p + 1; + + } else { + to_copy = strtoul(p + 1, &end, 10); + } + if (to_copy > input_len) { + REDEBUG("Invalid length at '%s'", p + 1); + goto nothing; + } + + if ((end[0] != ')') || (end[1] != '\0')) { + REDEBUG("Invalid ending at '%s'", end); + goto nothing; + } + + type = fr_str2int(dict_attr_types, data_type, PW_TYPE_INVALID); + if (type == PW_TYPE_INVALID) { + REDEBUG("Invalid data type '%s'", data_type); + goto nothing; + } + + if ((type != PW_TYPE_OCTETS) && (type != PW_TYPE_STRING)) { + REDEBUG("Cannot take substring of data type '%s'", data_type); + goto nothing; + } + + if (input_len < (offset + to_copy)) { + REDEBUG("Insufficient data to unpack '%s' from '%s'", data_type, data_name); + goto nothing; + } + + /* + * Just copy the string over. + */ + if (type == PW_TYPE_STRING) { + if (outlen <= to_copy) { + REDEBUG("Insufficient buffer space to unpack data"); + goto nothing; + } + + memcpy(out, input + offset, to_copy); + out[to_copy] = '\0'; + return to_copy; + } + + /* + * We hex encode octets. + */ + if (outlen <= (to_copy * 2)) { + REDEBUG("Insufficient buffer space to unpack data"); + goto nothing; + } + + return fr_bin2hex(out, input + offset, to_copy); + } + + type = fr_str2int(dict_attr_types, data_type, PW_TYPE_INVALID); + if (type == PW_TYPE_INVALID) { + REDEBUG("Invalid data type '%s'", data_type); + goto nothing; + } + + /* + * Output must be a non-zero limited size. + */ + if ((dict_attr_sizes[type][0] == 0) || + (dict_attr_sizes[type][0] != dict_attr_sizes[type][1])) { + REDEBUG("unpack requires fixed-size output type, not '%s'", data_type); + goto nothing; + } + + if (input_len < (offset + dict_attr_sizes[type][0])) { + REDEBUG("Insufficient data to unpack '%s' from '%s'", data_type, data_name); + goto nothing; + } + + da = dict_attrbyvalue(PW_CAST_BASE + type, 0); + if (!da) { + REDEBUG("Cannot decode type '%s'", data_type); + goto nothing; + } + + cast = fr_pair_afrom_da(request, da); + if (!cast) goto nothing; + + memcpy(&(cast->data), input + offset, dict_attr_sizes[type][0]); + cast->vp_length = dict_attr_sizes[type][0]; + + /* + * Hacks + */ + switch (type) { + case PW_TYPE_SIGNED: + case PW_TYPE_INTEGER: + case PW_TYPE_DATE: + cast->vp_integer = ntohl(cast->vp_integer); + break; + + case PW_TYPE_SHORT: + cast->vp_short = ((input[offset] << 8) | input[offset + 1]); + break; + + case PW_TYPE_INTEGER64: + cast->vp_integer64 = ntohll(cast->vp_integer64); + break; + + default: + break; + } + + len = vp_prints_value(out, outlen, cast, 0); + talloc_free(cast); + + if (is_truncated(len, outlen)) { + REDEBUG("Insufficient buffer space to unpack data"); + goto nothing; + } + + return len; +} + +/** Return a substring from a starting character for a given length + * + * Example: "%{substring:foobar 2 3}" == "oba" + * Example: "%{substring:foobar -3 2}" == "ba" + * Example: "%{substring:foobar 1 -1}" == "ooba" + * + * Syntax: "%{substring: }" + */ +static ssize_t substring_xlat(UNUSED void *instance, REQUEST *request, + char const *fmt, char *out, size_t outlen) +{ + ssize_t slen; + long start, len; + char const *p = fmt; + char *end, *buffer; + + /* + * Trim whitespace + */ + while (isspace((uint8_t) *p) && p++); + + /* + * Find numeric parameters at the end. + * Start with final space in fmt + */ + end = strrchr(p, ' '); + if (!end) { + arg_error: + REDEBUG("substring needs exactly three arguments: &ref "); + return -1; + } + if (end == fmt) goto arg_error; + + /* + * Walk back for previous space + */ + end--; + while ((end >= p) && (*end != ' ') && end--); + if (*end != ' ') goto arg_error; + /* + * Store the total length of fmt up to the parameters including + * leading whitespace - if we're given a plain string we need the + * whole thing + */ + slen = end - fmt; + + end++; + start = strtol(end, &end, 10); + end++; + len = strtol(end, &end, 10); + + /* + * Check for an attribute + */ + if (*p == '&') { + vp_tmpl_t vpt; + slen = tmpl_from_attr_substr(&vpt, p, REQUEST_CURRENT, PAIR_LIST_REQUEST, false, false); + if (slen <= 0) { + REDEBUG("%s", fr_strerror()); + return -1; + } + + slen = tmpl_aexpand(NULL, &buffer, request, &vpt, NULL, NULL); + if (slen < 0) { + talloc_free(buffer); + REDEBUG("Unable to expand substring value"); + return -1; + } + + } else { + /* + * Input is a string, copy it to the workspace + */ + buffer = talloc_array(NULL, char, slen + 1); + strncpy(buffer, fmt, slen); + buffer[slen] = '\0'; + } + /* + * Negative start counts in from the end of the string, + * calculate the actual start position + */ + if (start < 0) { + if ((0 - start) > slen) { + start = 0; + } else { + start = slen + start; + } + } + + if (start > slen) { + *out = '\0'; + talloc_free(buffer); + WARN("Start position %li is after end of string length of %li", start, slen); + return 0; + } + + /* + * Negative length drops characters from the end of the string, + * calculate the actual length + */ + if (len < 0) len = slen - start + len; + + if (len < 0) { + WARN("String length of %li too short for substring parameters", slen); + len = 0; + } + + /* + * Reduce length to match available string length + */ + if (len > (slen - start)) len = slen - start; + + /* + * Reduce length to "out" capacity + */ + if (len > (long) outlen) len = outlen; + + strncpy(out, buffer + start, len); + out[len] = '\0'; + talloc_free(buffer); + return len; +} + +/* + * Register the xlats + */ +static int mod_bootstrap(CONF_SECTION *conf, void *instance) +{ + if (cf_section_name2(conf)) return 0; + + xlat_register("unpack", unpack_xlat, NULL, instance); + xlat_register("substring", substring_xlat, NULL, instance); + + return 0; +} + +/* + * The module name should be the only globally exported symbol. + * That is, everything else should be 'static'. + * + * If the module needs to temporarily modify it's instantiation + * data, the type should be changed to RLM_TYPE_THREAD_UNSAFE. + * The server will then take care of ensuring that the module + * is single-threaded. + */ +extern module_t rlm_unpack; +module_t rlm_unpack = { + .magic = RLM_MODULE_INIT, + .name = "unpack", + .type = RLM_TYPE_THREAD_SAFE, + .bootstrap = mod_bootstrap +}; -- cgit v1.2.3