Merge pull request #422 from Pennyw0rth/neff-fix-maq

Fix maq module if MAQ not set
Pennyw0rth · Sep 24, 2024 · ac2dfc9 · ac2dfc9
2 parents 99d4e49 + 6dbf14b
commit ac2dfc9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/nxc/modules/hyperv-host.py b/nxc/modules/hyperv-host.py
@@ -22,7 +22,7 @@ def options(self, context, module_options):
  def on_admin_login(self, context, connection):
  self.context = context
 
- path = "SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters"
+ path = "SOFTWARE\\Microsoft\\Virtual Machine\\Guest\\Parameters"
  key = "HostName"
 
  try:

diff --git a/nxc/modules/maq.py b/nxc/modules/maq.py
@@ -1,3 +1,5 @@
+from pyasn1.error import PyAsn1Error
+
 
 class NXCModule:
  """
@@ -21,9 +23,10 @@ def options(self, context, module_options):
  multiple_hosts = False
 
  def on_login(self, context, connection):
- result = []
  context.log.display("Getting the MachineAccountQuota")
- searchFilter = "(objectClass=*)"
- attributes = ["ms-DS-MachineAccountQuota"]
- result = connection.search(searchFilter, attributes)
- context.log.highlight("MachineAccountQuota: %d" % result[0]["attributes"][0]["vals"][0])
+ result = connection.search("(objectClass=*)", ["ms-DS-MachineAccountQuota"])
+ try:
+ maq = result[0]["attributes"][0]["vals"][0]
+ context.log.highlight(f"MachineAccountQuota: {maq}")
+ except PyAsn1Error:
+ context.log.highlight("MachineAccountQuota: <not set>")