12 files changed, 32 insertions, 95 deletions

diff --git a/data/case_data/security_rule/deny_drop_icmp_geography_ssl_allfilter.json b/data/case_data/security_rule/deny_drop_icmp_geography_ssl_allfilter.json
index d8c4cd8..d4fa75b 100644
--- a/data/case_data/security_rule/deny_drop_icmp_geography_ssl_allfilter.json
+++ b/data/case_data/security_rule/deny_drop_icmp_geography_ssl_allfilter.json
@@ -27,7 +27,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "93.184.215.14"
             }
           ]
         }
@@ -42,7 +42,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -58,7 +58,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -73,7 +73,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -84,6 +84,6 @@
   "app_name_1": ["ssl"],
   "hope_return": "timed out",
   "counters_1": {"hits": 1},
-  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.baidu.com"}],
-  "command": "curl -kv https://www.baidu.com"
+  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.example.com"}],
+  "command": "curl -kv https://www.example.com"
 }
diff --git a/data/case_data/security_rule/deny_drop_icmp_geography_ssl_sni.json b/data/case_data/security_rule/deny_drop_icmp_geography_ssl_sni.json
index d8c4cd8..9e3fdf2 100644
--- a/data/case_data/security_rule/deny_drop_icmp_geography_ssl_sni.json
+++ b/data/case_data/security_rule/deny_drop_icmp_geography_ssl_sni.json
@@ -27,7 +27,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "93.184.215.14"
             }
           ]
         }
@@ -42,38 +42,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "attribute_name": "ATTR_SSL_CN",
-      "objectType": "fqdn",
-      "objectSubType": "fqdn",
-      "objectList": [
-        {
-          "addItemList": [
-            {
-              "keywordArray": [
-                "baidu"
-              ]
-            }
-          ]
-        }
-      ]
-    },{
-      "attribute_name": "ATTR_SSL_SAN",
-      "objectType": "fqdn",
-      "objectSubType": "fqdn",
-      "objectList": [
-        {
-          "addItemList": [
-            {
-              "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -84,6 +53,6 @@
   "app_name_1": ["ssl"],
   "hope_return": "timed out",
   "counters_1": {"hits": 1},
-  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.baidu.com"}],
-  "command": "curl -kv https://www.baidu.com"
+  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.example.com"}],
+  "command": "curl -kv https://www.example.com"
 }
diff --git a/data/case_data/security_rule/deny_drop_icmp_subid_mail_allfilter.json b/data/case_data/security_rule/deny_drop_icmp_subid_mail_allfilter.json
index d5d614e..ebf0a02 100644
--- a/data/case_data/security_rule/deny_drop_icmp_subid_mail_allfilter.json
+++ b/data/case_data/security_rule/deny_drop_icmp_subid_mail_allfilter.json
@@ -119,22 +119,6 @@
           ]
         }
       ]
-    },
-    {
-      "attribute_name": "ATTR_MAIL_ACCOUNT",
-      "objectType": "account",
-      "objectSubType": "account",
-      "objectList": [
-        {
-          "addItemList": [
-            {
-              "keywordArray": [
-                "[email protected]"
-              ]
-            }
-          ]
-        }
-      ]
     }
   ],
   "app_name_1": ["mail"],
diff --git a/data/case_data/security_rule/deny_drop_reset_geography_ssl_allfilter.json b/data/case_data/security_rule/deny_drop_reset_geography_ssl_allfilter.json
index aece2d7..f3879c0 100644
--- a/data/case_data/security_rule/deny_drop_reset_geography_ssl_allfilter.json
+++ b/data/case_data/security_rule/deny_drop_reset_geography_ssl_allfilter.json
@@ -25,7 +25,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "93.184.215.14"
             }
           ]
         }
@@ -40,7 +40,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -56,7 +56,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -71,7 +71,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -80,8 +80,8 @@
     }
   ],
   "app_name_1": ["ssl"],
-  "hope_return": "timed out",
+  "hope_return": "reset",
   "counters_1": {"hits": 1},
-  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.baidu.com"}],
-  "command": "curl -kv --connect-timeout 5 -m 10 https://www.baidu.com"
+  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.example.com"}],
+  "command": "curl -kv --connect-timeout 5 -m 10 https://www.example.com"
 }
diff --git a/data/case_data/security_rule/deny_drop_reset_geography_ssl_sni.json b/data/case_data/security_rule/deny_drop_reset_geography_ssl_sni.json
index ee92c2b..739ab6f 100644
--- a/data/case_data/security_rule/deny_drop_reset_geography_ssl_sni.json
+++ b/data/case_data/security_rule/deny_drop_reset_geography_ssl_sni.json
@@ -25,7 +25,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "93.184.215.14"
             }
           ]
         }
diff --git a/data/case_data/security_rule/deny_drop_reset_subid_mail_allfilter.json b/data/case_data/security_rule/deny_drop_reset_subid_mail_allfilter.json
index 62ad46a..86f897f 100644
--- a/data/case_data/security_rule/deny_drop_reset_subid_mail_allfilter.json
+++ b/data/case_data/security_rule/deny_drop_reset_subid_mail_allfilter.json
@@ -55,22 +55,6 @@
       ]
     },
     {
-      "attribute_name": "ATTR_MAIL_ATT_NAME",
-      "objectType": "keywords",
-      "objectSubType": "keywords",
-      "objectList": [
-        {
-          "addItemList": [
-            {
-              "keywordArray": [
-                "mail_test_english.txt"
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
       "attribute_name": "ATTR_MAIL_ATT_CONTENT",
       "objectType": "keywords",
       "objectSubType": "keywords",
diff --git a/data/case_data/security_rule/deny_rate_limit_geography_mail_allfilter.json b/data/case_data/security_rule/deny_rate_limit_geography_mail_allfilter.json
index 853d688..909efbd 100644
--- a/data/case_data/security_rule/deny_rate_limit_geography_mail_allfilter.json
+++ b/data/case_data/security_rule/deny_rate_limit_geography_mail_allfilter.json
@@ -130,7 +130,7 @@
     }
   ],
   "app_name_1": ["mail"],
-  "hope_return": "timed out",
+  "hope_return": "timeout",
   "counters_1": {"hits": 1},
   "log_query_param_1": [{"query_field_key": "mail_account","query_value": "[email protected]"}],
   "command": "curl --connect-timeout 10 -m 10 --url \"smtp://192.168.40.206\" --mail-from \"[email protected]\" --mail-rcpt \"[email protected]\" -H @/opt/test/automation/scripts/mailTestFile/mailMessage/subjectEnglish.txt --user \"[email protected]:111111\" -F '=(;type=multipart/mixed' -F '=(;type=multipart/mixed' -F \"=\"Bestman\";type=text/plain\" -F \"file=@/opt/test/automation/scripts/mailTestFile/mailAttach/mail_test_english.txt;type=`file --mime-type \"/opt/test/automation/scripts/mailTestFile/mailAttach/mail_test_english.txt\"|sed 's/.*: //'`;encoder=base64\" -F '=)'"
diff --git a/data/case_data/security_rule/deny_rate_limit_geography_mail_subject.json b/data/case_data/security_rule/deny_rate_limit_geography_mail_subject.json
index 36a6a0a..1723027 100644
--- a/data/case_data/security_rule/deny_rate_limit_geography_mail_subject.json
+++ b/data/case_data/security_rule/deny_rate_limit_geography_mail_subject.json
@@ -50,7 +50,7 @@
     }
   ],
   "app_name_1": ["mail"],
-  "hope_return": "timed out",
+  "hope_return": "timeout",
   "counters_1": {"hits": 1},
   "log_query_param_1": [{"query_field_key": "mail_account","query_value": "[email protected]"}],
   "command": "curl --connect-timeout 10 -m 10 --url \"smtp://192.168.40.206\" --mail-from \"[email protected]\" --mail-rcpt \"[email protected]\" -H @/opt/test/automation/scripts/mailTestFile/mailMessage/subjectEnglish.txt --user \"[email protected]:111111\" -F '=(;type=multipart/mixed' -F '=(;type=multipart/mixed' -F \"=\"Bestman\";type=text/plain\" -F \"file=@/opt/test/automation/scripts/mailTestFile/mailAttach/mail_test_english.txt;type=`file --mime-type \"/opt/test/automation/scripts/mailTestFile/mailAttach/mail_test_english.txt\"|sed 's/.*: //'`;encoder=base64\" -F '=)'"
diff --git a/data/case_data/security_rule/deny_rate_limit_geography_ssl_allfilter.json b/data/case_data/security_rule/deny_rate_limit_geography_ssl_allfilter.json
index 57c0953..428a015 100644
--- a/data/case_data/security_rule/deny_rate_limit_geography_ssl_allfilter.json
+++ b/data/case_data/security_rule/deny_rate_limit_geography_ssl_allfilter.json
@@ -26,7 +26,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "93.184.215.14"
             }
           ]
         }
@@ -41,7 +41,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -57,7 +57,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -72,7 +72,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -83,6 +83,6 @@
   "app_name_1": ["ssl"],
   "hope_return": "timed out",
   "counters_1": {"hits": 1},
-  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.baidu.com"}],
-  "command": "curl -kv --connect-timeout 5 -m 10 https://www.baidu.com"
+  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.example.com"}],
+  "command": "curl -kv --connect-timeout 5 -m 10 https://www.example.com"
 }
diff --git a/data/case_data/security_rule/deny_rate_limit_geography_ssl_sni.json b/data/case_data/security_rule/deny_rate_limit_geography_ssl_sni.json
index 71e5b3a..f783d51 100644
--- a/data/case_data/security_rule/deny_rate_limit_geography_ssl_sni.json
+++ b/data/case_data/security_rule/deny_rate_limit_geography_ssl_sni.json
@@ -26,7 +26,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "93.184.215.14"
             }
           ]
         }
@@ -41,7 +41,7 @@
           "addItemList": [
             {
               "keywordArray": [
-                "baidu"
+                "example"
               ]
             }
           ]
@@ -52,6 +52,6 @@
   "app_name_1": ["ssl"],
   "hope_return": "timed out",
   "counters_1": {"hits": 1},
-  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.baidu.com"}],
-    "command": "curl -kv --connect-timeout 5 -m 10 https://www.baidu.com"
+  "log_query_param_1": [{"query_field_key":"ssl_sni","query_value":"www.example.com"}],
+    "command": "curl -kv --connect-timeout 5 -m 10 https://www.example.com"
 }
diff --git a/data/case_data/security_rule/deny_redirect_AAAA_text_subid_qname.json b/data/case_data/security_rule/deny_redirect_AAAA_text_subid_qname.json
index 645abd8..c3782e5 100644
--- a/data/case_data/security_rule/deny_redirect_AAAA_text_subid_qname.json
+++ b/data/case_data/security_rule/deny_redirect_AAAA_text_subid_qname.json
@@ -40,7 +40,7 @@
               "latitude": "0",
               "longitude": "0",
               "addr_type": 4,
-              "ip_address": "192.168.40.206"
+              "ip_address": "121.14.154.93"
             }
           ]
         }
diff --git a/data/case_data/security_rule/deny_tamper_geography_dns_qname.json b/data/case_data/security_rule/deny_tamper_geography_dns_qname.json
index 3f7b178..782662e 100644
--- a/data/case_data/security_rule/deny_tamper_geography_dns_qname.json
+++ b/data/case_data/security_rule/deny_tamper_geography_dns_qname.json
@@ -49,7 +49,7 @@
     }
   ],
   "app_name_1": ["dns"],
-  "hope_return": "NXDOMAIN",
+  "hope_return": "recursion not",
   "counters_1": {"hits": 2},
   "log_query_param_1": [{"query_field_key":"dns_qname","query_value":"www.example.com"}],
   "command": "nslookup www.example.com -timeout=1"