--- parser3/src/classes/string.C 2013/03/10 18:45:07 1.207 +++ parser3/src/classes/string.C 2015/10/08 23:14:56 1.221 @@ -20,7 +20,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.207 2013/03/10 18:45:07 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.221 2015/10/08 23:14:56 moko Exp $"; // class @@ -53,6 +53,9 @@ DECLARE_CLASS_VAR(void, new MVoid, 0); #define MODE_APPEND "append" +#define UNESCAPE_MODE_JS "js" +#define UNESCAPE_MODE_URI "uri" + // statics static const String match_var_name(MATCH_VAR_NAME); @@ -153,27 +156,18 @@ static void _bool(Request& r, MethodPara static void _left(Request& r, MethodParams& params) { ssize_t sn=params.as_int(0, "n must be int", r); - if(sn<0) - throw Exception(PARSER_RUNTIME, - 0, - "n(%d) must be >=0", sn); - size_t n=(size_t)sn; - const String& string=GET_SELF(r, VString).string(); - r.write_assign_lang(string.mid(r.charsets.source(), 0, n)); + r.write_assign_lang(sn<0 ? string : string.mid(r.charsets.source(), 0, (size_t)sn)); } static void _right(Request& r, MethodParams& params) { - ssize_t sn=(size_t)params.as_int(0, "n must be int", r); - if(sn<0) - throw Exception(PARSER_RUNTIME, - 0, - "n(%d) must be >=0", sn); - size_t n=(size_t)sn; - - const String& string=GET_SELF(r, VString).string(); - size_t length=string.length(r.charsets.source()); - r.write_assign_lang(n0){ + size_t n=(size_t)sn; + const String& string=GET_SELF(r, VString).string(); + size_t length=string.length(r.charsets.source()); + r.write_assign_lang(nget_junction()->method_frame, match_var_name, vtable); + Temp_value_element temp(r, *replacement_code->get_junction()->method_frame, match_var_name, vtable); src.match(vregex, replace_action, &info, matches_count); } else { src.match(vregex, replace_action, &info, matches_count); @@ -486,14 +480,14 @@ class String_sql_event_handlers: public bool got_column; public: bool got_cell; - String& result; + const String* result; public: String_sql_event_handlers( const String& astatement_string, const char* astatement_cstr): statement_string(astatement_string), statement_cstr(astatement_cstr), got_column(false), got_cell(false), - result(*new String) {} + result(&String::Empty) {} bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) { if(got_column) { @@ -507,7 +501,7 @@ public: } bool before_rows(SQL_Error& /*error*/ ) { /* ignore */ return false; } bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } - bool add_row_cell(SQL_Error& error, const char* str, size_t length) { + bool add_row_cell(SQL_Error& error, const char* str, size_t) { if(got_cell) { error=SQL_Error(PARSER_RUNTIME, //statement_string, @@ -517,7 +511,7 @@ public: try { got_cell=true; - result.append_know_length(str, length, String::L_TAINTED); + result=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */ ); return false; } catch(...) { error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell"); @@ -587,7 +581,7 @@ const String* sql_result_string(Request& if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] - return &handlers.result; + return handlers.result; } static void _sql(Request& r, MethodParams& params) { @@ -630,7 +624,7 @@ static void _save(Request& r, MethodPara Charset* asked_charset=0; size_t file_name_index=0; - if(params.count()>1) + if(params.count()>1) { if(HashStringValue* options=params.as_no_junction(1, "second parameter should be string or hash").get_hash()){ // ^file.save[filespec;$.charset[] $.append(true)] int valid_options=0; @@ -655,11 +649,12 @@ static void _save(Request& r, MethodPara &mode, "unknown mode, must be 'append'"); } + } const String& file_name=params.as_string(file_name_index, FILE_NAME_MUST_BE_STRING); const String& src=GET_SELF(r, VString).string(); - String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/)); + String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // write file_write(r.charsets, r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append, asked_charset); @@ -679,17 +674,20 @@ static void _trim(Request& r, MethodPara const char* chars=0; if(params_count>0) { const String& skind=params.as_string(0, "'where' must be string"); - if(!skind.is_empty()) + if(!skind.is_empty()) { if(skind==TRIM_BOTH_OPTION) kind=String::TRIM_BOTH; else if(skind==TRIM_START_OPTION || skind=="start") kind=String::TRIM_START; else if(skind==TRIM_END_OPTION || skind=="end") kind=String::TRIM_END; + else if(params_count==1) + chars=skind.cstr(); else throw Exception(PARSER_RUNTIME, &skind, - "'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION); + "'kind' must be one of " TRIM_START_OPTION ", " TRIM_BOTH_OPTION ", " TRIM_END_OPTION); + } if(params_count>1) { const String& schars=params.as_string(1, "'chars' must be string"); @@ -702,9 +700,9 @@ static void _trim(Request& r, MethodPara } static void _base64(Request& r, MethodParams& params) { - if(params.count()) { + if(&r.get_self() == string_class) { // decode: ^string:base64[encoded[;$.strict(true|false)]] - const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); + const char* cstr=params.count() ? params.as_string(0, PARAMETER_MUST_BE_STRING).cstr() : ""; char* decoded=0; size_t length=0; @@ -740,15 +738,61 @@ static void _base64(Request& r, MethodPa } } -static void _escape(Request& r, MethodParams&){ +static void _idna(Request& r, MethodParams& params) { + if(&r.get_self() == string_class) { + // decode: ^string:idna[encoded] + const char* cstr=params.count() ? params.as_string(0, PARAMETER_MUST_BE_STRING).cstr() : ""; + r.write_assign_lang(*new String(pa_idna_decode(cstr, r.charsets.source()), String::L_TAINTED)); + } else { + // encode: ^str.idna[] + VString& self=GET_SELF(r, VString); + const char* cstr=self.string().cstr(); + r.write_assign_lang(*new String(pa_idna_encode(cstr, r.charsets.source()), String::L_TAINTED)); + } +} + +static void _js_escape(Request& r, MethodParams&){ const String& src=GET_SELF(r, VString).string(); r.write_assign_lang(src.escape(r.charsets.source())); } -static void _unescape(Request& r, MethodParams& params){ +static void _js_unescape(Request& r, MethodParams& params){ const String& src=params.as_string(0, PARAMETER_MUST_BE_STRING); if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true)) - r.write_assign_lang(*new String(result)); + r.write_assign_lang(*new String(result, String::L_TAINTED)); +} + +static void _unescape(Request& r, MethodParams& params){ + const String& mode=params.as_string(0, MODE_MUST_NOT_BE_CODE); + const String& src=params.as_string(1, PARAMETER_MUST_BE_STRING); + + Charset* from_charset=&r.charsets.client(); + + if(params.count() > 2) + if(HashStringValue* options=params.as_hash(2)) { + int valid_options=0; + if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){ + from_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER)); + valid_options++; + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + + bool mode_js; + if(mode==UNESCAPE_MODE_JS){ + mode_js=true; + } else if(mode==UNESCAPE_MODE_URI){ + mode_js=false; + } else { + throw Exception(PARSER_RUNTIME, &mode, "is invalid mode, must be either '"UNESCAPE_MODE_JS"' or '"UNESCAPE_MODE_URI"'"); + } + + const char* unescaped=unescape_chars(src.cstr(), src.length(), from_charset, mode_js); + if(*unescaped){ + const String* result=new String(Charset::transcode(unescaped, *from_charset, r.charsets.source()), String::L_TAINTED); + r.write_assign_lang(*result); + } } // constructor @@ -821,12 +865,19 @@ MString::MString(): Methoded("string") { add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); // ^string.base64[] << encode - // ^string:base64[encoded string] << decode + // ^string:base64[encoded string] << decode add_native_method("base64", Method::CT_ANY, _base64, 0, 2); + // ^string.idna[] << encode + // ^string:idna[encoded string] << decode + add_native_method("idna", Method::CT_ANY, _idna, 0, 1); + // ^string.js-escape[] - add_native_method("js-escape", Method::CT_ANY, _escape, 0, 0); + add_native_method("js-escape", Method::CT_DYNAMIC, _js_escape, 0, 0); // ^string:js-unescape[escaped%uXXXXstring] - add_native_method("js-unescape", Method::CT_STATIC, _unescape, 1, 1); -} + add_native_method("js-unescape", Method::CT_STATIC, _js_unescape, 1, 1); + + // ^string:unescape[js|uri;escaped;$.charset[...]] + add_native_method("unescape", Method::CT_STATIC, _unescape, 2, 3); +}