addressed #51

PKISolutions · May 26, 2022 · 8fcf10f · 8fcf10f
1 parent c980e1f
commit 8fcf10f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/PKI/Management/CertificateServices/OcspResponder.cs b/PKI/Management/CertificateServices/OcspResponder.cs
@@ -39,7 +39,11 @@ public class OcspResponder {
         readonly IOCSPAdmin _ocspAdmin = new OCSPAdminClass();
 
         OcspResponder(String serverName) {
-            if (String.IsNullOrEmpty(serverName) || "localhost".Equals(serverName, StringComparison.OrdinalIgnoreCase) || ".".Equals(serverName)) {
+            if (
+                String.IsNullOrEmpty(serverName)
+                || "localhost".Equals(serverName, StringComparison.OrdinalIgnoreCase)
+                || Environment.MachineName.Equals(serverName, StringComparison.OrdinalIgnoreCase)
+                || ".".Equals(serverName)) {
                 serverName = Environment.MachineName;
             }
 
@@ -190,23 +194,20 @@ public class OcspResponder {
         }
 
         static String getComputerName(IOCSPAdmin ocspAdmin, String serverName) {
+            // if serverName contains dot, then FQDN name is used, return it as is.
             if (serverName.Contains(".")) {
                 return serverName;
             }
 
-            try {
-                var arrayMembers = (String[])((IOCSPProperty)ocspAdmin.OCSPServiceProperties.ItemByName[MSFT_ARRAY_MEMBERS]).Value;
-                foreach (String arrayMember in arrayMembers) {
-                    String[] tokens = arrayMember.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
-                    // if we found match, assign FQDN to ComputerName property
-                    if (tokens[0].Equals(serverName, StringComparison.OrdinalIgnoreCase)) {
-                        return arrayMember;
-                    }
-                }
-            } catch { }
+            // otherwise, short name is passed, so current computer domain/workgroup is assumed
+            // retrieve domain suffix
+            String domainSuffix = DsUtils.GetCurrentDomainName();
+            // if empty, then current machine is not part of domain, so return host name
+            if (String.IsNullOrEmpty(domainSuffix)) {
+                return serverName;
+            }
 
-            // corner case when we can't 
-            return $"{serverName}.{DsUtils.GetCurrentDomainName()}";
+            return $"{serverName}.{domainSuffix}";
         }
 
         Object readValue(String propertyName) {

diff --git a/PKI/Properties/AssemblyInfo.cs b/PKI/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.7.14.0")]
-[assembly: AssemblyFileVersion("3.7.14.0")]
+[assembly: AssemblyVersion("3.7.15.0")]
+[assembly: AssemblyFileVersion("3.7.15.0")]