Skip to content

Commit 9f238eb

Browse files
tony-romanovychbrianmay
authored andcommitted
Properly decode seed hosts argument in server.py
When I starting sshuttle with option `--seed-hosts example.com`, got the following error: ``` hostwatch: Starting hostwatch with Python version 3.5.2 hostwatch: Traceback (most recent call last): ---> File "sshuttle.server", line 144, in start_hostwatch ---> File "sshuttle.hostwatch", line 272, in hw_main ---> File "sshuttle.hostwatch", line 234, in check_host ---> File "sshuttle.hostwatch", line 32, in _is_ip ---> File "/usr/lib/python3.5/re.py", line 163, in match ---> return _compile(pattern, flags).match(string) ---> TypeError: cannot use a string pattern on a bytes-like object Traceback (most recent call last): File "<string>", line 1, in <module> File "assembler.py", line 37, in <module> File "sshuttle.server", line 393, in main File "sshuttle.ssnet", line 596, in runonce File "sshuttle.server", line 324, in hostwatch_ready sshuttle.helpers.Fatal: hostwatch process died ``` It seems like the list of hosts is not properly decoded on the server side. This is an attempt to fix that.
1 parent 9b31574 commit 9f238eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sshuttle/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def hostwatch_ready(sock):
326326
def got_host_req(data):
327327
if not hw.pid:
328328
(hw.pid, hw.sock) = start_hostwatch(
329-
data.strip().split(), auto_hosts)
329+
data.decode("ASCII").strip().split(), auto_hosts)
330330
handlers.append(Handler(socks=[hw.sock],
331331
callback=hostwatch_ready))
332332
mux.got_host_req = got_host_req

0 commit comments

Comments
 (0)