Merge pull request #218 from aniqfakhrul/dev

Dev

Author: aniqfakhrul

.gitignore

@@ -8,3 +8,4 @@ build
 dist
 powerview-venv
 venv
+.venv

README.md

@@ -5,7 +5,7 @@
 
 <p align="center">
 
-<img src="https://img.shields.io/badge/version-2025.1.7-blue" alt="version 2025.1.7"/>
+<img src="https://img.shields.io/badge/version-2025.1.8-blue" alt="version 2025.1.8"/>
 
 <a href="https://x.com/aniqfakhrul">
     <img src="https://img.shields.io/twitter/follow/aniqfakhrul?style=social"

flake.nix

@@ -19,7 +19,7 @@
         pkgs = nixpkgs.legacyPackages.${system};
         powerview = pkgs.python3Packages.buildPythonApplication rec {
           pname = "powerview";
-          version = "2025.1.7";
+          version = "2025.1.8";
           format = "pyproject";
 
           src = pkgs.fetchFromGitHub {

powerview/_version.py

@@ -1,7 +1,7 @@
 import datetime
 
 __year__ = datetime.date.today().year
-__version__ = f"{__year__}.1.7"
+__version__ = f"{__year__}.1.8"
 __author__ = [
 	"Aniq Fakhrul",
 	"Ali Radzali"

powerview/lib/efs.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+from impacket.uuid import uuidtup_to_bin
+
+EFS_UUID = uuidtup_to_bin(('df1941c5-fe89-4e79-bf10-463657acf44d', '1.0'))

powerview/lib/ldap3/extend/__init__.py

@@ -31,8 +31,12 @@ def _format_vulnerability(self, vuln_dict):
 		"""Format a vulnerability dictionary as a string"""
 		vuln_id = vuln_dict.get('id', 'VULN')
 		description = vuln_dict.get('description', '')
-		severity = vuln_dict.get('severity', '').upper()
-		formatted = f"[{vuln_id}] {description} ({severity})"
+		sev_colored = vuln_dict.get('severity_colored')
+		if sev_colored:
+			formatted = f"[{vuln_id}] {description} ({sev_colored})"
+		else:
+			severity = vuln_dict.get('severity', '').upper()
+			formatted = f"[{vuln_id}] {description} ({severity})"
 		if 'details' in vuln_dict:
 			formatted += f" - {vuln_dict['details']}"
 		return formatted
@@ -60,7 +64,6 @@ def paged_search(self,
 		no_vuln_check = no_vuln_check or self.no_vuln_check
 		raw = raw or self.raw
 
-		# Save the original formatter
 		original_formatter = None
 		if raw and self.server and hasattr(self.server, 'custom_formatter'):
 			logging.debug("[CustomStandardExtendedOperations] Unsetting custom formatter")
@@ -73,18 +76,15 @@ def paged_search(self,
 				if cached_results is not None:
 					logging.debug("[CustomStandardExtendedOperations] Returning cached results for query")
 
-					# Mark results as coming from cache
 					for entry in cached_results:
 						if 'attributes' in entry:
 							entry['from_cache'] = True
 
-					# Process vulnerabilities for all objects
 					if not no_vuln_check:
 						for entry in cached_results:
 							if 'attributes' in entry:
 								vulnerabilities = self.vulnerability_detector.detect_vulnerabilities(entry['attributes'])
 								if vulnerabilities:
-									# Convert dictionary vulnerabilities to formatted strings
 									entry['attributes']['vulnerabilities'] = [self._format_vulnerability(v) for v in vulnerabilities]
 
 					return cached_results
@@ -131,7 +131,6 @@ def paged_search(self,
 				if self.use_adws:
 					results = list(adws_paged_search_generator(self._connection, modified_dn, modified_filter, search_scope, attributes, size_limit, time_limit, types_only, get_operational_attributes, controls, paged_size, paged_criticality))
 				else:
-					# Get all results first so we can post-process them
 					results = list(paged_search_generator(self._connection,
 												modified_dn,
 												modified_filter,
@@ -146,29 +145,24 @@ def paged_search(self,
 												paged_size,
 												paged_criticality))
 
-				# Filter out non-search results
 				filtered_results = []
 				for entry in results:
 					if entry['type'] != 'searchResEntry':
 						continue
 
-					# Strip entries if requested
 					if strip_entries:
 						strip_entry(entry)
 
 					filtered_results.append(entry)
 
-				# Process vulnerabilities for all objects
 				if not no_vuln_check:
 					for entry in filtered_results:
 						if 'attributes' in entry:
 							vulnerabilities = self.vulnerability_detector.detect_vulnerabilities(entry['attributes'])
 							if vulnerabilities:
-								# Convert dictionary vulnerabilities to formatted strings
 								entry['attributes']['vulnerabilities'] = [self._format_vulnerability(v) for v in vulnerabilities]
 
 				if not no_cache:
-					# Remove from_cache attribute before caching if it exists
 					for entry in filtered_results:
 						if 'attributes' in entry and 'from_cache' in entry['attributes']:
 							del entry['attributes']['from_cache']
@@ -208,37 +202,31 @@ def paged_search(self,
 						paged_criticality
 					))
 
-				# Filter out non-search results and strip entries if requested
 				filtered_results = []
 				for entry in results:
 					if hasattr(entry, 'type') and entry['type'] != 'searchResEntry':
 						continue
 
-					# Strip entries if requested
 					if strip_entries:
 						strip_entry(entry)
 
 					filtered_results.append(entry)
 
-				# Process vulnerabilities for all objects
 				if not no_vuln_check:
 					for entry in filtered_results:
 						if 'attributes' in entry:
 							vulnerabilities = self.vulnerability_detector.detect_vulnerabilities(entry['attributes'])
 							if vulnerabilities:
-								# Convert dictionary vulnerabilities to formatted strings
 								entry['attributes']['vulnerabilities'] = [self._format_vulnerability(v) for v in vulnerabilities]
 
 				if not no_cache:
-					# Remove from_cache attribute before caching if it exists
 					for entry in filtered_results:
 						if 'attributes' in entry and 'from_cache' in entry['attributes']:
 							del entry['attributes']['from_cache']
 
 					self.storage.cache_results(search_base, search_filter, search_scope, attributes, host=self.server.host, results=filtered_results, raw=raw)
 				return filtered_results
 		finally:
-			# Restore the original formatter
 			if raw and original_formatter is not None and self.server:
 				self.server.custom_formatter = original_formatter
 

powerview/lib/resolver.py

@@ -226,7 +226,7 @@ def human_readable_time_diff(past_date):
 		elif diff.days > 0:
 			return f"{diff.days} day{'s' if diff.days > 1 else ''} ago"
 		else:
-			return "today"
+			return f"today"
 
 	@staticmethod
 	def resolve_generalized_time(ldap_time):