Merge pull request BC-SECURITY#712 from BC-SECURITY/release/5.8.3

v5.8.3 into main
AmirulAndalib · Dec 15, 2023 · 53d8775 · 53d8775
2 parents dd7a460 + c70bf28
commit 53d8775
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.8.3] - 2023-12-15
+
+### Fixed
+
+-   Fixed error in Get-DomainComputer in Powerview when dnshostname property is missing (@Cx01N)
+
 ## [5.8.2] - 2023-12-09
 
 ### Fixed
@@ -698,7 +704,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Updated shellcoderdi to newest version (@Cx01N)
 -   Added a Nim launcher (@Hubbl3)
 
-[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.2...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.3...HEAD
+
+[5.8.3]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.2...v5.8.3
 
 [5.8.2]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.8.1...v5.8.2
 

diff --git a/empire/server/common/empire.py b/empire/server/common/empire.py
@@ -38,7 +38,7 @@
 
 from . import agents, credentials, listeners, stagers
 
-VERSION = "5.8.2 BC Security Fork"
+VERSION = "5.8.3 BC Security Fork"
 
 log = logging.getLogger(__name__)
 

diff --git a/empire/server/data/module_source/situational_awareness/network/powerview.ps1 b/empire/server/data/module_source/situational_awareness/network/powerview.ps1
@@ -6283,7 +6283,6 @@ http://blogs.technet.com/b/ashleymcglone/archive/2013/03/25/active-directory-ou-
     $GUIDs
 }
 
-
 function Get-DomainComputer {
 <#
 .SYNOPSIS
@@ -6777,17 +6776,23 @@ The raw DirectoryServices.SearchResult object, if -Raw is enabled.
                 $Prop = $_.Properties
             }
 
+            # Convert the 'dnshostname' property to a string and check if it is not empty
+            $dnshostname = $Prop['dnshostname'] -join ''  # Join all elements to form a string
+            if (-not ($dnshostname -and $dnshostname.Trim() -ne '')) {
+                # Skip this entry if dnshostname is missing or empty
+                return
+            }
+
             $Up = $True
             if ($PSBoundParameters['Ping']) {
-                $Up = Test-Connection -Count 1 -Quiet -ComputerName $Prop.dnshostname
+                $Up = Test-Connection -Count 1 -Quiet -ComputerName $dnshostname
             }
             if ($Up) {
                 if ($PSBoundParameters['Raw']) {
                     # return raw result objects
                     $Computer = $_
                     $Computer.PSObject.TypeNames.Insert(0, 'PowerView.Computer.Raw')
-                }
-                else {
+                } else {
                     $Computer = Convert-LDAPProperty -Properties $Prop
                     $Computer.PSObject.TypeNames.Insert(0, 'PowerView.Computer')
                 }
@@ -6803,7 +6808,6 @@ The raw DirectoryServices.SearchResult object, if -Raw is enabled.
     }
 }
 
-
 function Get-DomainObject {
 <#
 .SYNOPSIS

diff --git a/empire/test/test_helpers.py b/empire/test/test_helpers.py
@@ -9,4 +9,4 @@ def test_dynamic_powershell():
     new_script = helpers.generate_dynamic_powershell_script(
         script, "Find-LocalAdminAccess"
     )
-    assert len(new_script) == 96681
+    assert len(new_script) == 96863
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "empire-bc-security-fork"
-version = "5.8.2"
+version = "5.8.3"
 description = ""
 authors = ["BC Security <[email protected]>"]
 readme = "README.md"