Skip to content

Commit c608440

Browse files
committed
allow clients to specify username, do verify it
and add some type hints
1 parent c4070ab commit c608440

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

xpra/platform/win32/service.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import os
77

8+
from collections.abc import Sequence
9+
10+
811
PIPE_NAME = "xpra-service"
912

1013

@@ -24,7 +27,7 @@ def get_commonappdata_dir() -> str:
2427
return ""
2528

2629

27-
def main(argv):
30+
def main(argv: Sequence[str]) -> int:
2831
if len(argv) > 1 and argv[1] != "start":
2932
if argv[1] != "stop":
3033
raise ValueError(f"unsupported subcommand {argv[1]!r}")
@@ -39,7 +42,7 @@ def main(argv):
3942

4043
args = argv[:1] + [
4144
"proxy",
42-
"--bind-tcp=0.0.0.0:14500,auth=sys",
45+
"--bind-tcp=0.0.0.0:14500,auth=sys,client-username=true,verify-username=true",
4346
"--tray=no",
4447
# "-d", "win32,proxy",
4548
# "--mdns=no",
@@ -62,12 +65,12 @@ def main(argv):
6265
return run_mode("Xpra-Proxy", args)
6366

6467

65-
def run_mode(name, args):
68+
def run_mode(name: str, args: Sequence[str]) -> int:
6669
from xpra.platform import init, set_default_name
6770
set_default_name(name)
6871
init()
6972
from xpra.scripts.main import main as xpra_main
70-
return xpra_main(args[0], args)
73+
return int(xpra_main(args[0], args))
7174

7275

7376
if __name__ == "__main__":

0 commit comments

Comments
 (0)