--- parser3/src/classes/math.C 2019/11/15 11:09:51 1.92 +++ parser3/src/classes/math.C 2026/10/16 13:55:16 1.114 @@ -1,8 +1,8 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001-2017 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. @@ -10,12 +10,14 @@ #include "pa_vmethod_frame.h" #include "pa_common.h" +#include "pa_int.h" #include "pa_base64.h" #include "pa_vint.h" #include "pa_vmath.h" #include "pa_vfile.h" #include "pa_request.h" #include "pa_md5.h" +#include "pa_sha1.h" #include "pa_sha2.h" #include "pa_random.h" @@ -23,7 +25,7 @@ extern "C" char *crypt(const char* , const char* ); #endif -volatile const char * IDENT_MATH_C="$Id: math.C,v 1.92 2019/11/15 11:09:51 moko Exp $"; +volatile const char * IDENT_MATH_C="$Id: math.C,v 1.114 2026/10/16 13:55:16 moko Exp $"; // defines @@ -47,8 +49,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 +111,16 @@ static void math2(Request& r, MethodPara } MATH2(pow) +MATH2(atan2) + +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=ULP_EQ_DEFAULT_DIST; + if(params.count() == 3) + max_ulp=params.as_int(2, "max distance must be integer", r); + r.write(VBool::get(ulp_eq_double(a, b, max_ulp))); +} inline bool is_salt_body_char(unsigned char c) { return pa_isalnum(c) || c == '.' || c=='/'; @@ -134,7 +146,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 */ @@ -187,153 +199,14 @@ static void _md5(Request& r, MethodParam } -//SHA-1: - -struct SHA1Context { - unsigned Message_Digest[5], Length_Low, Length_High; - unsigned int Message_Block[64]; - int Message_Block_Index, Computed, Corrupted; -}; - -#define SHA1CircularShift(bits,word) ((((word) << (bits)) & 0xFFFFFFFF)|((word) >> (32-(bits)))) -void SHA1ProcessMessageBlock(SHA1Context *); -void SHA1PadMessage(SHA1Context *); -void SHA1Reset(SHA1Context *context) { - context->Length_Low = context->Length_High = context->Message_Block_Index = 0; - context->Message_Digest[0] = 0x67452301; - context->Message_Digest[1] = 0xEFCDAB89; - context->Message_Digest[2] = 0x98BADCFE; - context->Message_Digest[3] = 0x10325476; - context->Message_Digest[4] = 0xC3D2E1F0; - context->Computed = context->Corrupted = 0; -} - -int SHA1Result(SHA1Context *context) { - if (context->Corrupted) - return 0; - if (!context->Computed) { - SHA1PadMessage(context); - context->Computed = 1; - } - return 1; -} - -void SHA1Input(SHA1Context *context, const unsigned char *message_array, unsigned length) { - if (!length) - return; - if (context->Computed || context->Corrupted) { - context->Corrupted = 1; - return; - } - - while(length-- && !context->Corrupted) { - context->Message_Block[context->Message_Block_Index++] = (*message_array & 0xFF); - context->Length_Low += 8; - context->Length_Low &= 0xFFFFFFFF; - if (!context->Length_Low && !(context->Length_High=((1+context->Length_High)&0xFFFFFFFF))) - context->Corrupted = 1; // too long message - if (context->Message_Block_Index == 64) - SHA1ProcessMessageBlock(context); - message_array++; - } -} - -void SHA1ProcessMessageBlock(SHA1Context *context) { - const unsigned K[] = {0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6 }; - int t; - unsigned temp, W[80], buf[5]; - unsigned &A=buf[0], &B=buf[1], &C=buf[2], &D=buf[3], &E=buf[4]; - - for(t = 0; t < 16; t++) - W[t] = (((unsigned) context->Message_Block[t * 4]) << 24) | (((unsigned) context->Message_Block[t * 4 + 1]) << 16) | (((unsigned) context->Message_Block[t * 4 + 2]) << 8) | ((unsigned) context->Message_Block[t * 4 + 3]); - - for(t = 16; t < 80; t++) - W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]); - - memcpy (buf, context->Message_Digest, sizeof(buf)); - for(t = 0; t < 20; t++) { - temp = (SHA1CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for(t = 20; t < 40; t++) { - temp = (SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for(t = 40; t < 60; t++) { - temp = (SHA1CircularShift(5,A) + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for(t = 60; t < 80; t++) { - temp = (SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for (t = 0; t < 5; t++) - context->Message_Digest[t] = (context->Message_Digest[t] + buf[t]) & 0xFFFFFFFF; - - context->Message_Block_Index = 0; -} - -void SHA1PadMessage(SHA1Context *context) { - context->Message_Block[context->Message_Block_Index++] = 0x80; - if (context->Message_Block_Index > 56) { - //was 55, one shift - while(context->Message_Block_Index < 64) - context->Message_Block[context->Message_Block_Index++] = 0; - SHA1ProcessMessageBlock(context); - while(context->Message_Block_Index < 56) - context->Message_Block[context->Message_Block_Index++] = 0; - } else - while(context->Message_Block_Index < 56) - context->Message_Block[context->Message_Block_Index++] = 0; - context->Message_Block[56] = (context->Length_High >> 24) & 0xFF; - context->Message_Block[57] = (context->Length_High >> 16) & 0xFF; - context->Message_Block[58] = (context->Length_High >> 8) & 0xFF; - context->Message_Block[59] = (context->Length_High) & 0xFF; - context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF; - context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF; - context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF; - context->Message_Block[63] = (context->Length_Low) & 0xFF; - SHA1ProcessMessageBlock(context); -} - -#ifdef PA_BIG_ENDIAN -#define SWAP(n) (n) -#else -#define SWAP(n) (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -#endif - -void SHA1ReadDigest(void *buf, SHA1Context *c) -{ - if(!SHA1Result(c)) - throw Exception (PARSER_RUNTIME, 0, "Can not compute SHA1"); - - ((uint32_t *)buf)[0] = SWAP(c->Message_Digest[0]); - ((uint32_t *)buf)[1] = SWAP(c->Message_Digest[1]); - ((uint32_t *)buf)[2] = SWAP(c->Message_Digest[2]); - ((uint32_t *)buf)[3] = SWAP(c->Message_Digest[3]); - ((uint32_t *)buf)[4] = SWAP(c->Message_Digest[4]); -} - static void _sha1(Request& r, MethodParams& params) { const char *string = params.as_string(0, PARAMETER_MUST_BE_STRING).cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets).cstr(); - SHA1Context c; + PA_SHA1_CTX c; unsigned char digest[20]; - SHA1Reset (&c); - SHA1Input (&c, (const unsigned char*)string, strlen(string)); - SHA1ReadDigest(digest, &c); + pa_SHA1Reset (&c); + pa_SHA1Input (&c, (const unsigned char*)string, strlen(string)); + pa_SHA1ReadDigest(digest, &c); r.write(*new String(hex_string(digest, sizeof(digest), false))); } @@ -343,7 +216,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 +228,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 +268,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 +302,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); @@ -432,22 +313,22 @@ static void _digest(Request& r, MethodPa } if(method == M_SHA1){ - SHA1Context c; + PA_SHA1_CTX c; if(hmac){ - HMAC(hmac, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20); + HMAC(hmac, hmac_len, pa_SHA1Reset, pa_SHA1Input, pa_SHA1ReadDigest, 64, 20); } else { - SHA1Reset(&c); - SHA1Input(&c, (const unsigned char*)data.str, data.length); + pa_SHA1Reset(&c); + pa_SHA1Input(&c, (const unsigned char*)data.str, data.length); } char *str=(char *)pa_malloc(20); - SHA1ReadDigest(str, &c); + pa_SHA1ReadDigest(str, &c); digest = String::C(str, 20); } 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 +341,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); @@ -474,24 +355,82 @@ 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*/)))); + } + 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 _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*/) { +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 +519,6 @@ static void _convert(Request& r, MethodP } bool negative=false; - bool sign=false; // converting digits to their numeric values @@ -594,7 +532,7 @@ static void _convert(Request& r, MethodP for(c=src;c=base_from) { for(unsigned char *s=c;s remainders((size_t)round(data.length * log2(base_from) / log2(base_to)) + 1); + Array remainders((size_t)round(data.length * log((double)base_from) / log((double)base_to)) + 1); do { int carry = 0; @@ -645,7 +583,7 @@ static void _convert(Request& r, MethodP for (c=src; c= base_to) { - *(dst++) = carry / base_to; + *(dst++) = (unsigned char)(carry / base_to); carry %= base_to; } else if (dst > src) { *(dst++) = 0; @@ -661,7 +599,7 @@ static void _convert(Request& r, MethodP char *result_str = (char *)pa_malloc_atomic(result_length+1); if(negative) result_str[0] = '-'; - for(int i=0; i