--- parser3/src/classes/math.C 2020/12/15 17:10:29 1.96 +++ parser3/src/classes/math.C 2026/04/25 13:38:46 1.112 @@ -1,8 +1,8 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian portions from gen_uuid.c, Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o. @@ -23,7 +23,7 @@ extern "C" char *crypt(const char* , const char* ); #endif -volatile const char * IDENT_MATH_C="$Id: math.C,v 1.96 2020/12/15 17:10:29 moko Exp $"; +volatile const char * IDENT_MATH_C="$Id: math.C,v 1.112 2026/04/25 13:38:46 moko Exp $"; // defines @@ -47,8 +47,8 @@ DECLARE_CLASS_VAR(math, new MMath); static void _random(Request& r, MethodParams& params) { double top=params.as_double(0, "range must be expression", r); - if(top<1 || top>INT32_MAX) - throw Exception(PARSER_RUNTIME, 0, "top(%.15g) must be [1..%u]", top, INT32_MAX); + if(top<1 || top>INT_MAX) + throw Exception(PARSER_RUNTIME, 0, "top(%.15g) must be [1..%u]", top, INT_MAX); r.write(*new VInt(_random(uint(top)))); } @@ -109,6 +109,28 @@ static void math2(Request& r, MethodPara } MATH2(pow) +MATH2(atan2) + +static inline uint64_t ulp_key_double(double x) { + union { double d; uint64_t u; } v; v.d = x; + return (v.u & (1ull << 63)) ? (~v.u + 1ull) : (v.u | (1ull << 63)); +} + +static inline uint64_t ulp_distance_double(double a, double b) { + if (a == b) return 0; + uint64_t ka = ulp_key_double(a); + uint64_t kb = ulp_key_double(b); + return (ka > kb) ? (ka - kb) : (kb - ka); +} + +static void _eq(Request& r, MethodParams& params) { + double a=params.as_double(0, "parameter must be expression", r); + double b=params.as_double(1, "parameter must be expression", r); + uint64_t max_ulp=3; + if(params.count() == 3) + max_ulp=params.as_int(2, "max distance must be integer", r); + r.write(VBool::get(ulp_distance_double(a,b)<=max_ulp)); +} inline bool is_salt_body_char(unsigned char c) { return pa_isalnum(c) || c == '.' || c=='/'; @@ -134,7 +156,7 @@ static void _crypt(Request& r, MethodPar const char* normal_salt; char normalize_buf[MAX_STRING]; if(prefix_size==strlen(maybe_bodyless_salt)) { // bodyless? - strncpy(normalize_buf, maybe_bodyless_salt, MAX_STRING-MAX_SALT-1); + pa_strncpy(normalize_buf, maybe_bodyless_salt, MAX_STRING-MAX_SALT); char *cur=normalize_buf+strlen(normalize_buf); // sould add up MAX_SALT random chars static unsigned char itoa64[] = /* 0 ... 63 => ASCII - 64 */ @@ -317,7 +339,7 @@ void SHA1PadMessage(SHA1Context *context void SHA1ReadDigest(void *buf, SHA1Context *c) { if(!SHA1Result(c)) - throw Exception (PARSER_RUNTIME, 0, "Can not compute SHA1"); + throw Exception (PARSER_RUNTIME, 0, "Cannot compute SHA1"); ((uint32_t *)buf)[0] = SWAP(c->Message_Digest[0]); ((uint32_t *)buf)[1] = SWAP(c->Message_Digest[1]); @@ -343,7 +365,7 @@ String::C getData(Value& vdata, Request& 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(String::L_AS_IS); + VFile *file=vdata.as_vfile(); return String::C(file->value_ptr(),file->value_size()); } } @@ -355,13 +377,12 @@ void memxor(char *dest, const char *src, #define IPAD 0x36 #define OPAD 0x5c -#define HMAC(key,init,update,final,blocklen,digestlen){ \ +#define HMAC(key,keylen,init,update,final,blocklen,digestlen){ \ unsigned char tempdigest[digestlen], keydigest[digestlen]; \ - size_t keylen=strlen(key); \ /* Reduce the key's size, so that it becomes <= blocklen bytes. */ \ if (keylen > blocklen){ \ init(&c); \ - update(&c,(const unsigned char*)hmac, keylen); \ + update(&c,(const unsigned char*)key, keylen); \ final(keydigest, &c); \ key = (char *)keydigest; \ keylen = digestlen; \ @@ -396,19 +417,28 @@ static void _digest(Request& r, MethodPa 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; + size_t hmac_len=0; + + enum Format { F_HEX, F_BASE64, F_FILE } format = F_HEX; if(params.count() == 3) if(HashStringValue* options=params.as_hash(2)) { int valid_options=0; if(Value* value=options->get("hmac")) { - hmac=value->as_string().cstr(); + if(VFile* vfile=dynamic_cast(value)){ + hmac=(const char* )vfile->value_ptr(); + hmac_len=vfile->value_size(); + } else { + hmac=value->as_string().cstr(); + hmac_len=strlen(hmac); + } valid_options++; } if(Value* value=options->get("format")) { const String& sformat=value->as_string(); if (sformat == "hex") format = F_HEX; else if (sformat == "base64" ) format = F_BASE64; + else if (sformat == "file" ) format = F_FILE; else throw Exception(PARSER_RUNTIME, &sformat, "must be 'hex' or 'base64'"); valid_options++; } @@ -421,7 +451,7 @@ static void _digest(Request& r, MethodPa if(method == M_MD5){ PA_MD5_CTX c; if(hmac){ - HMAC(hmac, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16); + HMAC(hmac, hmac_len, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16); } else { pa_MD5Init(&c); pa_MD5Update(&c, (const unsigned char*)data.str, data.length); @@ -434,7 +464,7 @@ static void _digest(Request& r, MethodPa if(method == M_SHA1){ SHA1Context c; if(hmac){ - HMAC(hmac, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20); + HMAC(hmac, hmac_len, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20); } else { SHA1Reset(&c); SHA1Input(&c, (const unsigned char*)data.str, data.length); @@ -447,7 +477,7 @@ static void _digest(Request& r, MethodPa if(method == M_SHA256){ SHA256_CTX c; if(hmac){ - HMAC(hmac, pa_SHA256_Init, pa_SHA256_Update, pa_SHA256_Final, 64, SHA256_DIGEST_LENGTH); + HMAC(hmac, hmac_len, pa_SHA256_Init, pa_SHA256_Update, pa_SHA256_Final, 64, SHA256_DIGEST_LENGTH); } else { pa_SHA256_Init(&c); pa_SHA256_Update(&c, (const unsigned char*)data.str, data.length); @@ -460,7 +490,7 @@ static void _digest(Request& r, MethodPa if(method == M_SHA512){ SHA512_CTX c; if(hmac){ - HMAC(hmac, pa_SHA512_Init, pa_SHA512_Update, pa_SHA512_Final, 128, SHA512_DIGEST_LENGTH); + HMAC(hmac, hmac_len, pa_SHA512_Init, pa_SHA512_Update, pa_SHA512_Final, 128, SHA512_DIGEST_LENGTH); } else { pa_SHA512_Init(&c); pa_SHA512_Update(&c, (const unsigned char*)data.str, data.length); @@ -476,22 +506,80 @@ static void _digest(Request& r, MethodPa if(format == F_BASE64){ r.write(*new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /*no wrap*/)))); } + if(format == F_FILE){ + VFile& result=*new VFile; + result.set_binary(true, digest.str, digest.length); + r.write(result); + } } -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 _uuid7(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_uuid7_cstr(lower, solid))); +} + +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) { const char *string=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); - r.write(*new VInt(pa_crc32(string, strlen(string)))); + r.write(*new VDouble((uint)pa_crc32(string, strlen(string)))); } static const char* abc_hex = "0123456789ABCDEF"; @@ -580,7 +668,6 @@ static void _convert(Request& r, MethodP } bool negative=false; - bool sign=false; // converting digits to their numeric values @@ -594,7 +681,7 @@ static void _convert(Request& r, MethodP for(c=src;c=base_from) { for(unsigned char *s=c;s