added purging options, cleaned up api calls, added domains to service list prints

hummelm10 · hummelm10 · commit 6ff7964d6a38 · 2019-11-08T13:50:58.000-05:00
diff --git a/FastlyPythonCLI/scripts/CDN/__init__.py b/FastlyPythonCLI/scripts/CDN/__init__.py
@@ -1 +1,2 @@
-from .listPublicIPs import listPublicIPs
+from .listPublicIPs import listPublicIPs
+from .purge import *
diff --git a/FastlyPythonCLI/scripts/CDN/purge.py b/FastlyPythonCLI/scripts/CDN/purge.py
@@ -0,0 +1,121 @@
+import scripts
+import requests
+import pprint
+import pandas
+
+def purgeKey(service, key, soft):
+    if scripts.checkAPINoPrint():
+        header={"Accept":"application/json"}
+        header.update({"Fastly-Key":scripts.getKeyFromConfig()})
+        if soft:
+            header.update({"Fastly-Soft-Purge":"1"})
+        input("Request to be made: " + "https://api.fastly.com/service/" + str(service) + "/purge/" + str(key) + "\nPress Enter to continue...")    
+        r=requests.post("https://api.fastly.com/service/" + str(service) + "/purge/" + str(key),headers=header)
+        if r.status_code == 401:
+            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+        elif r.status_code == 200:
+            pprint.pprint(r.json())
+            input("Press ENTER to continue...")
+        else:
+            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+    else:
+        input(scripts.bcolors.WARNING + "Error with API Key, generate a new one. Press ENTER to continue..." + scripts.bcolors.ENDC)
+
+def purgeKeyMenu():
+    df = scripts.listServicesNoPrint()
+    print(df)
+    try:
+        sernumber = int(input("\n\nEnter service to purge: "))
+    except:
+        input("Not a valid number. Press enter to continue...")
+        scripts.clear()
+        purgeKeyMenu()
+    service = df['ID'].iloc(sernumber)
+    key = input("Enter key to purge: ")
+    while "Not a valid response.":
+        reply = str(input("Soft purge [Y/n]")).lower().strip()
+        if reply[0] == 'y':
+            purgeKey(service, key, True)
+        if reply[0] == 'n':
+            purgeKey(service, key, False)
+
+def purgeService(service):
+    if scripts.checkAPINoPrint():
+        header={"Accept":"application/json"}
+        header.update({"Fastly-Key":scripts.getKeyFromConfig()})
+        input("Request to be made: " + "https://api.fastly.com/service/" + str(service) + "/purge_all" + "\nPress enter to continue...")    
+        r=requests.post("https://api.fastly.com/service/" + str(service) + "/purge_all",headers=header)
+        if r.status_code == 401:
+            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+        elif r.status_code == 200:
+            pprint.pprint(r.json())
+            input("Press ENTER to continue...")
+        else:
+            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+    else:
+        input(scripts.bcolors.WARNING + "Error with API Key, generate a new one. Press ENTER to continue..." + scripts.bcolors.ENDC)
+
+def purgeServiceMenu():
+    df = scripts.listServicesNoPrint()
+    print(df)
+    try:
+        sernumber = int(input("\n\nEnter service to purge: "))
+    except:
+        input("Not a valid number. Press enter to continue...")
+        scripts.clear()
+        purgeKeyMenu()
+    service = df['ID'].iloc(sernumber)
+    purgeService(str(service))
+
+def purgeURL(url):
+    if scripts.checkAPINoPrint():
+        header={"Accept":"application/json"}
+        header.update({"Fastly-Key":scripts.getKeyFromConfig()})
+        header.update({"Fastly-Soft-Purge":"1"})
+        input("Purge URL: " + str(url) + "\nPress Enter to continue...")
+        r=requests.request("PURGE", str(url), headers=header)
+        if r.status_code == 401:
+            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+        elif r.status_code == 200:
+            pprint.pprint(r.json())
+            input("Press ENTER to continue...")
+        else:
+            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+    else:
+        input(scripts.bcolors.WARNING + "Error with API Key, generate a new one. Press ENTER to continue..." + scripts.bcolors.ENDC)
+
+def purgeMenu():
+    flag = True
+    scripts.clear()
+    while flag == True:
+        scripts.clear()
+        #Display menu options 
+        print('  ' + scripts.bcolors.BOLD + scripts.bcolors.UNDERLINE + scripts.bcolors.HEADER + 'PURGE MENU' + scripts.bcolors.ENDC + scripts.bcolors.ENDC + scripts.bcolors.ENDC)
+        print(scripts.bcolors.HEADER + '===========' + scripts.bcolors.ENDC)
+        print('1: Purge Key')
+        print('2: Purge Service')
+        print('3: Purge URL')
+        print('B to go back')
+        print(scripts.bcolors.HEADER + '===========' + scripts.bcolors.ENDC)
+        print(' ')
+        choice = input('Option: ')     #get user's choice
+
+        if choice == '1':
+            scripts.clear()
+            purgeKeyMenu()
+        elif choice == '2':
+            scripts.clear()
+            purgeServiceMenu()
+        elif choice == '3':
+            scripts.clear()
+            try:
+                url = str(input("Enter URL to purge: "))
+            except:
+                input("Error in input. Press Enter to continue...")
+                scripts.clear()
+                purgeMenu()
+            purgeURL(url)
+        elif choice == 'B' or choice == 'b':
+            flag = False
+        else:
+            input('Not a valid choice. Hit enter to continue...')
diff --git a/FastlyPythonCLI/scripts/CDNUtil.py b/FastlyPythonCLI/scripts/CDNUtil.py
@@ -9,6 +9,7 @@ def CDNMenu():
         print('  ' + scripts.bcolors.BOLD + scripts.bcolors.UNDERLINE + scripts.bcolors.HEADER + 'CDN MENU' + scripts.bcolors.ENDC + scripts.bcolors.ENDC + scripts.bcolors.ENDC)
         print(scripts.bcolors.HEADER + '===========' + scripts.bcolors.ENDC)
         print('1: List Public IPs')
+        print('2: Purge Options')
         print('B to go back')
         print(scripts.bcolors.HEADER + '===========' + scripts.bcolors.ENDC)
         print(' ')
@@ -17,6 +18,9 @@ def CDNMenu():
         if choice == '1':
             scripts.clear()
             scripts.CDN.listPublicIPs()
+        if choice == '2':
+            scripts.clear()
+            scripts.CDN.purgeMenu()
         elif choice == 'B' or choice == 'b':
             flag = False
         else:
diff --git a/FastlyPythonCLI/scripts/WAF/getRuleByID.py b/FastlyPythonCLI/scripts/WAF/getRuleByID.py
@@ -11,7 +11,7 @@ def getRuleByID(ruleid):
     header.update({"Fastly-Key":scripts.getKeyFromConfig()})
     r=requests.get("https://api.fastly.com/wafs/rules/" + ruleid,headers=header)
     if r.status_code == 401:
-        input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+        input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
     elif r.status_code == 200:
         with scripts.utils.DataFrameFromDict(r.json()['data']) as df:
             df['ID'] = df['id']
@@ -21,4 +21,4 @@ def getRuleByID(ruleid):
         # print(df)
         return df
     else:
-        input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+        input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
diff --git a/FastlyPythonCLI/scripts/WAF/getWAFRuleset.py b/FastlyPythonCLI/scripts/WAF/getWAFRuleset.py
@@ -23,7 +23,10 @@ def getWAFRuleset():
         # input("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/ruleset")
         r=requests.get("https://api.fastly.com/service/" + str(dfObj['Service ID'].iloc[inVar]) + "/wafs/" + str(dfObj['WAF ID'].iloc[inVar]) + "/rule_statuses",headers=header)
         if r.status_code == 401:
-            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+            input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
+        elif r.status_code == 404:
+            # * no waf for that service
+            pass
         elif r.status_code == 200:
             with scripts.utils.DataFrameFromDict(r.json()['data']) as df:
                 df['ID'] = df['attributes.unique_rule_id']
@@ -41,6 +44,6 @@ def getWAFRuleset():
             print(df)
             input("Press ENTER to continue...")
         else:
-            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+            input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
     else:
         input(scripts.bcolors.WARNING + "Error with API Key, generate a new one. Press ENTER to continue..." + scripts.bcolors.ENDC)
diff --git a/FastlyPythonCLI/scripts/WAF/listWAFIDs.py b/FastlyPythonCLI/scripts/WAF/listWAFIDs.py
@@ -16,11 +16,15 @@ def listWAFIDs():
                 r=requests.get("https://api.fastly.com/service/" + str(services['ID'].iloc[x]) + "/version/" + str(services['Version'].iloc[x]) + "/wafs",headers=header)
                 if r.status_code == 401:
                     input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+                elif r.status_code == 404:
+                    # * no waf for that service
+                    pass    
                 elif r.status_code == 200:
                     with scripts.utils.DataFrameFromDict(r.json()['data']) as df:
                         if df.empty != True:
                             df.insert(0, 'Name', str(services['Name'].iloc[x]))
                             df.insert(1, 'Service ID', str(services['ID'].iloc[x]))
+                            df.insert(2, 'Domain(s)', str(services['Domain(s)'].iloc[x]))
                             df['WAF ID'] = df['id']
                             df['Version'] = df['attributes.version']
                             df['Last Push'] = df['attributes.last_push']
@@ -30,12 +34,12 @@ def listWAFIDs():
                     if df.empty != True:
                         dfObj = dfObj.append(df)
                 else:
-                    input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+                    input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
             print(dfObj)
             input("Press ENTER to continue...")
             return dfObj
         else:
-            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+            input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
     else:
         input(scripts.bcolors.WARNING + "Error with API Key, generate a new one. Press ENTER to continue..." + scripts.bcolors.ENDC)
     return None
@@ -47,27 +51,32 @@ def listWAFIDsNoPrompt():
         if services is not None:
             dfObj = pandas.DataFrame()
             for x in range(len(services.index)):
-                header={"Accept":"application/vnd.api+json"}
-                header.update({"Fastly-Key":scripts.getKeyFromConfig()})
-                # print("https://api.fastly.com/service/" + str(services['ID'].iloc[x]) + "/version/" + str(services['Version'].iloc[x]) + "/wafs")
-                r=requests.get("https://api.fastly.com/service/" + str(services['ID'].iloc[x]) + "/version/" + str(services['Version'].iloc[x]) + "/wafs",headers=header)
-                if r.status_code == 401:
-                    input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
-                elif r.status_code == 200:
-                    with scripts.utils.DataFrameFromDict(r.json()['data']) as df:
+                if not services['Version'].isnull().iloc[x]:
+                    header={"Accept":"application/vnd.api+json"}
+                    header.update({"Fastly-Key":scripts.getKeyFromConfig()})
+                    # print("https://api.fastly.com/service/" + str(services['ID'].iloc[x]) + "/version/" + str(services['Version'].iloc[x]) + "/wafs")
+                    r=requests.get("https://api.fastly.com/service/" + str(services['ID'].iloc[x]) + "/version/" + str(services['Version'].iloc[x]) + "/wafs",headers=header)
+                    if r.status_code == 401:
+                        input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
+                    elif r.status_code == 404:
+                        # * no waf for that service
+                        pass
+                    elif r.status_code == 200:
+                        with scripts.utils.DataFrameFromDict(r.json()['data']) as df:
+                            if df.empty != True:
+                                df.insert(0, 'Name', str(services['Name'].iloc[x]))
+                                df.insert(1, 'Service ID', str(services['ID'].iloc[x]))
+                                df.insert(2, 'Domain(s)', str(services['Domain(s)'].iloc[x]))
+                                df['WAF ID'] = df['id']
+                                df['Version'] = df['attributes.version']
+                                df['Last Push'] = df['attributes.last_push']
+                                df['Logged Rules'] = df['attributes.rule_statuses_log_count']
+                                df['Blocked Rules'] = df['attributes.rule_statuses_block_count']
+                                df['Disabled Rules'] = df['attributes.rule_statuses_disabled_count']
                         if df.empty != True:
-                            df.insert(0, 'Name', str(services['Name'].iloc[x]))
-                            df.insert(1, 'Service ID', str(services['ID'].iloc[x]))
-                            df['WAF ID'] = df['id']
-                            df['Version'] = df['attributes.version']
-                            df['Last Push'] = df['attributes.last_push']
-                            df['Logged Rules'] = df['attributes.rule_statuses_log_count']
-                            df['Blocked Rules'] = df['attributes.rule_statuses_block_count']
-                            df['Disabled Rules'] = df['attributes.rule_statuses_disabled_count']
-                    if df.empty != True:
-                        dfObj = dfObj.append(df)
-                else:
-                    input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+                            dfObj = dfObj.append(df)
+                    else:
+                        input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
             print(dfObj)
             return dfObj
         else:
diff --git a/FastlyPythonCLI/scripts/WAF/listWAFRules.py b/FastlyPythonCLI/scripts/WAF/listWAFRules.py
@@ -10,7 +10,7 @@ def listWAFRules():
         header.update({"Fastly-Key":scripts.getKeyFromConfig()})
         r=requests.get("https://api.fastly.com/wafs/rules",headers=header)
         if r.status_code == 401:
-            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+            input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
         elif r.status_code == 200:
             with scripts.utils.DataFrameFromDict(r.json()['data']) as df:
                 df['ID'] = df['id']
@@ -21,6 +21,6 @@ def listWAFRules():
             print(df)
             input("Press ENTER to continue...")
         else:
-            input(scripts.bcolors.WARNING + "Error with request. Press ENTER to continue..." + scripts.bcolors.ENDC)
+            input(scripts.bcolors.WARNING + "Error with services request.\nStatus: " + str(r.status_code) +  "\nPress ENTER to continue..." + scripts.bcolors.ENDC)
     else:
         input(scripts.bcolors.WARNING + "Error with API Key, generate a new one. Press ENTER to continue..." + scripts.bcolors.ENDC)
diff --git a/FastlyPythonCLI/scripts/utils.py b/FastlyPythonCLI/scripts/utils.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-from .listPublicIPs import listPublicIPs`
	`1`	`+from .listPublicIPs import listPublicIPs`
	`2`	`+from .purge import *`