HTTP basic auth

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index f158730da71bef27d84a21edae79f6b32d1c51ed..6c5b98b2faafcd345921f512381c1afcc634669d 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -7,9 +7,11 @@ import sys
 import os
 import socket
 try:
-    from urllib.request import urlopen
+    # from urllib.request import urlopen, Request, HTTPPasswordMgrWithDefaultRealm
+    import urllib.request as urllib2
 except ImportError:
-    from urllib2 import urlopen
+    # from urllib2 import urlopen, Request, HTTPPasswordMgrWithDefaultRealm
+    import urllib2
 
 # from subprocess import STDOUT, PIPE, Popen
 import threading
@@ -366,14 +368,19 @@ class SimpleService(BaseService):
 
 
 class UrlService(SimpleService):
-    # TODO HTTP Basic Authentication
     def __init__(self, configuration=None, name=None):
         self.url = ""
         self.user = None
         self.password = None
-        self.request = None
         SimpleService.__init__(self, configuration=configuration, name=name)
 
+    def __add_auth(self):
+        passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
+        passman.add_password(None, self.url, self.user, self.password)
+        authhandler = urllib2.HTTPBasicAuthHandler(passman)
+        opener = urllib2.build_opener(authhandler)
+        urllib2.install_opener(opener)
+
     def _get_raw_data(self):
         """
         Get raw data from http request
@@ -381,15 +388,17 @@ class UrlService(SimpleService):
         """
         raw = None
         try:
-            f = urlopen(self.url, timeout=self.update_every)
+            f = urllib2.urlopen(self.url, timeout=self.update_every)
+        except Exception as e:
+            msg.error(self.__module__, str(e))
+            return None
+
+        try:
             raw = f.read().decode('utf-8')
         except Exception as e:
             msg.error(self.__module__, str(e))
         finally:
-            try:
-                f.close()
-            except:
-                pass
+            f.close()
         return raw
 
     def check(self):
@@ -405,6 +414,17 @@ class UrlService(SimpleService):
             self.url = str(self.configuration['url'])
         except (KeyError, TypeError):
             pass
+        try:
+            self.user = str(self.configuration['user'])
+        except (KeyError, TypeError):
+            pass
+        try:
+            self.password = str(self.configuration['password'])
+        except (KeyError, TypeError):
+            pass
+
+        if self.user is not None and self.password is not None:
+            self.__add_auth()
 
         if self._get_data() is not None:
             return True