the parallelism update

Author: alexankitty

libs/net.py

@@ -2,6 +2,7 @@
 from netaddr import IPAddress
 import netifaces as ni
 from libs.phone import *
+import csv
 
 def getIfIPs():
     print("Getting interface IPs.")

libs/phone.py

@@ -1,6 +1,5 @@
 import urllib3
-from bs4 import BeautifulSoup  
-import csv
+from bs4 import BeautifulSoup
 import requests
 import base64
 import re
@@ -54,23 +53,27 @@ def auth(self):
         self.session = requests.session()
         self.session.adapters.pop("https://", None)
         self.session.mount("https://", CustomSSLContextHTTPAdapter(ctx))
+        self.basicAuth = ('Polycom', self.pw)
         authstring = bytes(f"Polycom:{self.pw}", encoding="utf-8")
         # Check if password works
         resp = self.session.get(endpointJs, verify=False)
         js = resp.text
         authType = re.search(r'type: .*', js, re.MULTILINE).group(0)
         authType = self.charReplace(["'", '"', ","], authType)
+        authType = authType.replace('type: ', '')
         authType = authType.strip().lower()
+        authEndpoint = authType.replace('url: ', '')
         authEndpoint = re.search(r'url: .*.htm', js, re.MULTILINE).group(0)
         authEndpoint = self.charReplace(["'", '"', ","], authEndpoint)
+        authEndpoint = authEndpoint.replace('url: ', '')
         authEndpoint = endpointBase + authEndpoint.strip()
         if authType == 'get':
-            resp = self.session.post(authEndpoint, auth=('Polycom', self.pw), verify=False)
+            resp = self.session.get(authEndpoint, auth=self.basicAuth, verify=False)
         if authType == 'post':
-            resp = self.session.post(authEndpoint, auth=('Polycom', self.pw), verify=False)
-        if "INVALID" in resp.text:
-            return False
-        if resp.status_code == 200:
+            resp = self.session.post(authEndpoint, auth=self.basicAuth, verify=False)
+        if "INVALID" in resp.text or "Failed" in resp.text:
+            return False  
+        elif resp.status_code == 200:
             # return the session to simplify usage later.
             self.session.cookies = resp.cookies
             if not self.session.cookies:
@@ -84,7 +87,7 @@ def parseNames(self):
 
         configKeys = {}
         endpoint = f'https://{self.ip}/provConf.htm'
-        resp = self.session.get(endpoint, cookies=self.session.cookies, verify=False)
+        resp = self.session.get(endpoint, auth=self.basicAuth, cookies=self.session.cookies, verify=False)
         soup = BeautifulSoup(resp.text, 'xml')
         for index, key in self.paramKeys.items():
             tag = soup.find('input', {"paramName": key})
@@ -108,7 +111,7 @@ def setProvisioning(self):
             if self[key]:
                 #Only pull values we do have
                 data[index] = self[key]
-        resp = self.session.post(f'https://{self.ip}/form-submit', cookies=self.session.cookies, verify=False, data=data)
+        resp = self.session.post(f'https://{self.ip}/form-submit', auth=self.basicAuth, cookies=self.session.cookies, verify=False, data=data)
         if "CONF_CHANGE" in resp.text:
             return True
         else:

main.py

@@ -1,6 +1,7 @@
 import argparse
 from libs.net import *
 from libs.phone import *
+from joblib import Parallel, delayed
 
 ### CSV Headers
 ### mac,pw,servertype,serverurl,serveruser,serverpass,tries,retrywait,tagsnua
@@ -13,15 +14,19 @@ def main():
                         epilog='Alexankitty 2024')
     parser.add_argument('csvfile', help="CSV File of all MACs and Passwords for the phones to provision")
     parser.add_argument('-ip', '--ip-address', dest='ipaddress', help="IP Address in CIDR notation to scan for phones")
+    parser.add_argument('-p', '--parallel-jobs', dest='jobs', help='Sets the limit on the number of phones that can be done simultaneously')
 
     args = parser.parse_args()
     iparr = []
+    jobs = 5
 
     if not args.ipaddress:
         #Grab all interface IPs if the IP CIDR is not supplied
         iparr = getIfIPs()
     else:
         iparr.append(args.ipaddress)
+    if args.jobs:
+        jobs = args.jobs
 
     phoneIPs = scanNetwork(iparr)
     phones = parseCsv(args.csvfile)
@@ -30,22 +35,28 @@ def main():
     phoneArr = phonetuple[0]
     failures = phonetuple[1]
     if phoneArr:
-        for phone in phoneArr:
-            try:
-                #todo: make parallel
-                session = phone.auth()
-            except requests.exceptions.ConnectionError as e:
-                failures.append(f'{phone["ip"]} {phone["mac"]}: {e.args[0].reason}')
+        results = Parallel(n_jobs = jobs)(delayed(phoneHandler)(phone) for phone in phoneArr)
+         #for phone in phoneArr:
+            #phoneHandler(phone)
+        for result in results:
+            if result == True:
                 continue
-            if not session:
-                failures.append(f'{phone["ip"]} {phone["mac"]}: Authentication failed')
-                continue
-            if not phone.setProvisioning():
-                failures.append(f'{phone["ip"]} {phone["mac"]}: Configuration failed')
+            failures.append(result)
     for failure in failures:
         print(failure)
     if not failures:
         print("All phones configured successfully. :)")
 
+def phoneHandler(phone):
+    try:
+        session = phone.auth()
+    except requests.exceptions.ConnectionError as e:
+        return f'{phone["ip"]} {phone["mac"]}: {e.args[0].reason}'
+    if not session:
+        return f'{phone["ip"]} {phone["mac"]}: Authentication failed'
+    if not phone.setProvisioning():
+        return f'{phone["ip"]} {phone["mac"]}: Configuration failed'
+    return True
+
 if __name__=="__main__": 
     main() 

requirements.txt

@@ -5,4 +5,5 @@ requests
 cryptography
 bs4
 pyOpenSSL
-lxml
+lxml
+joblib