tccli 3.0.898.1__py2.py3-none-any.whl → 3.0.899.1__py2.py3-none-any.whl

tccli/services/waf/v20180125/api.json

@@ -294,6 +294,13 @@
       "output": "ModifyDomainWhiteRuleResponse",
       "status": "online"
     },
+    "ModifySpartaProtection": {
+      "document": "修改域名配置",
+      "input": "ModifySpartaProtectionRequest",
+      "name": "修改域名配置",
+      "output": "ModifySpartaProtectionResponse",
+      "status": "online"
+    },
     "ModifyWafAutoDenyRules": {
       "document": "修改ip惩罚规则",
       "input": "ModifyWafAutoDenyRulesRequest",
@@ -6268,6 +6275,344 @@
       ],
       "type": "object"
     },
+    "ModifySpartaProtectionRequest": {
+      "document": "ModifySpartaProtection请求参数结构体",
+      "members": [
+        {
+          "default": "",
+          "disabled": false,
+          "document": "域名",
+          "example": "www.test.com",
+          "member": "string",
+          "name": "Domain",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "域名ID",
+          "example": "s2dfd342dfd34423sdfs",
+          "member": "string",
+          "name": "DomainId",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "证书类型，0表示没有证书，CertType=1表示自有证书,2 为托管证书",
+          "example": "0",
+          "member": "int64",
+          "name": "CertType",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "CertType=1时，需要填次参数，表示证书内容",
+          "example": "sdfdfdf",
+          "member": "string",
+          "name": "Cert",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "CertType=1时，需要填次参数，表示证书的私钥",
+          "example": "sdfsdfs",
+          "member": "string",
+          "name": "PrivateKey",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "CertType=2时，需要填次参数，表示证书的ID",
+          "example": "3434",
+          "member": "string",
+          "name": "SSLId",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "表示是否开启了CDN代理",
+          "example": "0",
+          "member": "int64",
+          "name": "IsCdn",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "HTTPS回源协议",
+          "example": "https",
+          "member": "string",
+          "name": "UpstreamScheme",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "HTTPS回源端口,仅UpstreamScheme为http时需要填当前字段",
+          "example": "\"80,443\"",
+          "member": "string",
+          "name": "HttpsUpstreamPort",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "表示是否强制跳转到HTTPS，1表示开启，0表示不开启",
+          "example": "1",
+          "member": "uint64",
+          "name": "HttpsRewrite",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "回源类型，0表示通过IP回源,1 表示通过域名回源",
+          "example": "0",
+          "member": "int64",
+          "name": "UpstreamType",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "UpstreamType=1时，填次字段表示回源域名",
+          "example": "www.qq.com",
+          "member": "string",
+          "name": "UpstreamDomain",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "UpstreamType=0时，填次字段表示回源ip",
+          "example": "[\"1.1.1.1\\n\"]",
+          "member": "string",
+          "name": "SrcList",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "是否开启HTTP2，1表示开启，0表示不开启http2。开启HTTP2需要HTTPS支持",
+          "example": "0",
+          "member": "int64",
+          "name": "IsHttp2",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "是否开启WebSocket， 1：开启WebSocket，0：不开启WebSocket",
+          "example": "0",
+          "member": "int64",
+          "name": "IsWebsocket",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "负载均衡策略，0表示轮徇，1表示IP hash",
+          "example": "0",
+          "member": "int64",
+          "name": "LoadBalance",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "是否灰度",
+          "example": "0",
+          "member": "int64",
+          "name": "IsGray",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "WAF版本",
+          "example": "sparta-waf",
+          "member": "string",
+          "name": "Edition",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "端口信息",
+          "example": "无",
+          "member": "SpartaProtectionPort",
+          "name": "Ports",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "长短连接标志，仅IP回源时有效",
+          "example": "1",
+          "member": "string",
+          "name": "IsKeepAlive",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "实例id",
+          "example": "waf-sdjfksl",
+          "member": "string",
+          "name": "InstanceID",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "是否为Anycast ip类型：1 Anycast 0 普通ip",
+          "example": "0",
+          "member": "int64",
+          "name": "Anycast",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "src的权重",
+          "example": "[1.1.1]",
+          "member": "int64",
+          "name": "Weights",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "是否开启源站的主动健康检测，1表示开启，0表示不开启",
+          "example": "0",
+          "member": "int64",
+          "name": "ActiveCheck",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "TLS版本信息",
+          "example": "0",
+          "member": "int64",
+          "name": "TLSVersion",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "加密套件信息",
+          "example": "[0,1]",
+          "member": "int64",
+          "name": "Ciphers",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "0:不支持选择：默认模版  1:通用型模版 2:安全型模版 3:自定义模版",
+          "example": "0",
+          "member": "int64",
+          "name": "CipherTemplate",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "300s",
+          "example": "300",
+          "member": "int64",
+          "name": "ProxyReadTimeout",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "300s",
+          "example": "300",
+          "member": "int64",
+          "name": "ProxySendTimeout",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "0:关闭SNI；1:开启SNI，SNI=源请求host；2:开启SNI，SNI=修改为源站host；3：开启SNI，自定义host，SNI=SniHost；",
+          "example": "1",
+          "member": "int64",
+          "name": "SniType",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "SniType=3时，需要填此参数，表示自定义的host；",
+          "example": "test.com",
+          "member": "string",
+          "name": "SniHost",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "IsCdn=3时，需要填此参数，表示自定义header",
+          "example": "[\"x-real-ip\"]",
+          "member": "string",
+          "name": "IpHeaders",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifySpartaProtectionResponse": {
+      "document": "ModifySpartaProtection返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyWafAutoDenyRulesRequest": {
       "document": "ModifyWafAutoDenyRules请求参数结构体",
       "members": [
@@ -7211,6 +7556,62 @@
       ],
       "type": "object"
     },
+    "SpartaProtectionPort": {
+      "document": "waf斯巴达-编辑防护域名中的端口结构",
+      "members": [
+        {
+          "default": "",
+          "disabled": false,
+          "document": "nginx Id",
+          "member": "uint64",
+          "name": "NginxServerId",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "端口",
+          "member": "string",
+          "name": "Port",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "协议",
+          "member": "string",
+          "name": "Protocol",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "后端端口",
+          "member": "string",
+          "name": "UpstreamPort",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "后端协议",
+          "member": "string",
+          "name": "UpstreamProtocol",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "in"
+    },
     "Strategy": {
       "document": "自定义规则的匹配条件结构体",
       "members": [

tccli/services/waf/v20180125/examples.json

@@ -354,6 +354,32 @@
         "title": "更改某一条规则"
       }
     ],
+    "ModifySpartaProtection": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifySpartaProtection\n<公共请求参数>\n\n{\n    \"Domain\": \"www.test.com\",\n    \"LoadBalance\": \"0\",\n    \"UpstreamType\": \"0\",\n    \"CertType\": \"0\",\n    \"Ports\": [\n        {\n            \"NginxServerId\": \"0\",\n            \"Protocol\": \"http\",\n            \"Port\": \"80\",\n            \"UpstreamPort\": \"80\",\n            \"UpstreamProtocol\": \"http\"\n        }\n    ],\n    \"SrcList\": [\n        \"1.1.1.1\"\n    ],\n    \"IsCdn\": \"0\",\n    \"IsWebsocket\": \"0\",\n    \"IsGray\": \"0\",\n    \"IsHttp2\": \"0\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"9ee8be5b-6caa-4c39-ab70-890e0e673515\"\n    }\n}",
+        "title": "修改域名配置"
+      },
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifySpartaProtection\n<公共请求参数>\n\n{\n    \"Domain\": \"lucas0407-1.qcloudwaf.com\",\n    \"LoadBalance\": \"0\",\n    \"InstanceID\": \"waf_2kuj60v200b09bsr\",\n    \"UpstreamType\": \"0\",\n    \"IsWebsocket\": \"0\",\n    \"IsHttp2\": \"0\",\n    \"SrcList\": [\n        \"11.148.84.137\"\n    ],\n    \"CertType\": \"0\",\n    \"DomainId\": \"eb454223185451fe8b255a82b9d4bf94\",\n    \"Weights\": [\n        \"100\"\n    ],\n    \"IsKeepAlive\": \"1\",\n    \"IsCdn\": \"1\",\n    \"IsGray\": \"0\",\n    \"Anycast\": \"0\",\n    \"Ports\": [\n        {\n            \"NginxServerId\": \"62094\",\n            \"Protocol\": \"http\",\n            \"Port\": \"80\",\n            \"UpstreamPort\": \"80\",\n            \"UpstreamProtocol\": \"http\"\n        }\n    ],\n    \"ActiveCheck\": \"1\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"9c553d61-526a-44cf-a874-b24956033973\"\n    }\n}",
+        "title": "修改域名接入配置"
+      },
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifySpartaProtection\n<公共请求参数>\n\n{\n    \"IsGray\": \"0\",\n    \"Domain\": \"lucas0407-1.qcloudwaf.com\",\n    \"LoadBalance\": \"0\",\n    \"CipherTemplate\": \"0\",\n    \"InstanceID\": \"waf_2kuj60v200b09bsr\",\n    \"UpstreamType\": \"0\",\n    \"IsWebsocket\": \"0\",\n    \"IsHttp2\": \"0\",\n    \"SrcList\": [\n        \"114.132.223.23\"\n    ],\n    \"CertType\": \"0\",\n    \"DomainId\": \"eb454223185451fe8b255a82b9d4bf94\",\n    \"Weights\": [\n        \"100\"\n    ],\n    \"IsKeepAlive\": \"1\",\n    \"IsCdn\": \"1\",\n    \"TLSVersion\": \"3\",\n    \"Anycast\": \"0\",\n    \"Ports\": [\n        {\n            \"NginxServerId\": \"62094\",\n            \"Protocol\": \"http\",\n            \"Port\": \"80\",\n            \"UpstreamPort\": \"80\",\n            \"UpstreamProtocol\": \"http\"\n        }\n    ],\n    \"ActiveCheck\": \"1\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"13b8a309-3e7d-4393-91a4-271bf6d5dd71\"\n    }\n}",
+        "title": "ts"
+      },
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifySpartaProtection\n<公共请求参数>\n\n{\n    \"IsGray\": \"0\",\n    \"Domain\": \"lucas0919.qcloudwaf.com\",\n    \"LoadBalance\": \"0\",\n    \"CipherTemplate\": \"0\",\n    \"InstanceID\": \"lucas\",\n    \"UpstreamType\": \"0\",\n    \"IsWebsocket\": \"0\",\n    \"IsHttp2\": \"0\",\n    \"SrcList\": [\n        \"114.132.223.23\"\n    ],\n    \"CertType\": \"0\",\n    \"DomainId\": \"e801733b69605960a17388999868512a\",\n    \"Weights\": [\n        \"100\"\n    ],\n    \"IsKeepAlive\": \"1\",\n    \"IsCdn\": \"1\",\n    \"TLSVersion\": \"3\",\n    \"Anycast\": \"0\",\n    \"Ports\": [\n        {\n            \"NginxServerId\": \"63953\",\n            \"Protocol\": \"http\",\n            \"Port\": \"80\",\n            \"UpstreamPort\": \"80\",\n            \"UpstreamProtocol\": \"http\"\n        }\n    ],\n    \"ActiveCheck\": \"1\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"d6bd6f14-926e-4a3e-9a34-bb1dd7d9a51d\"\n    }\n}",
+        "title": "Modify-Host-1"
+      }
+    ],
     "ModifyWafAutoDenyRules": [
       {
         "document": "修改ip惩罚配置",

tccli/services/waf/waf_client.py

@@ -1577,6 +1577,58 @@ def doModifyWafThreatenIntelligence(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeAttackOverview(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_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.DescribeAttackOverviewRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeAttackOverview(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 doAddCustomWhiteRule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1837,7 +1889,7 @@ def doDescribeWafAutoDenyRules(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeAttackOverview(args, parsed_globals):
+def doModifySpartaProtection(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1866,11 +1918,11 @@ def doDescribeAttackOverview(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.DescribeAttackOverviewRequest()
+    model = models.ModifySpartaProtectionRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeAttackOverview(model)
+        rsp = client.ModifySpartaProtection(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2658,12 +2710,13 @@ ACTION_MAP = {
     "ModifyCustomRuleStatus": doModifyCustomRuleStatus,
     "DescribePeakValue": doDescribePeakValue,
     "ModifyWafThreatenIntelligence": doModifyWafThreatenIntelligence,
+    "DescribeAttackOverview": doDescribeAttackOverview,
     "AddCustomWhiteRule": doAddCustomWhiteRule,
     "ModifyWafAutoDenyRules": doModifyWafAutoDenyRules,
     "DescribeUserClbWafRegions": doDescribeUserClbWafRegions,
     "DeleteAttackDownloadRecord": doDeleteAttackDownloadRecord,
     "DescribeWafAutoDenyRules": doDescribeWafAutoDenyRules,
-    "DescribeAttackOverview": doDescribeAttackOverview,
+    "ModifySpartaProtection": doModifySpartaProtection,
     "DeleteDownloadRecord": doDeleteDownloadRecord,
     "CreateHost": doCreateHost,
     "DeleteSession": doDeleteSession,