--- parser3/src/classes/math.C 2001/09/26 10:32:25 1.6 +++ parser3/src/classes/math.C 2003/04/15 14:12:15 1.29 @@ -1,61 +1,170 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright(c) 2001, 2003 ArtLebedev Group(http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: math.C,v 1.6 2001/09/26 10:32:25 parser Exp $ + portions from gen_uuid.c, + Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o. */ -#include "pa_config_includes.h" +static const char* IDENT_MATH_C="$Date: 2003/04/15 14:12:15 $"; + #include "pa_common.h" #include "pa_vint.h" #include "pa_vmath.h" #include "pa_request.h" +#include "pa_md5.h" +#include "pa_threads.h" #ifdef WIN32 +# define _WIN32_WINNT 0x400 # include +# include +#endif + +#ifdef HAVE_CRYPT_H +#include #endif // defines #define PI 3.1415926535 -#define MATH_CLASS_NAME "math" +#define MAX_SALT 8 // class class MMath : public Methoded { public: MMath(Pool& pool); - void configure_admin(Request& r); public: // Methoded - bool used_directly() { return true; } + bool used_directly() { return false; } }; +#ifdef WIN32 +class Random_provider { + HCRYPTPROV fhProv; + + void acquire() { + SYNCHRONIZED; + + if(fhProv) + return; + + if(!CryptAcquireContext(&fhProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + throw Exception(0, + 0, + "CryptAcquireContext failed"); + } + void release() { + if(fhProv) + CryptReleaseContext(fhProv, 0); + } + +public: + Random_provider(): fhProv(0) {} + ~Random_provider() { release(); } + void generate(void *buffer, size_t size) { + acquire(); + + if(!CryptGenRandom(fhProv, size, (BYTE*)buffer)) + throw Exception(0, + 0, + "CryptGenRandom failed"); + } +} + random_provider; + +#else + +/// from gen_uuid.c +static int get_random_fd(void) +{ + struct timeval tv; + static int fd = -2; + int i; + + if (fd == -2) { + gettimeofday(&tv, 0); + fd = open("/dev/urandom", O_RDONLY); + if (fd == -1) + fd = open("/dev/random", O_RDONLY | O_NONBLOCK); + srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec); + } + /* Crank the random number generator a few times */ + gettimeofday(&tv, 0); + for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--) + rand(); + return fd; +} + + +/* + * Generate a series of random bytes. Use /dev/urandom if possible, + * and if not, use srandom/random. + */ +static void get_random_bytes(void *buf, int nbytes) +{ + int i, fd = get_random_fd(); + int lose_counter = 0; + char *cp = (char *) buf; + + if (fd >= 0) { + while (nbytes > 0) { + i = read(fd, cp, nbytes); + if (i <= 0) { + if (lose_counter++ > 16) + break; + continue; + } + nbytes -= i; + cp += i; + lose_counter = 0; + } + } + + /* XXX put something better here if no /dev/random! */ + for (i = 0; i < nbytes; i++) + *cp++ = rand() & 0xFF; + return; +} + + +#endif + + +// helpers + +static void random(void *buffer, size_t size) { +#ifdef WIN32 + random_provider.generate(buffer, size); +#else + get_random_bytes(buffer, size); +#endif +} + // methods -static unsigned int randomizer=0; +static inline int _random(uint top) { + uint raw; + random(&raw, sizeof(raw)); + return int(double(raw) / 0x100000000 * top ); +} static void _random(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& range=params->as_junction(0, "range must be expression"); - uint max=(uint)r.process(range).as_double(); - if(max<=1) - PTHROW(0, 0, + double top=r.process_to_value(range).as_double(); + if(top<=0) + throw Exception("parser.runtime", &method_name, - "bad range [0..%u]", max); + "top must be above 0(%g)", top); - Value& result=*new(pool) VInt(pool, (int)( - ((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * (max + 1))); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new(pool) VInt(pool, _random(uint(top)))); } -typedef double (*math1_func_ptr)(double); -static double round(double param) { return floor(param+0.5); } -static double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); } -static double trunc(double param) { return param > 0? floor(param) : ceil(param); } +typedef double(*math1_func_ptr)(double); static double frac(double param) { return param-trunc(param); } static double degrees(double param) { return param /PI *180; } static double radians(double param) { return param /180 *PI; } @@ -66,9 +175,8 @@ static void math1(Request& r, Pool& pool=r.pool(); Value& param=params->as_junction(0, "parameter must be expression"); - Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).as_double())); - result.set_name(method_name); - r.write_no_lang(result); + double result=(*func)(r.process_to_value(param).as_double()); + r.write_no_lang(*new(pool) VDouble(pool, result)); } #define MATH1(name) \ @@ -98,11 +206,10 @@ static void math2(Request& r, Value& a=params->as_junction(0, "parameter must be expression"); Value& b=params->as_junction(1, "parameter must be expression"); - Value& result=*new(pool) VDouble(pool, (*func)( - r.process(a).as_double(), - r.process(b).as_double())); - result.set_name(method_name); - r.write_no_lang(result); + double result=(*func)( + r.process_to_value(a).as_double(), + r.process_to_value(b).as_double()); + r.write_no_lang(*new(pool) VDouble(pool, result)); } #define MATH2(name) \ @@ -111,14 +218,144 @@ static void math2(Request& r, } MATH2(pow); +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])) { // $... {... + const char *cur=salt+1; // skip + while(is_salt_body_char(*cur++)) // ...$ ...} + ; + return cur-salt; + } else + return 0; + } else + return 0; +} +static void _crypt(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + const char *password=params->as_string(0, "password must be string").cstr(); + const char *maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr(); + + size_t prefix_size=calc_prefix_size(maybe_bodyless_salt); + 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); + char *cur=normalize_buf+strlen(normalize_buf); + // sould add up MAX_SALT random chars + static unsigned char itoa64[] = /* 0 ... 63 => ASCII - 64 */ + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + for(int i=0; ias_string(0, "parameter must be string").cstr(); + + + PA_MD5_CTX context; + unsigned char digest[16]; + PA_MD5Init(&context); + PA_MD5Update(&context, (const unsigned char*)string, strlen(string)); + PA_MD5Final(digest, &context); + + char *digest_bytes_hex=(char *)pool.malloc(sizeof(digest)*2/*byte->hh*/+1/*for zero-teminator*/); + unsigned char *src=digest; + unsigned char *end=digest+sizeof(digest); + char *dest=digest_bytes_hex; + while(src> 8, uuid.clock_seq & 0xFF, + uuid.node[0], uuid.node[1], uuid.node[2], + uuid.node[3], uuid.node[4], uuid.node[5]); + + r.write_pass_lang(*new(pool) String(pool, uuid_cstr)); +} + // constructor -MMath::MMath(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), MATH_CLASS_NAME)); - +MMath::MMath(Pool& apool) : Methoded(apool, "math") { // ^FUNC(expr) -#define ADD1(name) \ - add_native_method(#name, Method::CT_STATIC, _##name, 1, 1) +#define ADDX(name, X) \ + add_native_method(#name, Method::CT_STATIC, _##name, X, X) +#define ADD0(name) ADDX(name, 0) +#define ADD1(name) ADDX(name, 1) +#define ADD2(name) ADDX(name, 2) ADD1(round); ADD1(floor); ADD1(ceiling); ADD1(trunc); ADD1(frac); @@ -131,30 +368,20 @@ MMath::MMath(Pool& apool) : Methoded(apo ADD1(sqrt); ADD1(random); -#define ADD2(name) \ - add_native_method(#name, Method::CT_STATIC, _##name, 2, 2) - // ^pow(x;y) ADD2(pow); -} + // ^crypt[password;salt] + ADD2(crypt); -// in MSVC each thread has it's own pseudo-random sequence -// in win32 apache each thread can handle multiple requests -// so to get proper randoms we remember random generated in one thread -void MMath::configure_admin(Request&) { - // setting seed - srand( - randomizer ^ -#ifdef WIN32 - GetCurrentThreadId() ^ -#else - getpid() ^ -#endif - (unsigned int)time(NULL) - ); - if(!randomizer) - randomizer=rand(); + // ^md5[string] + ADD1(md5); + + // ^uuid[] + ADD0(uuid); + + // ^uid16[] + //ADD0(uid16); } // global variables