tccli-intl-en 3.0.1168.1__py2.py3-none-any.whl → 3.1.16.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.
Files changed (294) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/argument.py +1 -1
  3. tccli/plugins/sso/__init__.py +14 -0
  4. tccli/plugins/sso/login.py +23 -6
  5. tccli/plugins/sso/texts.py +4 -0
  6. tccli/services/__init__.py +49 -2
  7. tccli/services/advisor/advisor_client.py +10 -4
  8. tccli/services/ai3d/__init__.py +4 -0
  9. tccli/services/ai3d/ai3d_client.py +266 -0
  10. tccli/services/ai3d/v20250513/api.json +264 -0
  11. tccli/services/ai3d/v20250513/examples.json +20 -0
  12. tccli/services/aiart/aiart_client.py +5 -2
  13. tccli/services/ams/ams_client.py +20 -8
  14. tccli/services/antiddos/antiddos_client.py +350 -140
  15. tccli/services/apigateway/apigateway_client.py +465 -186
  16. tccli/services/apm/apm_client.py +835 -68
  17. tccli/services/apm/v20210622/api.json +3936 -1145
  18. tccli/services/apm/v20210622/examples.json +133 -23
  19. tccli/services/asr/asr_client.py +10 -4
  20. tccli/services/autoscaling/autoscaling_client.py +341 -114
  21. tccli/services/autoscaling/v20180419/api.json +514 -333
  22. tccli/services/autoscaling/v20180419/examples.json +46 -38
  23. tccli/services/batch/batch_client.py +140 -56
  24. tccli/services/bi/__init__.py +4 -0
  25. tccli/services/bi/bi_client.py +1498 -0
  26. tccli/services/bi/v20220105/api.json +5769 -0
  27. tccli/services/bi/v20220105/examples.json +215 -0
  28. tccli/services/billing/billing_client.py +1055 -134
  29. tccli/services/billing/v20180709/api.json +1654 -243
  30. tccli/services/billing/v20180709/examples.json +169 -25
  31. tccli/services/cam/cam_client.py +405 -162
  32. tccli/services/captcha/captcha_client.py +5 -2
  33. tccli/services/captcha/v20190722/api.json +16 -6
  34. tccli/services/captcha/v20190722/examples.json +3 -3
  35. tccli/services/car/car_client.py +165 -66
  36. tccli/services/cbs/cbs_client.py +190 -76
  37. tccli/services/ccc/ccc_client.py +1167 -268
  38. tccli/services/ccc/v20200210/api.json +2263 -202
  39. tccli/services/ccc/v20200210/examples.json +116 -12
  40. tccli/services/cdb/cdb_client.py +665 -266
  41. tccli/services/cdb/v20170320/api.json +426 -173
  42. tccli/services/cdb/v20170320/examples.json +6 -6
  43. tccli/services/cdc/cdc_client.py +100 -40
  44. tccli/services/cdc/v20201214/api.json +2 -2
  45. tccli/services/cdc/v20201214/examples.json +4 -4
  46. tccli/services/cdn/cdn_client.py +220 -88
  47. tccli/services/cdwdoris/cdwdoris_client.py +385 -154
  48. tccli/services/cdwpg/cdwpg_client.py +120 -48
  49. tccli/services/cdz/__init__.py +4 -0
  50. tccli/services/cdz/cdz_client.py +210 -0
  51. tccli/services/cdz/v20221123/api.json +233 -0
  52. tccli/services/cdz/v20221123/examples.json +12 -0
  53. tccli/services/cfg/cfg_client.py +80 -32
  54. tccli/services/cfg/v20210820/api.json +30 -10
  55. tccli/services/cfg/v20210820/examples.json +1 -1
  56. tccli/services/cfs/cfs_client.py +195 -78
  57. tccli/services/cfw/cfw_client.py +330 -132
  58. tccli/services/chdfs/chdfs_client.py +145 -58
  59. tccli/services/ciam/ciam_client.py +80 -32
  60. tccli/services/ckafka/ckafka_client.py +1033 -255
  61. tccli/services/ckafka/v20190819/api.json +3378 -1681
  62. tccli/services/ckafka/v20190819/examples.json +254 -160
  63. tccli/services/clb/clb_client.py +1054 -469
  64. tccli/services/clb/v20180317/api.json +2307 -1024
  65. tccli/services/clb/v20180317/examples.json +186 -126
  66. tccli/services/cloudaudit/cloudaudit_client.py +90 -36
  67. tccli/services/cls/cls_client.py +434 -173
  68. tccli/services/cmq/cmq_client.py +14 -803
  69. tccli/services/cmq/v20190304/api.json +173 -1367
  70. tccli/services/cmq/v20190304/examples.json +0 -120
  71. tccli/services/config/config_client.py +30 -12
  72. tccli/services/controlcenter/controlcenter_client.py +229 -2
  73. tccli/services/controlcenter/v20230110/api.json +528 -5
  74. tccli/services/controlcenter/v20230110/examples.json +32 -0
  75. tccli/services/csip/csip_client.py +339 -78
  76. tccli/services/csip/v20221121/api.json +1011 -38
  77. tccli/services/csip/v20221121/examples.json +24 -0
  78. tccli/services/ctsdb/__init__.py +4 -0
  79. tccli/services/ctsdb/ctsdb_client.py +266 -0
  80. tccli/services/ctsdb/v20230202/api.json +677 -0
  81. tccli/services/ctsdb/v20230202/examples.json +20 -0
  82. tccli/services/cvm/cvm_client.py +706 -189
  83. tccli/services/cvm/v20170312/api.json +1141 -510
  84. tccli/services/cvm/v20170312/examples.json +174 -128
  85. tccli/services/cwp/cwp_client.py +2325 -930
  86. tccli/services/cynosdb/cynosdb_client.py +3051 -575
  87. tccli/services/cynosdb/v20190107/api.json +14074 -7139
  88. tccli/services/cynosdb/v20190107/examples.json +597 -287
  89. tccli/services/dataintegration/dataintegration_client.py +5 -2
  90. tccli/services/dayu/dayu_client.py +515 -206
  91. tccli/services/dbbrain/dbbrain_client.py +210 -84
  92. tccli/services/dc/dc_client.py +90 -36
  93. tccli/services/dcdb/dcdb_client.py +310 -124
  94. tccli/services/dlc/dlc_client.py +859 -214
  95. tccli/services/dlc/v20210125/api.json +637 -13
  96. tccli/services/dlc/v20210125/examples.json +48 -0
  97. tccli/services/dms/dms_client.py +10 -4
  98. tccli/services/dnspod/dnspod_client.py +390 -111
  99. tccli/services/dnspod/v20210323/api.json +196 -0
  100. tccli/services/dnspod/v20210323/examples.json +24 -0
  101. tccli/services/domain/domain_client.py +120 -48
  102. tccli/services/dts/dts_client.py +415 -166
  103. tccli/services/eb/eb_client.py +130 -52
  104. tccli/services/ecdn/ecdn_client.py +75 -30
  105. tccli/services/ecm/ecm_client.py +620 -248
  106. tccli/services/eiam/eiam_client.py +200 -80
  107. tccli/services/emr/emr_client.py +3104 -117
  108. tccli/services/emr/v20190103/api.json +15311 -4361
  109. tccli/services/emr/v20190103/examples.json +452 -42
  110. tccli/services/es/es_client.py +105 -42
  111. tccli/services/facefusion/facefusion_client.py +15 -6
  112. tccli/services/faceid/faceid_client.py +95 -38
  113. tccli/services/faceid/v20180301/api.json +172 -45
  114. tccli/services/faceid/v20180301/examples.json +3 -3
  115. tccli/services/gaap/gaap_client.py +440 -176
  116. tccli/services/gme/gme_client.py +50 -20
  117. tccli/services/gpm/gpm_client.py +90 -36
  118. tccli/services/gse/gse_client.py +110 -44
  119. tccli/services/gwlb/gwlb_client.py +90 -36
  120. tccli/services/hunyuan/__init__.py +4 -0
  121. tccli/services/hunyuan/hunyuan_client.py +266 -0
  122. tccli/services/hunyuan/v20230901/api.json +270 -0
  123. tccli/services/hunyuan/v20230901/examples.json +20 -0
  124. tccli/services/iai/iai_client.py +145 -58
  125. tccli/services/iai/v20200303/api.json +187 -51
  126. tccli/services/iai/v20200303/examples.json +30 -12
  127. tccli/services/iap/iap_client.py +30 -12
  128. tccli/services/ims/ims_client.py +5 -2
  129. tccli/services/ims/v20201229/api.json +133 -141
  130. tccli/services/ims/v20201229/examples.json +3 -3
  131. tccli/services/intlpartnersmgt/intlpartnersmgt_client.py +516 -72
  132. tccli/services/intlpartnersmgt/v20220928/api.json +976 -60
  133. tccli/services/intlpartnersmgt/v20220928/examples.json +50 -2
  134. tccli/services/iotcloud/iotcloud_client.py +100 -40
  135. tccli/services/iotcloud/v20210408/api.json +216 -107
  136. tccli/services/iotcloud/v20210408/examples.json +9 -9
  137. tccli/services/ip/ip_client.py +30 -12
  138. tccli/services/kms/kms_client.py +1226 -227
  139. tccli/services/kms/v20190118/api.json +1562 -144
  140. tccli/services/kms/v20190118/examples.json +204 -78
  141. tccli/services/lcic/lcic_client.py +265 -106
  142. tccli/services/lighthouse/lighthouse_client.py +370 -148
  143. tccli/services/lighthouse/v20200324/api.json +14 -14
  144. tccli/services/lighthouse/v20200324/examples.json +5 -5
  145. tccli/services/live/live_client.py +804 -232
  146. tccli/services/live/v20180801/api.json +272 -0
  147. tccli/services/live/v20180801/examples.json +32 -0
  148. tccli/services/lke/__init__.py +4 -0
  149. tccli/services/lke/lke_client.py +5194 -0
  150. tccli/services/lke/v20231130/api.json +14803 -0
  151. tccli/services/lke/v20231130/examples.json +736 -0
  152. tccli/services/lkeap/__init__.py +4 -0
  153. tccli/services/lkeap/lkeap_client.py +602 -0
  154. tccli/services/lkeap/v20240522/api.json +953 -0
  155. tccli/services/lkeap/v20240522/examples.json +92 -0
  156. tccli/services/mariadb/mariadb_client.py +250 -100
  157. tccli/services/mdc/mdc_client.py +90 -36
  158. tccli/services/mdl/mdl_client.py +402 -82
  159. tccli/services/mdl/v20200326/api.json +1144 -58
  160. tccli/services/mdl/v20200326/examples.json +48 -16
  161. tccli/services/mdp/mdp_client.py +785 -122
  162. tccli/services/mdp/v20200527/api.json +1168 -44
  163. tccli/services/mdp/v20200527/examples.json +151 -79
  164. tccli/services/message/__init__.py +4 -0
  165. tccli/services/message/message_client.py +210 -0
  166. tccli/services/message/v20181225/api.json +72 -0
  167. tccli/services/message/v20181225/examples.json +13 -0
  168. tccli/services/mongodb/mongodb_client.py +1452 -136
  169. tccli/services/mongodb/v20190725/api.json +4393 -1462
  170. tccli/services/mongodb/v20190725/examples.json +265 -71
  171. tccli/services/monitor/monitor_client.py +1008 -296
  172. tccli/services/monitor/v20180724/api.json +660 -11
  173. tccli/services/monitor/v20180724/examples.json +152 -4
  174. tccli/services/mps/mps_client.py +1573 -354
  175. tccli/services/mps/v20190612/api.json +12394 -7243
  176. tccli/services/mps/v20190612/examples.json +244 -84
  177. tccli/services/msp/msp_client.py +35 -14
  178. tccli/services/ocr/ocr_client.py +596 -102
  179. tccli/services/ocr/v20181119/api.json +2271 -181
  180. tccli/services/ocr/v20181119/examples.json +70 -8
  181. tccli/services/omics/omics_client.py +100 -40
  182. tccli/services/organization/organization_client.py +580 -232
  183. tccli/services/postgres/postgres_client.py +455 -182
  184. tccli/services/postgres/v20170312/api.json +134 -109
  185. tccli/services/postgres/v20170312/examples.json +14 -14
  186. tccli/services/privatedns/privatedns_client.py +206 -60
  187. tccli/services/privatedns/v20201028/api.json +179 -0
  188. tccli/services/privatedns/v20201028/examples.json +8 -0
  189. tccli/services/pts/pts_client.py +240 -96
  190. tccli/services/quota/__init__.py +4 -0
  191. tccli/services/quota/quota_client.py +434 -0
  192. tccli/services/quota/v20241204/api.json +548 -0
  193. tccli/services/quota/v20241204/examples.json +51 -0
  194. tccli/services/rce/rce_client.py +5 -2
  195. tccli/services/redis/redis_client.py +698 -212
  196. tccli/services/redis/v20180412/api.json +968 -563
  197. tccli/services/redis/v20180412/examples.json +98 -56
  198. tccli/services/region/__init__.py +4 -0
  199. tccli/services/region/region_client.py +322 -0
  200. tccli/services/region/v20220627/api.json +399 -0
  201. tccli/services/region/v20220627/examples.json +29 -0
  202. tccli/services/rum/rum_client.py +300 -120
  203. tccli/services/scf/scf_client.py +210 -84
  204. tccli/services/ses/ses_client.py +368 -69
  205. tccli/services/ses/v20201002/api.json +240 -0
  206. tccli/services/ses/v20201002/examples.json +32 -0
  207. tccli/services/smh/__init__.py +4 -0
  208. tccli/services/smh/smh_client.py +714 -0
  209. tccli/services/smh/v20210712/api.json +1287 -0
  210. tccli/services/smh/v20210712/examples.json +85 -0
  211. tccli/services/sms/sms_client.py +90 -36
  212. tccli/services/sqlserver/sqlserver_client.py +3855 -470
  213. tccli/services/sqlserver/v20180328/api.json +9757 -3347
  214. tccli/services/sqlserver/v20180328/examples.json +480 -20
  215. tccli/services/ssl/ssl_client.py +504 -72
  216. tccli/services/ssl/v20191205/api.json +789 -21
  217. tccli/services/ssl/v20191205/examples.json +54 -0
  218. tccli/services/ssm/ssm_client.py +120 -48
  219. tccli/services/sts/sts_client.py +25 -10
  220. tccli/services/tag/tag_client.py +150 -60
  221. tccli/services/tat/tat_client.py +95 -38
  222. tccli/services/tbaas/__init__.py +4 -0
  223. tccli/services/tbaas/tbaas_client.py +378 -0
  224. tccli/services/tbaas/v20180416/api.json +551 -0
  225. tccli/services/tbaas/v20180416/examples.json +37 -0
  226. tccli/services/tcaplusdb/tcaplusdb_client.py +260 -104
  227. tccli/services/tcaplusdb/v20190823/api.json +836 -760
  228. tccli/services/tcaplusdb/v20190823/examples.json +3 -3
  229. tccli/services/tchd/tchd_client.py +5 -2
  230. tccli/services/tcmpp/tcmpp_client.py +520 -208
  231. tccli/services/tcr/tcr_client.py +380 -152
  232. tccli/services/tcsas/tcsas_client.py +295 -118
  233. tccli/services/tcsas/v20250106/api.json +155 -79
  234. tccli/services/tcsas/v20250106/examples.json +3 -3
  235. tccli/services/tcss/tcss_client.py +1650 -660
  236. tccli/services/tdid/tdid_client.py +240 -96
  237. tccli/services/tdmq/tdmq_client.py +2876 -466
  238. tccli/services/tdmq/v20200217/api.json +11607 -3958
  239. tccli/services/tdmq/v20200217/examples.json +562 -264
  240. tccli/services/tem/tem_client.py +280 -112
  241. tccli/services/teo/teo_client.py +4507 -966
  242. tccli/services/teo/v20220901/api.json +7341 -1405
  243. tccli/services/teo/v20220901/examples.json +679 -99
  244. tccli/services/tione/__init__.py +4 -0
  245. tccli/services/tione/tione_client.py +210 -0
  246. tccli/services/tione/v20211111/api.json +3074 -0
  247. tccli/services/tione/v20211111/examples.json +12 -0
  248. tccli/services/tiw/tiw_client.py +255 -102
  249. tccli/services/tke/tke_client.py +741 -274
  250. tccli/services/tke/v20180525/api.json +132 -7
  251. tccli/services/tke/v20180525/examples.json +42 -16
  252. tccli/services/tms/tms_client.py +5 -2
  253. tccli/services/tms/v20201229/api.json +91 -100
  254. tccli/services/tmt/tmt_client.py +5 -2
  255. tccli/services/trabbit/__init__.py +4 -0
  256. tccli/services/trabbit/trabbit_client.py +1778 -0
  257. tccli/services/trabbit/v20230418/api.json +4772 -0
  258. tccli/services/trabbit/v20230418/examples.json +237 -0
  259. tccli/services/trocket/__init__.py +4 -0
  260. tccli/services/trocket/trocket_client.py +2450 -0
  261. tccli/services/trocket/v20230308/api.json +6062 -0
  262. tccli/services/trocket/v20230308/examples.json +339 -0
  263. tccli/services/trro/trro_client.py +95 -38
  264. tccli/services/trtc/trtc_client.py +928 -192
  265. tccli/services/trtc/v20190722/api.json +1810 -256
  266. tccli/services/trtc/v20190722/examples.json +100 -6
  267. tccli/services/tts/tts_client.py +5 -2
  268. tccli/services/vclm/vclm_client.py +10 -4
  269. tccli/services/vm/v20210922/api.json +61 -30
  270. tccli/services/vm/v20210922/examples.json +0 -12
  271. tccli/services/vm/vm_client.py +20 -8
  272. tccli/services/vod/v20180717/api.json +332 -52
  273. tccli/services/vod/v20180717/examples.json +9 -1
  274. tccli/services/vod/v20240718/api.json +1105 -0
  275. tccli/services/vod/v20240718/examples.json +97 -0
  276. tccli/services/vod/vod_client.py +1316 -350
  277. tccli/services/vpc/v20170312/api.json +1166 -106
  278. tccli/services/vpc/v20170312/examples.json +197 -23
  279. tccli/services/vpc/vpc_client.py +2413 -739
  280. tccli/services/waf/v20180125/api.json +1372 -194
  281. tccli/services/waf/v20180125/examples.json +89 -1
  282. tccli/services/waf/waf_client.py +1149 -245
  283. tccli/services/wedata/v20210820/api.json +1577 -231
  284. tccli/services/wedata/v20210820/examples.json +74 -12
  285. tccli/services/wedata/v20250806/api.json +13644 -0
  286. tccli/services/wedata/v20250806/examples.json +621 -0
  287. tccli/services/wedata/wedata_client.py +6366 -1191
  288. tccli/services/yunjing/yunjing_client.py +355 -142
  289. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/METADATA +4 -7
  290. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/RECORD +294 -230
  291. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/WHEEL +1 -1
  292. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/entry_points.txt +0 -1
  293. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/LICENSE +0 -0
  294. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/top_level.txt +0 -0
tccli/services/waf/waf_client.py CHANGED
@@ -27,7 +27,10 @@ def doDescribeAttackType(args, parsed_globals):
27
27
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
28
28
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
29
29
  )
30
- 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):
30
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
31
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
32
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
33
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
31
34
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
32
35
  else:
33
36
  cred = credential.Credential(
@@ -39,7 +42,7 @@ def doDescribeAttackType(args, parsed_globals):
39
42
  endpoint=g_param[OptionsDefine.Endpoint],
40
43
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
41
44
  )
42
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
45
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
43
46
  if g_param[OptionsDefine.Language]:
44
47
  profile.language = g_param[OptionsDefine.Language]
45
48
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -79,7 +82,10 @@ def doDescribeDomainDetailsClb(args, parsed_globals):
79
82
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
80
83
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
81
84
  )
82
- 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):
85
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
86
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
87
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
88
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
83
89
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
84
90
  else:
85
91
  cred = credential.Credential(
@@ -91,7 +97,7 @@ def doDescribeDomainDetailsClb(args, parsed_globals):
91
97
  endpoint=g_param[OptionsDefine.Endpoint],
92
98
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
93
99
  )
94
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
100
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
95
101
  if g_param[OptionsDefine.Language]:
96
102
  profile.language = g_param[OptionsDefine.Language]
97
103
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -121,7 +127,7 @@ def doDescribeDomainDetailsClb(args, parsed_globals):
121
127
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
122
128
 
123
129
 
124
- def doDescribeDomains(args, parsed_globals):
130
+ def doAddAntiInfoLeakRules(args, parsed_globals):
125
131
  g_param = parse_global_arg(parsed_globals)
126
132
 
127
133
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -131,7 +137,10 @@ def doDescribeDomains(args, parsed_globals):
131
137
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
132
138
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
133
139
  )
134
- 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):
140
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
141
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
142
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
143
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
135
144
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
136
145
  else:
137
146
  cred = credential.Credential(
@@ -143,18 +152,18 @@ def doDescribeDomains(args, parsed_globals):
143
152
  endpoint=g_param[OptionsDefine.Endpoint],
144
153
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
145
154
  )
146
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
155
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
147
156
  if g_param[OptionsDefine.Language]:
148
157
  profile.language = g_param[OptionsDefine.Language]
149
158
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
150
159
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
151
160
  client._sdkVersion += ("_CLI_" + __version__)
152
161
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
153
- model = models.DescribeDomainsRequest()
162
+ model = models.AddAntiInfoLeakRulesRequest()
154
163
  model.from_json_string(json.dumps(args))
155
164
  start_time = time.time()
156
165
  while True:
157
- rsp = client.DescribeDomains(model)
166
+ rsp = client.AddAntiInfoLeakRules(model)
158
167
  result = rsp.to_json_string()
159
168
  try:
160
169
  json_obj = json.loads(result)
@@ -183,7 +192,10 @@ def doGetAttackHistogram(args, parsed_globals):
183
192
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
184
193
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
185
194
  )
186
- 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):
195
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
196
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
197
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
198
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
187
199
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
188
200
  else:
189
201
  cred = credential.Credential(
@@ -195,7 +207,7 @@ def doGetAttackHistogram(args, parsed_globals):
195
207
  endpoint=g_param[OptionsDefine.Endpoint],
196
208
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
197
209
  )
198
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
210
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
199
211
  if g_param[OptionsDefine.Language]:
200
212
  profile.language = g_param[OptionsDefine.Language]
201
213
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -235,7 +247,10 @@ def doGetAttackTotalCount(args, parsed_globals):
235
247
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
236
248
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
237
249
  )
238
- 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):
250
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
251
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
252
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
253
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
239
254
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
240
255
  else:
241
256
  cred = credential.Credential(
@@ -247,7 +262,7 @@ def doGetAttackTotalCount(args, parsed_globals):
247
262
  endpoint=g_param[OptionsDefine.Endpoint],
248
263
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
249
264
  )
250
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
265
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
251
266
  if g_param[OptionsDefine.Language]:
252
267
  profile.language = g_param[OptionsDefine.Language]
253
268
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -277,7 +292,7 @@ def doGetAttackTotalCount(args, parsed_globals):
277
292
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
278
293
 
279
294
 
280
- def doDescribeBatchIpAccessControl(args, parsed_globals):
295
+ def doAddCustomWhiteRule(args, parsed_globals):
281
296
  g_param = parse_global_arg(parsed_globals)
282
297
 
283
298
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -287,7 +302,10 @@ def doDescribeBatchIpAccessControl(args, parsed_globals):
287
302
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
288
303
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
289
304
  )
290
- 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):
305
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
306
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
307
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
308
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
291
309
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
292
310
  else:
293
311
  cred = credential.Credential(
@@ -299,18 +317,73 @@ def doDescribeBatchIpAccessControl(args, parsed_globals):
299
317
  endpoint=g_param[OptionsDefine.Endpoint],
300
318
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
301
319
  )
302
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
320
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
303
321
  if g_param[OptionsDefine.Language]:
304
322
  profile.language = g_param[OptionsDefine.Language]
305
323
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
306
324
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
307
325
  client._sdkVersion += ("_CLI_" + __version__)
308
326
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
309
- model = models.DescribeBatchIpAccessControlRequest()
327
+ model = models.AddCustomWhiteRuleRequest()
310
328
  model.from_json_string(json.dumps(args))
311
329
  start_time = time.time()
312
330
  while True:
313
- rsp = client.DescribeBatchIpAccessControl(model)
331
+ rsp = client.AddCustomWhiteRule(model)
332
+ result = rsp.to_json_string()
333
+ try:
334
+ json_obj = json.loads(result)
335
+ except TypeError as e:
336
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
337
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
338
+ break
339
+ cur_time = time.time()
340
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
341
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
342
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
343
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
344
+ else:
345
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
346
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
347
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
348
+
349
+
350
+ def doDeleteOwaspWhiteRule(args, parsed_globals):
351
+ g_param = parse_global_arg(parsed_globals)
352
+
353
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
354
+ cred = credential.CVMRoleCredential()
355
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
356
+ cred = credential.STSAssumeRoleCredential(
357
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
358
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
359
+ )
360
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
361
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
362
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
363
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
364
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
365
+ else:
366
+ cred = credential.Credential(
367
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
368
+ )
369
+ http_profile = HttpProfile(
370
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
371
+ reqMethod="POST",
372
+ endpoint=g_param[OptionsDefine.Endpoint],
373
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
374
+ )
375
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
376
+ if g_param[OptionsDefine.Language]:
377
+ profile.language = g_param[OptionsDefine.Language]
378
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
379
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
380
+ client._sdkVersion += ("_CLI_" + __version__)
381
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
382
+ model = models.DeleteOwaspWhiteRuleRequest()
383
+ model.from_json_string(json.dumps(args))
384
+ start_time = time.time()
385
+ while True:
386
+ rsp = client.DeleteOwaspWhiteRule(model)
314
387
  result = rsp.to_json_string()
315
388
  try:
316
389
  json_obj = json.loads(result)
@@ -339,7 +412,10 @@ def doModifyCustomRule(args, parsed_globals):
339
412
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
340
413
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
341
414
  )
342
- 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):
415
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
416
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
417
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
418
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
343
419
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
344
420
  else:
345
421
  cred = credential.Credential(
@@ -351,7 +427,7 @@ def doModifyCustomRule(args, parsed_globals):
351
427
  endpoint=g_param[OptionsDefine.Endpoint],
352
428
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
353
429
  )
354
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
430
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
355
431
  if g_param[OptionsDefine.Language]:
356
432
  profile.language = g_param[OptionsDefine.Language]
357
433
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -391,7 +467,10 @@ def doDescribeFindDomainList(args, parsed_globals):
391
467
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
392
468
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
393
469
  )
394
- 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):
470
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
471
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
472
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
473
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
395
474
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
396
475
  else:
397
476
  cred = credential.Credential(
@@ -403,7 +482,7 @@ def doDescribeFindDomainList(args, parsed_globals):
403
482
  endpoint=g_param[OptionsDefine.Endpoint],
404
483
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
405
484
  )
406
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
485
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
407
486
  if g_param[OptionsDefine.Language]:
408
487
  profile.language = g_param[OptionsDefine.Language]
409
488
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -443,7 +522,10 @@ def doModifyInstanceQpsLimit(args, parsed_globals):
443
522
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
444
523
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
445
524
  )
446
- 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):
525
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
526
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
527
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
528
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
447
529
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
448
530
  else:
449
531
  cred = credential.Credential(
@@ -455,7 +537,7 @@ def doModifyInstanceQpsLimit(args, parsed_globals):
455
537
  endpoint=g_param[OptionsDefine.Endpoint],
456
538
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
457
539
  )
458
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
540
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
459
541
  if g_param[OptionsDefine.Language]:
460
542
  profile.language = g_param[OptionsDefine.Language]
461
543
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -495,7 +577,10 @@ def doDescribeSpartaProtectionInfo(args, parsed_globals):
495
577
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
496
578
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
497
579
  )
498
- 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):
580
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
581
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
582
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
583
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
499
584
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
500
585
  else:
501
586
  cred = credential.Credential(
@@ -507,7 +592,7 @@ def doDescribeSpartaProtectionInfo(args, parsed_globals):
507
592
  endpoint=g_param[OptionsDefine.Endpoint],
508
593
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
509
594
  )
510
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
595
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
511
596
  if g_param[OptionsDefine.Language]:
512
597
  profile.language = g_param[OptionsDefine.Language]
513
598
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -547,7 +632,10 @@ def doDeleteCustomWhiteRule(args, parsed_globals):
547
632
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
548
633
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
549
634
  )
550
- 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):
635
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
636
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
637
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
638
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
551
639
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
552
640
  else:
553
641
  cred = credential.Credential(
@@ -559,7 +647,7 @@ def doDeleteCustomWhiteRule(args, parsed_globals):
559
647
  endpoint=g_param[OptionsDefine.Endpoint],
560
648
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
561
649
  )
562
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
650
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
563
651
  if g_param[OptionsDefine.Language]:
564
652
  profile.language = g_param[OptionsDefine.Language]
565
653
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -599,7 +687,10 @@ def doAddCustomRule(args, parsed_globals):
599
687
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
600
688
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
601
689
  )
602
- 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):
690
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
691
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
692
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
693
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
603
694
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
604
695
  else:
605
696
  cred = credential.Credential(
@@ -611,7 +702,7 @@ def doAddCustomRule(args, parsed_globals):
611
702
  endpoint=g_param[OptionsDefine.Endpoint],
612
703
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
613
704
  )
614
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
705
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
615
706
  if g_param[OptionsDefine.Language]:
616
707
  profile.language = g_param[OptionsDefine.Language]
617
708
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -641,6 +732,61 @@ def doAddCustomRule(args, parsed_globals):
641
732
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
642
733
 
643
734
 
735
+ def doDeleteOwaspRuleStatus(args, parsed_globals):
736
+ g_param = parse_global_arg(parsed_globals)
737
+
738
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
739
+ cred = credential.CVMRoleCredential()
740
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
741
+ cred = credential.STSAssumeRoleCredential(
742
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
743
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
744
+ )
745
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
746
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
747
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
748
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
749
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
750
+ else:
751
+ cred = credential.Credential(
752
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
753
+ )
754
+ http_profile = HttpProfile(
755
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
756
+ reqMethod="POST",
757
+ endpoint=g_param[OptionsDefine.Endpoint],
758
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
759
+ )
760
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
761
+ if g_param[OptionsDefine.Language]:
762
+ profile.language = g_param[OptionsDefine.Language]
763
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
764
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
765
+ client._sdkVersion += ("_CLI_" + __version__)
766
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
767
+ model = models.DeleteOwaspRuleStatusRequest()
768
+ model.from_json_string(json.dumps(args))
769
+ start_time = time.time()
770
+ while True:
771
+ rsp = client.DeleteOwaspRuleStatus(model)
772
+ result = rsp.to_json_string()
773
+ try:
774
+ json_obj = json.loads(result)
775
+ except TypeError as e:
776
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
777
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
778
+ break
779
+ cur_time = time.time()
780
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
781
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
782
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
783
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
784
+ else:
785
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
786
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
787
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
788
+
789
+
644
790
  def doDeleteCustomRule(args, parsed_globals):
645
791
  g_param = parse_global_arg(parsed_globals)
646
792
 
@@ -651,7 +797,10 @@ def doDeleteCustomRule(args, parsed_globals):
651
797
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
652
798
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
653
799
  )
654
- 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):
800
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
801
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
802
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
803
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
655
804
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
656
805
  else:
657
806
  cred = credential.Credential(
@@ -663,7 +812,7 @@ def doDeleteCustomRule(args, parsed_globals):
663
812
  endpoint=g_param[OptionsDefine.Endpoint],
664
813
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
665
814
  )
666
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
815
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
667
816
  if g_param[OptionsDefine.Language]:
668
817
  profile.language = g_param[OptionsDefine.Language]
669
818
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -703,7 +852,10 @@ def doModifyAntiFakeUrl(args, parsed_globals):
703
852
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
704
853
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
705
854
  )
706
- 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):
855
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
856
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
857
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
858
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
707
859
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
708
860
  else:
709
861
  cred = credential.Credential(
@@ -715,7 +867,7 @@ def doModifyAntiFakeUrl(args, parsed_globals):
715
867
  endpoint=g_param[OptionsDefine.Endpoint],
716
868
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
717
869
  )
718
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
870
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
719
871
  if g_param[OptionsDefine.Language]:
720
872
  profile.language = g_param[OptionsDefine.Language]
721
873
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -745,7 +897,7 @@ def doModifyAntiFakeUrl(args, parsed_globals):
745
897
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
746
898
 
747
899
 
748
- def doModifySpartaProtection(args, parsed_globals):
900
+ def doDescribeAntiInfoLeakageRules(args, parsed_globals):
749
901
  g_param = parse_global_arg(parsed_globals)
750
902
 
751
903
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -755,7 +907,10 @@ def doModifySpartaProtection(args, parsed_globals):
755
907
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
756
908
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
757
909
  )
758
- 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):
910
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
911
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
912
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
913
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
759
914
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
760
915
  else:
761
916
  cred = credential.Credential(
@@ -767,18 +922,18 @@ def doModifySpartaProtection(args, parsed_globals):
767
922
  endpoint=g_param[OptionsDefine.Endpoint],
768
923
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
769
924
  )
770
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
925
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
771
926
  if g_param[OptionsDefine.Language]:
772
927
  profile.language = g_param[OptionsDefine.Language]
773
928
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
774
929
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
775
930
  client._sdkVersion += ("_CLI_" + __version__)
776
931
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
777
- model = models.ModifySpartaProtectionRequest()
932
+ model = models.DescribeAntiInfoLeakageRulesRequest()
778
933
  model.from_json_string(json.dumps(args))
779
934
  start_time = time.time()
780
935
  while True:
781
- rsp = client.ModifySpartaProtection(model)
936
+ rsp = client.DescribeAntiInfoLeakageRules(model)
782
937
  result = rsp.to_json_string()
783
938
  try:
784
939
  json_obj = json.loads(result)
@@ -807,7 +962,10 @@ def doModifyInstanceElasticMode(args, parsed_globals):
807
962
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
808
963
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
809
964
  )
810
- 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):
965
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
966
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
967
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
968
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
811
969
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
812
970
  else:
813
971
  cred = credential.Credential(
@@ -819,7 +977,7 @@ def doModifyInstanceElasticMode(args, parsed_globals):
819
977
  endpoint=g_param[OptionsDefine.Endpoint],
820
978
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
821
979
  )
822
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
980
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
823
981
  if g_param[OptionsDefine.Language]:
824
982
  profile.language = g_param[OptionsDefine.Language]
825
983
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -859,7 +1017,10 @@ def doDescribeUserDomainInfo(args, parsed_globals):
859
1017
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
860
1018
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
861
1019
  )
862
- 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):
1020
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1021
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1022
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1023
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
863
1024
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
864
1025
  else:
865
1026
  cred = credential.Credential(
@@ -871,7 +1032,7 @@ def doDescribeUserDomainInfo(args, parsed_globals):
871
1032
  endpoint=g_param[OptionsDefine.Endpoint],
872
1033
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
873
1034
  )
874
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1035
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
875
1036
  if g_param[OptionsDefine.Language]:
876
1037
  profile.language = g_param[OptionsDefine.Language]
877
1038
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -901,7 +1062,7 @@ def doDescribeUserDomainInfo(args, parsed_globals):
901
1062
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
902
1063
 
903
1064
 
904
- def doDeleteCCRule(args, parsed_globals):
1065
+ def doModifyOwaspRuleTypeLevel(args, parsed_globals):
905
1066
  g_param = parse_global_arg(parsed_globals)
906
1067
 
907
1068
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -911,7 +1072,10 @@ def doDeleteCCRule(args, parsed_globals):
911
1072
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
1073
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
913
1074
  )
914
- 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):
1075
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1076
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1077
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1078
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
915
1079
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
1080
  else:
917
1081
  cred = credential.Credential(
@@ -923,18 +1087,18 @@ def doDeleteCCRule(args, parsed_globals):
923
1087
  endpoint=g_param[OptionsDefine.Endpoint],
924
1088
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
1089
  )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1090
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
927
1091
  if g_param[OptionsDefine.Language]:
928
1092
  profile.language = g_param[OptionsDefine.Language]
929
1093
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
930
1094
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
931
1095
  client._sdkVersion += ("_CLI_" + __version__)
932
1096
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
933
- model = models.DeleteCCRuleRequest()
1097
+ model = models.ModifyOwaspRuleTypeLevelRequest()
934
1098
  model.from_json_string(json.dumps(args))
935
1099
  start_time = time.time()
936
1100
  while True:
937
- rsp = client.DeleteCCRule(model)
1101
+ rsp = client.ModifyOwaspRuleTypeLevel(model)
938
1102
  result = rsp.to_json_string()
939
1103
  try:
940
1104
  json_obj = json.loads(result)
@@ -953,7 +1117,7 @@ def doDeleteCCRule(args, parsed_globals):
953
1117
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
954
1118
 
955
1119
 
956
- def doDescribeAntiInfoLeakageRules(args, parsed_globals):
1120
+ def doModifySpartaProtection(args, parsed_globals):
957
1121
  g_param = parse_global_arg(parsed_globals)
958
1122
 
959
1123
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -963,7 +1127,10 @@ def doDescribeAntiInfoLeakageRules(args, parsed_globals):
963
1127
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
964
1128
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
965
1129
  )
966
- 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):
1130
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1131
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1132
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1133
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
967
1134
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
968
1135
  else:
969
1136
  cred = credential.Credential(
@@ -975,18 +1142,73 @@ def doDescribeAntiInfoLeakageRules(args, parsed_globals):
975
1142
  endpoint=g_param[OptionsDefine.Endpoint],
976
1143
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
977
1144
  )
978
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1145
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
979
1146
  if g_param[OptionsDefine.Language]:
980
1147
  profile.language = g_param[OptionsDefine.Language]
981
1148
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
982
1149
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
983
1150
  client._sdkVersion += ("_CLI_" + __version__)
984
1151
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
985
- model = models.DescribeAntiInfoLeakageRulesRequest()
1152
+ model = models.ModifySpartaProtectionRequest()
986
1153
  model.from_json_string(json.dumps(args))
987
1154
  start_time = time.time()
988
1155
  while True:
989
- rsp = client.DescribeAntiInfoLeakageRules(model)
1156
+ rsp = client.ModifySpartaProtection(model)
1157
+ result = rsp.to_json_string()
1158
+ try:
1159
+ json_obj = json.loads(result)
1160
+ except TypeError as e:
1161
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1162
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1163
+ break
1164
+ cur_time = time.time()
1165
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1166
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1167
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1168
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1169
+ else:
1170
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1171
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1172
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1173
+
1174
+
1175
+ def doDescribeOwaspRuleTypes(args, parsed_globals):
1176
+ g_param = parse_global_arg(parsed_globals)
1177
+
1178
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1179
+ cred = credential.CVMRoleCredential()
1180
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1181
+ cred = credential.STSAssumeRoleCredential(
1182
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1183
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1184
+ )
1185
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1186
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1187
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1188
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1189
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1190
+ else:
1191
+ cred = credential.Credential(
1192
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1193
+ )
1194
+ http_profile = HttpProfile(
1195
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1196
+ reqMethod="POST",
1197
+ endpoint=g_param[OptionsDefine.Endpoint],
1198
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1199
+ )
1200
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1201
+ if g_param[OptionsDefine.Language]:
1202
+ profile.language = g_param[OptionsDefine.Language]
1203
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1204
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1205
+ client._sdkVersion += ("_CLI_" + __version__)
1206
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1207
+ model = models.DescribeOwaspRuleTypesRequest()
1208
+ model.from_json_string(json.dumps(args))
1209
+ start_time = time.time()
1210
+ while True:
1211
+ rsp = client.DescribeOwaspRuleTypes(model)
990
1212
  result = rsp.to_json_string()
991
1213
  try:
992
1214
  json_obj = json.loads(result)
@@ -1015,7 +1237,10 @@ def doDescribeHistogram(args, parsed_globals):
1015
1237
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1016
1238
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1017
1239
  )
1018
- 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):
1240
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1241
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1242
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1243
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1019
1244
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1020
1245
  else:
1021
1246
  cred = credential.Credential(
@@ -1027,7 +1252,7 @@ def doDescribeHistogram(args, parsed_globals):
1027
1252
  endpoint=g_param[OptionsDefine.Endpoint],
1028
1253
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1029
1254
  )
1030
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1255
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1031
1256
  if g_param[OptionsDefine.Language]:
1032
1257
  profile.language = g_param[OptionsDefine.Language]
1033
1258
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1067,7 +1292,10 @@ def doDescribeWebshellStatus(args, parsed_globals):
1067
1292
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1068
1293
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1069
1294
  )
1070
- 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):
1295
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1296
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1297
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1298
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1071
1299
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1072
1300
  else:
1073
1301
  cred = credential.Credential(
@@ -1079,7 +1307,7 @@ def doDescribeWebshellStatus(args, parsed_globals):
1079
1307
  endpoint=g_param[OptionsDefine.Endpoint],
1080
1308
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1081
1309
  )
1082
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1310
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1083
1311
  if g_param[OptionsDefine.Language]:
1084
1312
  profile.language = g_param[OptionsDefine.Language]
1085
1313
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1119,7 +1347,10 @@ def doDeleteAntiInfoLeakRule(args, parsed_globals):
1119
1347
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1120
1348
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1121
1349
  )
1122
- 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):
1350
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1351
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1352
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1353
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1123
1354
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1124
1355
  else:
1125
1356
  cred = credential.Credential(
@@ -1131,7 +1362,7 @@ def doDeleteAntiInfoLeakRule(args, parsed_globals):
1131
1362
  endpoint=g_param[OptionsDefine.Endpoint],
1132
1363
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1133
1364
  )
1134
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1365
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1135
1366
  if g_param[OptionsDefine.Language]:
1136
1367
  profile.language = g_param[OptionsDefine.Language]
1137
1368
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1161,6 +1392,116 @@ def doDeleteAntiInfoLeakRule(args, parsed_globals):
1161
1392
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1162
1393
 
1163
1394
 
1395
+ def doCreateOwaspWhiteRule(args, parsed_globals):
1396
+ g_param = parse_global_arg(parsed_globals)
1397
+
1398
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1399
+ cred = credential.CVMRoleCredential()
1400
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1401
+ cred = credential.STSAssumeRoleCredential(
1402
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1403
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1404
+ )
1405
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1406
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1407
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1408
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1409
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1410
+ else:
1411
+ cred = credential.Credential(
1412
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1413
+ )
1414
+ http_profile = HttpProfile(
1415
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1416
+ reqMethod="POST",
1417
+ endpoint=g_param[OptionsDefine.Endpoint],
1418
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1419
+ )
1420
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1421
+ if g_param[OptionsDefine.Language]:
1422
+ profile.language = g_param[OptionsDefine.Language]
1423
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1424
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1425
+ client._sdkVersion += ("_CLI_" + __version__)
1426
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1427
+ model = models.CreateOwaspWhiteRuleRequest()
1428
+ model.from_json_string(json.dumps(args))
1429
+ start_time = time.time()
1430
+ while True:
1431
+ rsp = client.CreateOwaspWhiteRule(model)
1432
+ result = rsp.to_json_string()
1433
+ try:
1434
+ json_obj = json.loads(result)
1435
+ except TypeError as e:
1436
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1437
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1438
+ break
1439
+ cur_time = time.time()
1440
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1441
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1442
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1443
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1444
+ else:
1445
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1446
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1447
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1448
+
1449
+
1450
+ def doModifyOwaspRuleStatus(args, parsed_globals):
1451
+ g_param = parse_global_arg(parsed_globals)
1452
+
1453
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1454
+ cred = credential.CVMRoleCredential()
1455
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1456
+ cred = credential.STSAssumeRoleCredential(
1457
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1458
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1459
+ )
1460
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1461
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1462
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1463
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1464
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1465
+ else:
1466
+ cred = credential.Credential(
1467
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1468
+ )
1469
+ http_profile = HttpProfile(
1470
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1471
+ reqMethod="POST",
1472
+ endpoint=g_param[OptionsDefine.Endpoint],
1473
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1474
+ )
1475
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1476
+ if g_param[OptionsDefine.Language]:
1477
+ profile.language = g_param[OptionsDefine.Language]
1478
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1479
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1480
+ client._sdkVersion += ("_CLI_" + __version__)
1481
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1482
+ model = models.ModifyOwaspRuleStatusRequest()
1483
+ model.from_json_string(json.dumps(args))
1484
+ start_time = time.time()
1485
+ while True:
1486
+ rsp = client.ModifyOwaspRuleStatus(model)
1487
+ result = rsp.to_json_string()
1488
+ try:
1489
+ json_obj = json.loads(result)
1490
+ except TypeError as e:
1491
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1492
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1493
+ break
1494
+ cur_time = time.time()
1495
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1496
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1497
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1498
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1499
+ else:
1500
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1501
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1502
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1503
+
1504
+
1164
1505
  def doCreateDeals(args, parsed_globals):
1165
1506
  g_param = parse_global_arg(parsed_globals)
1166
1507
 
@@ -1171,7 +1512,10 @@ def doCreateDeals(args, parsed_globals):
1171
1512
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1172
1513
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1173
1514
  )
1174
- 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):
1515
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1516
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1517
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1518
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1175
1519
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1176
1520
  else:
1177
1521
  cred = credential.Credential(
@@ -1183,7 +1527,7 @@ def doCreateDeals(args, parsed_globals):
1183
1527
  endpoint=g_param[OptionsDefine.Endpoint],
1184
1528
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1185
1529
  )
1186
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1530
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1187
1531
  if g_param[OptionsDefine.Language]:
1188
1532
  profile.language = g_param[OptionsDefine.Language]
1189
1533
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1223,7 +1567,10 @@ def doDescribeRuleLimit(args, parsed_globals):
1223
1567
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1224
1568
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1225
1569
  )
1226
- 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):
1570
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1571
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1572
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1573
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1227
1574
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1228
1575
  else:
1229
1576
  cred = credential.Credential(
@@ -1235,7 +1582,7 @@ def doDescribeRuleLimit(args, parsed_globals):
1235
1582
  endpoint=g_param[OptionsDefine.Endpoint],
1236
1583
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1237
1584
  )
1238
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1585
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1239
1586
  if g_param[OptionsDefine.Language]:
1240
1587
  profile.language = g_param[OptionsDefine.Language]
1241
1588
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1265,7 +1612,7 @@ def doDescribeRuleLimit(args, parsed_globals):
1265
1612
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1266
1613
 
1267
1614
 
1268
- def doAddAntiInfoLeakRules(args, parsed_globals):
1615
+ def doDescribeDomains(args, parsed_globals):
1269
1616
  g_param = parse_global_arg(parsed_globals)
1270
1617
 
1271
1618
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1275,7 +1622,10 @@ def doAddAntiInfoLeakRules(args, parsed_globals):
1275
1622
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1276
1623
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1277
1624
  )
1278
- 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):
1625
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1626
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1627
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1628
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1279
1629
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1280
1630
  else:
1281
1631
  cred = credential.Credential(
@@ -1287,18 +1637,18 @@ def doAddAntiInfoLeakRules(args, parsed_globals):
1287
1637
  endpoint=g_param[OptionsDefine.Endpoint],
1288
1638
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1289
1639
  )
1290
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1640
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1291
1641
  if g_param[OptionsDefine.Language]:
1292
1642
  profile.language = g_param[OptionsDefine.Language]
1293
1643
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1294
1644
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1295
1645
  client._sdkVersion += ("_CLI_" + __version__)
1296
1646
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1297
- model = models.AddAntiInfoLeakRulesRequest()
1647
+ model = models.DescribeDomainsRequest()
1298
1648
  model.from_json_string(json.dumps(args))
1299
1649
  start_time = time.time()
1300
1650
  while True:
1301
- rsp = client.AddAntiInfoLeakRules(model)
1651
+ rsp = client.DescribeDomains(model)
1302
1652
  result = rsp.to_json_string()
1303
1653
  try:
1304
1654
  json_obj = json.loads(result)
@@ -1327,7 +1677,10 @@ def doModifyHostStatus(args, parsed_globals):
1327
1677
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1328
1678
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1329
1679
  )
1330
- 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):
1680
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1681
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1682
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1683
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1331
1684
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1332
1685
  else:
1333
1686
  cred = credential.Credential(
@@ -1339,7 +1692,7 @@ def doModifyHostStatus(args, parsed_globals):
1339
1692
  endpoint=g_param[OptionsDefine.Endpoint],
1340
1693
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1341
1694
  )
1342
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1695
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1343
1696
  if g_param[OptionsDefine.Language]:
1344
1697
  profile.language = g_param[OptionsDefine.Language]
1345
1698
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1379,7 +1732,10 @@ def doDescribeModuleStatus(args, parsed_globals):
1379
1732
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1380
1733
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1381
1734
  )
1382
- 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):
1735
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1736
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1737
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1738
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1383
1739
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1384
1740
  else:
1385
1741
  cred = credential.Credential(
@@ -1391,7 +1747,7 @@ def doDescribeModuleStatus(args, parsed_globals):
1391
1747
  endpoint=g_param[OptionsDefine.Endpoint],
1392
1748
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1393
1749
  )
1394
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1750
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1395
1751
  if g_param[OptionsDefine.Language]:
1396
1752
  profile.language = g_param[OptionsDefine.Language]
1397
1753
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1431,7 +1787,10 @@ def doModifyAntiFakeUrlStatus(args, parsed_globals):
1431
1787
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1432
1788
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1433
1789
  )
1434
- 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):
1790
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1791
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1792
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1793
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1435
1794
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1436
1795
  else:
1437
1796
  cred = credential.Credential(
@@ -1443,7 +1802,7 @@ def doModifyAntiFakeUrlStatus(args, parsed_globals):
1443
1802
  endpoint=g_param[OptionsDefine.Endpoint],
1444
1803
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1445
1804
  )
1446
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1805
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1447
1806
  if g_param[OptionsDefine.Language]:
1448
1807
  profile.language = g_param[OptionsDefine.Language]
1449
1808
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1483,7 +1842,10 @@ def doDescribeVipInfo(args, parsed_globals):
1483
1842
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1484
1843
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1485
1844
  )
1486
- 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):
1845
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1846
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1847
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1848
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1487
1849
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1488
1850
  else:
1489
1851
  cred = credential.Credential(
@@ -1495,7 +1857,7 @@ def doDescribeVipInfo(args, parsed_globals):
1495
1857
  endpoint=g_param[OptionsDefine.Endpoint],
1496
1858
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1497
1859
  )
1498
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1860
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1499
1861
  if g_param[OptionsDefine.Language]:
1500
1862
  profile.language = g_param[OptionsDefine.Language]
1501
1863
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1535,7 +1897,10 @@ def doDeleteHost(args, parsed_globals):
1535
1897
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1536
1898
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1537
1899
  )
1538
- 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):
1900
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1901
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1902
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1903
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1539
1904
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1540
1905
  else:
1541
1906
  cred = credential.Credential(
@@ -1547,7 +1912,7 @@ def doDeleteHost(args, parsed_globals):
1547
1912
  endpoint=g_param[OptionsDefine.Endpoint],
1548
1913
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1549
1914
  )
1550
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1915
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1551
1916
  if g_param[OptionsDefine.Language]:
1552
1917
  profile.language = g_param[OptionsDefine.Language]
1553
1918
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1587,7 +1952,10 @@ def doDescribePeakPoints(args, parsed_globals):
1587
1952
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1588
1953
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1589
1954
  )
1590
- 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):
1955
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1956
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1957
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1958
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1591
1959
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1592
1960
  else:
1593
1961
  cred = credential.Credential(
@@ -1599,7 +1967,7 @@ def doDescribePeakPoints(args, parsed_globals):
1599
1967
  endpoint=g_param[OptionsDefine.Endpoint],
1600
1968
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1601
1969
  )
1602
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1970
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1603
1971
  if g_param[OptionsDefine.Language]:
1604
1972
  profile.language = g_param[OptionsDefine.Language]
1605
1973
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1639,7 +2007,10 @@ def doModifyCustomWhiteRule(args, parsed_globals):
1639
2007
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1640
2008
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1641
2009
  )
1642
- 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):
2010
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2011
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2012
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2013
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1643
2014
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1644
2015
  else:
1645
2016
  cred = credential.Credential(
@@ -1651,7 +2022,7 @@ def doModifyCustomWhiteRule(args, parsed_globals):
1651
2022
  endpoint=g_param[OptionsDefine.Endpoint],
1652
2023
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1653
2024
  )
1654
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2025
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1655
2026
  if g_param[OptionsDefine.Language]:
1656
2027
  profile.language = g_param[OptionsDefine.Language]
1657
2028
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1662,7 +2033,117 @@ def doModifyCustomWhiteRule(args, parsed_globals):
1662
2033
  model.from_json_string(json.dumps(args))
1663
2034
  start_time = time.time()
1664
2035
  while True:
1665
- rsp = client.ModifyCustomWhiteRule(model)
2036
+ rsp = client.ModifyCustomWhiteRule(model)
2037
+ result = rsp.to_json_string()
2038
+ try:
2039
+ json_obj = json.loads(result)
2040
+ except TypeError as e:
2041
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
2042
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
2043
+ break
2044
+ cur_time = time.time()
2045
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
2046
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
2047
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
2048
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
2049
+ else:
2050
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
2051
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
2052
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2053
+
2054
+
2055
+ def doDescribeCertificateVerifyResult(args, parsed_globals):
2056
+ g_param = parse_global_arg(parsed_globals)
2057
+
2058
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
2059
+ cred = credential.CVMRoleCredential()
2060
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
2061
+ cred = credential.STSAssumeRoleCredential(
2062
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2063
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2064
+ )
2065
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2066
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2067
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2068
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2069
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2070
+ else:
2071
+ cred = credential.Credential(
2072
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
2073
+ )
2074
+ http_profile = HttpProfile(
2075
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
2076
+ reqMethod="POST",
2077
+ endpoint=g_param[OptionsDefine.Endpoint],
2078
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2079
+ )
2080
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2081
+ if g_param[OptionsDefine.Language]:
2082
+ profile.language = g_param[OptionsDefine.Language]
2083
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2084
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
2085
+ client._sdkVersion += ("_CLI_" + __version__)
2086
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
2087
+ model = models.DescribeCertificateVerifyResultRequest()
2088
+ model.from_json_string(json.dumps(args))
2089
+ start_time = time.time()
2090
+ while True:
2091
+ rsp = client.DescribeCertificateVerifyResult(model)
2092
+ result = rsp.to_json_string()
2093
+ try:
2094
+ json_obj = json.loads(result)
2095
+ except TypeError as e:
2096
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
2097
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
2098
+ break
2099
+ cur_time = time.time()
2100
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
2101
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
2102
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
2103
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
2104
+ else:
2105
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
2106
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
2107
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2108
+
2109
+
2110
+ def doDeleteIpAccessControlV2(args, parsed_globals):
2111
+ g_param = parse_global_arg(parsed_globals)
2112
+
2113
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
2114
+ cred = credential.CVMRoleCredential()
2115
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
2116
+ cred = credential.STSAssumeRoleCredential(
2117
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2118
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2119
+ )
2120
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2121
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2122
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2123
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2124
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2125
+ else:
2126
+ cred = credential.Credential(
2127
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
2128
+ )
2129
+ http_profile = HttpProfile(
2130
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
2131
+ reqMethod="POST",
2132
+ endpoint=g_param[OptionsDefine.Endpoint],
2133
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2134
+ )
2135
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2136
+ if g_param[OptionsDefine.Language]:
2137
+ profile.language = g_param[OptionsDefine.Language]
2138
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2139
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
2140
+ client._sdkVersion += ("_CLI_" + __version__)
2141
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
2142
+ model = models.DeleteIpAccessControlV2Request()
2143
+ model.from_json_string(json.dumps(args))
2144
+ start_time = time.time()
2145
+ while True:
2146
+ rsp = client.DeleteIpAccessControlV2(model)
1666
2147
  result = rsp.to_json_string()
1667
2148
  try:
1668
2149
  json_obj = json.loads(result)
@@ -1681,7 +2162,7 @@ def doModifyCustomWhiteRule(args, parsed_globals):
1681
2162
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1682
2163
 
1683
2164
 
1684
- def doDescribeCertificateVerifyResult(args, parsed_globals):
2165
+ def doSwitchElasticMode(args, parsed_globals):
1685
2166
  g_param = parse_global_arg(parsed_globals)
1686
2167
 
1687
2168
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1691,7 +2172,10 @@ def doDescribeCertificateVerifyResult(args, parsed_globals):
1691
2172
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1692
2173
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1693
2174
  )
1694
- 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):
2175
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2176
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2177
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2178
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1695
2179
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1696
2180
  else:
1697
2181
  cred = credential.Credential(
@@ -1703,18 +2187,18 @@ def doDescribeCertificateVerifyResult(args, parsed_globals):
1703
2187
  endpoint=g_param[OptionsDefine.Endpoint],
1704
2188
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1705
2189
  )
1706
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2190
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1707
2191
  if g_param[OptionsDefine.Language]:
1708
2192
  profile.language = g_param[OptionsDefine.Language]
1709
2193
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1710
2194
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1711
2195
  client._sdkVersion += ("_CLI_" + __version__)
1712
2196
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1713
- model = models.DescribeCertificateVerifyResultRequest()
2197
+ model = models.SwitchElasticModeRequest()
1714
2198
  model.from_json_string(json.dumps(args))
1715
2199
  start_time = time.time()
1716
2200
  while True:
1717
- rsp = client.DescribeCertificateVerifyResult(model)
2201
+ rsp = client.SwitchElasticMode(model)
1718
2202
  result = rsp.to_json_string()
1719
2203
  try:
1720
2204
  json_obj = json.loads(result)
@@ -1733,7 +2217,7 @@ def doDescribeCertificateVerifyResult(args, parsed_globals):
1733
2217
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1734
2218
 
1735
2219
 
1736
- def doDeleteIpAccessControlV2(args, parsed_globals):
2220
+ def doModifyInstanceRenewFlag(args, parsed_globals):
1737
2221
  g_param = parse_global_arg(parsed_globals)
1738
2222
 
1739
2223
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1743,7 +2227,10 @@ def doDeleteIpAccessControlV2(args, parsed_globals):
1743
2227
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1744
2228
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1745
2229
  )
1746
- 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):
2230
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2231
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2232
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2233
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1747
2234
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1748
2235
  else:
1749
2236
  cred = credential.Credential(
@@ -1755,18 +2242,18 @@ def doDeleteIpAccessControlV2(args, parsed_globals):
1755
2242
  endpoint=g_param[OptionsDefine.Endpoint],
1756
2243
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1757
2244
  )
1758
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2245
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1759
2246
  if g_param[OptionsDefine.Language]:
1760
2247
  profile.language = g_param[OptionsDefine.Language]
1761
2248
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1762
2249
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1763
2250
  client._sdkVersion += ("_CLI_" + __version__)
1764
2251
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1765
- model = models.DeleteIpAccessControlV2Request()
2252
+ model = models.ModifyInstanceRenewFlagRequest()
1766
2253
  model.from_json_string(json.dumps(args))
1767
2254
  start_time = time.time()
1768
2255
  while True:
1769
- rsp = client.DeleteIpAccessControlV2(model)
2256
+ rsp = client.ModifyInstanceRenewFlag(model)
1770
2257
  result = rsp.to_json_string()
1771
2258
  try:
1772
2259
  json_obj = json.loads(result)
@@ -1785,7 +2272,7 @@ def doDeleteIpAccessControlV2(args, parsed_globals):
1785
2272
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1786
2273
 
1787
2274
 
1788
- def doSwitchElasticMode(args, parsed_globals):
2275
+ def doDescribeUserLevel(args, parsed_globals):
1789
2276
  g_param = parse_global_arg(parsed_globals)
1790
2277
 
1791
2278
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1795,7 +2282,10 @@ def doSwitchElasticMode(args, parsed_globals):
1795
2282
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1796
2283
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1797
2284
  )
1798
- 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):
2285
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2286
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2287
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2288
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1799
2289
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1800
2290
  else:
1801
2291
  cred = credential.Credential(
@@ -1807,18 +2297,18 @@ def doSwitchElasticMode(args, parsed_globals):
1807
2297
  endpoint=g_param[OptionsDefine.Endpoint],
1808
2298
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1809
2299
  )
1810
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2300
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1811
2301
  if g_param[OptionsDefine.Language]:
1812
2302
  profile.language = g_param[OptionsDefine.Language]
1813
2303
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1814
2304
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1815
2305
  client._sdkVersion += ("_CLI_" + __version__)
1816
2306
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1817
- model = models.SwitchElasticModeRequest()
2307
+ model = models.DescribeUserLevelRequest()
1818
2308
  model.from_json_string(json.dumps(args))
1819
2309
  start_time = time.time()
1820
2310
  while True:
1821
- rsp = client.SwitchElasticMode(model)
2311
+ rsp = client.DescribeUserLevel(model)
1822
2312
  result = rsp.to_json_string()
1823
2313
  try:
1824
2314
  json_obj = json.loads(result)
@@ -1837,7 +2327,7 @@ def doSwitchElasticMode(args, parsed_globals):
1837
2327
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1838
2328
 
1839
2329
 
1840
- def doModifyInstanceRenewFlag(args, parsed_globals):
2330
+ def doDescribeCCRule(args, parsed_globals):
1841
2331
  g_param = parse_global_arg(parsed_globals)
1842
2332
 
1843
2333
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1847,7 +2337,10 @@ def doModifyInstanceRenewFlag(args, parsed_globals):
1847
2337
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1848
2338
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1849
2339
  )
1850
- 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):
2340
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2341
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2342
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2343
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1851
2344
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1852
2345
  else:
1853
2346
  cred = credential.Credential(
@@ -1859,18 +2352,18 @@ def doModifyInstanceRenewFlag(args, parsed_globals):
1859
2352
  endpoint=g_param[OptionsDefine.Endpoint],
1860
2353
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1861
2354
  )
1862
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2355
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1863
2356
  if g_param[OptionsDefine.Language]:
1864
2357
  profile.language = g_param[OptionsDefine.Language]
1865
2358
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1866
2359
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1867
2360
  client._sdkVersion += ("_CLI_" + __version__)
1868
2361
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1869
- model = models.ModifyInstanceRenewFlagRequest()
2362
+ model = models.DescribeCCRuleRequest()
1870
2363
  model.from_json_string(json.dumps(args))
1871
2364
  start_time = time.time()
1872
2365
  while True:
1873
- rsp = client.ModifyInstanceRenewFlag(model)
2366
+ rsp = client.DescribeCCRule(model)
1874
2367
  result = rsp.to_json_string()
1875
2368
  try:
1876
2369
  json_obj = json.loads(result)
@@ -1889,7 +2382,7 @@ def doModifyInstanceRenewFlag(args, parsed_globals):
1889
2382
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1890
2383
 
1891
2384
 
1892
- def doDescribeUserLevel(args, parsed_globals):
2385
+ def doModifyOwaspRuleTypeAction(args, parsed_globals):
1893
2386
  g_param = parse_global_arg(parsed_globals)
1894
2387
 
1895
2388
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1899,7 +2392,10 @@ def doDescribeUserLevel(args, parsed_globals):
1899
2392
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1900
2393
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1901
2394
  )
1902
- 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):
2395
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2396
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2397
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2398
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1903
2399
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1904
2400
  else:
1905
2401
  cred = credential.Credential(
@@ -1911,18 +2407,18 @@ def doDescribeUserLevel(args, parsed_globals):
1911
2407
  endpoint=g_param[OptionsDefine.Endpoint],
1912
2408
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1913
2409
  )
1914
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2410
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1915
2411
  if g_param[OptionsDefine.Language]:
1916
2412
  profile.language = g_param[OptionsDefine.Language]
1917
2413
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1918
2414
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1919
2415
  client._sdkVersion += ("_CLI_" + __version__)
1920
2416
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1921
- model = models.DescribeUserLevelRequest()
2417
+ model = models.ModifyOwaspRuleTypeActionRequest()
1922
2418
  model.from_json_string(json.dumps(args))
1923
2419
  start_time = time.time()
1924
2420
  while True:
1925
- rsp = client.DescribeUserLevel(model)
2421
+ rsp = client.ModifyOwaspRuleTypeAction(model)
1926
2422
  result = rsp.to_json_string()
1927
2423
  try:
1928
2424
  json_obj = json.loads(result)
@@ -1941,7 +2437,7 @@ def doDescribeUserLevel(args, parsed_globals):
1941
2437
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1942
2438
 
1943
2439
 
1944
- def doDescribeCCRule(args, parsed_globals):
2440
+ def doDescribeCustomRuleList(args, parsed_globals):
1945
2441
  g_param = parse_global_arg(parsed_globals)
1946
2442
 
1947
2443
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1951,7 +2447,10 @@ def doDescribeCCRule(args, parsed_globals):
1951
2447
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1952
2448
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1953
2449
  )
1954
- 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):
2450
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2451
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2452
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2453
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1955
2454
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1956
2455
  else:
1957
2456
  cred = credential.Credential(
@@ -1963,18 +2462,18 @@ def doDescribeCCRule(args, parsed_globals):
1963
2462
  endpoint=g_param[OptionsDefine.Endpoint],
1964
2463
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1965
2464
  )
1966
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2465
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1967
2466
  if g_param[OptionsDefine.Language]:
1968
2467
  profile.language = g_param[OptionsDefine.Language]
1969
2468
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1970
2469
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
1971
2470
  client._sdkVersion += ("_CLI_" + __version__)
1972
2471
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1973
- model = models.DescribeCCRuleRequest()
2472
+ model = models.DescribeCustomRuleListRequest()
1974
2473
  model.from_json_string(json.dumps(args))
1975
2474
  start_time = time.time()
1976
2475
  while True:
1977
- rsp = client.DescribeCCRule(model)
2476
+ rsp = client.DescribeCustomRuleList(model)
1978
2477
  result = rsp.to_json_string()
1979
2478
  try:
1980
2479
  json_obj = json.loads(result)
@@ -1993,7 +2492,7 @@ def doDescribeCCRule(args, parsed_globals):
1993
2492
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1994
2493
 
1995
2494
 
1996
- def doDescribeCustomRuleList(args, parsed_globals):
2495
+ def doDescribeAttackOverview(args, parsed_globals):
1997
2496
  g_param = parse_global_arg(parsed_globals)
1998
2497
 
1999
2498
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2003,7 +2502,10 @@ def doDescribeCustomRuleList(args, parsed_globals):
2003
2502
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2004
2503
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2005
2504
  )
2006
- 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):
2505
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2506
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2507
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2508
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2007
2509
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2008
2510
  else:
2009
2511
  cred = credential.Credential(
@@ -2015,18 +2517,18 @@ def doDescribeCustomRuleList(args, parsed_globals):
2015
2517
  endpoint=g_param[OptionsDefine.Endpoint],
2016
2518
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2017
2519
  )
2018
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2520
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2019
2521
  if g_param[OptionsDefine.Language]:
2020
2522
  profile.language = g_param[OptionsDefine.Language]
2021
2523
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2022
2524
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
2023
2525
  client._sdkVersion += ("_CLI_" + __version__)
2024
2526
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
2025
- model = models.DescribeCustomRuleListRequest()
2527
+ model = models.DescribeAttackOverviewRequest()
2026
2528
  model.from_json_string(json.dumps(args))
2027
2529
  start_time = time.time()
2028
2530
  while True:
2029
- rsp = client.DescribeCustomRuleList(model)
2531
+ rsp = client.DescribeAttackOverview(model)
2030
2532
  result = rsp.to_json_string()
2031
2533
  try:
2032
2534
  json_obj = json.loads(result)
@@ -2045,7 +2547,7 @@ def doDescribeCustomRuleList(args, parsed_globals):
2045
2547
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2046
2548
 
2047
2549
 
2048
- def doDescribeAttackOverview(args, parsed_globals):
2550
+ def doModifyOwaspWhiteRule(args, parsed_globals):
2049
2551
  g_param = parse_global_arg(parsed_globals)
2050
2552
 
2051
2553
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2055,7 +2557,10 @@ def doDescribeAttackOverview(args, parsed_globals):
2055
2557
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2056
2558
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2057
2559
  )
2058
- 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):
2560
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2561
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2562
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2563
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2059
2564
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2060
2565
  else:
2061
2566
  cred = credential.Credential(
@@ -2067,18 +2572,18 @@ def doDescribeAttackOverview(args, parsed_globals):
2067
2572
  endpoint=g_param[OptionsDefine.Endpoint],
2068
2573
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2069
2574
  )
2070
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2575
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2071
2576
  if g_param[OptionsDefine.Language]:
2072
2577
  profile.language = g_param[OptionsDefine.Language]
2073
2578
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2074
2579
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
2075
2580
  client._sdkVersion += ("_CLI_" + __version__)
2076
2581
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
2077
- model = models.DescribeAttackOverviewRequest()
2582
+ model = models.ModifyOwaspWhiteRuleRequest()
2078
2583
  model.from_json_string(json.dumps(args))
2079
2584
  start_time = time.time()
2080
2585
  while True:
2081
- rsp = client.DescribeAttackOverview(model)
2586
+ rsp = client.ModifyOwaspWhiteRule(model)
2082
2587
  result = rsp.to_json_string()
2083
2588
  try:
2084
2589
  json_obj = json.loads(result)
@@ -2107,7 +2612,10 @@ def doDescribeHosts(args, parsed_globals):
2107
2612
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2108
2613
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2109
2614
  )
2110
- 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):
2615
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2616
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2617
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2618
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2111
2619
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2112
2620
  else:
2113
2621
  cred = credential.Credential(
@@ -2119,7 +2627,7 @@ def doDescribeHosts(args, parsed_globals):
2119
2627
  endpoint=g_param[OptionsDefine.Endpoint],
2120
2628
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2121
2629
  )
2122
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2630
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2123
2631
  if g_param[OptionsDefine.Language]:
2124
2632
  profile.language = g_param[OptionsDefine.Language]
2125
2633
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2159,7 +2667,10 @@ def doAddSpartaProtection(args, parsed_globals):
2159
2667
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2160
2668
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2161
2669
  )
2162
- 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):
2670
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2671
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2672
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2673
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2163
2674
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2164
2675
  else:
2165
2676
  cred = credential.Credential(
@@ -2171,7 +2682,7 @@ def doAddSpartaProtection(args, parsed_globals):
2171
2682
  endpoint=g_param[OptionsDefine.Endpoint],
2172
2683
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2173
2684
  )
2174
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2685
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2175
2686
  if g_param[OptionsDefine.Language]:
2176
2687
  profile.language = g_param[OptionsDefine.Language]
2177
2688
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2211,7 +2722,10 @@ def doDescribePolicyStatus(args, parsed_globals):
2211
2722
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2212
2723
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2213
2724
  )
2214
- 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):
2725
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2726
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2727
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2728
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2215
2729
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2216
2730
  else:
2217
2731
  cred = credential.Credential(
@@ -2223,7 +2737,7 @@ def doDescribePolicyStatus(args, parsed_globals):
2223
2737
  endpoint=g_param[OptionsDefine.Endpoint],
2224
2738
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2225
2739
  )
2226
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2740
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2227
2741
  if g_param[OptionsDefine.Language]:
2228
2742
  profile.language = g_param[OptionsDefine.Language]
2229
2743
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2263,7 +2777,10 @@ def doDescribeSession(args, parsed_globals):
2263
2777
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2264
2778
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2265
2779
  )
2266
- 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):
2780
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2781
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2782
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2783
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2267
2784
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2268
2785
  else:
2269
2786
  cred = credential.Credential(
@@ -2275,7 +2792,7 @@ def doDescribeSession(args, parsed_globals):
2275
2792
  endpoint=g_param[OptionsDefine.Endpoint],
2276
2793
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2277
2794
  )
2278
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2795
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2279
2796
  if g_param[OptionsDefine.Language]:
2280
2797
  profile.language = g_param[OptionsDefine.Language]
2281
2798
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2315,7 +2832,10 @@ def doDescribeTopAttackDomain(args, parsed_globals):
2315
2832
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2316
2833
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2317
2834
  )
2318
- 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):
2835
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2836
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2837
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2838
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2319
2839
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2320
2840
  else:
2321
2841
  cred = credential.Credential(
@@ -2327,7 +2847,7 @@ def doDescribeTopAttackDomain(args, parsed_globals):
2327
2847
  endpoint=g_param[OptionsDefine.Endpoint],
2328
2848
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2329
2849
  )
2330
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2850
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2331
2851
  if g_param[OptionsDefine.Language]:
2332
2852
  profile.language = g_param[OptionsDefine.Language]
2333
2853
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2367,7 +2887,10 @@ def doModifyHost(args, parsed_globals):
2367
2887
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2368
2888
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2369
2889
  )
2370
- 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):
2890
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2891
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2892
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2893
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2371
2894
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2372
2895
  else:
2373
2896
  cred = credential.Credential(
@@ -2379,7 +2902,7 @@ def doModifyHost(args, parsed_globals):
2379
2902
  endpoint=g_param[OptionsDefine.Endpoint],
2380
2903
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2381
2904
  )
2382
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2905
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2383
2906
  if g_param[OptionsDefine.Language]:
2384
2907
  profile.language = g_param[OptionsDefine.Language]
2385
2908
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2419,7 +2942,10 @@ def doDescribeTlsVersion(args, parsed_globals):
2419
2942
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2420
2943
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2421
2944
  )
2422
- 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):
2945
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2946
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2947
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2948
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2423
2949
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2424
2950
  else:
2425
2951
  cred = credential.Credential(
@@ -2431,7 +2957,7 @@ def doDescribeTlsVersion(args, parsed_globals):
2431
2957
  endpoint=g_param[OptionsDefine.Endpoint],
2432
2958
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2433
2959
  )
2434
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2960
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2435
2961
  if g_param[OptionsDefine.Language]:
2436
2962
  profile.language = g_param[OptionsDefine.Language]
2437
2963
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2471,7 +2997,10 @@ def doModifyProtectionStatus(args, parsed_globals):
2471
2997
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2472
2998
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2473
2999
  )
2474
- 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):
3000
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3001
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3002
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3003
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2475
3004
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2476
3005
  else:
2477
3006
  cred = credential.Credential(
@@ -2483,7 +3012,7 @@ def doModifyProtectionStatus(args, parsed_globals):
2483
3012
  endpoint=g_param[OptionsDefine.Endpoint],
2484
3013
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2485
3014
  )
2486
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3015
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2487
3016
  if g_param[OptionsDefine.Language]:
2488
3017
  profile.language = g_param[OptionsDefine.Language]
2489
3018
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2523,7 +3052,10 @@ def doDescribeCiphersDetail(args, parsed_globals):
2523
3052
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2524
3053
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2525
3054
  )
2526
- 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):
3055
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3056
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3057
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3058
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2527
3059
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2528
3060
  else:
2529
3061
  cred = credential.Credential(
@@ -2535,7 +3067,7 @@ def doDescribeCiphersDetail(args, parsed_globals):
2535
3067
  endpoint=g_param[OptionsDefine.Endpoint],
2536
3068
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2537
3069
  )
2538
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3070
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2539
3071
  if g_param[OptionsDefine.Language]:
2540
3072
  profile.language = g_param[OptionsDefine.Language]
2541
3073
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2565,6 +3097,61 @@ def doDescribeCiphersDetail(args, parsed_globals):
2565
3097
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2566
3098
 
2567
3099
 
3100
+ def doDescribeOwaspWhiteRules(args, parsed_globals):
3101
+ g_param = parse_global_arg(parsed_globals)
3102
+
3103
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
3104
+ cred = credential.CVMRoleCredential()
3105
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
3106
+ cred = credential.STSAssumeRoleCredential(
3107
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3108
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3109
+ )
3110
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3111
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3112
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3113
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3114
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3115
+ else:
3116
+ cred = credential.Credential(
3117
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
3118
+ )
3119
+ http_profile = HttpProfile(
3120
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
3121
+ reqMethod="POST",
3122
+ endpoint=g_param[OptionsDefine.Endpoint],
3123
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3124
+ )
3125
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3126
+ if g_param[OptionsDefine.Language]:
3127
+ profile.language = g_param[OptionsDefine.Language]
3128
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
3129
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
3130
+ client._sdkVersion += ("_CLI_" + __version__)
3131
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
3132
+ model = models.DescribeOwaspWhiteRulesRequest()
3133
+ model.from_json_string(json.dumps(args))
3134
+ start_time = time.time()
3135
+ while True:
3136
+ rsp = client.DescribeOwaspWhiteRules(model)
3137
+ result = rsp.to_json_string()
3138
+ try:
3139
+ json_obj = json.loads(result)
3140
+ except TypeError as e:
3141
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
3142
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
3143
+ break
3144
+ cur_time = time.time()
3145
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
3146
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
3147
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
3148
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
3149
+ else:
3150
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
3151
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
3152
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
3153
+
3154
+
2568
3155
  def doModifyIpAccessControl(args, parsed_globals):
2569
3156
  g_param = parse_global_arg(parsed_globals)
2570
3157
 
@@ -2575,7 +3162,10 @@ def doModifyIpAccessControl(args, parsed_globals):
2575
3162
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2576
3163
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2577
3164
  )
2578
- 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):
3165
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3166
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3167
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3168
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2579
3169
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2580
3170
  else:
2581
3171
  cred = credential.Credential(
@@ -2587,7 +3177,7 @@ def doModifyIpAccessControl(args, parsed_globals):
2587
3177
  endpoint=g_param[OptionsDefine.Endpoint],
2588
3178
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2589
3179
  )
2590
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3180
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2591
3181
  if g_param[OptionsDefine.Language]:
2592
3182
  profile.language = g_param[OptionsDefine.Language]
2593
3183
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2627,7 +3217,10 @@ def doDescribeAntiFakeRules(args, parsed_globals):
2627
3217
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2628
3218
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2629
3219
  )
2630
- 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):
3220
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3221
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3222
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3223
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2631
3224
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2632
3225
  else:
2633
3226
  cred = credential.Credential(
@@ -2639,7 +3232,7 @@ def doDescribeAntiFakeRules(args, parsed_globals):
2639
3232
  endpoint=g_param[OptionsDefine.Endpoint],
2640
3233
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2641
3234
  )
2642
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3235
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2643
3236
  if g_param[OptionsDefine.Language]:
2644
3237
  profile.language = g_param[OptionsDefine.Language]
2645
3238
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2679,7 +3272,10 @@ def doImportIpAccessControl(args, parsed_globals):
2679
3272
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2680
3273
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2681
3274
  )
2682
- 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):
3275
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3276
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3277
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3278
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2683
3279
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2684
3280
  else:
2685
3281
  cred = credential.Credential(
@@ -2691,7 +3287,7 @@ def doImportIpAccessControl(args, parsed_globals):
2691
3287
  endpoint=g_param[OptionsDefine.Endpoint],
2692
3288
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2693
3289
  )
2694
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3290
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2695
3291
  if g_param[OptionsDefine.Language]:
2696
3292
  profile.language = g_param[OptionsDefine.Language]
2697
3293
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2731,7 +3327,10 @@ def doDescribeDomainDetailsSaas(args, parsed_globals):
2731
3327
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2732
3328
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2733
3329
  )
2734
- 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):
3330
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3331
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3332
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3333
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2735
3334
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2736
3335
  else:
2737
3336
  cred = credential.Credential(
@@ -2743,7 +3342,7 @@ def doDescribeDomainDetailsSaas(args, parsed_globals):
2743
3342
  endpoint=g_param[OptionsDefine.Endpoint],
2744
3343
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2745
3344
  )
2746
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3345
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2747
3346
  if g_param[OptionsDefine.Language]:
2748
3347
  profile.language = g_param[OptionsDefine.Language]
2749
3348
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2783,7 +3382,10 @@ def doModifyBotStatus(args, parsed_globals):
2783
3382
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2784
3383
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2785
3384
  )
2786
- 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):
3385
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3386
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3387
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3388
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2787
3389
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2788
3390
  else:
2789
3391
  cred = credential.Credential(
@@ -2795,7 +3397,7 @@ def doModifyBotStatus(args, parsed_globals):
2795
3397
  endpoint=g_param[OptionsDefine.Endpoint],
2796
3398
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2797
3399
  )
2798
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3400
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2799
3401
  if g_param[OptionsDefine.Language]:
2800
3402
  profile.language = g_param[OptionsDefine.Language]
2801
3403
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2835,7 +3437,10 @@ def doModifyAntiInfoLeakRules(args, parsed_globals):
2835
3437
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2836
3438
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2837
3439
  )
2838
- 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):
3440
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3441
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3442
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3443
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2839
3444
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2840
3445
  else:
2841
3446
  cred = credential.Credential(
@@ -2847,7 +3452,7 @@ def doModifyAntiInfoLeakRules(args, parsed_globals):
2847
3452
  endpoint=g_param[OptionsDefine.Endpoint],
2848
3453
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2849
3454
  )
2850
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3455
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2851
3456
  if g_param[OptionsDefine.Language]:
2852
3457
  profile.language = g_param[OptionsDefine.Language]
2853
3458
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2887,7 +3492,10 @@ def doCreateIpAccessControl(args, parsed_globals):
2887
3492
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2888
3493
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2889
3494
  )
2890
- 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):
3495
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3496
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3497
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3498
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2891
3499
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2892
3500
  else:
2893
3501
  cred = credential.Credential(
@@ -2899,7 +3507,7 @@ def doCreateIpAccessControl(args, parsed_globals):
2899
3507
  endpoint=g_param[OptionsDefine.Endpoint],
2900
3508
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2901
3509
  )
2902
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3510
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2903
3511
  if g_param[OptionsDefine.Language]:
2904
3512
  profile.language = g_param[OptionsDefine.Language]
2905
3513
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2939,7 +3547,10 @@ def doAddAntiFakeUrl(args, parsed_globals):
2939
3547
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2940
3548
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2941
3549
  )
2942
- 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):
3550
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3551
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3552
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3553
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2943
3554
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2944
3555
  else:
2945
3556
  cred = credential.Credential(
@@ -2951,7 +3562,7 @@ def doAddAntiFakeUrl(args, parsed_globals):
2951
3562
  endpoint=g_param[OptionsDefine.Endpoint],
2952
3563
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2953
3564
  )
2954
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3565
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2955
3566
  if g_param[OptionsDefine.Language]:
2956
3567
  profile.language = g_param[OptionsDefine.Language]
2957
3568
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2991,7 +3602,10 @@ def doDescribeUserClbWafRegions(args, parsed_globals):
2991
3602
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2992
3603
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2993
3604
  )
2994
- 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):
3605
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3606
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3607
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3608
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2995
3609
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2996
3610
  else:
2997
3611
  cred = credential.Credential(
@@ -3003,7 +3617,7 @@ def doDescribeUserClbWafRegions(args, parsed_globals):
3003
3617
  endpoint=g_param[OptionsDefine.Endpoint],
3004
3618
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3005
3619
  )
3006
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3620
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3007
3621
  if g_param[OptionsDefine.Language]:
3008
3622
  profile.language = g_param[OptionsDefine.Language]
3009
3623
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3043,7 +3657,10 @@ def doDescribeObjects(args, parsed_globals):
3043
3657
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3044
3658
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3045
3659
  )
3046
- 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):
3660
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3661
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3662
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3663
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3047
3664
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3048
3665
  else:
3049
3666
  cred = credential.Credential(
@@ -3055,7 +3672,7 @@ def doDescribeObjects(args, parsed_globals):
3055
3672
  endpoint=g_param[OptionsDefine.Endpoint],
3056
3673
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3057
3674
  )
3058
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3675
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3059
3676
  if g_param[OptionsDefine.Language]:
3060
3677
  profile.language = g_param[OptionsDefine.Language]
3061
3678
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3095,7 +3712,10 @@ def doModifyCustomRuleStatus(args, parsed_globals):
3095
3712
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3096
3713
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3097
3714
  )
3098
- 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):
3715
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3716
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3717
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3718
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3099
3719
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3100
3720
  else:
3101
3721
  cred = credential.Credential(
@@ -3107,7 +3727,7 @@ def doModifyCustomRuleStatus(args, parsed_globals):
3107
3727
  endpoint=g_param[OptionsDefine.Endpoint],
3108
3728
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3109
3729
  )
3110
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3730
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3111
3731
  if g_param[OptionsDefine.Language]:
3112
3732
  profile.language = g_param[OptionsDefine.Language]
3113
3733
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3147,7 +3767,10 @@ def doDescribeIpAccessControl(args, parsed_globals):
3147
3767
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3148
3768
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3149
3769
  )
3150
- 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):
3770
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3771
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3772
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3773
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3151
3774
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3152
3775
  else:
3153
3776
  cred = credential.Credential(
@@ -3159,7 +3782,7 @@ def doDescribeIpAccessControl(args, parsed_globals):
3159
3782
  endpoint=g_param[OptionsDefine.Endpoint],
3160
3783
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3161
3784
  )
3162
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3785
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3163
3786
  if g_param[OptionsDefine.Language]:
3164
3787
  profile.language = g_param[OptionsDefine.Language]
3165
3788
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3199,7 +3822,10 @@ def doDescribeDomainCountInfo(args, parsed_globals):
3199
3822
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3200
3823
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3201
3824
  )
3202
- 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):
3825
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3826
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3827
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3828
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3203
3829
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3204
3830
  else:
3205
3831
  cred = credential.Credential(
@@ -3211,7 +3837,7 @@ def doDescribeDomainCountInfo(args, parsed_globals):
3211
3837
  endpoint=g_param[OptionsDefine.Endpoint],
3212
3838
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3213
3839
  )
3214
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3840
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3215
3841
  if g_param[OptionsDefine.Language]:
3216
3842
  profile.language = g_param[OptionsDefine.Language]
3217
3843
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3251,7 +3877,10 @@ def doDeleteSpartaProtection(args, parsed_globals):
3251
3877
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3252
3878
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3253
3879
  )
3254
- 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):
3880
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3881
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3882
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3883
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3255
3884
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3256
3885
  else:
3257
3886
  cred = credential.Credential(
@@ -3263,7 +3892,7 @@ def doDeleteSpartaProtection(args, parsed_globals):
3263
3892
  endpoint=g_param[OptionsDefine.Endpoint],
3264
3893
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3265
3894
  )
3266
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3895
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3267
3896
  if g_param[OptionsDefine.Language]:
3268
3897
  profile.language = g_param[OptionsDefine.Language]
3269
3898
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3293,7 +3922,7 @@ def doDeleteSpartaProtection(args, parsed_globals):
3293
3922
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
3294
3923
 
3295
3924
 
3296
- def doAddCustomWhiteRule(args, parsed_globals):
3925
+ def doDescribeBatchIpAccessControl(args, parsed_globals):
3297
3926
  g_param = parse_global_arg(parsed_globals)
3298
3927
 
3299
3928
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3303,7 +3932,10 @@ def doAddCustomWhiteRule(args, parsed_globals):
3303
3932
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3304
3933
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3305
3934
  )
3306
- 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):
3935
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3936
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3937
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3938
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3307
3939
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3308
3940
  else:
3309
3941
  cred = credential.Credential(
@@ -3315,18 +3947,73 @@ def doAddCustomWhiteRule(args, parsed_globals):
3315
3947
  endpoint=g_param[OptionsDefine.Endpoint],
3316
3948
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3317
3949
  )
3318
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3950
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3319
3951
  if g_param[OptionsDefine.Language]:
3320
3952
  profile.language = g_param[OptionsDefine.Language]
3321
3953
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
3322
3954
  client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
3323
3955
  client._sdkVersion += ("_CLI_" + __version__)
3324
3956
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
3325
- model = models.AddCustomWhiteRuleRequest()
3957
+ model = models.DescribeBatchIpAccessControlRequest()
3326
3958
  model.from_json_string(json.dumps(args))
3327
3959
  start_time = time.time()
3328
3960
  while True:
3329
- rsp = client.AddCustomWhiteRule(model)
3961
+ rsp = client.DescribeBatchIpAccessControl(model)
3962
+ result = rsp.to_json_string()
3963
+ try:
3964
+ json_obj = json.loads(result)
3965
+ except TypeError as e:
3966
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
3967
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
3968
+ break
3969
+ cur_time = time.time()
3970
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
3971
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
3972
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
3973
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
3974
+ else:
3975
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
3976
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
3977
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
3978
+
3979
+
3980
+ def doDescribeOwaspRules(args, parsed_globals):
3981
+ g_param = parse_global_arg(parsed_globals)
3982
+
3983
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
3984
+ cred = credential.CVMRoleCredential()
3985
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
3986
+ cred = credential.STSAssumeRoleCredential(
3987
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3988
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3989
+ )
3990
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3991
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3992
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3993
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3994
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3995
+ else:
3996
+ cred = credential.Credential(
3997
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
3998
+ )
3999
+ http_profile = HttpProfile(
4000
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
4001
+ reqMethod="POST",
4002
+ endpoint=g_param[OptionsDefine.Endpoint],
4003
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4004
+ )
4005
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4006
+ if g_param[OptionsDefine.Language]:
4007
+ profile.language = g_param[OptionsDefine.Language]
4008
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
4009
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
4010
+ client._sdkVersion += ("_CLI_" + __version__)
4011
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
4012
+ model = models.DescribeOwaspRulesRequest()
4013
+ model.from_json_string(json.dumps(args))
4014
+ start_time = time.time()
4015
+ while True:
4016
+ rsp = client.DescribeOwaspRules(model)
3330
4017
  result = rsp.to_json_string()
3331
4018
  try:
3332
4019
  json_obj = json.loads(result)
@@ -3355,7 +4042,10 @@ def doDeleteSession(args, parsed_globals):
3355
4042
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3356
4043
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3357
4044
  )
3358
- 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):
4045
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4046
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4047
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4048
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3359
4049
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3360
4050
  else:
3361
4051
  cred = credential.Credential(
@@ -3367,7 +4057,7 @@ def doDeleteSession(args, parsed_globals):
3367
4057
  endpoint=g_param[OptionsDefine.Endpoint],
3368
4058
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3369
4059
  )
3370
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4060
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3371
4061
  if g_param[OptionsDefine.Language]:
3372
4062
  profile.language = g_param[OptionsDefine.Language]
3373
4063
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3407,7 +4097,10 @@ def doGenerateDealsAndPayNew(args, parsed_globals):
3407
4097
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3408
4098
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3409
4099
  )
3410
- 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):
4100
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4101
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4102
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4103
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3411
4104
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3412
4105
  else:
3413
4106
  cred = credential.Credential(
@@ -3419,7 +4112,7 @@ def doGenerateDealsAndPayNew(args, parsed_globals):
3419
4112
  endpoint=g_param[OptionsDefine.Endpoint],
3420
4113
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3421
4114
  )
3422
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4115
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3423
4116
  if g_param[OptionsDefine.Language]:
3424
4117
  profile.language = g_param[OptionsDefine.Language]
3425
4118
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3459,7 +4152,10 @@ def doCreateHost(args, parsed_globals):
3459
4152
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3460
4153
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3461
4154
  )
3462
- 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):
4155
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4156
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4157
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4158
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3463
4159
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3464
4160
  else:
3465
4161
  cred = credential.Credential(
@@ -3471,7 +4167,7 @@ def doCreateHost(args, parsed_globals):
3471
4167
  endpoint=g_param[OptionsDefine.Endpoint],
3472
4168
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3473
4169
  )
3474
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4170
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3475
4171
  if g_param[OptionsDefine.Language]:
3476
4172
  profile.language = g_param[OptionsDefine.Language]
3477
4173
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3511,7 +4207,10 @@ def doModifyDomainsCLSStatus(args, parsed_globals):
3511
4207
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3512
4208
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3513
4209
  )
3514
- 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):
4210
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4211
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4212
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4213
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3515
4214
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3516
4215
  else:
3517
4216
  cred = credential.Credential(
@@ -3523,7 +4222,7 @@ def doModifyDomainsCLSStatus(args, parsed_globals):
3523
4222
  endpoint=g_param[OptionsDefine.Endpoint],
3524
4223
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3525
4224
  )
3526
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4225
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3527
4226
  if g_param[OptionsDefine.Language]:
3528
4227
  profile.language = g_param[OptionsDefine.Language]
3529
4228
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3563,7 +4262,10 @@ def doRefreshAccessCheckResult(args, parsed_globals):
3563
4262
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3564
4263
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3565
4264
  )
3566
- 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):
4265
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4266
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4267
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4268
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3567
4269
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3568
4270
  else:
3569
4271
  cred = credential.Credential(
@@ -3575,7 +4277,7 @@ def doRefreshAccessCheckResult(args, parsed_globals):
3575
4277
  endpoint=g_param[OptionsDefine.Endpoint],
3576
4278
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3577
4279
  )
3578
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4280
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3579
4281
  if g_param[OptionsDefine.Language]:
3580
4282
  profile.language = g_param[OptionsDefine.Language]
3581
4283
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3615,7 +4317,10 @@ def doDescribeCustomWhiteRule(args, parsed_globals):
3615
4317
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3616
4318
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3617
4319
  )
3618
- 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):
4320
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4321
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4322
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4323
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3619
4324
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3620
4325
  else:
3621
4326
  cred = credential.Credential(
@@ -3627,7 +4332,7 @@ def doDescribeCustomWhiteRule(args, parsed_globals):
3627
4332
  endpoint=g_param[OptionsDefine.Endpoint],
3628
4333
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3629
4334
  )
3630
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4335
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3631
4336
  if g_param[OptionsDefine.Language]:
3632
4337
  profile.language = g_param[OptionsDefine.Language]
3633
4338
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3667,7 +4372,10 @@ def doDescribeHost(args, parsed_globals):
3667
4372
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3668
4373
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3669
4374
  )
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):
4375
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4376
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4377
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4378
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3671
4379
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3672
4380
  else:
3673
4381
  cred = credential.Credential(
@@ -3679,7 +4387,7 @@ def doDescribeHost(args, parsed_globals):
3679
4387
  endpoint=g_param[OptionsDefine.Endpoint],
3680
4388
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3681
4389
  )
3682
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4390
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3683
4391
  if g_param[OptionsDefine.Language]:
3684
4392
  profile.language = g_param[OptionsDefine.Language]
3685
4393
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3719,7 +4427,10 @@ def doDescribeHostLimit(args, parsed_globals):
3719
4427
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3720
4428
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3721
4429
  )
3722
- 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):
4430
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4431
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4432
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4433
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3723
4434
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3724
4435
  else:
3725
4436
  cred = credential.Credential(
@@ -3731,7 +4442,7 @@ def doDescribeHostLimit(args, parsed_globals):
3731
4442
  endpoint=g_param[OptionsDefine.Endpoint],
3732
4443
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3733
4444
  )
3734
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4445
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3735
4446
  if g_param[OptionsDefine.Language]:
3736
4447
  profile.language = g_param[OptionsDefine.Language]
3737
4448
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3771,7 +4482,10 @@ def doGetInstanceQpsLimit(args, parsed_globals):
3771
4482
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3772
4483
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3773
4484
  )
3774
- 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):
4485
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4486
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4487
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4488
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3775
4489
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3776
4490
  else:
3777
4491
  cred = credential.Credential(
@@ -3783,7 +4497,7 @@ def doGetInstanceQpsLimit(args, parsed_globals):
3783
4497
  endpoint=g_param[OptionsDefine.Endpoint],
3784
4498
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3785
4499
  )
3786
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4500
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3787
4501
  if g_param[OptionsDefine.Language]:
3788
4502
  profile.language = g_param[OptionsDefine.Language]
3789
4503
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3823,7 +4537,10 @@ def doModifyAntiInfoLeakRuleStatus(args, parsed_globals):
3823
4537
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3824
4538
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3825
4539
  )
3826
- 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):
4540
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4541
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4542
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4543
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3827
4544
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3828
4545
  else:
3829
4546
  cred = credential.Credential(
@@ -3835,7 +4552,7 @@ def doModifyAntiInfoLeakRuleStatus(args, parsed_globals):
3835
4552
  endpoint=g_param[OptionsDefine.Endpoint],
3836
4553
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3837
4554
  )
3838
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4555
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3839
4556
  if g_param[OptionsDefine.Language]:
3840
4557
  profile.language = g_param[OptionsDefine.Language]
3841
4558
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3875,7 +4592,10 @@ def doDescribeDomainVerifyResult(args, parsed_globals):
3875
4592
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3876
4593
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3877
4594
  )
3878
- 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):
4595
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4596
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4597
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4598
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3879
4599
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3880
4600
  else:
3881
4601
  cred = credential.Credential(
@@ -3887,7 +4607,7 @@ def doDescribeDomainVerifyResult(args, parsed_globals):
3887
4607
  endpoint=g_param[OptionsDefine.Endpoint],
3888
4608
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3889
4609
  )
3890
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4610
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3891
4611
  if g_param[OptionsDefine.Language]:
3892
4612
  profile.language = g_param[OptionsDefine.Language]
3893
4613
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3927,7 +4647,10 @@ def doSearchAttackLog(args, parsed_globals):
3927
4647
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3928
4648
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3929
4649
  )
3930
- 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):
4650
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4651
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4652
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4653
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3931
4654
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3932
4655
  else:
3933
4656
  cred = credential.Credential(
@@ -3939,7 +4662,7 @@ def doSearchAttackLog(args, parsed_globals):
3939
4662
  endpoint=g_param[OptionsDefine.Endpoint],
3940
4663
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3941
4664
  )
3942
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4665
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3943
4666
  if g_param[OptionsDefine.Language]:
3944
4667
  profile.language = g_param[OptionsDefine.Language]
3945
4668
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -3979,7 +4702,10 @@ def doDescribeInstances(args, parsed_globals):
3979
4702
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3980
4703
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3981
4704
  )
3982
- 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):
4705
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4706
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4707
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4708
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3983
4709
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3984
4710
  else:
3985
4711
  cred = credential.Credential(
@@ -3991,7 +4717,7 @@ def doDescribeInstances(args, parsed_globals):
3991
4717
  endpoint=g_param[OptionsDefine.Endpoint],
3992
4718
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3993
4719
  )
3994
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4720
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3995
4721
  if g_param[OptionsDefine.Language]:
3996
4722
  profile.language = g_param[OptionsDefine.Language]
3997
4723
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4021,6 +4747,61 @@ def doDescribeInstances(args, parsed_globals):
4021
4747
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
4022
4748
 
4023
4749
 
4750
+ def doModifyOwaspRuleTypeStatus(args, parsed_globals):
4751
+ g_param = parse_global_arg(parsed_globals)
4752
+
4753
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
4754
+ cred = credential.CVMRoleCredential()
4755
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
4756
+ cred = credential.STSAssumeRoleCredential(
4757
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4758
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4759
+ )
4760
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4761
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4762
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4763
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4764
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4765
+ else:
4766
+ cred = credential.Credential(
4767
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
4768
+ )
4769
+ http_profile = HttpProfile(
4770
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
4771
+ reqMethod="POST",
4772
+ endpoint=g_param[OptionsDefine.Endpoint],
4773
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4774
+ )
4775
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4776
+ if g_param[OptionsDefine.Language]:
4777
+ profile.language = g_param[OptionsDefine.Language]
4778
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
4779
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
4780
+ client._sdkVersion += ("_CLI_" + __version__)
4781
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
4782
+ model = models.ModifyOwaspRuleTypeStatusRequest()
4783
+ model.from_json_string(json.dumps(args))
4784
+ start_time = time.time()
4785
+ while True:
4786
+ rsp = client.ModifyOwaspRuleTypeStatus(model)
4787
+ result = rsp.to_json_string()
4788
+ try:
4789
+ json_obj = json.loads(result)
4790
+ except TypeError as e:
4791
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
4792
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
4793
+ break
4794
+ cur_time = time.time()
4795
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
4796
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
4797
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
4798
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
4799
+ else:
4800
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
4801
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
4802
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
4803
+
4804
+
4024
4805
  def doModifyUserSignatureRule(args, parsed_globals):
4025
4806
  g_param = parse_global_arg(parsed_globals)
4026
4807
 
@@ -4031,7 +4812,10 @@ def doModifyUserSignatureRule(args, parsed_globals):
4031
4812
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4032
4813
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4033
4814
  )
4034
- 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):
4815
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4816
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4817
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4818
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4035
4819
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4036
4820
  else:
4037
4821
  cred = credential.Credential(
@@ -4043,7 +4827,7 @@ def doModifyUserSignatureRule(args, parsed_globals):
4043
4827
  endpoint=g_param[OptionsDefine.Endpoint],
4044
4828
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4045
4829
  )
4046
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4830
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4047
4831
  if g_param[OptionsDefine.Language]:
4048
4832
  profile.language = g_param[OptionsDefine.Language]
4049
4833
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4083,7 +4867,10 @@ def doModifyHostFlowMode(args, parsed_globals):
4083
4867
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4084
4868
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4085
4869
  )
4086
- 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):
4870
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4871
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4872
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4873
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4087
4874
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4088
4875
  else:
4089
4876
  cred = credential.Credential(
@@ -4095,7 +4882,7 @@ def doModifyHostFlowMode(args, parsed_globals):
4095
4882
  endpoint=g_param[OptionsDefine.Endpoint],
4096
4883
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4097
4884
  )
4098
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4885
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4099
4886
  if g_param[OptionsDefine.Language]:
4100
4887
  profile.language = g_param[OptionsDefine.Language]
4101
4888
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4135,7 +4922,10 @@ def doModifyInstanceName(args, parsed_globals):
4135
4922
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4136
4923
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4137
4924
  )
4138
- 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):
4925
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4926
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4927
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4928
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4139
4929
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4140
4930
  else:
4141
4931
  cred = credential.Credential(
@@ -4147,7 +4937,7 @@ def doModifyInstanceName(args, parsed_globals):
4147
4937
  endpoint=g_param[OptionsDefine.Endpoint],
4148
4938
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4149
4939
  )
4150
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4940
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4151
4941
  if g_param[OptionsDefine.Language]:
4152
4942
  profile.language = g_param[OptionsDefine.Language]
4153
4943
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4187,7 +4977,10 @@ def doModifyModuleStatus(args, parsed_globals):
4187
4977
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4188
4978
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4189
4979
  )
4190
- 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):
4980
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
4981
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
4982
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
4983
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4191
4984
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4192
4985
  else:
4193
4986
  cred = credential.Credential(
@@ -4199,7 +4992,7 @@ def doModifyModuleStatus(args, parsed_globals):
4199
4992
  endpoint=g_param[OptionsDefine.Endpoint],
4200
4993
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4201
4994
  )
4202
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
4995
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4203
4996
  if g_param[OptionsDefine.Language]:
4204
4997
  profile.language = g_param[OptionsDefine.Language]
4205
4998
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4239,7 +5032,10 @@ def doModifyApiAnalyzeStatus(args, parsed_globals):
4239
5032
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4240
5033
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4241
5034
  )
4242
- 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):
5035
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5036
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5037
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5038
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4243
5039
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4244
5040
  else:
4245
5041
  cred = credential.Credential(
@@ -4251,7 +5047,7 @@ def doModifyApiAnalyzeStatus(args, parsed_globals):
4251
5047
  endpoint=g_param[OptionsDefine.Endpoint],
4252
5048
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4253
5049
  )
4254
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5050
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4255
5051
  if g_param[OptionsDefine.Language]:
4256
5052
  profile.language = g_param[OptionsDefine.Language]
4257
5053
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4291,7 +5087,10 @@ def doModifyCustomWhiteRuleStatus(args, parsed_globals):
4291
5087
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4292
5088
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4293
5089
  )
4294
- 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):
5090
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5091
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5092
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5093
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4295
5094
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4296
5095
  else:
4297
5096
  cred = credential.Credential(
@@ -4303,7 +5102,7 @@ def doModifyCustomWhiteRuleStatus(args, parsed_globals):
4303
5102
  endpoint=g_param[OptionsDefine.Endpoint],
4304
5103
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4305
5104
  )
4306
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5105
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4307
5106
  if g_param[OptionsDefine.Language]:
4308
5107
  profile.language = g_param[OptionsDefine.Language]
4309
5108
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4343,7 +5142,10 @@ def doDescribePorts(args, parsed_globals):
4343
5142
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4344
5143
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4345
5144
  )
4346
- 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):
5145
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5146
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5147
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5148
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4347
5149
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4348
5150
  else:
4349
5151
  cred = credential.Credential(
@@ -4355,7 +5157,7 @@ def doDescribePorts(args, parsed_globals):
4355
5157
  endpoint=g_param[OptionsDefine.Endpoint],
4356
5158
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4357
5159
  )
4358
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5160
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4359
5161
  if g_param[OptionsDefine.Language]:
4360
5162
  profile.language = g_param[OptionsDefine.Language]
4361
5163
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4395,7 +5197,10 @@ def doModifyHostMode(args, parsed_globals):
4395
5197
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4396
5198
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4397
5199
  )
4398
- 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):
5200
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5201
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5202
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5203
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4399
5204
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4400
5205
  else:
4401
5206
  cred = credential.Credential(
@@ -4407,7 +5212,7 @@ def doModifyHostMode(args, parsed_globals):
4407
5212
  endpoint=g_param[OptionsDefine.Endpoint],
4408
5213
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4409
5214
  )
4410
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5215
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4411
5216
  if g_param[OptionsDefine.Language]:
4412
5217
  profile.language = g_param[OptionsDefine.Language]
4413
5218
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4447,7 +5252,10 @@ def doModifyDomainPostAction(args, parsed_globals):
4447
5252
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4448
5253
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4449
5254
  )
4450
- 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):
5255
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5256
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5257
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5258
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4451
5259
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4452
5260
  else:
4453
5261
  cred = credential.Credential(
@@ -4459,7 +5267,7 @@ def doModifyDomainPostAction(args, parsed_globals):
4459
5267
  endpoint=g_param[OptionsDefine.Endpoint],
4460
5268
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4461
5269
  )
4462
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5270
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4463
5271
  if g_param[OptionsDefine.Language]:
4464
5272
  profile.language = g_param[OptionsDefine.Language]
4465
5273
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4499,7 +5307,10 @@ def doModifySpartaProtectionMode(args, parsed_globals):
4499
5307
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4500
5308
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4501
5309
  )
4502
- 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):
5310
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5311
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5312
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5313
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4503
5314
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4504
5315
  else:
4505
5316
  cred = credential.Credential(
@@ -4511,7 +5322,7 @@ def doModifySpartaProtectionMode(args, parsed_globals):
4511
5322
  endpoint=g_param[OptionsDefine.Endpoint],
4512
5323
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4513
5324
  )
4514
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5325
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4515
5326
  if g_param[OptionsDefine.Language]:
4516
5327
  profile.language = g_param[OptionsDefine.Language]
4517
5328
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4551,7 +5362,10 @@ def doUpsertCCRule(args, parsed_globals):
4551
5362
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4552
5363
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4553
5364
  )
4554
- 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):
5365
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5366
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5367
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5368
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4555
5369
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4556
5370
  else:
4557
5371
  cred = credential.Credential(
@@ -4563,7 +5377,7 @@ def doUpsertCCRule(args, parsed_globals):
4563
5377
  endpoint=g_param[OptionsDefine.Endpoint],
4564
5378
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4565
5379
  )
4566
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5380
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4567
5381
  if g_param[OptionsDefine.Language]:
4568
5382
  profile.language = g_param[OptionsDefine.Language]
4569
5383
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4603,7 +5417,10 @@ def doModifyObject(args, parsed_globals):
4603
5417
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4604
5418
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4605
5419
  )
4606
- 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):
5420
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5421
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5422
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5423
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4607
5424
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4608
5425
  else:
4609
5426
  cred = credential.Credential(
@@ -4615,7 +5432,7 @@ def doModifyObject(args, parsed_globals):
4615
5432
  endpoint=g_param[OptionsDefine.Endpoint],
4616
5433
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4617
5434
  )
4618
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5435
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4619
5436
  if g_param[OptionsDefine.Language]:
4620
5437
  profile.language = g_param[OptionsDefine.Language]
4621
5438
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4655,7 +5472,10 @@ def doDeleteAntiFakeUrl(args, parsed_globals):
4655
5472
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4656
5473
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4657
5474
  )
4658
- 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):
5475
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5476
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5477
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5478
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4659
5479
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4660
5480
  else:
4661
5481
  cred = credential.Credential(
@@ -4667,7 +5487,7 @@ def doDeleteAntiFakeUrl(args, parsed_globals):
4667
5487
  endpoint=g_param[OptionsDefine.Endpoint],
4668
5488
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4669
5489
  )
4670
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5490
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4671
5491
  if g_param[OptionsDefine.Language]:
4672
5492
  profile.language = g_param[OptionsDefine.Language]
4673
5493
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4707,7 +5527,10 @@ def doDescribeCCRuleList(args, parsed_globals):
4707
5527
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4708
5528
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4709
5529
  )
4710
- 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):
5530
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5531
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5532
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5533
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4711
5534
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4712
5535
  else:
4713
5536
  cred = credential.Credential(
@@ -4719,7 +5542,7 @@ def doDescribeCCRuleList(args, parsed_globals):
4719
5542
  endpoint=g_param[OptionsDefine.Endpoint],
4720
5543
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4721
5544
  )
4722
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5545
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4723
5546
  if g_param[OptionsDefine.Language]:
4724
5547
  profile.language = g_param[OptionsDefine.Language]
4725
5548
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4749,6 +5572,61 @@ def doDescribeCCRuleList(args, parsed_globals):
4749
5572
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
4750
5573
 
4751
5574
 
5575
+ def doDeleteCCRule(args, parsed_globals):
5576
+ g_param = parse_global_arg(parsed_globals)
5577
+
5578
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
5579
+ cred = credential.CVMRoleCredential()
5580
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
5581
+ cred = credential.STSAssumeRoleCredential(
5582
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
5583
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
5584
+ )
5585
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5586
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5587
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5588
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
5589
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
5590
+ else:
5591
+ cred = credential.Credential(
5592
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
5593
+ )
5594
+ http_profile = HttpProfile(
5595
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
5596
+ reqMethod="POST",
5597
+ endpoint=g_param[OptionsDefine.Endpoint],
5598
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
5599
+ )
5600
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
5601
+ if g_param[OptionsDefine.Language]:
5602
+ profile.language = g_param[OptionsDefine.Language]
5603
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
5604
+ client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
5605
+ client._sdkVersion += ("_CLI_" + __version__)
5606
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
5607
+ model = models.DeleteCCRuleRequest()
5608
+ model.from_json_string(json.dumps(args))
5609
+ start_time = time.time()
5610
+ while True:
5611
+ rsp = client.DeleteCCRule(model)
5612
+ result = rsp.to_json_string()
5613
+ try:
5614
+ json_obj = json.loads(result)
5615
+ except TypeError as e:
5616
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
5617
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
5618
+ break
5619
+ cur_time = time.time()
5620
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
5621
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
5622
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
5623
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
5624
+ else:
5625
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
5626
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
5627
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
5628
+
5629
+
4752
5630
  def doModifyWebshellStatus(args, parsed_globals):
4753
5631
  g_param = parse_global_arg(parsed_globals)
4754
5632
 
@@ -4759,7 +5637,10 @@ def doModifyWebshellStatus(args, parsed_globals):
4759
5637
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4760
5638
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4761
5639
  )
4762
- 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):
5640
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5641
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5642
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5643
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4763
5644
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4764
5645
  else:
4765
5646
  cred = credential.Credential(
@@ -4771,7 +5652,7 @@ def doModifyWebshellStatus(args, parsed_globals):
4771
5652
  endpoint=g_param[OptionsDefine.Endpoint],
4772
5653
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4773
5654
  )
4774
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5655
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4775
5656
  if g_param[OptionsDefine.Language]:
4776
5657
  profile.language = g_param[OptionsDefine.Language]
4777
5658
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4811,7 +5692,10 @@ def doUpsertSession(args, parsed_globals):
4811
5692
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4812
5693
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4813
5694
  )
4814
- 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):
5695
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5696
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5697
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5698
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4815
5699
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4816
5700
  else:
4817
5701
  cred = credential.Credential(
@@ -4823,7 +5707,7 @@ def doUpsertSession(args, parsed_globals):
4823
5707
  endpoint=g_param[OptionsDefine.Endpoint],
4824
5708
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4825
5709
  )
4826
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5710
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4827
5711
  if g_param[OptionsDefine.Language]:
4828
5712
  profile.language = g_param[OptionsDefine.Language]
4829
5713
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4863,7 +5747,10 @@ def doFreshAntiFakeUrl(args, parsed_globals):
4863
5747
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4864
5748
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4865
5749
  )
4866
- 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):
5750
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5751
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5752
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5753
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4867
5754
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4868
5755
  else:
4869
5756
  cred = credential.Credential(
@@ -4875,7 +5762,7 @@ def doFreshAntiFakeUrl(args, parsed_globals):
4875
5762
  endpoint=g_param[OptionsDefine.Endpoint],
4876
5763
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4877
5764
  )
4878
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5765
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4879
5766
  if g_param[OptionsDefine.Language]:
4880
5767
  profile.language = g_param[OptionsDefine.Language]
4881
5768
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4915,7 +5802,10 @@ def doModifyDomainIpv6Status(args, parsed_globals):
4915
5802
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4916
5803
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4917
5804
  )
4918
- 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):
5805
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5806
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5807
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5808
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4919
5809
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4920
5810
  else:
4921
5811
  cred = credential.Credential(
@@ -4927,7 +5817,7 @@ def doModifyDomainIpv6Status(args, parsed_globals):
4927
5817
  endpoint=g_param[OptionsDefine.Endpoint],
4928
5818
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4929
5819
  )
4930
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5820
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4931
5821
  if g_param[OptionsDefine.Language]:
4932
5822
  profile.language = g_param[OptionsDefine.Language]
4933
5823
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -4967,7 +5857,10 @@ def doModifyUserLevel(args, parsed_globals):
4967
5857
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
4968
5858
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
4969
5859
  )
4970
- 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):
5860
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
5861
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
5862
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
5863
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
4971
5864
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
4972
5865
  else:
4973
5866
  cred = credential.Credential(
@@ -4979,7 +5872,7 @@ def doModifyUserLevel(args, parsed_globals):
4979
5872
  endpoint=g_param[OptionsDefine.Endpoint],
4980
5873
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
4981
5874
  )
4982
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
5875
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
4983
5876
  if g_param[OptionsDefine.Language]:
4984
5877
  profile.language = g_param[OptionsDefine.Language]
4985
5878
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -5022,29 +5915,34 @@ MODELS_MAP = {
5022
5915
  ACTION_MAP = {
5023
5916
  "DescribeAttackType": doDescribeAttackType,
5024
5917
  "DescribeDomainDetailsClb": doDescribeDomainDetailsClb,
5025
- "DescribeDomains": doDescribeDomains,
5918
+ "AddAntiInfoLeakRules": doAddAntiInfoLeakRules,
5026
5919
  "GetAttackHistogram": doGetAttackHistogram,
5027
5920
  "GetAttackTotalCount": doGetAttackTotalCount,
5028
- "DescribeBatchIpAccessControl": doDescribeBatchIpAccessControl,
5921
+ "AddCustomWhiteRule": doAddCustomWhiteRule,
5922
+ "DeleteOwaspWhiteRule": doDeleteOwaspWhiteRule,
5029
5923
  "ModifyCustomRule": doModifyCustomRule,
5030
5924
  "DescribeFindDomainList": doDescribeFindDomainList,
5031
5925
  "ModifyInstanceQpsLimit": doModifyInstanceQpsLimit,
5032
5926
  "DescribeSpartaProtectionInfo": doDescribeSpartaProtectionInfo,
5033
5927
  "DeleteCustomWhiteRule": doDeleteCustomWhiteRule,
5034
5928
  "AddCustomRule": doAddCustomRule,
5929
+ "DeleteOwaspRuleStatus": doDeleteOwaspRuleStatus,
5035
5930
  "DeleteCustomRule": doDeleteCustomRule,
5036
5931
  "ModifyAntiFakeUrl": doModifyAntiFakeUrl,
5037
- "ModifySpartaProtection": doModifySpartaProtection,
5932
+ "DescribeAntiInfoLeakageRules": doDescribeAntiInfoLeakageRules,
5038
5933
  "ModifyInstanceElasticMode": doModifyInstanceElasticMode,
5039
5934
  "DescribeUserDomainInfo": doDescribeUserDomainInfo,
5040
- "DeleteCCRule": doDeleteCCRule,
5041
- "DescribeAntiInfoLeakageRules": doDescribeAntiInfoLeakageRules,
5935
+ "ModifyOwaspRuleTypeLevel": doModifyOwaspRuleTypeLevel,
5936
+ "ModifySpartaProtection": doModifySpartaProtection,
5937
+ "DescribeOwaspRuleTypes": doDescribeOwaspRuleTypes,
5042
5938
  "DescribeHistogram": doDescribeHistogram,
5043
5939
  "DescribeWebshellStatus": doDescribeWebshellStatus,
5044
5940
  "DeleteAntiInfoLeakRule": doDeleteAntiInfoLeakRule,
5941
+ "CreateOwaspWhiteRule": doCreateOwaspWhiteRule,
5942
+ "ModifyOwaspRuleStatus": doModifyOwaspRuleStatus,
5045
5943
  "CreateDeals": doCreateDeals,
5046
5944
  "DescribeRuleLimit": doDescribeRuleLimit,
5047
- "AddAntiInfoLeakRules": doAddAntiInfoLeakRules,
5945
+ "DescribeDomains": doDescribeDomains,
5048
5946
  "ModifyHostStatus": doModifyHostStatus,
5049
5947
  "DescribeModuleStatus": doDescribeModuleStatus,
5050
5948
  "ModifyAntiFakeUrlStatus": doModifyAntiFakeUrlStatus,
@@ -5058,8 +5956,10 @@ ACTION_MAP = {
5058
5956
  "ModifyInstanceRenewFlag": doModifyInstanceRenewFlag,
5059
5957
  "DescribeUserLevel": doDescribeUserLevel,
5060
5958
  "DescribeCCRule": doDescribeCCRule,
5959
+ "ModifyOwaspRuleTypeAction": doModifyOwaspRuleTypeAction,
5061
5960
  "DescribeCustomRuleList": doDescribeCustomRuleList,
5062
5961
  "DescribeAttackOverview": doDescribeAttackOverview,
5962
+ "ModifyOwaspWhiteRule": doModifyOwaspWhiteRule,
5063
5963
  "DescribeHosts": doDescribeHosts,
5064
5964
  "AddSpartaProtection": doAddSpartaProtection,
5065
5965
  "DescribePolicyStatus": doDescribePolicyStatus,
@@ -5069,6 +5969,7 @@ ACTION_MAP = {
5069
5969
  "DescribeTlsVersion": doDescribeTlsVersion,
5070
5970
  "ModifyProtectionStatus": doModifyProtectionStatus,
5071
5971
  "DescribeCiphersDetail": doDescribeCiphersDetail,
5972
+ "DescribeOwaspWhiteRules": doDescribeOwaspWhiteRules,
5072
5973
  "ModifyIpAccessControl": doModifyIpAccessControl,
5073
5974
  "DescribeAntiFakeRules": doDescribeAntiFakeRules,
5074
5975
  "ImportIpAccessControl": doImportIpAccessControl,
@@ -5083,7 +5984,8 @@ ACTION_MAP = {
5083
5984
  "DescribeIpAccessControl": doDescribeIpAccessControl,
5084
5985
  "DescribeDomainCountInfo": doDescribeDomainCountInfo,
5085
5986
  "DeleteSpartaProtection": doDeleteSpartaProtection,
5086
- "AddCustomWhiteRule": doAddCustomWhiteRule,
5987
+ "DescribeBatchIpAccessControl": doDescribeBatchIpAccessControl,
5988
+ "DescribeOwaspRules": doDescribeOwaspRules,
5087
5989
  "DeleteSession": doDeleteSession,
5088
5990
  "GenerateDealsAndPayNew": doGenerateDealsAndPayNew,
5089
5991
  "CreateHost": doCreateHost,
@@ -5097,6 +5999,7 @@ ACTION_MAP = {
5097
5999
  "DescribeDomainVerifyResult": doDescribeDomainVerifyResult,
5098
6000
  "SearchAttackLog": doSearchAttackLog,
5099
6001
  "DescribeInstances": doDescribeInstances,
6002
+ "ModifyOwaspRuleTypeStatus": doModifyOwaspRuleTypeStatus,
5100
6003
  "ModifyUserSignatureRule": doModifyUserSignatureRule,
5101
6004
  "ModifyHostFlowMode": doModifyHostFlowMode,
5102
6005
  "ModifyInstanceName": doModifyInstanceName,
@@ -5111,6 +6014,7 @@ ACTION_MAP = {
5111
6014
  "ModifyObject": doModifyObject,
5112
6015
  "DeleteAntiFakeUrl": doDeleteAntiFakeUrl,
5113
6016
  "DescribeCCRuleList": doDescribeCCRuleList,
6017
+ "DeleteCCRule": doDeleteCCRule,
5114
6018
  "ModifyWebshellStatus": doModifyWebshellStatus,
5115
6019
  "UpsertSession": doUpsertSession,
5116
6020
  "FreshAntiFakeUrl": doFreshAntiFakeUrl,