review comments

Biroj Nayak · mconnew · commit 6c670d2b7d85 · 2023-10-24T11:02:34.000-07:00
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/UDS/UDSBindingTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/UDS/UDSBindingTests.cs
@@ -97,6 +97,7 @@ public void WindowsAuth()
     }
 
     [WcfFact]
+    [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(SSL_Available))]
     [OuterLoop]
     private void BasicCertAsTransport()
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/strings.resx b/src/System.ServiceModel.UnixDomainSocket/src/Resources/strings.resx
@@ -204,4 +204,7 @@
   <data name="TransferModeNotSupported" xml:space="preserve">
     <value>Transfer mode {0} is not supported by {1}.</value>
   </data>
+  <data name="UnsupportedSecuritySetting" xml:space="preserve">
+<value>The value '{1}' is not supported in this context for the binding security property '{0}'.</value>
+</data>
 </root>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.cs.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.cs.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Nelze vyřešit název hostitele identifikátoru URI {0} pomocí služby DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">Byla zadána úroveň zabezpečení {0}, ale zabezpečení přenosu SSL podporuje pouze EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.de.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.de.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Der Hostname von URI "{0}" kann nicht mithilfe von DNS aufgelöst werden.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">Die Schutzebene "{0}" war angegeben, die SSL-Transportsicherheit unterstützt jedoch nur EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.es.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.es.xlf
@@ -132,6 +132,11 @@
         <target state="translated">No se puede resolver el nombre de host del URI "{0}" con DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">Se especificó el nivel de protección "{0}", pero la seguridad de transporte SSL solo admite EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.fr.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.fr.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Impossible de résoudre le nom d'hôte de l'URI '{0}' à l'aide de DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">Le niveau de protection '{0}' a été spécifié, mais la sécurité du transport SSL prend uniquement en charge EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.it.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.it.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Impossibile risolvere il nome host dell'URI "{0}" tramite DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">È stato specificato il livello di protezione '{0}', ma la sicurezza del trasporto SSL supporta solo EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.ja.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.ja.xlf
@@ -132,6 +132,11 @@
         <target state="translated">DNS を使用して URI "{0}" のホスト名を解決できません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">保護レベル '{0}' が指定されましたが、SSL トランスポート セキュリティでサポートされるのは EncryptAndSign のみです。</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.ko.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.ko.xlf
@@ -132,6 +132,11 @@
         <target state="translated">DNS를 사용하여 URI "{0}"의 호스트 이름을 확인할 수 없습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">보호 수준 '{0}'이(가) 지정되었지만, SSL 전송 보안은 EncryptAndSign만 지원합니다.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.pl.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.pl.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Nie można rozpoznać nazwy hosta o identyfikatorze URI „{0}” za pomocą usługi DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">Określono poziom zabezpieczeń „{0}”, jednak zabezpieczenia transportowe protokołu SSL obsługują tylko metodę EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.pt-BR.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.pt-BR.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Não é possível resolver nome de host de URI "{0}" usando DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">O nível de proteção '{0}' foi especificado, ainda assim a segurança do transporte SSL apenas dá suporte a EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.ru.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.ru.xlf
@@ -132,6 +132,11 @@
         <target state="translated">Не удается разрешить имя узла URI "{0}" с помощью DNS.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">Указан уровень защиты "{0}", однако защита транспорта SSL поддерживает только EncryptAndSign.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.tr.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.tr.xlf
@@ -132,6 +132,11 @@
         <target state="translated">DNS kullanılarak URI "{0}" ana bilgisayar adı çözümlenemiyor.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">SSL aktarım güvenliği yalnızca EncryptAndSign özelliğini desteklese de, '{0}' koruma düzeyi belirtildi.</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.zh-Hans.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.zh-Hans.xlf
@@ -132,6 +132,11 @@
         <target state="translated">无法使用 DNS 解析 URI“{0}”的主机名。</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">指定了保护级别“{0}”，但 SSL 传输安全性仅支持 EncryptAndSign。</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.zh-Hant.xlf b/src/System.ServiceModel.UnixDomainSocket/src/Resources/xlf/strings.zh-Hant.xlf
@@ -132,6 +132,11 @@
         <target state="translated">無法使用 DNS 解析 URI "{0}" 的主機名稱。</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnsupportedSecuritySetting">
+        <source>The value '{1}' is not supported in this context for the binding security property '{0}'.</source>
+        <target state="new">The value '{1}' is not supported in this context for the binding security property '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnsupportedSslProtectionLevel">
         <source>The protection level '{0}' was specified, yet SSL transport security only supports EncryptAndSign.</source>
         <target state="translated">已指定保護層級 '{0}'，但是 SSL 傳輸安全性只支援 EncryptAndSign。</target>
diff --git a/src/System.ServiceModel.UnixDomainSocket/src/System/ServiceModel/UnixDomainSocketSecurity.cs b/src/System.ServiceModel.UnixDomainSocket/src/System/ServiceModel/UnixDomainSocketSecurity.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel;
 using System.Diagnostics.Contracts;
+using System.Runtime.InteropServices;
 using System.ServiceModel.Channels;
 
 namespace System.ServiceModel
@@ -13,7 +14,12 @@ public sealed class UnixDomainSocketSecurity
 
         private UnixDomainSocketSecurityMode _mode;
 
-        public UnixDomainSocketSecurity() : this(DefaultMode, new UnixDomainSocketTransportSecurity()) { }
+        public UnixDomainSocketSecurity()
+        {
+            _mode = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+                UnixDomainSocketSecurityMode.Transport : UnixDomainSocketSecurityMode.TransportCredentialOnly;
+            Transport = new UnixDomainSocketTransportSecurity();
+        }
 
         private UnixDomainSocketSecurity(UnixDomainSocketSecurityMode mode, UnixDomainSocketTransportSecurity transportSecurity)
         {
@@ -50,7 +56,7 @@ internal BindingElement CreateTransportSecurity()
             {
                 if(_mode == UnixDomainSocketSecurityMode.TransportCredentialOnly && Transport.ClientCredentialType != UnixDomainSocketClientCredentialType.PosixIdentity)
                 {
-                    throw new NotSupportedException();
+                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.Format(SR.UnsupportedSecuritySetting, "Mode", _mode)));
                 }
                 return Transport.CreateTransportProtectionAndAuthentication();
             }
diff --git a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketSecurityTest.cs b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketSecurityTest.cs
@@ -4,6 +4,7 @@
 
 
 using System;
+using System.Runtime.InteropServices;
 using System.ServiceModel;
 using Infrastructure.Common;
 using Xunit;
@@ -14,7 +15,9 @@ public static class UnixDomainSocketSecurityTest
     public static void Ctor_Default_Initializes_Properties()
     {
         UnixDomainSocketSecurity security = new UnixDomainSocketSecurity();
-        Assert.Equal<UnixDomainSocketSecurityMode>(UnixDomainSocketSecurityMode.Transport, security.Mode);
+        UnixDomainSocketSecurityMode mode = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+                UnixDomainSocketSecurityMode.Transport : UnixDomainSocketSecurityMode.TransportCredentialOnly;
+        Assert.Equal<UnixDomainSocketSecurityMode>(mode, security.Mode);
     }
 
     [WcfTheory]

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ public void WindowsAuth()`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`[WcfFact]`
	`100`	`+ [Issue(2870, OS = OSID.OSX)]`
`100`	`101`	`[Condition(nameof(SSL_Available))]`
`101`	`102`	`[OuterLoop]`
`102`	`103`	`private void BasicCertAsTransport()`