daanselen/meshbook
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Targeting tags seems to work well. Needing doc update.

Browse Source
This commit is contained in:
Daan Selen
2025-03-27 11:19:04 +01:00
parent b2bf899d42
commit 1d4b89a2ed
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meshbook.py
+15 -11
View File
@@ -191,6 +191,8 @@ async def filter_targets(devices: list[dict], os_categories: dict, target_os: st
if not device["reachable"]: if not device["reachable"]:
continue # Skip unreachable devices. continue # Skip unreachable devices.
print(target_tag)
print(device["device_tags"])
if target_tag and target_tag not in device["device_tags"]: if target_tag and target_tag not in device["device_tags"]:
continue continue
@@ -208,6 +210,7 @@ async def gather_targets(meshbook: dict, group_list: dict[str, list[dict]], os_c
target_list = [] target_list = []
target_os = meshbook.get("target_os") target_os = meshbook.get("target_os")
target_tag = meshbook.get("target_tag")
async def process_device_or_group(pseudo_target, group_list, os_categories, target_os) -> list[str]: async def process_device_or_group(pseudo_target, group_list, os_categories, target_os) -> list[str]:
''' '''
@@ -221,7 +224,7 @@ async def gather_targets(meshbook: dict, group_list: dict[str, list[dict]], os_c
matched_devices.append(device) matched_devices.append(device)
if matched_devices: if matched_devices:
return await filter_targets(matched_devices, os_categories, target_os) return await filter_targets(matched_devices, os_categories, target_os, target_tag)
return [] return []
match meshbook: match meshbook:
@@ -243,7 +246,7 @@ async def gather_targets(meshbook: dict, group_list: dict[str, list[dict]], os_c
case {"group": pseudo_target}: # Single group target case {"group": pseudo_target}: # Single group target
if isinstance(pseudo_target, str) and pseudo_target in group_list: if isinstance(pseudo_target, str) and pseudo_target in group_list:
matched_devices = await filter_targets(group_list[pseudo_target], os_categories, target_os) matched_devices = await filter_targets(group_list[pseudo_target], os_categories, target_os, target_tag)
target_list.extend(matched_devices) target_list.extend(matched_devices)
elif pseudo_target not in group_list: elif pseudo_target not in group_list:
console(text_color.yellow + "Targeted group not found on the MeshCentral server.", True) console(text_color.yellow + "Targeted group not found on the MeshCentral server.", True)
@@ -254,11 +257,11 @@ async def gather_targets(meshbook: dict, group_list: dict[str, list[dict]], os_c
if isinstance(pseudo_target, list): if isinstance(pseudo_target, list):
for sub_pseudo_target in pseudo_target: for sub_pseudo_target in pseudo_target:
if sub_pseudo_target in group_list: if sub_pseudo_target in group_list:
matched_devices = await filter_targets(group_list[sub_pseudo_target], os_categories, target_os) matched_devices = await filter_targets(group_list[sub_pseudo_target], os_categories, target_os, target_tag)
target_list.extend(matched_devices) target_list.extend(matched_devices)
if pseudo_target.lower() == "all": if pseudo_target.lower() == "all":
for group in group_list: for group in group_list:
matched_devices = await filter_targets(group_list[group], os_categories, target_os) matched_devices = await filter_targets(group_list[group], os_categories, target_os, target_tag)
target_list.extend(matched_devices) target_list.extend(matched_devices)
else: else:
console(text_color.yellow + "The 'groups' method is being used, but only one string is given. Did you mean 'group'?", True) console(text_color.yellow + "The 'groups' method is being used, but only one string is given. Did you mean 'group'?", True)
@@ -294,7 +297,7 @@ async def execute_meshbook(session: meshctrl.Session, targets: dict, meshbook: d
} }
round += 1 round += 1
console(("-" * 40)) console(text_color.reset + ("-" * 40))
if args.indent: if args.indent:
console((json.dumps(responses_list,indent=4)), True) console((json.dumps(responses_list,indent=4)), True)
@@ -333,7 +336,7 @@ async def main():
The following section mainly displays used variables and first steps of the program to the console. The following section mainly displays used variables and first steps of the program to the console.
''' '''
console(("-" * 40)) console(text_color.reset + ("-" * 40))
console("meshbook: " + text_color.yellow + args.meshbook) console("meshbook: " + text_color.yellow + args.meshbook)
console("Operating System Categorisation file: " + text_color.yellow + args.oscategories) console("Operating System Categorisation file: " + text_color.yellow + args.oscategories)
console("Configuration file: " + text_color.yellow + args.conf) console("Configuration file: " + text_color.yellow + args.conf)
@@ -352,7 +355,7 @@ async def main():
console("Silent: " + text_color.yellow + "False") # Can be pre-defined because if silent flag was passed then none of this would be printed. console("Silent: " + text_color.yellow + "False") # Can be pre-defined because if silent flag was passed then none of this would be printed.
session = await init_connection(credentials) session = await init_connection(credentials)
console(("-" * 40)) console(text_color.reset + ("-" * 40))
console(text_color.italic + "Trying to load the MeshCentral account credential file...") console(text_color.italic + "Trying to load the MeshCentral account credential file...")
console(text_color.italic + "Trying to load the meshbook yaml file and compile it into something workable...") console(text_color.italic + "Trying to load the meshbook yaml file and compile it into something workable...")
console(text_color.italic + "Trying to load the Operating System categorisation JSON file...") console(text_color.italic + "Trying to load the Operating System categorisation JSON file...")
@@ -368,10 +371,10 @@ async def main():
if len(targets_list) == 0: if len(targets_list) == 0:
console(text_color.red + "No targets found or targets unreachable, quitting.", True) console(text_color.red + "No targets found or targets unreachable, quitting.", True)
console(("-" * 40), True) console(text_color.reset + ("-" * 40), True)
else: else:
console(("-" * 40)) console(text_color.reset + ("-" * 40))
match meshbook: match meshbook:
case {"group": candidate_target_name}: case {"group": candidate_target_name}:
@@ -395,8 +398,9 @@ async def main():
console(text_color.yellow + "{}...".format(x+1)) # Countdown! console(text_color.yellow + "{}...".format(x+1)) # Countdown!
await asyncio.sleep(1) await asyncio.sleep(1)
console(("-" * 40)) console(text_color.reset + ("-" * 40))
await execute_meshbook(session, targets_list, meshbook, group_list) print(json.dumps(targets_list,indent=4))
#await execute_meshbook(session, targets_list, meshbook, group_list)
await session.close() await session.close()