Ticket #2125: paket handler.patch

trunk/src/xpra/server/server_core.py

@@ -677 +677 @@
         netlog("initializing packet handlers")
         self._default_packet_handlers = {
             "hello":                                self._process_hello,
+            "register":                             self._process_register,
             "disconnect":                           self._process_disconnect,
             "udp-control":                          self._process_udp_control,
             Protocol.CONNECTION_LOST:               self._process_connection_lost,
@@ -1411 +1412 @@
         proto.send_now(("hello", {"version" : version}))
         #client is meant to close the connection itself, but just in case:
         self.timeout_add(5*1000, self.send_disconnect, proto, DONE, "version sent")
+    def _process_hello(self, proto, packet):
+        success, c = self._process(proto, packet)
+        if not success:
+            return
 
-    def _process_hello(self, proto, packet):
+        #this will call auth_verified if successful
+        #it may also just send challenge packets,
+        #in which case we'll end up here parsing the hello again
+        start_thread(self.verify_auth, "authenticate connection", daemon=True, args=(proto, packet, c))
+    # process:
+    def _process(self, proto, packet):
         capabilities = packet[1]
         c = typedict(capabilities)
         proto.set_compression_level(c.intget("compression_level", self.compression_level))
@@ -1422 +1432 @@
             #if we got here, we parsed a packet from the client!
             #(maybe the client used an encoding it claims not to support?)
             self.disconnect_client(proto, PROTOCOL_ERROR, "failed to negotiate a packet encoder")
-            return
+            return False, null
 
         log("process_hello: capabilities=%s", capabilities)
         if c.boolget("version_request"):
             self.send_version_info(proto, c.boolget("full-version-request"))
-            return
+            return True, null
         #verify version:
         remote_version = c.strget("version")
         verr = version_compat_check(remote_version)
@@ -1434 +1444 @@
         if verr is not None:
             self.disconnect_client(proto, VERSION_ERROR, "incompatible version: %s" % verr)
             proto.close()
+            return False, null
+
+        return True, c
+
+    ######################################################################
+    # register:
+    def _process_register(self, proto, packet):
+        log.error("register_server")
+
+        success, c = self._process(proto, packet)
+        if not success:
             return
-        #this will call auth_verified if successful
-        #it may also just send challenge packets,
-        #in which case we'll end up here parsing the hello again
-        start_thread(self.verify_auth, "authenticate connection", daemon=True, args=(proto, packet, c))
 
+        options = c.dictget("register-options")
+        log.error(csv(options))
+
+        from mod_python import apache
+        session = self.get_remote_host(apache.REMOTE_NOLOOKUP)
+        log.error(csv(session))
+
+        answer = {}
+        answer.message =  add_user(self.filename, "foo", "bar", "nonody", "nobody", session, "", "")
+
+        log.error(csv(answer))
+
+        proto.send_now(("registered", answer))
+
+
+
+    ######################################################################
+
+
     def make_authenticators(self, socktype, username, conn):
         authlog("make_authenticators%s", (socktype, username, conn))
         authenticators = []