Added Basic Auth and modified _parse_track_id (#6)

* modified _parse_track_id

I am not parsing all the data returned after an 'a=control' string. Made some changes to fix this.

* Added Basic Auth

Added Basic autherization per RFC 2068.

* Updated how track list is populated

Author: killian441

rtsp.py

@@ -11,7 +11,7 @@
 # Ported to Python3, removed GoodThread
 # -killian441
 
-import ast, datetime, re, socket, threading, time, traceback
+import ast, base64, datetime, re, socket, threading, time, traceback
 from hashlib import md5
 try:
     from urllib.parse import urlparse
@@ -155,7 +155,7 @@ def _connect_server(self):
                             (e, self._parsed_url.hostname, self._server_port))
 
     def _update_content_base(self, msg):
-        m = re.search(r'[Cc]ontent-[Bb]ase:\s?(?P<base>[a-zA-Z0-9_:\/\.]+)', msg)
+        m = re.search(r'[Cc]ontent-[Bb]ase:\s?(?P<base>[a-zA-Z0-9_:\/\.-]+)', msg)
         if (m and m.group('base')):
             new_url = m.group('base')
             if new_url[-1] == '/':
@@ -206,8 +206,13 @@ def _add_auth(self, msg):
            (i.e. everything after "www-authentication")'''
         #TODO: this is too simplistic and will fail if more than one method
         #       is acceptable, among other issues
+        #       i.e. REALM-value is case-sensitive, so theres a failure.
         if msg.lower().startswith('basic'):
-            pass
+            response = self._parsed_url.username + ':' + \
+                       self._parsed_url.password
+            response = base64.b64encode(response.encode())
+            auth_string = 'Basic {}'.format(response)
+            self._auth = auth_string
         elif msg.lower().startswith('digest '):
             mod_msg = '{'+msg[7:].replace('=',':')+'}'
             mod_msg = mod_msg.replace('realm','"realm"')
@@ -328,8 +333,11 @@ def _parse_header_params(self, header_param_lines):
 
     def _parse_track_id(self, sdp):
         '''Resolves a string of the form trackID = 2 from sdp'''
-        m = re.findall(r'a=control:(?P<trackid>[\w=\d]+)', sdp, re.S)
-        self.track_id_lst = m
+        #m = re.findall(r'a=control:(?P<trackid>[\w=\d]+)', sdp, re.S)
+        # The following returns full url after a=control:
+        m = re.findall(r'a=control:(?P<trackid>[:/\.\w\d]+[=\d][\d]*)', sdp, re.S)
+        m.remove(self._orig_url)
+        self.track_id_lst = [x.replace(self._orig_url+'/','') for x in m]
 
     def _next_seq(self):
         self._cseq += 1