fixed modify WAF rule

Author: hummelm10

FastlyPythonCLI/scripts/WAF/getWAFRuleset.py

@@ -2,6 +2,7 @@
 import scripts
 import pprint
 import pandas
+import json
 from pandas.io.json import json_normalize
 from .listWAFIDs import listWAFIDs
 from .listWAFIDs import listWAFIDsNoPrompt
@@ -88,11 +89,14 @@ def getWAFRuleset():
                     #print(json.dumps(data))
                     header={"Accept":"application/vnd.api+json"}
                     header.update({"Fastly-Key":scripts.getKeyFromConfig()})
+                   
                     #r=requests.get("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(rid) + "/rule_status",headers=header)
                     #pprint.pprint(r.json()['data'])
                     header.update({"Content-Type":"application/vnd.api+json"})
-                    #print("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(rid) + "/rule_status")
-                    r=requests.patch("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(row['ID']) + "/rule_status", data=body ,headers=header)
+                    #print(json.dumps(header))
+                    #print(json.dumps(body))
+                    #print("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(row['Num ID']) + "/rule_status")
+                    r=requests.patch("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(row['Num ID']) + "/rule_status", data=str(json.dumps(body)) ,headers=header)
                     if r.status_code == 200:
                         pprint.pprint(r.json()['data'])
                     else:

FastlyPythonCLI/scripts/WAF/modifyRules.py

@@ -21,29 +21,31 @@ def modifyRules():
         ruleids = str(input("Enter rule ID's to modify (Example: 1010010,931100,931110): ")).lower().strip()
         action = str(input("Enter action to perform on rules (disabled, log, block):")).lower().strip()
         ruleList = ruleids.split(",")
-        data = {}
+        body = {}
         datatemp = {}
         attributes = {}
         for rid in ruleList:
+            print(str(rid))
             wrid=str(dfObj['WAF ID'].iloc[inVar]) + "-" + str(rid)
             datatemp.update({"id":wrid})
             datatemp.update({"type":"rule_status"})
             attributes.update({"status":action})
             datatemp.update({"attributes":attributes})
-            data.update({"data":datatemp})
+            body.update({"data":datatemp})
             #print(json.dumps(data))
             header={"Accept":"application/vnd.api+json"}
             header.update({"Fastly-Key":scripts.getKeyFromConfig()})
             #r=requests.get("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(rid) + "/rule_status",headers=header)
             #pprint.pprint(r.json()['data'])
             header.update({"Content-Type":"application/vnd.api+json"})
-            #print("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(rid) + "/rule_status")
-            r=requests.patch("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(rid) + "/rule_status", data=data ,headers=header)
+            #print(json.dumps(header))
+            #print(json.dumps(body))
+            #print("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(row['Num ID']) + "/rule_status")
+            r=requests.patch("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rules/" + str(rid) + "/rule_status", data=str(json.dumps(body)) ,headers=header)
             if r.status_code == 200:
                 pprint.pprint(r.json()['data'])
             else:
                 print(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) + scripts.bcolors.ENDC)
-                break
         while "Not a valid response.":
             reply = str(input("Modify another set [Y/n]: ")).lower().strip()
             if reply == 'y':