--- parser3/src/classes/math.C 2017/02/07 22:00:28 1.85 +++ parser3/src/classes/math.C 2021/10/19 16:16:35 1.98 @@ -1,7 +1,7 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) portions from gen_uuid.c, @@ -10,6 +10,7 @@ #include "pa_vmethod_frame.h" #include "pa_common.h" +#include "pa_base64.h" #include "pa_vint.h" #include "pa_vmath.h" #include "pa_vfile.h" @@ -22,7 +23,7 @@ extern "C" char *crypt(const char* , const char* ); #endif -volatile const char * IDENT_MATH_C="$Id: math.C,v 1.85 2017/02/07 22:00:28 moko Exp $"; +volatile const char * IDENT_MATH_C="$Id: math.C,v 1.98 2021/10/19 16:16:35 moko Exp $"; // defines @@ -337,6 +338,16 @@ static void _sha1(Request& r, MethodPara r.write(*new String(hex_string(digest, sizeof(digest), false))); } +String::C getData(Value& vdata, Request& r){ + if(const String* sdata=vdata.get_string()){ + String::Body body=sdata->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // explode content, honor tainting changes + return String::C(body.cstr(), body.length()); + } else { + VFile *file=vdata.as_vfile(); + return String::C(file->value_ptr(),file->value_size()); + } +} + void memxor(char *dest, const char *src, size_t n){ for (;n>0;n--) *dest++ ^= *src++; } @@ -374,16 +385,7 @@ void memxor(char *dest, const char *src, static void _digest(Request& r, MethodParams& params) { const String &smethod = params.as_string(0, PARAMETER_MUST_BE_STRING); - Value& vdata=params.as_no_junction(1, "parameter must be string or file"); - - String::C data; - if(const String* sdata=vdata.get_string()){ - String::Body body=sdata->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // explode content, honor tainting changes - data=String::C(body.cstr(), body.length()); - } else { - VFile *file=vdata.as_vfile(String::L_AS_IS); - data=String::C(file->value_ptr(),file->value_size()); - } + String::C data=getData(params.as_no_junction(1, "parameter must be string or file"), r); enum Method { M_MD5, M_SHA1, M_SHA256, M_SHA512 } method; @@ -391,7 +393,7 @@ static void _digest(Request& r, MethodPa else if (smethod == "sha1" ) method = M_SHA1; else if (smethod == "sha256" ) method = M_SHA256; else if (smethod == "sha512" ) method = M_SHA512; - else throw Exception(PARSER_RUNTIME, &smethod, "must be 'md5' or 'sha1'"); + else throw Exception(PARSER_RUNTIME, &smethod, "must be 'md5' or 'sha1' or 'sha256' or 'sha512'"); const char *hmac=0; enum Format { F_HEX, F_BASE64 } format = F_HEX; @@ -472,19 +474,50 @@ static void _digest(Request& r, MethodPa r.write(*new String(hex_string((unsigned char *)digest.str, digest.length, false))); } if(format == F_BASE64){ - r.write(*new String(pa_base64_encode(digest.str, digest.length))); + r.write(*new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /*no wrap*/)))); } } -static void _uuid(Request& r, MethodParams& /*params*/) { - r.write(*new String(get_uuid_cstr())); +static void _uuid(Request& r, MethodParams& params) { + bool lower=false; + bool solid=false; + + if (params.count() == 1) + if (HashStringValue* options = params.as_hash(0)) { + int valid_options = 0; + if (Value* vlower = options->get("lower")) { + lower = r.process(*vlower).as_bool(); + valid_options++; + } + if (Value* vsolid = options->get("solid")) { + solid = r.process(*vsolid).as_bool(); + valid_options++; + } + if (valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + + r.write(*new String(get_uuid_cstr(lower, solid))); } -static void _uid64(Request& r, MethodParams& /*params*/) { +static void _uid64(Request& r, MethodParams& params) { + bool lower = false; + + if (params.count() == 1) + if (HashStringValue* options = params.as_hash(0)) { + int valid_options = 0; + if (Value* vlower = options->get("lower")) { + lower = r.process(*vlower).as_bool(); + valid_options++; + } + if (valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + unsigned char id[64/8]; random(&id, sizeof(id)); - r.write(*new String(hex_string(id, sizeof(id), true))); + r.write(*new String(hex_string(id, sizeof(id), !lower))); } static void _crc32(Request& r, MethodParams& params) { @@ -492,49 +525,189 @@ static void _crc32(Request& r, MethodPar r.write(*new VInt(pa_crc32(string, strlen(string)))); } -static void toBase(unsigned long long int value, unsigned int base, char*& ptr){ - static const char* hex="0123456789ABCDEF"; - unsigned int rest = (unsigned int)(value % base); - if(value >= base) - toBase( (value-rest)/base, base, ptr); - *ptr++=(char)hex[rest]; +static const char* abc_hex = "0123456789ABCDEF"; + +static unsigned char hex_lookup[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, + 0,10,11,12,13,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,10,11,12,13,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +static unsigned char abc_lookup[256] = {}; +static unsigned char abc_256_lookup[256] = {}; + +inline unsigned char *init_abc_256() { + if(!abc_256_lookup[255]) + for(int i=0; i<256; i++) abc_256_lookup[i] = (unsigned char)i; + return abc_256_lookup; } static void _convert(Request& r, MethodParams& params) { - const char *str=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); + String::C data=getData(params.as_no_junction(0, "parameter must be string or file"), r); - int base_from=params.as_int(1, "base from must be integer", r); - if(base_from < 2 || base_from > 16) - throw Exception(PARSER_RUNTIME, 0, "base from must be an integer from 2 to 16"); + bool abc_mode = true; + unsigned char *lookup; + const char *abc_from; + int base_from; + + if(params[1].is_string()) { + abc_from = params[1].get_string()->cstr(); + base_from = strlen(abc_from); + if(base_from < 2) + throw Exception(PARSER_RUNTIME, 0, "alphabet 'from' must contain at least 2 characters"); + lookup = abc_lookup; + memset(abc_lookup,0,sizeof(abc_lookup)); + for(int i=0; i 16 && base_from != 256) + throw Exception(PARSER_RUNTIME, 0, "base 'from' must be an integer from 2 to 16 or 256"); + if (base_from == 256) { + abc_from = ""; + lookup = init_abc_256(); + } else { + abc_mode = false; + abc_from = abc_hex; + lookup = hex_lookup; + } + } - int base_to=params.as_int(2, "base to must be integer", r); - if(base_to < 2 || base_to > 16) - throw Exception(PARSER_RUNTIME, 0, "base to must be an integer from 2 to 16"); + const char *abc_to; + int base_to; - while(isspace(*str)) - str++; + if(params[2].is_string()) { + abc_to=params[2].get_string()->cstr(); + base_to=strlen(abc_to); + if(base_to < 2) + throw Exception(PARSER_RUNTIME, 0, "alphabet 'to' must contain at least 2 characters"); + } else { + base_to=params.as_int(2, "base 'to' must be integer or string", r); + if(base_to < 2 || base_to > 16 && base_to != 256) + throw Exception(PARSER_RUNTIME, 0, "base 'to' must be an integer from 2 to 16 or 256"); + if (base_to == 256) { + abc_to = (char *)init_abc_256(); + } else { + abc_to = abc_hex; + } + } - if(!*str) - return; + VFile* result_file = 0; + + if(params.count() == 4) + if(HashStringValue* options=params.as_hash(3)) { + int valid_options=0; + if(Value* value=options->get("format")) { + const String& sformat=value->as_string(); + if (sformat == "file" ) result_file = new VFile; + else if (sformat != "string") throw Exception(PARSER_RUNTIME, &sformat, "must be 'string' or 'file'"); + valid_options++; + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } bool negative=false; - if(str[0]=='-') { - negative=true; - str++; - } else if(str[0]=='+') { - str++; + bool sign=false; + + // converting digits to their numeric values + + unsigned char *src=(unsigned char *)pa_strdup(data.str, data.length); + const unsigned char *src_end = src + data.length; + + unsigned char *c; + + if(abc_mode){ + + for(c=src;c=base_from) { + for(unsigned char *s=c;s remainders((size_t)round(data.length * log((double)base_from) / log((double)base_to)) + 1); + + do { + int carry = 0; + unsigned char *dst = src; + for (c=src; c= base_to) { + *(dst++) = (unsigned char)(carry / base_to); + carry %= base_to; + } else if (dst > src) { + *(dst++) = 0; + } + } + src_end = dst; + remainders += abc_to[carry]; + } while (src_end > src); - char result_cstr[sizeof(unsigned long long int)*8+1/*minus for negative number*/+1/*terminator*/]; - char* ptr=result_cstr; + // result processing + + size_t result_length = negative + remainders.count(); + char *result_str = (char *)pa_malloc_atomic(result_length+1); if(negative) - *ptr++='-'; + result_str[0] = '-'; + for(size_t i=0; iset(true /*tainted*/, 0 /*binary*/, result_str, result_length, 0, 0, &r); + r.write(*result_file); + } else { + if(memchr(result_str, 0, result_length)) + throw Exception(PARSER_RUNTIME, 0, "Invalid \\x00 character found while converting to string. Convert to file instead."); - toBase(value, base_to, ptr); - *ptr=0; - r.write(*new String(pa_strdup(result_cstr))); + fix_line_breaks(result_str, result_length); + + if(result_length) + r.write(*new String(result_str, String::L_TAINTED)); + } } // constructor @@ -552,8 +725,8 @@ MMath::MMath(): Methoded("math") { ADD1(abs); ADD1(sign); ADD1(exp); ADD1(log); ADD1(log10); - ADD1(sin); ADD1(asin); - ADD1(cos); ADD1(acos); + ADD1(sin); ADD1(asin); + ADD1(cos); ADD1(acos); ADD1(tan); ADD1(atan); ADD1(degrees); ADD1(radians); ADD1(sqrt); @@ -578,11 +751,13 @@ MMath::MMath(): Methoded("math") { ADD1(crc32); // ^math:uuid[] - ADD0(uuid); + // ^math:uuid[options hash] + add_native_method("uuid", Method::CT_STATIC, _uuid, 0, 1); // ^math:uid64[] - ADD0(uid64); + // ^math:uid64[options hash] + add_native_method("uid64", Method::CT_STATIC, _uid64, 0, 1); - // ^math:convert[number](base-from;base-to) - add_native_method("convert", Method::CT_STATIC, _convert, 3, 3); + // ^math:convert[number|file](base-from)|[abc_from](base-to)|[abc_to][options] + add_native_method("convert", Method::CT_STATIC, _convert, 3, 4); }