diff --git a/fritzbox_cpu_temperature.py b/fritzbox_cpu_temperature.py index fddcc21..159cc73 100755 --- a/fritzbox_cpu_temperature.py +++ b/fritzbox_cpu_temperature.py @@ -9,6 +9,7 @@ [fritzbox_*] env.fritzbox_ip [ip address of the fritzbox] + env.fritzbox_username [fritzbox username] env.fritzbox_password [fritzbox password] This plugin supports the following munin configuration parameters: @@ -29,9 +30,10 @@ def get_cpu_temperature(): """get the current cpu temperature""" server = os.environ['fritzbox_ip'] + username = os.environ['fritzbox_username'] password = os.environ['fritzbox_password'] - sid = fh.get_sid(server, password) + sid = fh.get_sid(server, username, password) data = fh.get_page(server, sid, PAGE) m = re.search(pattern, data) diff --git a/fritzbox_cpu_usage.py b/fritzbox_cpu_usage.py index 875c203..ef9469a 100755 --- a/fritzbox_cpu_usage.py +++ b/fritzbox_cpu_usage.py @@ -9,6 +9,7 @@ [fritzbox_*] env.fritzbox_ip [ip address of the fritzbox] + env.fritzbox_username[fritzbox username] env.fritzbox_password [fritzbox password] This plugin supports the following munin configuration parameters: @@ -29,9 +30,10 @@ def get_cpu_usage(): """get the current cpu usage""" server = os.environ['fritzbox_ip'] + username = os.environ['fritzbox_username'] password = os.environ['fritzbox_password'] - sid = fh.get_sid(server, password) + sid = fh.get_sid(server, username, password) data = fh.get_page(server, sid, PAGE) m = re.search(pattern, data) diff --git a/fritzbox_helper.py b/fritzbox_helper.py index c13c19c..4ffabf6 100755 --- a/fritzbox_helper.py +++ b/fritzbox_helper.py @@ -25,7 +25,7 @@ from xml.dom import minidom USER_AGENT = "Mozilla/5.0 (U; Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0" -def get_sid(server, password, port=80): +def get_sid(server, username, password, port=80): """Obtains the sid after login into the fritzbox""" conn = httplib.HTTPConnection(server + ':' + str(port)) @@ -58,7 +58,7 @@ def get_sid(server, password, port=80): "Content-Type": "application/x-www-form-urlencoded", "User-Agent": USER_AGENT} - login_page = "/login_sid.lua?&response=" + response_bf + login_page = "/login_sid.lua?username=" + username + "&response=" + response_bf conn.request("GET", login_page, '', headers) response = conn.getresponse() data = response.read() @@ -69,6 +69,7 @@ def get_sid(server, password, port=80): sid = re.search("(.*?)", data).group(1) if sid == "0000000000000000": print "ERROR - No SID received because of invalid password" + sys.exit(0) return sid diff --git a/fritzbox_memory_usage.py b/fritzbox_memory_usage.py index 7821f2f..12ae9aa 100755 --- a/fritzbox_memory_usage.py +++ b/fritzbox_memory_usage.py @@ -9,6 +9,7 @@ [fritzbox_*] env.fritzbox_ip [ip address of the fritzbox] + env.fritzbox_username [fritzbox username] env.fritzbox_password [fritzbox password] This plugin supports the following munin configuration parameters: @@ -30,9 +31,10 @@ def get_memory_usage(): """get the current memory usage""" server = os.environ['fritzbox_ip'] + username = os.environ['fritzbox_username'] password = os.environ['fritzbox_password'] - sid = fh.get_sid(server, password) + sid = fh.get_sid(server, username, password) data = fh.get_page(server, sid, PAGE) matches = re.finditer(pattern, data) if matches: diff --git a/fritzbox_power_consumption.py b/fritzbox_power_consumption.py index 919167a..3a5cbc0 100755 --- a/fritzbox_power_consumption.py +++ b/fritzbox_power_consumption.py @@ -9,6 +9,7 @@ [fritzbox_*] env.fritzbox_ip [ip address of the fritzbox] + env.fritzbox_username [fritzbox username] env.fritzbox_password [fritzbox password] This plugin supports the following munin configuration parameters: @@ -30,9 +31,10 @@ def get_power_consumption(): """get the current power consumption usage""" server = os.environ['fritzbox_ip'] + username = os.environ['fritzbox_username'] password = os.environ['fritzbox_password'] - sid = fh.get_sid(server, password) + sid = fh.get_sid(server, username, password) data = fh.get_page(server, sid, PAGE) matches = re.finditer(pattern, data) if matches: diff --git a/fritzbox_uptime.py b/fritzbox_uptime.py index bd502e8..603c1cd 100755 --- a/fritzbox_uptime.py +++ b/fritzbox_uptime.py @@ -9,6 +9,7 @@ [fritzbox_*] env.fritzbox_ip [ip address of the fritzbox] + env.fritzbox_username [fritzbox username] env.fritzbox_password [fritzbox password] This plugin supports the following munin configuration parameters: @@ -29,9 +30,10 @@ def get_uptime(): """get the current uptime""" server = os.environ['fritzbox_ip'] + username = os.environ['fritzbox_username'] password = os.environ['fritzbox_password'] - sid = fh.get_sid(server, password) + sid = fh.get_sid(server, username, username, password) data = fh.get_page(server, sid, PAGE) matches = re.finditer(pattern, data) if matches: diff --git a/fritzbox_wifi_devices.py b/fritzbox_wifi_devices.py index 0c5c01b..38e5565 100755 --- a/fritzbox_wifi_devices.py +++ b/fritzbox_wifi_devices.py @@ -9,6 +9,7 @@ [fritzbox_*] env.fritzbox_ip [ip address of the fritzbox] + env.fritzbox_username [fritzbox username] env.fritzbox_password [fritzbox password] This plugin supports the following munin configuration parameters: @@ -29,9 +30,10 @@ def get_connected_wifi_devices(): """gets the numbrer of currently connected wifi devices""" server = os.environ['fritzbox_ip'] + username = os.environ['fritzbox_username'] password = os.environ['fritzbox_password'] - sid = fh.get_sid(server, password) + sid = fh.get_sid(server, username, password) data = fh.get_page(server, sid, PAGE) m = re.search(pattern, data) if m: