Skip to content

Commit 4a343a8

Browse files
publish jdcloud-sdk-python 1.6.164
1 parent 4141ac6 commit 4a343a8

37 files changed

Lines changed: 175 additions & 60 deletions

jdcloud_sdk/services/waf/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ API版本:1.0.4
88
|2021-04-08|1.0.3|版本2|* API及分组定义基础接口|
99
|2022-01-12|1.0.4|版本3|* API及分组定义基础接口|
1010
|2022-02-24|1.0.5|版本4|* API及分组定义基础接口|
11+
|2022-06-13|1.0.6|版本5|* API及分组定义基础接口|
1112

jdcloud_sdk/services/waf/apis/GetEsLogDetailRequest.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def __init__(self, regionId,start, end, pageSize, pageIndex):
5353
self.status = None
5454
self.logType = None
5555
self.logId = None
56+
self.request_id = None
5657
self.start = start
5758
self.end = end
5859
self.pageSize = pageSize
@@ -124,3 +125,9 @@ def setLogId(self, logId):
124125
"""
125126
self.logId = logId
126127

128+
def setRequest_id(self, request_id):
129+
"""
130+
:param request_id: (Optional) 请求Id,检索字段
131+
"""
132+
self.request_id = request_id
133+

jdcloud_sdk/services/waf/client/WafClient.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
2626
if config is None:
2727
config = Config('waf.jdcloud-api.com')
2828

29-
super(WafClient, self).__init__(credential, config, 'waf', '1.0.5', logger)
29+
super(WafClient, self).__init__(credential, config, 'waf', '1.0.6', logger)

jdcloud_sdk/services/waf/models/ActiveFuncReq.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919

2020
class ActiveFuncReq(object):
2121

22-
def __init__(self, domain, wafInstanceId=None, enable=None, isGm=None):
22+
def __init__(self, domain, wafInstanceId=None, enable=None):
2323
"""
2424
:param wafInstanceId: (Optional) 实例id,代表要设置的WAF实例
2525
:param domain: 域名
2626
:param enable: (Optional) 是否使能 0表示否
27-
:param isGm: (Optional) 是否国密
2827
"""
2928

3029
self.wafInstanceId = wafInstanceId
3130
self.domain = domain
3231
self.enable = enable
33-
self.isGm = isGm

jdcloud_sdk/services/waf/models/AntiModeCcReq.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@
1919

2020
class AntiModeCcReq(object):
2121

22-
def __init__(self, wafInstanceId, domain, ccMode=None, qps=None, action=None):
22+
def __init__(self, wafInstanceId, domain, ccMode, action, ):
2323
"""
2424
:param wafInstanceId: WAF实例id
2525
:param domain: 域名
26-
:param ccMode: (Optional) 0表示正常,1表示攻击紧急,2全局模式 3单ip模式
27-
:param qps: (Optional) cc qps配置,ccMode 为0/1时, 该字段传0, 表示不可配; ccMode为2/3时,qps限制[1-20000]
28-
:param action: (Optional) 动作配置,默认为告警,支持1,2,3, 5, 7五种类型动作
26+
:param ccMode: 防护模式 1宽松模式,2正常模式 3严格模式
27+
:param action: 动作配置
2928
"""
3029

3130
self.wafInstanceId = wafInstanceId
3231
self.domain = domain
3332
self.ccMode = ccMode
34-
self.qps = qps
3533
self.action = action

jdcloud_sdk/services/waf/models/AntiSpiderConfReq.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919

2020
class AntiSpiderConfReq(object):
2121

22-
def __init__(self, domain, wafInstanceId=None, action=None):
22+
def __init__(self, domain, wafInstanceId=None, spiderMode=None, action=None):
2323
"""
2424
:param wafInstanceId: (Optional) WAF实例id
2525
:param domain: 域名
26-
:param action: (Optional) action配置, 只支持 1,2,5 atOp
26+
:param spiderMode: (Optional) 防护模式 1宽松模式,2正常模式,3严格模式
27+
:param action: (Optional) 动作配置
2728
"""
2829

2930
self.wafInstanceId = wafInstanceId
3031
self.domain = domain
32+
self.spiderMode = spiderMode
3133
self.action = action

jdcloud_sdk/services/waf/models/CcConf.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@
1919

2020
class CcConf(object):
2121

22-
def __init__(self, enable=None, ccMode=None, qps=None, enableUserDefine=None, rulesCount=None, action=None):
22+
def __init__(self, enable=None, ccMode=None, enableUserDefine=None, rulesCount=None, action=None):
2323
"""
2424
:param enable: (Optional) 是否使能 0表示否
25-
:param ccMode: (Optional) 0表示正常,1表示攻击紧急
26-
:param qps: (Optional) qps配置
25+
:param ccMode: (Optional) 防护模式
2726
:param enableUserDefine: (Optional) 是否支持自定义cc,0表示否
2827
:param rulesCount: (Optional) cc自定义规则个数
2928
:param action: (Optional) 动作配置,默认为告警,支持1,2,3和5四种类型动作
3029
"""
3130

3231
self.enable = enable
3332
self.ccMode = ccMode
34-
self.qps = qps
3533
self.enableUserDefine = enableUserDefine
3634
self.rulesCount = rulesCount
3735
self.action = action

jdcloud_sdk/services/waf/models/DenyActionCfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class DenyActionCfg(object):
2121

2222
def __init__(self, atOp, atVal, ):
2323
"""
24-
:param atOp: 黑名单匹配动作类型 1-4 分别表示forbidden@1 redirect@2 verify@captcha3 verify@jscookie4 5-告警(自定义bot增加),6-302cookie(自定义bot增加), 7-cc动态防护
25-
:param atVal: 黑名单匹配动作内容 当atOp为3/4/7时,atVal为空,atOp=1时,atVal为自定义页面,atOp=2时,atVal为跳转url。
24+
:param atOp: 黑名单匹配动作类型 观察 5:notice 人机识别 3:verify@captcha, 4:verify@jscookie, 6:verify@rdtcookie 拦截 1:forbidden@, 2:redirect@ 动态防护 7:cc动态防护(仅cc安全防护支持)
25+
:param atVal: 黑名单匹配动作内容 当atOp为3-7时,atVal为空,atOp=1时,atVal为自定义页面,atOp=2时,atVal为跳转url。
2626
"""
2727

2828
self.atOp = atOp

jdcloud_sdk/services/waf/models/DomainConfig.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class DomainConfig(object):
2121

22-
def __init__(self, domain=None, cname=None, certName=None, lbConf=None, dnsStatus=None, wafConf=None, ccConf=None, aclConf=None, ipbanConf=None, lastAttackReport=None, antispiderConf=None, webcacheConf=None, disableWaf=None, skipConf=None, denyConf=None, webUserdefConf=None, ratelimitConf=None, userDefPageConf=None, filterHeaderConf=None, filterSenseConf=None, intSemConf=None, uriRewriteConf=None, threatinfoConf=None, proxycacheConf=None, botConf=None, riskConf=None):
22+
def __init__(self, domain=None, cname=None, certName=None, lbConf=None, dnsStatus=None, wafConf=None, ccConf=None, aclConf=None, ipbanConf=None, ipbanUsrConf=None, lastAttackReport=None, antispiderConf=None, webcacheConf=None, disableWaf=None, skipConf=None, denyConf=None, webUserdefConf=None, ratelimitConf=None, userDefPageConf=None, filterHeaderConf=None, filterSenseConf=None, intSemConf=None, uriRewriteConf=None, threatinfoConf=None, proxycacheConf=None, botConf=None, riskConf=None):
2323
"""
2424
:param domain: (Optional) 域名
2525
:param cname: (Optional) cname域名
@@ -30,6 +30,7 @@ def __init__(self, domain=None, cname=None, certName=None, lbConf=None, dnsStatu
3030
:param ccConf: (Optional) 网站cc防护配置
3131
:param aclConf: (Optional) 网站acl防护配置
3232
:param ipbanConf: (Optional) 网站恶意ip防护配置
33+
:param ipbanUsrConf: (Optional) 网站恶意ip自定义防护配置
3334
:param lastAttackReport: (Optional) 网站过去两天攻击情况
3435
:param antispiderConf: (Optional) 网站防爬虫防护配置
3536
:param webcacheConf: (Optional) 网站防篡改防护配置
@@ -58,6 +59,7 @@ def __init__(self, domain=None, cname=None, certName=None, lbConf=None, dnsStatu
5859
self.ccConf = ccConf
5960
self.aclConf = aclConf
6061
self.ipbanConf = ipbanConf
62+
self.ipbanUsrConf = ipbanUsrConf
6163
self.lastAttackReport = lastAttackReport
6264
self.antispiderConf = antispiderConf
6365
self.webcacheConf = webcacheConf

jdcloud_sdk/services/waf/models/GeoCfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __init__(self, val, atCfg, id=None):
2323
"""
2424
:param id: (Optional) 序号id,更新时需要
2525
:param val: geo名称
26-
:param atCfg: action配置
26+
:param atCfg: 动作配置,旗舰版全部支持,其它套餐不支持观察
2727
"""
2828

2929
self.id = id

0 commit comments

Comments
 (0)