Добавлена обработка заголовков запроса X-Forwarded...

[vpproxy.git] / vphttp.py

diff --git a/vphttp.py b/vphttp.py
index bda34851d4be98e4ef5b7df5b6ef2d710e5e44ee..040e94cf3555e667292fa14105d69b7850e3cfdf 100644 (file)
--- a/vphttp.py
+++ b/vphttp.py
@@ -27,6 +27,7 @@ import hashlib
 import vpconfig
 from vpconfig import VPConfig
 import vlcclient
 import vpconfig
 from vpconfig import VPConfig
 import vlcclient

+import gc

 import plugins.modules.ipaddr as ipaddr
 from clientcounter import ClientCounter
 from plugins.modules.PluginInterface import VPProxyPlugin
 import plugins.modules.ipaddr as ipaddr
 from clientcounter import ClientCounter
 from plugins.modules.PluginInterface import VPProxyPlugin


@@ -36,7 +37,9 @@ try:
 except ImportError:
     pass
 
 except ImportError:
     pass
 

+import uuid

 
 

+from apscheduler.schedulers.background import BackgroundScheduler

 
 class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
 
 class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 


@@ -85,11 +88,12 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
         try:
             while True:
 
         try:
             while True:

-
+            

                 if not self.clientconnected:
                     logger.debug("Client is not connected, terminating")
                     break
 
                 if not self.clientconnected:
                     logger.debug("Client is not connected, terminating")
                     break
 

+                VPStuff.vlcclient.mark(self.vlcid)

                 data = self.video.read(4096)
                 if data and self.clientconnected:
                     self.wfile.write(data)
                 data = self.video.read(4096)
                 if data and self.clientconnected:
                     self.wfile.write(data)


@@ -134,6 +138,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         '''
         GET request handler
         '''
         '''
         GET request handler
         '''

+

         logger = logging.getLogger('http_HTTPHandler')
         self.clientconnected = True
         # Don't wait videodestroydelay if error happened
         logger = logging.getLogger('http_HTTPHandler')
         self.clientconnected = True
         # Don't wait videodestroydelay if error happened


@@ -145,6 +150,14 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         # Connected client IP address
         self.clientip = self.request.getpeername()[0]
 
         # Connected client IP address
         self.clientip = self.request.getpeername()[0]
 

+        req_headers = self.headers 
+        self.client_data = { 
+          'ip': self.clientip, 
+          'forwarded-for': req_headers.get('X-Forwarded-For'),
+          'client-agent': req_headers.get('User-Agent'),
+          'uuid': uuid.uuid4()
+          }
+          

         if VPConfig.firewall:
             # If firewall enabled
             self.clientinrange = any(map(lambda i: ipaddr.IPAddress(self.clientip) \
         if VPConfig.firewall:
             # If firewall enabled
             self.clientinrange = any(map(lambda i: ipaddr.IPAddress(self.clientip) \


@@ -164,7 +177,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             self.reqtype = self.splittedpath[1].lower()
             # If first parameter is 'pid' or 'torrent' or it should be handled
             # by plugin
             self.reqtype = self.splittedpath[1].lower()
             # If first parameter is 'pid' or 'torrent' or it should be handled
             # by plugin

-            if not (self.reqtype in ('get','mp4','ogg') or self.reqtype in VPStuff.pluginshandlers):
+            if not (self.reqtype in ('get','mp4','ogg','ogv') or self.reqtype in VPStuff.pluginshandlers):

                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:
                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:


@@ -185,7 +198,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         self.handleRequest(headers_only)
 
     def handleRequest(self, headers_only):
         self.handleRequest(headers_only)
 
     def handleRequest(self, headers_only):

-
+      

         # Limit concurrent connections
         if 0 < VPConfig.maxconns <= VPStuff.clientcounter.total:
             logger.debug("Maximum connections reached, can't serve this")
         # Limit concurrent connections
         if 0 < VPConfig.maxconns <= VPStuff.clientcounter.total:
             logger.debug("Maximum connections reached, can't serve this")


@@ -216,26 +229,28 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 self.params.append('0')
 
         # Adding client to clientcounter
                 self.params.append('0')
 
         # Adding client to clientcounter

-        clients = VPStuff.clientcounter.add(self.reqtype+'\\'+self.path_unquoted, self.clientip)
+        clients = VPStuff.clientcounter.add(self.reqtype+'/'+self.path_unquoted, self.client_data)

         # If we are the one client, but sucessfully got vp instance from clientcounter,
         # then somebody is waiting in the videodestroydelay state
 
         # Check if we are first client
         # If we are the one client, but sucessfully got vp instance from clientcounter,
         # then somebody is waiting in the videodestroydelay state
 
         # Check if we are first client

-        if VPStuff.clientcounter.get(self.reqtype+'\\'+self.path_unquoted)==1:
+        if VPStuff.clientcounter.get(self.reqtype+'/'+self.path_unquoted)==1:

             logger.debug("First client, should create VLC session")
             shouldcreatevp = True
         else:
             logger.debug("Can reuse existing session")
             shouldcreatevp = False
 
             logger.debug("First client, should create VLC session")
             shouldcreatevp = True
         else:
             logger.debug("Can reuse existing session")
             shouldcreatevp = False
 

-        self.vlcid = hashlib.md5(self.reqtype+'\\'+self.path_unquoted).hexdigest()
+        self.vlcid = hashlib.md5(self.reqtype+'/'+self.path_unquoted).hexdigest()

 
         # Send fake headers if this User-Agent is in fakeheaderuas tuple
         if fakeua:
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)
 
         # Send fake headers if this User-Agent is in fakeheaderuas tuple
         if fakeua:
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)

-            if self.reqtype=="ogg":
+            self.send_header('Cache-Control','no-cache, no-store, must-revalidate');
+            self.send_header('Pragma','no-cache');
+            if self.reqtype in ("ogg","ogv"):

                 self.send_header("Content-Type", "video/ogg")
             else:
                 self.send_header("Content-Type", "video/mpeg")
                 self.send_header("Content-Type", "video/ogg")
             else:
                 self.send_header("Content-Type", "video/mpeg")


@@ -295,6 +310,9 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])
 
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])
 

+                self.send_header('Cache-Control','no-cache, no-store, must-revalidate');
+                self.send_header('Pragma','no-cache');
+

                 if self.reqtype=="ogg":
                     self.send_header("Content-Type", "video/ogg")
                 else:
                 if self.reqtype=="ogg":
                     self.send_header("Content-Type", "video/ogg")
                 else:


@@ -303,6 +321,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 # End headers. Next goes video data
                 self.end_headers()
                 logger.debug("Headers sent")
                 # End headers. Next goes video data
                 self.end_headers()
                 logger.debug("Headers sent")

+                self.headerssent = True

 
             # Run proxyReadWrite
             self.proxyReadWrite()
 
             # Run proxyReadWrite
             self.proxyReadWrite()


@@ -326,16 +345,8 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         finally:
             logger.debug("END REQUEST")
             logger.info("Closed connection from " + self.clientip + " path " + self.path)
         finally:
             logger.debug("END REQUEST")
             logger.info("Closed connection from " + self.clientip + " path " + self.path)

-            VPStuff.clientcounter.delete(self.reqtype+'\\'+self.path_unquoted, self.clientip)
-            if not VPStuff.clientcounter.get(self.reqtype+'\\'+self.path_unquoted):
-                try:
-                    logger.debug("That was the last client, destroying VPClient")
-                    logger.info("Stopping broadcasting " + self.path)
-                    VPStuff.vlcclient.stopBroadcast(self.vlcid)
-                except:
-                    pass
-                self.vp.destroy()
-
+            VPStuff.clientcounter.delete(self.reqtype+'/'+self.path_unquoted, self.client_data)
+            self.vp.destroy()

 
 class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
 
 
 class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
 


@@ -402,6 +413,7 @@ for i in pluginslist:
         continue
     logger.debug('Plugin loaded: ' + plugname)
     for j in plugininstance.handlers:
         continue
     logger.debug('Plugin loaded: ' + plugname)
     for j in plugininstance.handlers:

+        logger.info("Registering handler '" + j +"'")

         VPStuff.pluginshandlers[j] = plugininstance
     VPStuff.pluginlist.append(plugininstance)
 
         VPStuff.pluginshandlers[j] = plugininstance
     VPStuff.pluginlist.append(plugininstance)
 


@@ -504,6 +516,14 @@ def _reloadconfig(signum=None, frame=None):
     from vpconfig import VPConfig
     logger.info('Config reloaded')
 
     from vpconfig import VPConfig
     logger.info('Config reloaded')
 

+sched = BackgroundScheduler()
+sched.start()
+
+def clean_streams():
+  VPStuff.vlcclient.clean_streams(VPConfig.videodestroydelay)
+
+job = sched.add_job(clean_streams, 'interval', seconds=15)
+

 # setting signal handlers
 try:
     gevent.signal(signal.SIGHUP, _reloadconfig)
 # setting signal handlers
 try:
     gevent.signal(signal.SIGHUP, _reloadconfig)


@@ -522,7 +542,7 @@ else:
 
 try:
     logger.info("Using gevent %s" % gevent.__version__)
 
 try:
     logger.info("Using gevent %s" % gevent.__version__)

-    logger.info("Using psutil %s" % psutil.__version__)
+    logger.info("Usig psutil %s" % psutil.__version__)

     logger.info("Using VLC %s" % VPStuff.vlcclient._vlcver)
     logger.info("Server started.")
     while True:
     logger.info("Using VLC %s" % VPStuff.vlcclient._vlcver)
     logger.info("Server started.")
     while True:


@@ -537,4 +557,5 @@ try:
         # Return to our server tasks
         server.handle_request()
 except (KeyboardInterrupt, SystemExit):
         # Return to our server tasks
         server.handle_request()
 except (KeyboardInterrupt, SystemExit):

+    sched.shutdown()

     shutdown()
     shutdown()