tccli 3.0.1169.1__py2.py3-none-any.whl → 3.0.1170.1__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- tccli/__init__.py +1 -1
- tccli/services/aiart/v20221229/api.json +9 -0
- tccli/services/cls/v20201016/api.json +15 -6
- tccli/services/cwp/cwp_client.py +118 -65
- tccli/services/cwp/v20180228/api.json +135 -2
- tccli/services/cwp/v20180228/examples.json +8 -0
- tccli/services/emr/emr_client.py +163 -4
- tccli/services/emr/v20190103/api.json +880 -11
- tccli/services/emr/v20190103/examples.json +24 -0
- tccli/services/ioa/v20220601/api.json +5 -5
- tccli/services/smh/smh_client.py +281 -16
- tccli/services/smh/v20210712/api.json +806 -2
- tccli/services/smh/v20210712/examples.json +40 -0
- tccli/services/trtc/v20190722/api.json +7 -7
- tccli/services/vod/v20180717/api.json +12 -0
- {tccli-3.0.1169.1.dist-info → tccli-3.0.1170.1.dist-info}/METADATA +2 -2
- {tccli-3.0.1169.1.dist-info → tccli-3.0.1170.1.dist-info}/RECORD +20 -20
- {tccli-3.0.1169.1.dist-info → tccli-3.0.1170.1.dist-info}/WHEEL +0 -0
- {tccli-3.0.1169.1.dist-info → tccli-3.0.1170.1.dist-info}/entry_points.txt +0 -0
- {tccli-3.0.1169.1.dist-info → tccli-3.0.1170.1.dist-info}/license_files/LICENSE +0 -0
    
        tccli/__init__.py
    CHANGED
    
    | @@ -1 +1 @@ | |
| 1 | 
            -
            __version__ = '3.0. | 
| 1 | 
            +
            __version__ = '3.0.1170.1'
         | 
| @@ -767,6 +767,15 @@ | |
| 767 767 | 
             
                      "required": true,
         | 
| 768 768 | 
             
                      "type": "string"
         | 
| 769 769 | 
             
                    },
         | 
| 770 | 
            +
                    {
         | 
| 771 | 
            +
                      "disabled": false,
         | 
| 772 | 
            +
                      "document": "商品图中的商品主体名称。\n建议说明商品主体,否则影响生成效果。",
         | 
| 773 | 
            +
                      "example": "汽车",
         | 
| 774 | 
            +
                      "member": "string",
         | 
| 775 | 
            +
                      "name": "Product",
         | 
| 776 | 
            +
                      "required": false,
         | 
| 777 | 
            +
                      "type": "string"
         | 
| 778 | 
            +
                    },
         | 
| 770 779 | 
             
                    {
         | 
| 771 780 | 
             
                      "disabled": false,
         | 
| 772 781 | 
             
                      "document": "商品 Mask 图 Url,要求背景透明,保留商品主体。\n如果不传,将自动使用内置的商品分割算法得到 Mask。\n支持自定义上传 Mask,如果该参数不为空,则以实际上传的数据为准。\n图片限制:Mask 图必须和商品原图分辨率一致,转成 Base64 字符串后小于 6MB,格式仅支持 png。",
         | 
| @@ -13348,7 +13348,16 @@ | |
| 13348 13348 | 
             
                    },
         | 
| 13349 13349 | 
             
                    {
         | 
| 13350 13350 | 
             
                      "disabled": false,
         | 
| 13351 | 
            -
                      "document": " | 
| 13351 | 
            +
                      "document": "原始日志是否按时间排序返回;可选值:asc(升序)、desc(降序),默认为 desc\n注意:\n* 仅当检索分析语句(Query)不包含SQL时有效\n* SQL结果排序方式参考<a href=\"https://cloud.tencent.com/document/product/614/58978\" target=\"_blank\">SQL ORDER BY语法</a>",
         | 
| 13352 | 
            +
                      "example": "asc",
         | 
| 13353 | 
            +
                      "member": "string",
         | 
| 13354 | 
            +
                      "name": "Sort",
         | 
| 13355 | 
            +
                      "required": false,
         | 
| 13356 | 
            +
                      "type": "string"
         | 
| 13357 | 
            +
                    },
         | 
| 13358 | 
            +
                    {
         | 
| 13359 | 
            +
                      "disabled": false,
         | 
| 13360 | 
            +
                      "document": "表示单次查询返回的原始日志条数,默认为100,最大值为1000。\n注意:\n* 仅当检索分析语句(Query)不包含SQL时有效\n* SQL结果条数指定方式参考<a href=\"https://cloud.tencent.com/document/product/614/58977\" target=\"_blank\">SQL LIMIT语法</a>\n\n可通过两种方式获取后续更多日志:\n* Context:透传上次接口返回的Context值,获取后续更多日志,总计最多可获取1万条原始日志\n* Offset:偏移量,表示从第几行开始返回原始日志,无日志条数限制",
         | 
| 13352 13361 | 
             
                      "example": "100",
         | 
| 13353 13362 | 
             
                      "member": "int64",
         | 
| 13354 13363 | 
             
                      "name": "Limit",
         | 
| @@ -13357,12 +13366,12 @@ | |
| 13357 13366 | 
             
                    },
         | 
| 13358 13367 | 
             
                    {
         | 
| 13359 13368 | 
             
                      "disabled": false,
         | 
| 13360 | 
            -
                      "document": " | 
| 13361 | 
            -
                      "example": " | 
| 13362 | 
            -
                      "member": " | 
| 13363 | 
            -
                      "name": " | 
| 13369 | 
            +
                      "document": "查询原始日志的偏移量,表示从第几行开始返回原始日志,默认为0。 \n注意:\n* 仅当检索分析语句(Query)不包含SQL时有效\n* 不能与Context参数同时使用\n* 仅适用于单日志主题检索",
         | 
| 13370 | 
            +
                      "example": "0",
         | 
| 13371 | 
            +
                      "member": "uint64",
         | 
| 13372 | 
            +
                      "name": "Offset",
         | 
| 13364 13373 | 
             
                      "required": false,
         | 
| 13365 | 
            -
                      "type": " | 
| 13374 | 
            +
                      "type": "int"
         | 
| 13366 13375 | 
             
                    },
         | 
| 13367 13376 | 
             
                    {
         | 
| 13368 13377 | 
             
                      "disabled": false,
         | 
    
        tccli/services/cwp/cwp_client.py
    CHANGED
    
    | @@ -3657,6 +3657,58 @@ def doDescribeMachineLicenseDetail(args, parsed_globals): | |
| 3657 3657 | 
             
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 3658 3658 |  | 
| 3659 3659 |  | 
| 3660 | 
            +
            def doExportScanTaskDetails(args, parsed_globals):
         | 
| 3661 | 
            +
                g_param = parse_global_arg(parsed_globals)
         | 
| 3662 | 
            +
             | 
| 3663 | 
            +
                if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
         | 
| 3664 | 
            +
                    cred = credential.CVMRoleCredential()
         | 
| 3665 | 
            +
                elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
         | 
| 3666 | 
            +
                    cred = credential.STSAssumeRoleCredential(
         | 
| 3667 | 
            +
                        g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
         | 
| 3668 | 
            +
                        g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
         | 
| 3669 | 
            +
                    )
         | 
| 3670 | 
            +
                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):
         | 
| 3671 | 
            +
                    cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
         | 
| 3672 | 
            +
                else:
         | 
| 3673 | 
            +
                    cred = credential.Credential(
         | 
| 3674 | 
            +
                        g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
         | 
| 3675 | 
            +
                    )
         | 
| 3676 | 
            +
                http_profile = HttpProfile(
         | 
| 3677 | 
            +
                    reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
         | 
| 3678 | 
            +
                    reqMethod="POST",
         | 
| 3679 | 
            +
                    endpoint=g_param[OptionsDefine.Endpoint],
         | 
| 3680 | 
            +
                    proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
         | 
| 3681 | 
            +
                )
         | 
| 3682 | 
            +
                profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
         | 
| 3683 | 
            +
                if g_param[OptionsDefine.Language]:
         | 
| 3684 | 
            +
                    profile.language = g_param[OptionsDefine.Language]
         | 
| 3685 | 
            +
                mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
         | 
| 3686 | 
            +
                client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
         | 
| 3687 | 
            +
                client._sdkVersion += ("_CLI_" + __version__)
         | 
| 3688 | 
            +
                models = MODELS_MAP[g_param[OptionsDefine.Version]]
         | 
| 3689 | 
            +
                model = models.ExportScanTaskDetailsRequest()
         | 
| 3690 | 
            +
                model.from_json_string(json.dumps(args))
         | 
| 3691 | 
            +
                start_time = time.time()
         | 
| 3692 | 
            +
                while True:
         | 
| 3693 | 
            +
                    rsp = client.ExportScanTaskDetails(model)
         | 
| 3694 | 
            +
                    result = rsp.to_json_string()
         | 
| 3695 | 
            +
                    try:
         | 
| 3696 | 
            +
                        json_obj = json.loads(result)
         | 
| 3697 | 
            +
                    except TypeError as e:
         | 
| 3698 | 
            +
                        json_obj = json.loads(result.decode('utf-8'))  # python3.3
         | 
| 3699 | 
            +
                    if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
         | 
| 3700 | 
            +
                        break
         | 
| 3701 | 
            +
                    cur_time = time.time()
         | 
| 3702 | 
            +
                    if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
         | 
| 3703 | 
            +
                        raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
         | 
| 3704 | 
            +
                        (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
         | 
| 3705 | 
            +
                        search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
         | 
| 3706 | 
            +
                    else:
         | 
| 3707 | 
            +
                        print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
         | 
| 3708 | 
            +
                    time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
         | 
| 3709 | 
            +
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 3710 | 
            +
             | 
| 3711 | 
            +
             | 
| 3660 3712 | 
             
            def doSwitchBashRules(args, parsed_globals):
         | 
| 3661 3713 | 
             
                g_param = parse_global_arg(parsed_globals)
         | 
| 3662 3714 |  | 
| @@ -10105,7 +10157,7 @@ def doDeleteReverseShellEvents(args, parsed_globals): | |
| 10105 10157 | 
             
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 10106 10158 |  | 
| 10107 10159 |  | 
| 10108 | 
            -
            def  | 
| 10160 | 
            +
            def doModifyReverseShellRulesAggregation(args, parsed_globals):
         | 
| 10109 10161 | 
             
                g_param = parse_global_arg(parsed_globals)
         | 
| 10110 10162 |  | 
| 10111 10163 | 
             
                if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
         | 
| @@ -10134,11 +10186,11 @@ def doExportScanTaskDetails(args, parsed_globals): | |
| 10134 10186 | 
             
                client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
         | 
| 10135 10187 | 
             
                client._sdkVersion += ("_CLI_" + __version__)
         | 
| 10136 10188 | 
             
                models = MODELS_MAP[g_param[OptionsDefine.Version]]
         | 
| 10137 | 
            -
                model = models. | 
| 10189 | 
            +
                model = models.ModifyReverseShellRulesAggregationRequest()
         | 
| 10138 10190 | 
             
                model.from_json_string(json.dumps(args))
         | 
| 10139 10191 | 
             
                start_time = time.time()
         | 
| 10140 10192 | 
             
                while True:
         | 
| 10141 | 
            -
                    rsp = client. | 
| 10193 | 
            +
                    rsp = client.ModifyReverseShellRulesAggregation(model)
         | 
| 10142 10194 | 
             
                    result = rsp.to_json_string()
         | 
| 10143 10195 | 
             
                    try:
         | 
| 10144 10196 | 
             
                        json_obj = json.loads(result)
         | 
| @@ -17697,7 +17749,7 @@ def doDescribeBaselineStrategyList(args, parsed_globals): | |
| 17697 17749 | 
             
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 17698 17750 |  | 
| 17699 17751 |  | 
| 17700 | 
            -
            def  | 
| 17752 | 
            +
            def doModifyBaselineRuleIgnore(args, parsed_globals):
         | 
| 17701 17753 | 
             
                g_param = parse_global_arg(parsed_globals)
         | 
| 17702 17754 |  | 
| 17703 17755 | 
             
                if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
         | 
| @@ -17726,11 +17778,11 @@ def doDescribeScanMalwareSchedule(args, parsed_globals): | |
| 17726 17778 | 
             
                client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
         | 
| 17727 17779 | 
             
                client._sdkVersion += ("_CLI_" + __version__)
         | 
| 17728 17780 | 
             
                models = MODELS_MAP[g_param[OptionsDefine.Version]]
         | 
| 17729 | 
            -
                model = models. | 
| 17781 | 
            +
                model = models.ModifyBaselineRuleIgnoreRequest()
         | 
| 17730 17782 | 
             
                model.from_json_string(json.dumps(args))
         | 
| 17731 17783 | 
             
                start_time = time.time()
         | 
| 17732 17784 | 
             
                while True:
         | 
| 17733 | 
            -
                    rsp = client. | 
| 17785 | 
            +
                    rsp = client.ModifyBaselineRuleIgnore(model)
         | 
| 17734 17786 | 
             
                    result = rsp.to_json_string()
         | 
| 17735 17787 | 
             
                    try:
         | 
| 17736 17788 | 
             
                        json_obj = json.loads(result)
         | 
| @@ -20037,58 +20089,6 @@ def doDescribeRansomDefenseEventsList(args, parsed_globals): | |
| 20037 20089 | 
             
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 20038 20090 |  | 
| 20039 20091 |  | 
| 20040 | 
            -
            def doExportLicenseDetail(args, parsed_globals):
         | 
| 20041 | 
            -
                g_param = parse_global_arg(parsed_globals)
         | 
| 20042 | 
            -
             | 
| 20043 | 
            -
                if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
         | 
| 20044 | 
            -
                    cred = credential.CVMRoleCredential()
         | 
| 20045 | 
            -
                elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
         | 
| 20046 | 
            -
                    cred = credential.STSAssumeRoleCredential(
         | 
| 20047 | 
            -
                        g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
         | 
| 20048 | 
            -
                        g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
         | 
| 20049 | 
            -
                    )
         | 
| 20050 | 
            -
                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):
         | 
| 20051 | 
            -
                    cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
         | 
| 20052 | 
            -
                else:
         | 
| 20053 | 
            -
                    cred = credential.Credential(
         | 
| 20054 | 
            -
                        g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
         | 
| 20055 | 
            -
                    )
         | 
| 20056 | 
            -
                http_profile = HttpProfile(
         | 
| 20057 | 
            -
                    reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
         | 
| 20058 | 
            -
                    reqMethod="POST",
         | 
| 20059 | 
            -
                    endpoint=g_param[OptionsDefine.Endpoint],
         | 
| 20060 | 
            -
                    proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
         | 
| 20061 | 
            -
                )
         | 
| 20062 | 
            -
                profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
         | 
| 20063 | 
            -
                if g_param[OptionsDefine.Language]:
         | 
| 20064 | 
            -
                    profile.language = g_param[OptionsDefine.Language]
         | 
| 20065 | 
            -
                mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
         | 
| 20066 | 
            -
                client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
         | 
| 20067 | 
            -
                client._sdkVersion += ("_CLI_" + __version__)
         | 
| 20068 | 
            -
                models = MODELS_MAP[g_param[OptionsDefine.Version]]
         | 
| 20069 | 
            -
                model = models.ExportLicenseDetailRequest()
         | 
| 20070 | 
            -
                model.from_json_string(json.dumps(args))
         | 
| 20071 | 
            -
                start_time = time.time()
         | 
| 20072 | 
            -
                while True:
         | 
| 20073 | 
            -
                    rsp = client.ExportLicenseDetail(model)
         | 
| 20074 | 
            -
                    result = rsp.to_json_string()
         | 
| 20075 | 
            -
                    try:
         | 
| 20076 | 
            -
                        json_obj = json.loads(result)
         | 
| 20077 | 
            -
                    except TypeError as e:
         | 
| 20078 | 
            -
                        json_obj = json.loads(result.decode('utf-8'))  # python3.3
         | 
| 20079 | 
            -
                    if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
         | 
| 20080 | 
            -
                        break
         | 
| 20081 | 
            -
                    cur_time = time.time()
         | 
| 20082 | 
            -
                    if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
         | 
| 20083 | 
            -
                        raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
         | 
| 20084 | 
            -
                        (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
         | 
| 20085 | 
            -
                        search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
         | 
| 20086 | 
            -
                    else:
         | 
| 20087 | 
            -
                        print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
         | 
| 20088 | 
            -
                    time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
         | 
| 20089 | 
            -
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 20090 | 
            -
             | 
| 20091 | 
            -
             | 
| 20092 20092 | 
             
            def doExportAssetProcessInfoList(args, parsed_globals):
         | 
| 20093 20093 | 
             
                g_param = parse_global_arg(parsed_globals)
         | 
| 20094 20094 |  | 
| @@ -22429,6 +22429,58 @@ def doDeleteBaselineWeakPassword(args, parsed_globals): | |
| 22429 22429 | 
             
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 22430 22430 |  | 
| 22431 22431 |  | 
| 22432 | 
            +
            def doDescribeScanMalwareSchedule(args, parsed_globals):
         | 
| 22433 | 
            +
                g_param = parse_global_arg(parsed_globals)
         | 
| 22434 | 
            +
             | 
| 22435 | 
            +
                if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
         | 
| 22436 | 
            +
                    cred = credential.CVMRoleCredential()
         | 
| 22437 | 
            +
                elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
         | 
| 22438 | 
            +
                    cred = credential.STSAssumeRoleCredential(
         | 
| 22439 | 
            +
                        g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
         | 
| 22440 | 
            +
                        g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
         | 
| 22441 | 
            +
                    )
         | 
| 22442 | 
            +
                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):
         | 
| 22443 | 
            +
                    cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
         | 
| 22444 | 
            +
                else:
         | 
| 22445 | 
            +
                    cred = credential.Credential(
         | 
| 22446 | 
            +
                        g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
         | 
| 22447 | 
            +
                    )
         | 
| 22448 | 
            +
                http_profile = HttpProfile(
         | 
| 22449 | 
            +
                    reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
         | 
| 22450 | 
            +
                    reqMethod="POST",
         | 
| 22451 | 
            +
                    endpoint=g_param[OptionsDefine.Endpoint],
         | 
| 22452 | 
            +
                    proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
         | 
| 22453 | 
            +
                )
         | 
| 22454 | 
            +
                profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
         | 
| 22455 | 
            +
                if g_param[OptionsDefine.Language]:
         | 
| 22456 | 
            +
                    profile.language = g_param[OptionsDefine.Language]
         | 
| 22457 | 
            +
                mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
         | 
| 22458 | 
            +
                client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
         | 
| 22459 | 
            +
                client._sdkVersion += ("_CLI_" + __version__)
         | 
| 22460 | 
            +
                models = MODELS_MAP[g_param[OptionsDefine.Version]]
         | 
| 22461 | 
            +
                model = models.DescribeScanMalwareScheduleRequest()
         | 
| 22462 | 
            +
                model.from_json_string(json.dumps(args))
         | 
| 22463 | 
            +
                start_time = time.time()
         | 
| 22464 | 
            +
                while True:
         | 
| 22465 | 
            +
                    rsp = client.DescribeScanMalwareSchedule(model)
         | 
| 22466 | 
            +
                    result = rsp.to_json_string()
         | 
| 22467 | 
            +
                    try:
         | 
| 22468 | 
            +
                        json_obj = json.loads(result)
         | 
| 22469 | 
            +
                    except TypeError as e:
         | 
| 22470 | 
            +
                        json_obj = json.loads(result.decode('utf-8'))  # python3.3
         | 
| 22471 | 
            +
                    if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
         | 
| 22472 | 
            +
                        break
         | 
| 22473 | 
            +
                    cur_time = time.time()
         | 
| 22474 | 
            +
                    if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
         | 
| 22475 | 
            +
                        raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
         | 
| 22476 | 
            +
                        (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
         | 
| 22477 | 
            +
                        search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
         | 
| 22478 | 
            +
                    else:
         | 
| 22479 | 
            +
                        print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
         | 
| 22480 | 
            +
                    time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
         | 
| 22481 | 
            +
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 22482 | 
            +
             | 
| 22483 | 
            +
             | 
| 22432 22484 | 
             
            def doDeleteNonlocalLoginPlaces(args, parsed_globals):
         | 
| 22433 22485 | 
             
                g_param = parse_global_arg(parsed_globals)
         | 
| 22434 22486 |  | 
| @@ -23677,7 +23729,7 @@ def doExportRiskDnsEventList(args, parsed_globals): | |
| 23677 23729 | 
             
                FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
         | 
| 23678 23730 |  | 
| 23679 23731 |  | 
| 23680 | 
            -
            def  | 
| 23732 | 
            +
            def doExportLicenseDetail(args, parsed_globals):
         | 
| 23681 23733 | 
             
                g_param = parse_global_arg(parsed_globals)
         | 
| 23682 23734 |  | 
| 23683 23735 | 
             
                if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
         | 
| @@ -23706,11 +23758,11 @@ def doModifyBaselineRuleIgnore(args, parsed_globals): | |
| 23706 23758 | 
             
                client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
         | 
| 23707 23759 | 
             
                client._sdkVersion += ("_CLI_" + __version__)
         | 
| 23708 23760 | 
             
                models = MODELS_MAP[g_param[OptionsDefine.Version]]
         | 
| 23709 | 
            -
                model = models. | 
| 23761 | 
            +
                model = models.ExportLicenseDetailRequest()
         | 
| 23710 23762 | 
             
                model.from_json_string(json.dumps(args))
         | 
| 23711 23763 | 
             
                start_time = time.time()
         | 
| 23712 23764 | 
             
                while True:
         | 
| 23713 | 
            -
                    rsp = client. | 
| 23765 | 
            +
                    rsp = client.ExportLicenseDetail(model)
         | 
| 23714 23766 | 
             
                    result = rsp.to_json_string()
         | 
| 23715 23767 | 
             
                    try:
         | 
| 23716 23768 | 
             
                        json_obj = json.loads(result)
         | 
| @@ -26878,6 +26930,7 @@ ACTION_MAP = { | |
| 26878 26930 | 
             
                "DescribeLicense": doDescribeLicense,
         | 
| 26879 26931 | 
             
                "ExportBashPolicies": doExportBashPolicies,
         | 
| 26880 26932 | 
             
                "DescribeMachineLicenseDetail": doDescribeMachineLicenseDetail,
         | 
| 26933 | 
            +
                "ExportScanTaskDetails": doExportScanTaskDetails,
         | 
| 26881 26934 | 
             
                "SwitchBashRules": doSwitchBashRules,
         | 
| 26882 26935 | 
             
                "DescribeAssetUserList": doDescribeAssetUserList,
         | 
| 26883 26936 | 
             
                "DescribeAssetWebLocationInfo": doDescribeAssetWebLocationInfo,
         | 
| @@ -27002,7 +27055,7 @@ ACTION_MAP = { | |
| 27002 27055 | 
             
                "ScanAsset": doScanAsset,
         | 
| 27003 27056 | 
             
                "ModifyBruteAttackRules": doModifyBruteAttackRules,
         | 
| 27004 27057 | 
             
                "DeleteReverseShellEvents": doDeleteReverseShellEvents,
         | 
| 27005 | 
            -
                " | 
| 27058 | 
            +
                "ModifyReverseShellRulesAggregation": doModifyReverseShellRulesAggregation,
         | 
| 27006 27059 | 
             
                "DescribeJavaMemShellPluginInfo": doDescribeJavaMemShellPluginInfo,
         | 
| 27007 27060 | 
             
                "ExportAssetInitServiceList": doExportAssetInitServiceList,
         | 
| 27008 27061 | 
             
                "ModifyLoginWhiteInfo": doModifyLoginWhiteInfo,
         | 
| @@ -27148,7 +27201,7 @@ ACTION_MAP = { | |
| 27148 27201 | 
             
                "DescribeBashRules": doDescribeBashRules,
         | 
| 27149 27202 | 
             
                "DescribeAttackStatistics": doDescribeAttackStatistics,
         | 
| 27150 27203 | 
             
                "DescribeBaselineStrategyList": doDescribeBaselineStrategyList,
         | 
| 27151 | 
            -
                " | 
| 27204 | 
            +
                "ModifyBaselineRuleIgnore": doModifyBaselineRuleIgnore,
         | 
| 27152 27205 | 
             
                "ModifyMalwareWhiteList": doModifyMalwareWhiteList,
         | 
| 27153 27206 | 
             
                "DescribeWebHookRule": doDescribeWebHookRule,
         | 
| 27154 27207 | 
             
                "RetryVulFix": doRetryVulFix,
         | 
| @@ -27193,7 +27246,6 @@ ACTION_MAP = { | |
| 27193 27246 | 
             
                "GetLocalStorageItem": doGetLocalStorageItem,
         | 
| 27194 27247 | 
             
                "ExportRansomDefenseMachineList": doExportRansomDefenseMachineList,
         | 
| 27195 27248 | 
             
                "DescribeRansomDefenseEventsList": doDescribeRansomDefenseEventsList,
         | 
| 27196 | 
            -
                "ExportLicenseDetail": doExportLicenseDetail,
         | 
| 27197 27249 | 
             
                "ExportAssetProcessInfoList": doExportAssetProcessInfoList,
         | 
| 27198 27250 | 
             
                "DescribeMachinesSimple": doDescribeMachinesSimple,
         | 
| 27199 27251 | 
             
                "DescribeBashEvents": doDescribeBashEvents,
         | 
| @@ -27239,6 +27291,7 @@ ACTION_MAP = { | |
| 27239 27291 | 
             
                "DescribeAssetTotalCount": doDescribeAssetTotalCount,
         | 
| 27240 27292 | 
             
                "DescribeHotVulTop": doDescribeHotVulTop,
         | 
| 27241 27293 | 
             
                "DeleteBaselineWeakPassword": doDeleteBaselineWeakPassword,
         | 
| 27294 | 
            +
                "DescribeScanMalwareSchedule": doDescribeScanMalwareSchedule,
         | 
| 27242 27295 | 
             
                "DeleteNonlocalLoginPlaces": doDeleteNonlocalLoginPlaces,
         | 
| 27243 27296 | 
             
                "ExportAssetSystemPackageList": doExportAssetSystemPackageList,
         | 
| 27244 27297 | 
             
                "EditReverseShellRules": doEditReverseShellRules,
         | 
| @@ -27263,7 +27316,7 @@ ACTION_MAP = { | |
| 27263 27316 | 
             
                "ExportWebPageEventList": doExportWebPageEventList,
         | 
| 27264 27317 | 
             
                "DescribeBaselineHostRiskTop": doDescribeBaselineHostRiskTop,
         | 
| 27265 27318 | 
             
                "ExportRiskDnsEventList": doExportRiskDnsEventList,
         | 
| 27266 | 
            -
                " | 
| 27319 | 
            +
                "ExportLicenseDetail": doExportLicenseDetail,
         | 
| 27267 27320 | 
             
                "DescribeEmergencyResponseList": doDescribeEmergencyResponseList,
         | 
| 27268 27321 | 
             
                "DescribeAttackTrends": doDescribeAttackTrends,
         | 
| 27269 27322 | 
             
                "DescribeScreenDefenseTrends": doDescribeScreenDefenseTrends,
         | 
| @@ -92,11 +92,11 @@ | |
| 92 92 | 
             
                  "status": "online"
         | 
| 93 93 | 
             
                },
         | 
| 94 94 | 
             
                "CreateCloudProtectServiceOrderRecord": {
         | 
| 95 | 
            -
                  "document": "云护航服务使用完成后,该接口可以确认收货",
         | 
| 95 | 
            +
                  "document": "云护航计费产品已下线\n\n云护航服务使用完成后,该接口可以确认收货",
         | 
| 96 96 | 
             
                  "input": "CreateCloudProtectServiceOrderRecordRequest",
         | 
| 97 97 | 
             
                  "name": "云护航服务确认收货",
         | 
| 98 98 | 
             
                  "output": "CreateCloudProtectServiceOrderRecordResponse",
         | 
| 99 | 
            -
                  "status": " | 
| 99 | 
            +
                  "status": "deprecated"
         | 
| 100 100 | 
             
                },
         | 
| 101 101 | 
             
                "CreateEmergencyVulScan": {
         | 
| 102 102 | 
             
                  "document": "创建应急漏洞扫描任务",
         | 
| @@ -3283,6 +3283,13 @@ | |
| 3283 3283 | 
             
                  "output": "ModifyRansomDefenseStrategyStatusResponse",
         | 
| 3284 3284 | 
             
                  "status": "online"
         | 
| 3285 3285 | 
             
                },
         | 
| 3286 | 
            +
                "ModifyReverseShellRulesAggregation": {
         | 
| 3287 | 
            +
                  "document": "编辑反弹Shell规则(支持多服务器选择)",
         | 
| 3288 | 
            +
                  "input": "ModifyReverseShellRulesAggregationRequest",
         | 
| 3289 | 
            +
                  "name": "编辑反弹Shell规则(支持多服务器选择)-聚合版本-支持正则",
         | 
| 3290 | 
            +
                  "output": "ModifyReverseShellRulesAggregationResponse",
         | 
| 3291 | 
            +
                  "status": "online"
         | 
| 3292 | 
            +
                },
         | 
| 3286 3293 | 
             
                "ModifyRiskDnsPolicy": {
         | 
| 3287 3294 | 
             
                  "document": "更改恶意请求策略",
         | 
| 3288 3295 | 
             
                  "input": "ModifyRiskDnsPolicyRequest",
         | 
| @@ -48470,6 +48477,132 @@ | |
| 48470 48477 | 
             
                  ],
         | 
| 48471 48478 | 
             
                  "type": "object"
         | 
| 48472 48479 | 
             
                },
         | 
| 48480 | 
            +
                "ModifyReverseShellRulesAggregationRequest": {
         | 
| 48481 | 
            +
                  "document": "ModifyReverseShellRulesAggregation请求参数结构体",
         | 
| 48482 | 
            +
                  "members": [
         | 
| 48483 | 
            +
                    {
         | 
| 48484 | 
            +
                      "disabled": false,
         | 
| 48485 | 
            +
                      "document": "规则ID(新增时请留空)",
         | 
| 48486 | 
            +
                      "example": "1",
         | 
| 48487 | 
            +
                      "member": "uint64",
         | 
| 48488 | 
            +
                      "name": "Id",
         | 
| 48489 | 
            +
                      "required": false,
         | 
| 48490 | 
            +
                      "type": "int"
         | 
| 48491 | 
            +
                    },
         | 
| 48492 | 
            +
                    {
         | 
| 48493 | 
            +
                      "disabled": false,
         | 
| 48494 | 
            +
                      "document": "客户端ID数组",
         | 
| 48495 | 
            +
                      "example": "[]",
         | 
| 48496 | 
            +
                      "member": "string",
         | 
| 48497 | 
            +
                      "name": "Uuids",
         | 
| 48498 | 
            +
                      "required": false,
         | 
| 48499 | 
            +
                      "type": "list"
         | 
| 48500 | 
            +
                    },
         | 
| 48501 | 
            +
                    {
         | 
| 48502 | 
            +
                      "disabled": false,
         | 
| 48503 | 
            +
                      "document": "主机IP",
         | 
| 48504 | 
            +
                      "example": "xxx",
         | 
| 48505 | 
            +
                      "member": "string",
         | 
| 48506 | 
            +
                      "name": "HostIp",
         | 
| 48507 | 
            +
                      "required": false,
         | 
| 48508 | 
            +
                      "type": "string"
         | 
| 48509 | 
            +
                    },
         | 
| 48510 | 
            +
                    {
         | 
| 48511 | 
            +
                      "disabled": false,
         | 
| 48512 | 
            +
                      "document": "目标IP",
         | 
| 48513 | 
            +
                      "example": "xxx",
         | 
| 48514 | 
            +
                      "member": "string",
         | 
| 48515 | 
            +
                      "name": "DestIp",
         | 
| 48516 | 
            +
                      "required": false,
         | 
| 48517 | 
            +
                      "type": "string"
         | 
| 48518 | 
            +
                    },
         | 
| 48519 | 
            +
                    {
         | 
| 48520 | 
            +
                      "disabled": false,
         | 
| 48521 | 
            +
                      "document": "目标端口",
         | 
| 48522 | 
            +
                      "example": "xxx",
         | 
| 48523 | 
            +
                      "member": "string",
         | 
| 48524 | 
            +
                      "name": "DestPort",
         | 
| 48525 | 
            +
                      "required": false,
         | 
| 48526 | 
            +
                      "type": "string"
         | 
| 48527 | 
            +
                    },
         | 
| 48528 | 
            +
                    {
         | 
| 48529 | 
            +
                      "disabled": false,
         | 
| 48530 | 
            +
                      "document": "进程名",
         | 
| 48531 | 
            +
                      "example": "xxx",
         | 
| 48532 | 
            +
                      "member": "string",
         | 
| 48533 | 
            +
                      "name": "ProcessName",
         | 
| 48534 | 
            +
                      "required": false,
         | 
| 48535 | 
            +
                      "type": "string"
         | 
| 48536 | 
            +
                    },
         | 
| 48537 | 
            +
                    {
         | 
| 48538 | 
            +
                      "disabled": false,
         | 
| 48539 | 
            +
                      "document": "是否全局规则(默认否)",
         | 
| 48540 | 
            +
                      "example": "1",
         | 
| 48541 | 
            +
                      "member": "uint64",
         | 
| 48542 | 
            +
                      "name": "IsGlobal",
         | 
| 48543 | 
            +
                      "required": false,
         | 
| 48544 | 
            +
                      "type": "int"
         | 
| 48545 | 
            +
                    },
         | 
| 48546 | 
            +
                    {
         | 
| 48547 | 
            +
                      "disabled": false,
         | 
| 48548 | 
            +
                      "document": "事件列表和详情点击加白时关联的事件id (新增规则时请留空)",
         | 
| 48549 | 
            +
                      "example": "12",
         | 
| 48550 | 
            +
                      "member": "uint64",
         | 
| 48551 | 
            +
                      "name": "EventId",
         | 
| 48552 | 
            +
                      "required": false,
         | 
| 48553 | 
            +
                      "type": "int"
         | 
| 48554 | 
            +
                    },
         | 
| 48555 | 
            +
                    {
         | 
| 48556 | 
            +
                      "disabled": false,
         | 
| 48557 | 
            +
                      "document": "加白方式, 0:常规加白 1:正则加白",
         | 
| 48558 | 
            +
                      "example": "1",
         | 
| 48559 | 
            +
                      "member": "uint64",
         | 
| 48560 | 
            +
                      "name": "WhiteType",
         | 
| 48561 | 
            +
                      "required": false,
         | 
| 48562 | 
            +
                      "type": "int"
         | 
| 48563 | 
            +
                    },
         | 
| 48564 | 
            +
                    {
         | 
| 48565 | 
            +
                      "disabled": false,
         | 
| 48566 | 
            +
                      "document": "正则表达式",
         | 
| 48567 | 
            +
                      "example": "*abc*",
         | 
| 48568 | 
            +
                      "member": "string",
         | 
| 48569 | 
            +
                      "name": "RuleRegexp",
         | 
| 48570 | 
            +
                      "required": false,
         | 
| 48571 | 
            +
                      "type": "string"
         | 
| 48572 | 
            +
                    },
         | 
| 48573 | 
            +
                    {
         | 
| 48574 | 
            +
                      "disabled": false,
         | 
| 48575 | 
            +
                      "document": "处理历史事件, 0:不处理 1:处理",
         | 
| 48576 | 
            +
                      "example": "1",
         | 
| 48577 | 
            +
                      "member": "uint64",
         | 
| 48578 | 
            +
                      "name": "HandleHistory",
         | 
| 48579 | 
            +
                      "required": false,
         | 
| 48580 | 
            +
                      "type": "int"
         | 
| 48581 | 
            +
                    },
         | 
| 48582 | 
            +
                    {
         | 
| 48583 | 
            +
                      "disabled": false,
         | 
| 48584 | 
            +
                      "document": "批次id",
         | 
| 48585 | 
            +
                      "example": "85c909fe-c87c-11e9-a100-5cb90191ae78",
         | 
| 48586 | 
            +
                      "member": "string",
         | 
| 48587 | 
            +
                      "name": "GroupID",
         | 
| 48588 | 
            +
                      "required": false,
         | 
| 48589 | 
            +
                      "type": "string"
         | 
| 48590 | 
            +
                    }
         | 
| 48591 | 
            +
                  ],
         | 
| 48592 | 
            +
                  "type": "object"
         | 
| 48593 | 
            +
                },
         | 
| 48594 | 
            +
                "ModifyReverseShellRulesAggregationResponse": {
         | 
| 48595 | 
            +
                  "document": "ModifyReverseShellRulesAggregation返回参数结构体",
         | 
| 48596 | 
            +
                  "members": [
         | 
| 48597 | 
            +
                    {
         | 
| 48598 | 
            +
                      "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
         | 
| 48599 | 
            +
                      "member": "string",
         | 
| 48600 | 
            +
                      "name": "RequestId",
         | 
| 48601 | 
            +
                      "type": "string"
         | 
| 48602 | 
            +
                    }
         | 
| 48603 | 
            +
                  ],
         | 
| 48604 | 
            +
                  "type": "object"
         | 
| 48605 | 
            +
                },
         | 
| 48473 48606 | 
             
                "ModifyRiskDnsPolicyRequest": {
         | 
| 48474 48607 | 
             
                  "document": "ModifyRiskDnsPolicy请求参数结构体",
         | 
| 48475 48608 | 
             
                  "members": [
         | 
| @@ -3806,6 +3806,14 @@ | |
| 3806 3806 | 
             
                    "title": "批量修改防勒索策略状态"
         | 
| 3807 3807 | 
             
                  }
         | 
| 3808 3808 | 
             
                ],
         | 
| 3809 | 
            +
                "ModifyReverseShellRulesAggregation": [
         | 
| 3810 | 
            +
                  {
         | 
| 3811 | 
            +
                    "document": "增加正则规则",
         | 
| 3812 | 
            +
                    "input": "POST / HTTP/1.1\nHost: xxx\nContent-Type: application/json\nX-TC-Action: ModifyReverseShellRulesAggregation\n<公共请求参数>\n\n{\n    \"IsGlobal\": 1,\n    \"WhiteType\": 1,\n    \"RuleRegexp\": \"xxx\",\n    \"HandleHistory\": 1,\n    \"GroupID\": \"\"\n}",
         | 
| 3813 | 
            +
                    "output": "{\n    \"Response\": {\n        \"RequestId\": \"1\"\n    }\n}",
         | 
| 3814 | 
            +
                    "title": "增加正则规则"
         | 
| 3815 | 
            +
                  }
         | 
| 3816 | 
            +
                ],
         | 
| 3809 3817 | 
             
                "ModifyRiskDnsPolicy": [
         | 
| 3810 3818 | 
             
                  {
         | 
| 3811 3819 | 
             
                    "document": "",
         |