--- parser3/src/classes/math.C 2002/08/01 11:41:12 1.23 +++ parser3/src/classes/math.C 2004/07/28 14:38:20 1.39 @@ -1,59 +1,177 @@ /** @file Parser: @b math parser class. - Copyright(c) 2001, 2002 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2001-2004 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: 2002/08/01 11:41:12 $"; +static const char * const IDENT_MATH_C="$Date: 2004/07/28 14:38:20 $"; +#include "pa_vmethod_frame.h" #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 -// for threadID +# define _WIN32_WINNT 0x400 # include +# include #endif -#ifdef HAVE_CRYPT_H -#include +#ifdef HAVE_CRYPT +# ifdef HAVE_CRYPT_H +# include +# endif +#else + extern char *crypt(const char* , const char* ); #endif // defines -#define PI 3.1415926535 #define MAX_SALT 8 // class -class MMath : public Methoded { +class MMath: public Methoded { public: - MMath(Pool& pool); - void configure_admin(Request& r); + MMath(); public: // Methoded bool used_directly() { return false; } }; +// global variables + +DECLARE_CLASS_VAR(math, 0 /*fictive*/, new MMath); + +#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; + +#define MAX_UINT 0xFFFFFFFFu + static inline int _random(uint top) { - return (int)(((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * top ); + uint raw; + random(&raw, sizeof(raw)); + return int(double(raw) / MAX_UINT * 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"); - double top=r.process_to_value(range).as_double(); - if(top<=1) +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(); + if(top<=0 || top>MAX_UINT) throw Exception("parser.runtime", - &method_name, - "top must be above 1(%g)", top); + 0, + "top(%g) must be [1..%u]", top, MAX_UINT); - r.write_no_lang(*new(pool) VInt(pool, _random(uint(top)))); + r.write_no_lang(*new VInt(_random(uint(top)))); } @@ -62,23 +180,20 @@ static double frac(double param) { retur static double degrees(double param) { return param /PI *180; } static double radians(double param) { return param /180 *PI; } -static void math1(Request& r, - const String& method_name, MethodParams *params, - math1_func_ptr func) { - Pool& pool=r.pool(); - Value& param=params->as_junction(0, "parameter must be expression"); +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()); - r.write_no_lang(*new(pool) VDouble(pool, result)); + double result=func(r.process_to_value(param).as_double()); + r.write_no_lang(*new VDouble(result)); } #define MATH1(name) \ - static void _##name(Request& r, const String& method_name, MethodParams *params) {\ - math1(r, method_name, params, &name);\ + static void _##name(Request& r, MethodParams& params) {\ + math1(r, params, &name);\ } #define MATH1P(name_parser, name_c) \ - static void _##name_parser(Request& r, const String& method_name, MethodParams *params) {\ - math1(r, method_name, params, &name_c);\ + static void _##name_parser(Request& r, MethodParams& params) {\ + math1(r, params, &name_c);\ } MATH1(round); MATH1(floor); MATH1P(ceiling, ceil); MATH1(trunc); MATH1(frac); @@ -92,33 +207,30 @@ MATH1(sqrt); typedef double (*math2_func_ptr)(double, double); -static void math2(Request& r, - const String& method_name, MethodParams *params, - math2_func_ptr func) { - Pool& pool=r.pool(); - Value& a=params->as_junction(0, "parameter must be expression"); - Value& b=params->as_junction(1, "parameter must be expression"); +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)( + 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)); + r.write_no_lang(*new VDouble(result)); } #define MATH2(name) \ - static void _##name(Request& r, const String& method_name, MethodParams *params) {\ - math2(r, method_name, params, &name);\ + static void _##name(Request& r, MethodParams& params) {\ + math2(r, params, &name);\ } 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++)) // ...$ ...} +static size_t calc_prefix_size(const char* salt) { + if(strlen(salt)) { + if(!is_salt_body_char((unsigned char)salt[0])) { // $... {... + const char* cur=salt+1; // skip + while(is_salt_body_char((unsigned char)*cur++)) // ...$ ...} ; return cur-salt; } else @@ -126,13 +238,12 @@ static size_t calc_prefix_size(const cha } 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(); +static void _crypt(Request& r, MethodParams& params) { + 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; + 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); @@ -151,35 +262,120 @@ static void _crypt(Request& r, const Str */ if(strncmp(normal_salt, PA_MD5PW_ID, PA_MD5PW_IDLEN) == 0) { const size_t sample_size=120; - char *sample_buf=(char *)pool.malloc(sample_size); + char *sample_buf=new(PointerFreeGC) char[sample_size]; pa_MD5Encode((const unsigned char *)password, (const unsigned char *)normal_salt, sample_buf, sample_size); - r.write_pass_lang(*new(pool) String(pool, sample_buf)); + String sample(sample_buf); + r.write_pass_lang(sample); } else { #ifdef HAVE_CRYPT - const char *sample_buf=crypt(password, normal_salt); - if(!sample_buf // nothing generated - || !sample_buf[0] // generated nothing - || strncmp(sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved + const char* static_sample_buf=crypt(password, normal_salt); + 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", - &method_name, - "on this platform does not support '%.*s' salt prefix", prefix_size, normal_salt); + 0, + "crypt on this platform does not support '%.*s' salt prefix", prefix_size, normal_salt); - r.write_pass_lang(*new(pool) String(pool, sample_buf)); + r.write_pass_lang(String(pa_strdup(static_sample_buf))); #else throw Exception("parser.runtime", - &method_name, + 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> 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 String(uuid_cstr)); +} + +static void _uid64(Request& r, MethodParams& /*params*/) { + + unsigned char id[64/8]; + random(&id, sizeof(id)); + + r.write_pass_lang(*new String(hex_string(id, sizeof(id), true))); +} + // constructor -MMath::MMath(Pool& apool) : Methoded(apool, "math") { +MMath::MMath(): Methoded("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); @@ -192,46 +388,18 @@ 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(); -} - -// global variables - -Methoded *math_base_class; -Hash *math_consts; -// creator + // ^md5[string] + ADD1(md5); -Methoded *MMath_create(Pool& pool) { - math_consts=new(pool) Hash(pool); - math_consts->put( - *new(pool) String(pool, "PI"), - new(pool) VDouble(pool, PI)); + // ^uuid[] + ADD0(uuid); - return math_base_class=new(pool) MMath(pool); + // ^uid64[] + ADD0(uid64); }