支持用户自定域的escape编码。使用方法：在tableinfo中编译表所在行的第四列写escape。

src/entry/Maat_rule.cpp

@@ -30,7 +30,7 @@
 #include "stream_fuzzy_hash.h"
 #include "gram_index_engine.h"
 
-int MAAT_FRAME_VERSION_2_2_20180801=1;
+int MAAT_FRAME_VERSION_2_2_20180808=1;
 
 const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
 							"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};
@@ -588,7 +588,7 @@ int read_table_info(struct _Maat_table_info_t** p_table_info,int num,const char*
 	FILE*fp=NULL;
 	char line[MAX_TABLE_LINE_SIZE];
 	int i=0,ret=0,table_cnt=0;
-	char table_type_str[16],not_care[256];
+	char table_type_str[16],not_care[1024], user_region_encoding[32];
 	MESA_htable_handle string2int_map=map_create();
 	struct _Maat_table_info_t*p=NULL;
 	struct _Maat_table_info_t*conj_table=NULL;
@@ -604,6 +604,9 @@ int read_table_info(struct _Maat_table_info_t** p_table_info,int num,const char*
 	map_register(string2int_map,"similar", TABLE_TYPE_SIMILARITY);
 	map_register(string2int_map,"quickoff",0);
 	map_register(string2int_map,"quickon",1);
+	map_register(string2int_map,"escape",USER_REGION_ENCODE_ESCAPE);
+//	map_register(string2int_map,"base64",USER_REGION_ENCODE_BASE64); //NOT supported yet
+	
 	for(i=0;i<MAX_CHARSET_NUM;i++)
 	{
 		if(strlen(CHARSET_STRING[i])>0)
@@ -637,10 +640,16 @@ int read_table_info(struct _Maat_table_info_t** p_table_info,int num,const char*
 		}
 		p=create_table_info(max_thread_num);
 
-		sscanf(line,"%hu\t%s\t%s\t%s",&(p->table_id)
+		ret=sscanf(line,"%hu\t%s\t%s\t%s",&(p->table_id)
 											,p->table_name[0]
 											,table_type_str
 											,not_care);
+		if(ret<3)
+		{
+			MESA_handle_runtime_log(logger, RLOG_LV_FATAL,maat_module,
+									"Maat read table info %s line %d error: not enough column.",table_info_path,i);
+			continue;
+		}
 		ret=map_str2int(string2int_map,strlwr(table_type_str),(int*)&(p->table_type));
 		if(ret<0)
 		{
@@ -670,6 +679,16 @@ int read_table_info(struct _Maat_table_info_t** p_table_info,int num,const char*
 					p->valid_flag_column=-1;
 				}
 				break;
+			case TABLE_TYPE_COMPILE:	
+				ret=sscanf(not_care,"%[a-z0-9]",user_region_encoding);
+				if(ret>0)
+				{	
+					ret=map_str2int(string2int_map,strlwr(user_region_encoding),(int*)&(p->user_region_encoding));
+				}
+				if(ret!=1)
+				{
+					p->user_region_encoding=USER_REGION_ENCODE_NONE;
+				}
 			default:
 				break;
 		}
@@ -2664,9 +2683,18 @@ void update_compile_rule(struct _Maat_table_info_t* table,const char* table_line
 		table->udpate_err_cnt++;
 		return;
 	}
+	switch(table->user_region_encoding)
+	{
+		case USER_REGION_ENCODE_ESCAPE:
+			str_unescape(user_region);
+			break;
+		default:
+			break;
+	}
 	p_m_rule->serv_def_len=strlen(user_region)+1;
 	p_compile->service_defined=(char*)malloc(p_m_rule->serv_def_len*sizeof(char));
 	memcpy(p_compile->service_defined,user_region,p_m_rule->serv_def_len);
+
 	if(p_compile->is_valid==FALSE)
 	{
 		ret=del_compile_rule(table,p_compile,scanner, logger);

src/entry/Maat_rule_internal.h

@@ -231,6 +231,10 @@ struct _region_stat_t
 		int ipv6_rule_cnt;
 	};
 };
+#define	USER_REGION_ENCODE_NONE		0
+#define	USER_REGION_ENCODE_ESCAPE	1
+#define	USER_REGION_ENCODE_BASE64	2
+
 struct _Maat_table_info_t
 {
 	unsigned short table_id;
@@ -256,7 +260,8 @@ struct _Maat_table_info_t
 		int ipv6_rule_cnt;
 	};
 	struct _plugin_table_info *cb_info;
-	int valid_flag_column;
+	int valid_flag_column;		//for plugin table
+	int user_region_encoding;	//for compile table, USER_REGION_ENCODE_xx
 //for stat>>>>>>>>
 	unsigned long long udpate_err_cnt;
 	unsigned long long iconv_err_cnt;

test/maat_json.json

@@ -9,7 +9,7 @@
             "do_blacklist": 1,
             "do_log": 1,
             "effective_range": 0,
-            "user_region": "anything",
+            "user_region": "escaped\\bdata:have\\ba\\bspace\\band\\ba\\b\\&\\bsymbol.",
             "is_valid": "yes",
             "groups": [
                 {

test/maat_test.cpp

@@ -109,6 +109,20 @@ const char* print_maat_result(struct Maat_rule_t* result,int ret)
 	}
 	return buff;
 }
+void test_service_define_escape(struct Maat_rule_t* rule)
+{
+	char*p=strchr(rule->service_defined,' ');
+	if(p!=NULL)
+	{
+		printf("Test service define escape Success.\n");
+	}
+	else
+	{
+		printf("Test service define escape Failed.\n");
+	}
+
+}
+
 int test_string_full_scan(Maat_feather_t feather,const char* table_name,scan_status_t* mid)
 {
 	int ret=0;
@@ -220,6 +234,7 @@ int test_ipv4_scan(Maat_feather_t feather,const char* table_name,scan_status_t*
 	else
 	{
 		ret=Maat_scan_proto_addr(feather,table_id,&ipv4_addr,6,result,4, mid,0);
+		test_service_define_escape(result+0);
 		printf("IPv4 addr Scan:%s\n",print_maat_result(result,ret));
 	}
 	return ret;
@@ -543,6 +558,7 @@ void test_offset_str_scan(Maat_feather_t feather,const char* table_name)
 	test_offset_str_scan_with_chunk(feather,table_name,1460);
 	return;
 }
+
 void test_longer_service_define(Maat_feather_t feather, struct Maat_rule_t* rule)
 {
 	int ret=0;

test/table_info.conf

@@ -15,7 +15,7 @@
 #
 #For expr/expr_plus Table
 #id	name	type	src_charset	dst_charset	do_merge cross_cache quick_mode
-0	COMPILE	compile	--
+0	COMPILE	compile	escape	--
 1	GROUP	group	--
 2	HTTP_URL	expr	UTF8	GBK/BIG5/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	128	quickoff
 2	HTTP_HOST	expr	UTF8	GBK/BIG5/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8	yes	128	quickoff