fix multiple conversion issues and the delldrac module

This commit is contained in:
TrustedSec 2016-07-21 23:27:37 -04:00
parent e562ebf9ee
commit 1724dd6b07

View file

@ -12,7 +12,7 @@
# @TrustedSec # @TrustedSec
# #
########################################## ##########################################
import urllib from urllib import *
import re import re
import threading import threading
import sys import sys
@ -95,7 +95,7 @@ def login_drac(ipaddr_single):
"WEBVAR_ISCMCLOGIN": 0 "WEBVAR_ISCMCLOGIN": 0
} }
# URL encode it # URL encode it
data = urllib.parse.urlencode(opts) data = urlencode(opts)
# our headers to pass (taken from raw post) # our headers to pass (taken from raw post)
headers = { headers = {
# "Host": "10.245.196.52", # "Host": "10.245.196.52",
@ -113,10 +113,10 @@ def login_drac(ipaddr_single):
} }
# request the page # request the page
req = urllib.request.Request(url, data, headers) #req = urlopen(url, data, headers)
try: try:
# capture the response # capture the response
response = urllib.request.urlopen(req, timeout=2) response = urlopen(url, data, headers, timeout=2)
data = response.read() data = response.read()
# if we failed our login, just pass through # if we failed our login, just pass through
if "Failure_Login_IPMI_Then_LDAP" in data: if "Failure_Login_IPMI_Then_LDAP" in data:
@ -153,7 +153,7 @@ def login_chassis(ipaddr_single):
"WEBSERVER_timeout_select": "1800" "WEBSERVER_timeout_select": "1800"
} }
# url encode # url encode
data = urllib.parse.urlencode(opts) data = urlencode(opts)
# headers (taken from raw POST) # headers (taken from raw POST)
headers = { headers = {
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:14.0) Gecko/20100101 Firefox/14.0.1", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:14.0) Gecko/20100101 Firefox/14.0.1",
@ -165,11 +165,12 @@ def login_chassis(ipaddr_single):
"Referer": "https://%s/cgi-bin/webcgi/login" % (ipaddr_single), "Referer": "https://%s/cgi-bin/webcgi/login" % (ipaddr_single),
"Content-Length": 78 "Content-Length": 78
} }
# request the page # request the page
req = urllib.request.Request(url, data, headers) #req = Request(url, data, headers)
try: try:
# capture the response # capture the response
response = urllib.request.urlopen(req, timeout=2) response = urlopen(url, data, headers, timeout=2)
data = response.read() data = response.read()
# if we failed to login # if we failed to login
if "login_failed_hr_top" in data: if "login_failed_hr_top" in data: