--- parser3/src/classes/math.C 2001/07/06 11:13:35 1.2 +++ parser3/src/classes/math.C 2003/04/14 14:59:29 1.26 @@ -1,61 +1,75 @@ /** @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) */ -static const char *RCSId="$Id: math.C,v 1.2 2001/07/06 11:13:35 parser Exp $"; -#include "pa_config_includes.h" +static const char* IDENT_MATH_C="$Date: 2003/04/14 14:59:29 $"; + #include "pa_common.h" #include "pa_vint.h" #include "pa_vmath.h" #include "pa_request.h" +#include "pa_md5.h" + +#ifdef WIN32 +// for threadID +# include +#endif + +#ifdef HAVE_CRYPT_H +#include +#endif // defines -#define MATH_CLASS_NAME "math" +#define PI 3.1415926535 +#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; } }; // methods - +static unsigned int randomizer=0; +static inline int _random(uint top) { + return (int)(((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * top ); +} static void _random(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& range=params->get_junction(0, "range must be expression"); - uint max=(uint)r.process(range).as_double(); - if(max<=1) - PTHROW(0, 0, + Value& range=params->as_junction(0, "range must be expression"); + 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); - r.write_no_lang(*new(pool) VInt(pool, rand()%max)); + 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 ); } - +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; } static void math1(Request& r, const String& method_name, MethodParams *params, math1_func_ptr func) { Pool& pool=r.pool(); - Value& param=params->get_junction(0, "parameter must be expression"); + 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) \ @@ -67,11 +81,13 @@ static void math1(Request& r, math1(r, method_name, params, &name_c);\ } MATH1(round); MATH1(floor); MATH1P(ceiling, ceil); +MATH1(trunc); MATH1(frac); MATH1P(abs, fabs); MATH1(sign); MATH1(exp); MATH1(log); MATH1(sin); MATH1(asin); MATH1(cos); MATH1(acos); MATH1(tan); MATH1(atan); +MATH1(degrees); MATH1(radians); MATH1(sqrt); @@ -80,14 +96,13 @@ static void math2(Request& r, const String& method_name, MethodParams *params, math2_func_ptr func) { Pool& pool=r.pool(); - Value& a=params->get_junction(0, "parameter must be expression"); - Value& b=params->get_junction(1, "parameter must be expression"); + 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) \ @@ -96,27 +111,109 @@ static void math2(Request& r, } MATH2(pow); -// constructor +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(); -MMath::MMath(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), MATH_CLASS_NAME)); + 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(); + 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(srcput( *new(pool) String(pool, "PI"), - new(pool) VDouble(pool, 3.1415926535)); + new(pool) VDouble(pool, PI)); return math_base_class=new(pool) MMath(pool); }