--- parser3/src/classes/math.C 2003/11/20 15:35:29 1.35 +++ parser3/src/classes/math.C 2008/06/16 09:37:47 1.52 @@ -1,14 +1,14 @@ /** @file Parser: @b math parser class. - Copyright(c) 2001-2003 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2001-2005 ArtLebedev Group(http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) portions from gen_uuid.c, Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o. */ -static const char* IDENT_MATH_C="$Date: 2003/11/20 15:35:29 $"; +static const char * const IDENT_MATH_C="$Date: 2008/06/16 09:37:47 $"; #include "pa_vmethod_frame.h" #include "pa_common.h" @@ -164,10 +164,9 @@ static inline int _random(uint top) { } static void _random(Request& r, MethodParams& params) { - Value& range=params.as_junction(0, "range must be expression"); - double top=r.process_to_value(range).as_double(); + double top=params.as_double(0, "range must be expression", r); if(top<=0 || top>MAX_UINT) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "top(%g) must be [1..%u]", top, MAX_UINT); @@ -181,9 +180,8 @@ static double degrees(double param) { re static double radians(double param) { return param /180 *PI; } static void math1(Request& r, MethodParams& params, math1_func_ptr func) { - Value& param=params.as_junction(0, "parameter must be expression"); - - double result=func(r.process_to_value(param).as_double()); + double param=params.as_double(0, "parameter must be expression", r); + double result=func(param); r.write_no_lang(*new VDouble(result)); } @@ -198,7 +196,8 @@ static void math1(Request& r, MethodPara MATH1(round); MATH1(floor); MATH1P(ceiling, ceil); MATH1(trunc); MATH1(frac); MATH1P(abs, fabs); MATH1(sign); -MATH1(exp); MATH1(log); +MATH1(exp); +MATH1(log); MATH1(log10); MATH1(sin); MATH1(asin); MATH1(cos); MATH1(acos); MATH1(tan); MATH1(atan); @@ -208,12 +207,9 @@ MATH1(sqrt); typedef double (*math2_func_ptr)(double, double); static void math2(Request& r, MethodParams& params, math2_func_ptr func) { - Value& a=params.as_junction(0, "parameter must be expression"); - Value& b=params.as_junction(1, "parameter must be expression"); - - double result=func( - r.process_to_value(a).as_double(), - r.process_to_value(b).as_double()); + double a=params.as_double(0, "parameter must be expression", r); + double b=params.as_double(1, "parameter must be expression", r); + double result=func(a, b); r.write_no_lang(*new VDouble(result)); } @@ -227,10 +223,10 @@ inline bool is_salt_body_char(int c) { return isalnum(c) || c == '.' || c=='/'; } static size_t calc_prefix_size(const char* salt) { - if(size_t salt_size=strlen(salt)) { - if(!is_salt_body_char(salt[0])) { // $... {... + if(strlen(salt)) { + if(!is_salt_body_char((unsigned char)salt[0])) { // $... {... const char* cur=salt+1; // skip - while(is_salt_body_char(*cur++)) // ...$ ...} + while(is_salt_body_char((unsigned char)*cur++)) // ...$ ...} ; return cur-salt; } else @@ -273,39 +269,21 @@ static void _crypt(Request& r, MethodPar if(!static_sample_buf // nothing generated || !static_sample_buf[0] // generated nothing || strncmp(static_sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "crypt on this platform does not support '%.*s' salt prefix", prefix_size, normal_salt); r.write_pass_lang(String(pa_strdup(static_sample_buf))); #else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "salt must start with '" PA_MD5PW_ID "'"); #endif } } -static const char* hex_string(unsigned char* bytes, size_t size, bool upcase) { - char *bytes_hex=new(PointerFreeGC) char [size*2/*byte->hh*/+1/*for zero-teminator*/]; - unsigned char *src=bytes; - unsigned char *end=bytes+size; - char *dest=bytes_hex; - - static const char *hex=upcase?"0123456789ABCDEF":"0123456789abcdef"; - - for(; src> (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); +} + + +static void _sha1(Request& r, MethodParams& params) { + const char *string = params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); + + SHA1Context c; + SHA1Reset (&c); + SHA1Input (&c, (const unsigned char*)string, strlen(string)); + if (!SHA1Result (&c)) + throw Exception (PARSER_RUNTIME, 0, "Can not compute SHA1"); + + char digest[128]; + sprintf(digest, "%08x%08x%08x%08x%08x", c.Message_Digest[0], c.Message_Digest[1], c.Message_Digest[2], c.Message_Digest[3], c.Message_Digest[4]); + + char *ret = new(PointerFreeGC) char[strlen(digest)+1]; + strcpy(ret, digest); + r.write_pass_lang(*new String(ret, 0, false)); + } + + /// to hell with extra bytes on 64bit platforms struct uuid { unsigned int time_low; @@ -367,6 +486,73 @@ static void _uid64(Request& r, MethodPar r.write_pass_lang(*new String(hex_string(id, sizeof(id), true))); } +static void _crc32(Request& r, MethodParams& params) { + const char *string=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); + r.write_no_lang(*new VInt(pa_crc32(string, strlen(string)))); +} + +static void _long2ip(Request& r, MethodParams& params) { + unsigned long l=(unsigned long)trunc(params.as_double(0, "parameter must be expression", r)); + static const int ip_cstr_bufsize=3*4+3+1; + char* ip_cstr=new(PointerFreeGC) char[ip_cstr_bufsize]; + + snprintf(ip_cstr, ip_cstr_bufsize, "%d.%d.%d.%d", + (l>>24) & 0xFF, + (l>>16) & 0xFF, + (l>>8) & 0xFF, + l & 0xFF); + + r.write_no_lang(*new String(ip_cstr)); +} + +static void _ip2long(Request& r, MethodParams& params) { + const String ip=params.as_string(0, PARAMETER_MUST_BE_STRING); + if(ip.is_empty()) + throw Exception(PARSER_RUNTIME, + 0, + "IP address must not be empty."); + + const char* ip_cstr=ip.cstr(); + ulong result=0; + uint byte_value=0; + uint dot_cnt=0; + bool byte_start=true; + bool err=false; + const char* p=ip_cstr; + while(char c=*p++){ + uint digit=(uint)(c-'0'); // assume ascii + if(digit>=0 && digit<=9){ + byte_start=false; + if((byte_value=byte_value*10+digit) > 255){ + err=true; + break; + } + } else if(c=='.'){ + if(byte_start){ // two dots in row or IP started with dot + err=true; + break; + } else { + byte_start=true; + dot_cnt++; + result=(result << 8)+(ulong)byte_value; + byte_value=0; + } + } else { // invalid char + err=true; + break; + } + } + + if(err || dot_cnt!=3 || byte_start){ + throw Exception(PARSER_RUNTIME, + 0, + "Invalid IP address '%s' specified.", ip_cstr); + } else { + result=(result << 8)+(ulong)byte_value; + r.write_no_lang(*new VDouble(result)); + } +} + // constructor MMath::MMath(): Methoded("math") { @@ -380,7 +566,8 @@ MMath::MMath(): Methoded("math") { ADD1(round); ADD1(floor); ADD1(ceiling); ADD1(trunc); ADD1(frac); ADD1(abs); ADD1(sign); - ADD1(exp); ADD1(log); + ADD1(exp); + ADD1(log); ADD1(log10); ADD1(sin); ADD1(asin); ADD1(cos); ADD1(acos); ADD1(tan); ADD1(atan); @@ -388,18 +575,27 @@ MMath::MMath(): Methoded("math") { ADD1(sqrt); ADD1(random); - // ^pow(x;y) + // ^math:pow(x;y) ADD2(pow); - // ^crypt[password;salt] + // ^math:crypt[password;salt] ADD2(crypt); - // ^md5[string] + // ^math:md5[string] ADD1(md5); - // ^uuid[] + // ^math:sha1[string] + ADD1(sha1); + + // ^math:crc32[string] + ADD1(crc32); + + ADD1(long2ip); + ADD1(ip2long); + + // ^math:uuid[] ADD0(uuid); - // ^uid64[] + // ^math:uid64[] ADD0(uid64); }