chore: fix tests

SpecterOps · Oct 4, 2023 · ec9191b · ec9191b
1 parent bebdd5b
commit ec9191b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/test/unit/Facades/MockSearchResultEntry.cs b/test/unit/Facades/MockSearchResultEntry.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 using SharpHoundCommonLib;
 using SharpHoundCommonLib.Enums;
 
@@ -37,8 +38,14 @@ public string GetProperty(string propertyName)
 
         public byte[] GetByteProperty(string propertyName)
         {
-            //returning something not null specifically for these properties for the parseAllProperties tests
-            if (propertyName == "badpasswordtime" || propertyName == "domainsid") return new byte[] { 0x20 };
+            if (!_properties.Contains(propertyName))
+                return null;
+
+            if (_properties[propertyName] is string prop)
+            {
+                return Encoding.ASCII.GetBytes(prop);
+            }
+
             return _properties[propertyName] as byte[];
         }
 
@@ -48,24 +55,19 @@ public string[] GetArrayProperty(string propertyName)
                 return Array.Empty<string>();
 
             var value = _properties[propertyName];
-            Type valueType = value.GetType();
-
-            if (valueType.IsArray)
+            if (value.IsArray())
                 return value as string[];
-            else
-                return new string[1] { (value ?? "").ToString() };
+
+            return new [] { (value ?? "").ToString() };
         }
 
         public byte[][] GetByteArrayProperty(string propertyName)
         {
-
             if (!_properties.Contains(propertyName))
                 return Array.Empty<byte[]>();
-
-            var byteArray = new byte[] { 0x20 };
-            var byteArrayArray = new byte[][] { byteArray };
-
-            return byteArrayArray;
+
+            var property = _properties[propertyName] as byte[][];
+            return property;
         }
 
         public bool GetIntProperty(string propertyName, out int value)
@@ -106,11 +108,14 @@ public string GetGuid()
 
         public int PropCount(string prop)
         {
-            var count = 0;
-
-            foreach (var property in _properties) count++;
+            var property = _properties[prop];
+            if (property.IsArray())
+            {
+                var cast = property as string[];
+                return cast?.Length ?? 0;
+            }
 
-            return count;
+            return 1;
         }
 
         public IEnumerable<string> PropertyNames()

diff --git a/test/unit/Helpers.cs b/test/unit/Helpers.cs
@@ -33,6 +33,14 @@ internal static async Task<T[]> ToArrayAsync<T>(this IAsyncEnumerable<T> items,
                 results.Add(item);
             return results.ToArray();
         }
+
+        internal static bool IsArray(this object obj)
+        {
+            var valueType = obj?.GetType();
+            if (valueType == null)
+                return false;
+            return valueType.IsArray;
+        }
     }
 
     public sealed class WindowsOnlyFact : FactAttribute