Ticket #2125: sessions.patch

src/xpra/server/auth/sqlauthbase.py

@@ -31 +31 @@
         return tuple(str(x[0]) for x in data)
 
     def get_sessions(self):
-        cursor = self.db_cursor(self.sessions_query, (self.username, self.password_used or ""))
+        cursor = self.db_cursor(self.sessions_query_by_username, (self.username, ))
+        datas = cursor.fetchall()
+        return self.parse_session_datas(datas)
+
+    def get_session_by_token(self, token):
+        cursor = self.db_cursor(self.sessions_get_by_token, (token, ))
         data = cursor.fetchone()
         if not data:
             return None
         return self.parse_session_data(data)
 
+    def parse_session_datas(self, datas):
+        sessions = []
+        for data in datas:
+            parsed_data = self.parse_session_data(data)
+            
+            if parsed_data is None:
+                return None
+            
+            sessions.append(parsed_data)
+            
+        return sessions
+
     def parse_session_data(self, data):
         try:
             uid = data[0]
@@ -129 +146 @@
         a = auth_class(username, self.uri)
         passwords = a.get_passwords()
         assert passwords
-        log("authenticate: got %i passwords", len(passwords))
+        assert len(passwords) in 1
         assert password in passwords
         a.password_used = password
-        sessions = a.get_sessions()
-        assert sessions, "no sessions found"
-        log("sql authentication success, found sessions: %s", sessions)
+        print("success, found password")
+        #sessions = a.get_sessions()
+        #assert sessions, "no sessions found"
+        #log("sql authentication success, found sessions: %s", sessions)
 
     def get_authenticator_class(self):
         raise NotImplementedError()

src/xpra/server/proxy/proxy_server.py

@@ -335 +335 @@
             try:
                 auth_sessions = authenticator.get_sessions()
                 authlog("proxy_auth %s.get_sessions()=%s", authenticator, auth_sessions)
-                if auth_sessions:
+                if len(auth_sessions) > 0:
                     sessions = auth_sessions
                     break
             except Exception as e:
@@ -344 +344 @@
                 authlog.error(" %s", e)
                 disconnect(AUTHENTICATION_ERROR, "cannot access sessions")
                 return
-        authlog("proxy_auth(%s, {..}, %s) found sessions: %s", client_proto, auth_caps, sessions)
-        if sessions is None:
+        
+        if len(sessions) == 1:
+            session_selected = sessions[0]
+        elif len(sessions) > 1:
+            # TODO selection session
+            # sessionId = ???
+            session_selected = sessions[0]
+        else:
             disconnect(SESSION_NOT_FOUND, "no sessions found")
             return
         self.proxy_session(client_proto, c, auth_caps, sessions)
@@ -662 +668 @@
                 if auth_sessions:
                     sessions = auth_sessions
                     break
-            if sessions:
-                uid, gid = sessions[:2]
+
+            sessions_info = []
+            for session in sessions:
+                
+                uid, gid = session[:2]
                 if not POSIX or (uid==getuid() and gid==getgid()):
                     self.reap()
                     i = 0
@@ -683 +692 @@
                             iinfo.update(proxy_instance.get_info())
                         instances_info[i] = iinfo
                         i += 1
-                    info["instances"] = instances_info
-                    info["proxies"] = len(instances)
+                        
+                    sessions_info.append({"instances": instances_info, "proxies": len(instances)})
+
+            info["sessions"] = sessions_info
+            
         return info

src/xpra/server/auth/sys_auth_base.py

@@ -208 +208 @@
             displays = []
         v = uid, gid, displays, {}, {}
         log("%s.get_sessions()=%s", self, v)
-        return v
+        return [v]
 
 
 class SysAuthenticator(SysAuthenticatorBase):

src/unittests/unit/server/auth_test.py

@@ -235 +235 @@
                         assert self.capsauth(a, verify, client_salt), "%s failed" % a.authenticate
                         if display_count>0:
                             sessions = a.get_sessions()
-                            assert len(sessions)>=3
-                            displays = sessions[2]
+                            assert len(sessions) == 1
+                            session = sessions[0]
+                            assert len(session)>=3
+                            displays = session[2]
                             assert len(displays)==display_count, "expected %i displays but got %i : %s" % (
-                                display_count, len(sessions), sessions)
+                                display_count, len(session), session)
                         assert not self.capsauth(a, verify, client_salt), "authenticated twice!"
                         passwords = a.get_passwords()
                         assert len(passwords)==1, "expected just one password in file, got %i" % len(passwords)

src/xpra/server/auth/multifile_auth.py

@@ -103 +103 @@
         if not verify_digest(self.digest, fpassword, salt, challenge_response):
             log.warn("Warning: %s challenge for '%s' does not match", self.digest, self.username)
             return False
-        self.sessions = uid, gid, displays, env_options, session_options
+        self.sessions = [(uid, gid, displays, env_options, session_options)]
         return True
 
     def get_sessions(self):