--- parser3/src/classes/math.C 2003/04/14 14:59:29 1.26 +++ parser3/src/classes/math.C 2003/07/24 06:49:22 1.33 @@ -3,19 +3,24 @@ Copyright(c) 2001, 2003 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/04/14 14:59:29 $"; +static const char* IDENT_MATH_C="$Date: 2003/07/24 06:49:22 $"; #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 @@ -32,16 +37,118 @@ static const char* IDENT_MATH_C="$Date: class MMath : public Methoded { public: MMath(Pool& pool); - void configure_admin(Request& r); public: // Methoded 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) { - return (int)(((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * top ); + uint raw; + random(&raw, sizeof(raw)); + return int(double(raw) / 0xFFFFFFFFu * top ); } static void _random(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -152,10 +259,9 @@ 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); - pa_MD5Encode((const unsigned char *)password, + PA_MD5Encode((const unsigned char *)password, (const unsigned char *)normal_salt, 1/*TRUE: mix in magic string*/, - sample_buf, sample_size, - 0, 0); + sample_buf, sample_size); r.write_pass_lang(*new(pool) String(pool, sample_buf)); } else { #ifdef HAVE_CRYPT @@ -176,33 +282,102 @@ static void _crypt(Request& r, const Str } } +static const char* hex_string(Pool& pool, unsigned char* bytes, size_t size, bool upcase) { + char *bytes_hex=(char *)pool.malloc(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"; + + const char *format=upcase?"%02X":"%02x"; + for(; srcas_string(0, "parameter must be string").cstr(); - const size_t sample_size=120; - char sample_buf[sample_size]; - const int sample_bytes_count=12; - unsigned char sample_bytes[sample_bytes_count]; - pa_MD5Encode((const unsigned char *)string, - (const unsigned char *)"", 0/*FALSE: mix in magic string*/, - sample_buf, sample_size, - sample_bytes, sample_bytes_count); - char *sample_bytes_hex=(char *)pool.malloc(sample_bytes_count*2/*byte->hh*/+1/*for zero-teminator*/); - unsigned char *src=sample_bytes; - unsigned char *end=sample_bytes+sample_bytes_count; - char *dest=sample_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)); +} + +static void _uid64(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + unsigned char id[64/8]; + random(&id, sizeof(id)); + + r.write_pass_lang(*new(pool) String(pool, + hex_string(pool, id, sizeof(id), true))); } // constructor 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); @@ -215,9 +390,6 @@ 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); @@ -226,24 +398,12 @@ MMath::MMath(Pool& apool) : Methoded(apo // ^md5[string] ADD1(md5); -} -// 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(); + // ^uuid[] + ADD0(uuid); + + // ^uid64[] + ADD0(uid64); } // global variables