Merge pull request #22 from jimm98y/features/disable-100-continue

F disable 100-continue

Author: jimm98y

src/OnvifClient/Program.cs

@@ -13,7 +13,7 @@
 }
 else
 {
-    using (var client = new SimpleOnvifClient(device, "admin", "password"))
+    using (var client = new SimpleOnvifClient(device, "admin", "password", true))
     {
         var deviceInfo = await client.GetDeviceInformationAsync();
         var services = await client.GetServicesAsync(true);

src/SharpOnvifClient/Behaviors/DisableExpect100ContinueBehavior.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Net.Http;
+using System.ServiceModel.Channels;
+using System.ServiceModel.Description;
+using System.ServiceModel.Dispatcher;
+
+namespace SharpOnvifClient.Behaviors
+{
+    public class DisableExpect100ContinueBehavior : IEndpointBehavior
+    {
+        public void AddBindingParameters(ServiceEndpoint endpoint, BindingParameterCollection bindingParameters)
+        {
+            bindingParameters.Add(new Func<HttpClientHandler, HttpMessageHandler>(GetHttpMessageHandler));
+        }
+
+        public void ApplyClientBehavior(ServiceEndpoint endpoint, ClientRuntime clientRuntime) { }
+
+        public void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDispatcher endpointDispatcher) { }
+
+        public void Validate(ServiceEndpoint endpoint) { }
+
+        public HttpMessageHandler GetHttpMessageHandler(HttpClientHandler httpClientHandler)
+        {
+            return new DisableExpect100ContinueMessageHandler(httpClientHandler);
+        }
+    }
+}

src/SharpOnvifClient/Behaviors/DisableExpect100ContinueBehaviorExtensions.cs

@@ -0,0 +1,21 @@
+using System;
+using System.ServiceModel;
+
+namespace SharpOnvifClient.Behaviors
+{
+    public static class DisableExpect100ContinueBehaviorExtensions
+    {
+        public static void SetDisableExpect100Continue<TChannel>(
+            this ClientBase<TChannel> channel,
+            System.ServiceModel.Description.IEndpointBehavior disableExpect100Continue = null) where TChannel : class
+        {
+            if (disableExpect100Continue == null)
+                return;
+
+            if (!channel.Endpoint.EndpointBehaviors.Contains(disableExpect100Continue))
+            {
+                channel.Endpoint.EndpointBehaviors.Add(disableExpect100Continue);
+            }
+        }
+    }
+}

src/SharpOnvifClient/Behaviors/DisableExpect100ContinueMessageHandler.cs

@@ -0,0 +1,24 @@
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SharpOnvifClient.Behaviors
+{
+    public class DisableExpect100ContinueMessageHandler : DelegatingHandler
+    {
+        public DisableExpect100ContinueMessageHandler(HttpMessageHandler innerHandler)
+        {
+            InnerHandler = innerHandler;
+        }
+
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            HttpResponseMessage response;
+
+            request.Headers.ExpectContinue = false;
+            response = await base.SendAsync(request, cancellationToken);
+
+            return response;
+        }
+    }
+}

src/SharpOnvifClient/SimpleOnvifClient.cs

@@ -1,4 +1,5 @@
-using SharpOnvifClient.DeviceMgmt;
+using SharpOnvifClient.Behaviors;
+using SharpOnvifClient.DeviceMgmt;
 using SharpOnvifClient.Events;
 using SharpOnvifClient.Media;
 using SharpOnvifClient.PTZ;
@@ -13,6 +14,9 @@
 
 namespace SharpOnvifClient
 {
+    /// <summary>
+    /// Simple Onvif client implements the basic Onvif device operations such as device information, media profiles, stream URI, PTZ operations and event subscriptions.
+    /// </summary>
     public class SimpleOnvifClient : IDisposable
     {
         private bool _disposedValue;
@@ -25,14 +29,36 @@ public class SimpleOnvifClient : IDisposable
         private readonly System.Net.NetworkCredential _credentials;
         private readonly OnvifAuthentication _authentication;
         private readonly IEndpointBehavior _legacyAuth;
-
-        public SimpleOnvifClient(string onvifUri) : this(onvifUri, null, null, OnvifAuthentication.None)
+        private readonly IEndpointBehavior _disableExpect100ContinueBehavior;
+
+        /// <summary>
+        /// Creates an instance of <see cref="SimpleOnvifClient"/>.
+        /// </summary>
+        /// <param name="onvifUri">Onvif URI.</param>
+        /// <param name="disableExpect100Continue">Disables the default Expect: 100-continue HTTP header.</param>
+        public SimpleOnvifClient(string onvifUri, bool disableExpect100Continue = false) : this(onvifUri, null, null, OnvifAuthentication.None, disableExpect100Continue)
         { }
 
-        public SimpleOnvifClient(string onvifUri, string userName, string password) : this(onvifUri, userName, password, OnvifAuthentication.WsUsernameToken | OnvifAuthentication.HttpDigest)
+        /// <summary>
+        /// Creates an instance of <see cref="SimpleOnvifClient"/>.
+        /// </summary>
+        /// <param name="onvifUri">Onvif URI.</param>
+        /// <param name="userName">User name.</param>
+        /// <param name="password">Password.</param>
+        /// <param name="disableExpect100Continue">Disables the default Expect: 100-continue HTTP header.</param>
+        public SimpleOnvifClient(string onvifUri, string userName, string password, bool disableExpect100Continue = false) : this(onvifUri, userName, password, OnvifAuthentication.WsUsernameToken | OnvifAuthentication.HttpDigest, disableExpect100Continue)
         { }
 
-        public SimpleOnvifClient(string onvifUri, string userName, string password, OnvifAuthentication authentication)
+        /// <summary>
+        /// Creates an instance of <see cref="SimpleOnvifClient"/>.
+        /// </summary>
+        /// <param name="onvifUri">Onvif URI.</param>
+        /// <param name="userName">User name.</param>
+        /// <param name="password">Password.</param>
+        /// <param name="authentication">Type of the authentication to use: <see cref="OnvifAuthentication"/>.</param>
+        /// <param name="disableExpect100Continue">Disables the default Expect: 100-continue HTTP header.</param>
+        /// <exception cref="ArgumentNullException">Thrown when onvifUri is empty.</exception>
+        public SimpleOnvifClient(string onvifUri, string userName, string password, OnvifAuthentication authentication, bool disableExpect100Continue = false)
         {
             if (string.IsNullOrWhiteSpace(onvifUri))
                 throw new ArgumentNullException(nameof(onvifUri));
@@ -50,6 +76,11 @@ public SimpleOnvifClient(string onvifUri, string userName, string password, Onvi
                 }
             }
 
+            if (disableExpect100Continue)
+            {
+                _disableExpect100ContinueBehavior = new DisableExpect100ContinueBehavior();
+            }
+
             _onvifUri = onvifUri;
             _authentication = authentication;
         }
@@ -79,6 +110,7 @@ public TClient GetOrCreateClient<TClient, TChannel>(string uri, Func<string, TCl
                 {
                     var client = creator(uri);
                     client.SetOnvifAuthentication(_authentication, _credentials, _legacyAuth);
+                    client.SetDisableExpect100Continue(_disableExpect100ContinueBehavior);
                     _clients.Add(key, client);
                     return client;
                 }