yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zerotier-members: fix passing member_ip

Browse Source
This commit is contained in:
Jörg Thalheim
2025-08-25 14:36:04 +02:00
parent 306f83e357
commit 2bebcab736
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/zerotier-members/zerotier-members.py
View File

@@ -66,9 +66,12 @@ def get_network_id() -> str:
def allow_member(args: argparse.Namespace) -> None: def allow_member(args: argparse.Namespace) -> None:
if args.member_ip: if args.member_ip:
member_id = compute_member_id(args.member_ip) member_id = compute_member_id(args.member_id_or_ip)
else: else:
member_id = args.member_id if not args.member_id_or_ip:
msg = "Either --member-ip or member_id_or_ip must be provided"
raise ClanError(msg)
member_id = args.member_id_or_ip
network_id = get_network_id() network_id = get_network_id()
token = ZEROTIER_STATE_DIR.joinpath("authtoken.secret").read_text() token = ZEROTIER_STATE_DIR.joinpath("authtoken.secret").read_text()
conn = http.client.HTTPConnection("localhost", 9993) conn = http.client.HTTPConnection("localhost", 9993)
@@ -111,10 +114,12 @@ def main() -> None:
parser_allow = subparser.add_parser("allow", help="Allow a member to join") parser_allow = subparser.add_parser("allow", help="Allow a member to join")
parser_allow.add_argument( parser_allow.add_argument(
"--member-ip", "--member-ip",
help="Allow a member to join by their zerotier ipv6 address", help="Interpret the positional argument as an IPv6 address instead of member ID",
action="store_true", action="store_true",
) )
parser_allow.add_argument("member_id") parser_allow.add_argument(
"member_id_or_ip", help="Member ID or IPv6 address (when --member-ip is used)"
)
parser_allow.set_defaults(func=allow_member) parser_allow.set_defaults(func=allow_member)
parser_list = subparser.add_parser("list", help="List members") parser_list = subparser.add_parser("list", help="List members")