mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
VR: fix password server exception when no password is found (#9699)
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]: ----------------------------------------
```
This commit is contained in:
parent
7d95952bc1
commit
94a47ac778
@ -114,7 +114,7 @@ class PasswordRequestHandler(BaseHTTPRequestHandler):
|
||||
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 @@ class PasswordRequestHandler(BaseHTTPRequestHandler):
|
||||
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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user