--- parser3/src/classes/string.C 2018/01/19 16:52:50 1.238 +++ parser3/src/classes/string.C 2019/11/20 20:48:25 1.243 @@ -7,6 +7,7 @@ #include "classes.h" #include "pa_vmethod_frame.h" +#include "pa_base64.h" #include "pa_request.h" #include "pa_vdouble.h" @@ -20,7 +21,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.238 2018/01/19 16:52:50 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.243 2019/11/20 20:48:25 moko Exp $"; // class @@ -443,22 +444,19 @@ static void _lower(Request& r, MethodPar #ifndef DOXYGEN class String_sql_event_handlers: public SQL_Driver_query_event_handlers { - const String& statement_string; const char* statement_cstr; bool got_column; public: bool got_cell; const String* result; public: - String_sql_event_handlers( - const String& astatement_string, const char* astatement_cstr): - statement_string(astatement_string), statement_cstr(astatement_cstr), + String_sql_event_handlers(): got_column(false), got_cell(false), result(&String::Empty) {} bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) { if(got_column) { - error=SQL_Error(PARSER_RUNTIME, /*statement_string,*/ "result must contain exactly one column"); + error=SQL_Error("result must contain exactly one column"); return true; } got_column=true; @@ -468,10 +466,9 @@ public: bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } bool add_row_cell(SQL_Error& error, const char* str, size_t) { if(got_cell) { - error=SQL_Error(PARSER_RUNTIME, /*statement_string,*/ "result must not contain more then one row"); + error=SQL_Error("result must not contain more then one row"); return true; } - try { got_cell=true; result=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */ ); @@ -483,11 +480,7 @@ public: } }; #endif -extern String sql_bind_name; -extern String sql_limit_name; -extern String sql_offset_name; -extern String sql_default_name; -extern String sql_distinct_name; + extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); @@ -528,14 +521,9 @@ const String* sql_result_string(Request& const String& statement_string=r.process_to_string(statement); const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection()); - String_sql_event_handlers handlers(statement_string, statement_cstr); + String_sql_event_handlers handlers; - r.connection()->query( - statement_cstr, - placeholders_count, placeholders, - offset, limit, - handlers, - statement_string); + r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string); if(bind) unmarshal_bind_updates(*bind, placeholders_count, placeholders); @@ -654,40 +642,83 @@ static void _trim(Request& r, MethodPara r.write(src.trim(kind, chars, &r.charsets.source())); } +Base64Options base64_encode_options(Request& r, HashStringValue* options) { + Base64Options result; + if(options) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next()) { + String::Body key=i.key(); + Value* value=i.value(); + if(key == "pad") { + result.pad=r.process(*value).as_bool(); + valid_options++; + } else if(key == "wrap") { + result.wrap=r.process(*value).as_bool(); + valid_options++; + } else if(key == "url-safe") { + if(r.process(*value).as_bool()) + result.set_url_safe_abc(); + valid_options++; + } + } + + if(valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + return result; +} + +Base64Options base64_decode_options(Request& r, HashStringValue* options) { + Base64Options result; + if(options) { + int valid_options=0; + for(HashStringValue::Iterator i(*options); i; i.next() ) { + String::Body key=i.key(); + Value* value=i.value(); + if(key == "pad") { + result.pad=r.process(*value).as_bool(); + valid_options++; + } else if(key == "strict") { + result.strict=r.process(*value).as_bool(); + valid_options++; + } else if(key == "url-safe") { + if(r.process(*value).as_bool()) + result.set_url_safe_abc(); + valid_options++; + } + } + + if(valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + return result; +} + static void _base64(Request& r, MethodParams& params) { if(&r.get_self() == string_class) { - // decode: ^string:base64[encoded[;$.strict(true|false)]] + // decode: ^string:base64[encoded[;options]] const char* cstr=params.count() ? params.as_string(0, PARAMETER_MUST_BE_STRING).cstr() : ""; - char* decoded=0; - size_t length=0; + Base64Options options = base64_decode_options(r, params.count() > 1 ? params.as_hash(1) : NULL); - bool strict=false; - if(params.count() > 1) - if(HashStringValue* options=params.as_hash(1)) { - int valid_options=0; - if(Value* vstrict=options->get(BASE64_STRICT_OPTION_NAME)) { - strict=r.process(*vstrict).as_bool(); - valid_options++; - } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); - } + char* decoded=0; + size_t length=pa_base64_decode(cstr, strlen(cstr), decoded, options); - pa_base64_decode(cstr, strlen(cstr), decoded, length, strict); if(decoded && length){ - if(memchr((const char*)decoded, 0, length)) - throw Exception(PARSER_RUNTIME, 0, "Invalid \\x00 character found while decode to string. Decode it to file instead."); + if(memchr(decoded, 0, length)) + throw Exception(PARSER_RUNTIME, 0, "Invalid \\x00 character found while decoding to string. Decode to file instead."); fix_line_breaks(decoded, length); + if(length) r.write(*new String(decoded, String::L_TAINTED)); } } else { - // encode: ^str.base64[] + // encode: ^str.base64[options] VString& self=GET_SELF(r, VString); const char* cstr=self.string().cstr(); - const char* encoded=pa_base64_encode(cstr, strlen(cstr)); - r.write(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/)); + Base64Options options = base64_encode_options(r, params.count() ? params.as_hash(0) : NULL); + const char* encoded=pa_base64_encode(cstr, strlen(cstr), options); + r.write(*new String(encoded, String::L_TAINTED /*once ?param=base64(something) was needed*/ )); } }