Merged revisions 537015-537026 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r537015 | tomasr | 2007-05-10 17:16:49 -0500 (Thu, 10 May 2007) | 1 line
  
  QPID-435: Fix HeadersExchangeTest
........
  r537019 | tomasr | 2007-05-10 17:25:01 -0500 (Thu, 10 May 2007) | 1 line
  
  QPID-441 Fix handling of bounced messages
........
  r537026 | tomasr | 2007-05-10 17:46:46 -0500 (Thu, 10 May 2007) | 1 line
  
  QPID-398 SSL support for .NET client
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@537031 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 76 insertions, 3 deletions

diff --git a/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/dotnet/Qpid.Sasl/DefaultClientFactory.cs
index 43f0470a21..44df9c7ee2 100644
--- a/dotnet/Qpid.Sasl/DefaultClientFactory.cs
+++ b/dotnet/Qpid.Sasl/DefaultClientFactory.cs
@@ -21,7 +21,6 @@
 

 using System;

 using System.Collections;

-using System.Text;

 

 using Qpid.Sasl.Mechanisms;

 

@@ -29,11 +28,12 @@ namespace Qpid.Sasl
 {

    public class DefaultClientFactory : ISaslClientFactory

    {

-      private static readonly string[] SUPPORTED = new string[] { 

+      private static readonly string[] SUPPORTED = new string[] {

                DigestSaslClient.Mechanism,

                CramMD5SaslClient.Mechanism,

                PlainSaslClient.Mechanism, 

                AnonymousSaslClient.Mechanism,

+               ExternalSaslClient.Mechanism,

             };

 

       public string[] GetSupportedMechanisms(IDictionary props)

@@ -52,6 +52,7 @@ namespace Qpid.Sasl
             vetoed.Add(CramMD5SaslClient.Mechanism);

             vetoed.Add(PlainSaslClient.Mechanism);

             vetoed.Add(AnonymousSaslClient.Mechanism);

+            vetoed.Add(ExternalSaslClient.Mechanism);

          } 

          if ( props.Contains(SaslProperties.PolicyNoAnonymous) )

          {

@@ -85,6 +86,8 @@ namespace Qpid.Sasl
                return new AnonymousSaslClient(authorizationId, props, handler);

             case DigestSaslClient.Mechanism:

                return new DigestSaslClient(authorizationId, serverName, protocol, props, handler);

+            case ExternalSaslClient.Mechanism:

+               return new ExternalSaslClient(authorizationId, props, handler);

             }

          }

          // unknown mechanism

diff --git a/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
new file mode 100644
index 0000000000..127591e2da
--- /dev/null
+++ b/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
@@ -0,0 +1,69 @@
+/*

+ *

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ *

+ */

+

+using System;

+using System.Collections;

+using System.Text;

+

+namespace Qpid.Sasl.Mechanisms

+{

+   /// <summary>

+   /// Implements the EXTERNAL authentication mechanism

+   /// as outlined in RFC 2222

+   /// </summary>

+   public class ExternalSaslClient : SaslClient

+   {

+      public const string Mechanism = "EXTERNAL";

+

+      public ExternalSaslClient(

+         string authid, IDictionary properties, 

+         ISaslCallbackHandler handler)

+         : base(authid, null, null, properties, handler)

+      {

+      }

+

+      #region ISaslClient Implementation

+      //

+      // ISaslClient Implementation

+      //

+

+      public override string MechanismName

+      {

+         get { return Mechanism; }

+      }

+

+      public override bool HasInitialResponse

+      {

+         get { return true; }

+      }

+

+      public override byte[] EvaluateChallenge(byte[] challenge)

+      {

+         // ignore challenge

+         SetComplete();

+         return Encoding.UTF8.GetBytes(AuthorizationId);

+      }

+

+      #endregion // ISaslClient Implementation

+

+   } // class ExternalSaslClient

+

+} // namespace Qpid.Sasl.Mechanisms

diff --git a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
index fa7e91811f..41784a8413 100644
--- a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
+++ b/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
@@ -38,6 +38,7 @@
     <Compile Include="Configuration\SaslConfiguration.cs" />

     <Compile Include="Configuration\SaslConfigurationSectionHandler.cs" />

     <Compile Include="MD5HMAC.cs" />

+    <Compile Include="Mechanisms\ExternalSaslClient.cs" />

     <Compile Include="SaslException.cs" />

     <Compile Include="Mechanisms\AnonymousSaslClient.cs" />

     <Compile Include="Mechanisms\DigestSaslClient.cs" />

@@ -60,4 +61,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>

+</Project>
\ No newline at end of file