From 23baa40e717518a21d039f2554bcac17c79de74f Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 18 Sep 2024 09:25:44 +0200 Subject: [PATCH] VR: fix password server exception when no password is found see errors in /var/log/daemon.log below ``` Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: ---------------------------------------- Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: Exception occurred during processing of request from ('192.168.20.8', 51108) Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: Traceback (most recent call last): Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/usr/lib/python3.11/socketserver.py", line 691, in process_request_thread Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: self.finish_request(request, client_address) Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/usr/lib/python3.11/socketserver.py", line 361, in finish_request Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: self.RequestHandlerClass(request, client_address, self) Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/usr/lib/python3.11/socketserver.py", line 755, in __init__ Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: self.handle() Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/usr/lib/python3.11/http/server.py", line 432, in handle Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: self.handle_one_request() Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/usr/lib/python3.11/http/server.py", line 420, in handle_one_request Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: method() Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/opt/cloud/bin/passwd_server_ip.py", line 117, in do_GET Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: self.wfile.write('saved_password') Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: File "/usr/lib/python3.11/socketserver.py", line 834, in write Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: self._sock.sendall(b) Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: TypeError: a bytes-like object is required, not 'str' Sep 13 12:36:58 systemvm passwd_server_ip.py[2154]: ---------------------------------------- ``` --- systemvm/debian/opt/cloud/bin/passwd_server_ip.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/passwd_server_ip.py b/systemvm/debian/opt/cloud/bin/passwd_server_ip.py index 7df4ec27763d..8051951a18f5 100755 --- a/systemvm/debian/opt/cloud/bin/passwd_server_ip.py +++ b/systemvm/debian/opt/cloud/bin/passwd_server_ip.py @@ -114,7 +114,7 @@ def do_GET(self): if requestType == 'send_my_password': password = getPassword(clientAddress) if not password: - self.wfile.write('saved_password') + self.wfile.write('saved_password'.encode()) syslog.syslog('serve_password: requested password not found for %s' % clientAddress) else: self.wfile.write(password.encode()) @@ -122,11 +122,11 @@ def do_GET(self): elif requestType == 'saved_password': removePassword(clientAddress) savePasswordFile() - self.wfile.write('saved_password') + self.wfile.write('saved_password'.encode()) syslog.syslog('serve_password: saved_password ack received from %s' % clientAddress) else: self.send_response(400) - self.wfile.write('bad_request') + self.wfile.write('bad_request'.encode()) syslog.syslog('serve_password: bad_request from IP %s' % clientAddress) return