tccli 3.0.922.1__py2.py3-none-any.whl → 3.0.924.1__py2.py3-none-any.whl

tccli/services/waf/v20180125/api.json

@@ -266,6 +266,13 @@
       "output": "GetAttackDownloadRecordsResponse",
       "status": "online"
     },
+    "GetAttackHistogram": {
+      "document": "生成攻击日志的产生时间柱状图",
+      "input": "GetAttackHistogramRequest",
+      "name": "攻击日志统计",
+      "output": "GetAttackHistogramResponse",
+      "status": "online"
+    },
     "ModifyAccessPeriod": {
       "document": "本接口用于修改访问日志保存期限及大字段是否存储",
       "input": "ModifyAccessPeriodRequest",
@@ -5189,6 +5196,84 @@
       ],
       "type": "object"
     },
+    "GetAttackHistogramRequest": {
+      "document": "GetAttackHistogram请求参数结构体",
+      "members": [
+        {
+          "default": "",
+          "disabled": false,
+          "document": "查询的域名，所有域名使用all",
+          "member": "string",
+          "name": "Domain",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "查询起始时间",
+          "member": "datetime",
+          "name": "StartTime",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "查询结束时间",
+          "member": "datetime",
+          "name": "EndTime",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "Lucene语法",
+          "member": "string",
+          "name": "QueryString",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "GetAttackHistogramResponse": {
+      "document": "GetAttackHistogram返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "统计详情",
+          "member": "LogHistogramInfo",
+          "name": "Data",
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "时间段大小",
+          "member": "uint64",
+          "name": "Period",
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "统计的条目数",
+          "member": "uint64",
+          "name": "TotalCount",
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "HostRecord": {
       "document": "clb-waf防护域名",
       "members": [
@@ -6119,6 +6204,32 @@
       ],
       "usage": "both"
     },
+    "LogHistogramInfo": {
+      "document": "攻击日志统计详情",
+      "members": [
+        {
+          "default": "",
+          "disabled": false,
+          "document": "日志条数",
+          "member": "int64",
+          "name": "Count",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "时间戳",
+          "member": "int64",
+          "name": "TimeStamp",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "ModifyAccessPeriodRequest": {
       "document": "ModifyAccessPeriod请求参数结构体",
       "members": [

tccli/services/waf/v20180125/examples.json

@@ -322,6 +322,14 @@
         "title": "查询下载攻击日志任务记录列表"
       }
     ],
+    "GetAttackHistogram": [
+      {
+        "document": "",
+        "input": "https://waf.tencentcloudapi.com/?Action=GetAttackHistogram\n&StartTime=2020-08-2800:00:00\n&ToTime=2020-08-2814:12:36\n&Domain=all\n&QueryString=method:GET\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"Data\": [\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598544000\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598545800\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598547600\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598549400\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598551200\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598553000\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598554800\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598556600\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598558400\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598560200\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598562000\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598563800\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598565600\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598567400\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598569200\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598571000\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598572800\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598574600\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598576400\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598578200\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598580000\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598581800\n            },\n            {\n                \"Count\": 17,\n                \"TimeStamp\": 1598583600\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598585400\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598587200\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598589000\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598590800\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598592600\n            },\n            {\n                \"Count\": 0,\n                \"TimeStamp\": 1598594400\n            }\n        ],\n        \"Period\": 1800,\n        \"TotalCount\": 17\n    }\n}",
+        "title": "攻击日志统计详情"
+      }
+    ],
     "ModifyAccessPeriod": [
       {
         "document": "",

tccli/services/waf/waf_client.py

@@ -329,7 +329,7 @@ def doDescribeDomains(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeAccessIndex(args, parsed_globals):
+def doGetAttackHistogram(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -358,11 +358,11 @@ def doDescribeAccessIndex(args, parsed_globals):
     client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeAccessIndexRequest()
+    model = models.GetAttackHistogramRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeAccessIndex(model)
+        rsp = client.GetAttackHistogram(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -641,6 +641,58 @@ def doDeleteIpAccessControl(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeAccessIndex(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeAccessIndexRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeAccessIndex(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doModifyWafAutoDenyStatus(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2738,12 +2790,13 @@ ACTION_MAP = {
     "DeleteDomainWhiteRules": doDeleteDomainWhiteRules,
     "ModifyAreaBanStatus": doModifyAreaBanStatus,
     "DescribeDomains": doDescribeDomains,
-    "DescribeAccessIndex": doDescribeAccessIndex,
+    "GetAttackHistogram": doGetAttackHistogram,
     "CreateAccessExport": doCreateAccessExport,
     "SearchAttackLog": doSearchAttackLog,
     "DescribeAccessHistogram": doDescribeAccessHistogram,
     "DescribeInstances": doDescribeInstances,
     "DeleteIpAccessControl": doDeleteIpAccessControl,
+    "DescribeAccessIndex": doDescribeAccessIndex,
     "ModifyWafAutoDenyStatus": doModifyWafAutoDenyStatus,
     "ModifyAccessPeriod": doModifyAccessPeriod,
     "DescribeFlowTrend": doDescribeFlowTrend,

{tccli-3.0.922.1.dist-info → tccli-3.0.924.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tccli
-Version: 3.0.922.1
+Version: 3.0.924.1
 Summary: Universal Command Line Environment for Tencent Cloud
 Project-URL: Bug Tracker, https://github.com/TencentCloud/tencentcloud-cli/issues
 Project-URL: Homepage, https://github.com/TencentCloud/tencentcloud-cli
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: jmespath==0.10.0
 Requires-Dist: six==1.16.0
-Requires-Dist: tencentcloud-sdk-python>=3.0.922
+Requires-Dist: tencentcloud-sdk-python>=3.0.924
 Description-Content-Type: text/markdown
 
 # 命令行工具简介