diff --git a/superTornado.py b/superTornado.py index 9ce6b1b..b0ae1a3 100644 --- a/superTornado.py +++ b/superTornado.py @@ -49,28 +49,6 @@ class VideoHandler(BaseHandler): return self.render("v/video.html") -class UnauthorizedHandler(BaseHandler): - def get(self): - self.render("v/illegal.html") - - def post(self): - force = self.get_argument("illegalAccess","") - if force == "1" : - self.set_secure_cookie("user", "illegalUser") - self.redirect("/video") - else : - self.redirect("/") - - -class DisconnectionHandler(BaseHandler): - def post(self): - if not self.current_user : - self.close() - return - self.clear_cookie("user") - self.redirect("/") - -class WSocketHandler(BaseHandler,tornado.websocket.WebSocketHandler): def open(self) : if not self.current_user : self.close() @@ -130,12 +108,35 @@ class WSocketHandler(BaseHandler,tornado.websocket.WebSocketHandler): print e self.write_message("error") + +class UnauthorizedHandler(BaseHandler,tornado.websocket.WebSocketHandler): + def get(self): + self.render("v/illegal.html") + + def post(self): + force = self.get_argument("illegalAccess","") + if force == "1" : + self.set_secure_cookie("user", "illegalUser") + self.redirect("/video") + else : + self.redirect("/") + + +class DisconnectionHandler(BaseHandler): + def post(self): + if not self.current_user : + self.close() + return + self.clear_cookie("user") + self.redirect("/") + + + application = tornado.web.Application([ (r"/", MainHandler), (r"/video", VideoHandler), (r"/unauthorized", UnauthorizedHandler), (r"/disconnection", DisconnectionHandler), - (r"/socket", WSocketHandler), (r"/style/(.*)", tornado.web.StaticFileHandler,{"path":"./v/style"},), (r"/images/(.*)", tornado.web.StaticFileHandler,{"path":"./v/images"},), (r"/js/(.*)", tornado.web.StaticFileHandler,{"path":"./v/js"},)], diff --git a/v/video.html b/v/video.html index f39cdc2..815b91b 100644 --- a/v/video.html +++ b/v/video.html @@ -6,7 +6,7 @@ Acces camera