fix #2140 add serializable to all exceptions

Mpdreamz · Mpdreamz · commit b9c7c7061234 · 2016-06-28T18:37:04.000+02:00
+ tests for all of these
diff --git a/src/Elasticsearch.Net/Exceptions/ConnectionException.cs b/src/Elasticsearch.Net/Exceptions/ConnectionException.cs
@@ -1,14 +1,33 @@
 using System;
+using System.Collections.Generic;
 using System.Net;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 
 namespace Elasticsearch.Net.Connection
 {
-	public class ConnectionException : System.Exception
+	[Serializable]
+	public class ConnectionException : Exception
 	{
 		public int HttpStatusCode { get; private set; }
 		public ConnectionException(int statusCode = -1, string response = null) : base(Enum.GetName(typeof(HttpStatusCode), statusCode))
 		{
 			this.HttpStatusCode = statusCode;
 		}
+
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected ConnectionException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+            this.HttpStatusCode = info.GetInt32("HttpStatusCode");
+        }
+
+		[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null) throw new ArgumentNullException(nameof(info));
+
+            info.AddValue("HttpStatusCode", this.HttpStatusCode);
+            base.GetObjectData(info, context);
+        }
 	}
 }
diff --git a/src/Elasticsearch.Net/Exceptions/ElasticsearchAuthException.cs b/src/Elasticsearch.Net/Exceptions/ElasticsearchAuthException.cs
@@ -1,45 +1,84 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 
 namespace Elasticsearch.Net.Connection
 {
+	[Serializable]
 	public abstract class ElasticsearchAuthException : Exception
 	{
 		protected abstract string ExceptionType { get; }
 		protected abstract int StatusCode { get; }
 
+		public ElasticsearchResponse<Stream> Response { get; private set; }
+
 		protected ElasticsearchAuthException(ElasticsearchResponse<Stream> response)
 		{
 			this.Response = response;
 		}
 
-		internal ElasticsearchServerException ToElasticsearchServerException()
-		{
-			if (this.Response == null)
-				return null;
-			return new ElasticsearchServerException(this.StatusCode, this.ExceptionType);
-		}
-		public ElasticsearchResponse<Stream> Response { get; private set; }
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected ElasticsearchAuthException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+		internal ElasticsearchServerException ToElasticsearchServerException() => 
+			this.Response == null ? null : new ElasticsearchServerException(this.StatusCode, this.ExceptionType);
+
+
 	}
 
+	[Serializable]
 	public class ElasticsearchAuthorizationException : ElasticsearchAuthException
 	{
 		public ElasticsearchAuthorizationException(ElasticsearchResponse<Stream> response) : base(response) { }
 
-		protected override string ExceptionType { get { return "AuthorizationException"; } }
+		protected override string ExceptionType => "AuthorizationException";
+
+		protected override int StatusCode => 403;
+
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected ElasticsearchAuthorizationException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+		[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null) throw new ArgumentNullException(nameof(info));
 
-		protected override int StatusCode { get { return 403; } }
+            info.AddValue("ExceptionType", this.ExceptionType);
+            info.AddValue("StatusCode", this.StatusCode);
+            base.GetObjectData(info, context);
+        }
 	}
 
 
+	[Serializable]
 	public class ElasticsearchAuthenticationException : ElasticsearchAuthException
 	{
-		protected override string ExceptionType { get { return  "AuthenticationException"; } }
+		protected override string ExceptionType => "AuthenticationException";
 
-		protected override int StatusCode { get { return 401; } }
+		protected override int StatusCode => 401;
 
 		public ElasticsearchAuthenticationException(ElasticsearchResponse<Stream> response) : base(response) { }
 
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected ElasticsearchAuthenticationException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+		[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null) throw new ArgumentNullException(nameof(info));
+
+            info.AddValue("ExceptionType", this.ExceptionType);
+            info.AddValue("StatusCode", this.StatusCode);
+            base.GetObjectData(info, context);
+        }
+
 	}
 }
diff --git a/src/Elasticsearch.Net/Exceptions/ElasticsearchServerException.cs b/src/Elasticsearch.Net/Exceptions/ElasticsearchServerException.cs
@@ -1,11 +1,14 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using System.Text;
 using System.Text.RegularExpressions;
 
 namespace Elasticsearch.Net
 {
+	[Serializable]
 	public class ElasticsearchServerException : Exception
 	{
 		private static readonly Regex ExceptionSplitter = new Regex(@"^([^\[]*?)\[(.*)\]", RegexOptions.Singleline);
@@ -35,5 +38,23 @@ private static string ParseError(ElasticsearchServerError error)
 			error.ExceptionType = matches.Groups[1].Value;
 			return matches.Groups[2].Value;
 		}
+
+
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected ElasticsearchServerException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+            this.Status = info.GetInt32("Status");
+            this.ExceptionType = info.GetString("ExceptionType");
+        }
+
+		[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null) throw new ArgumentNullException(nameof(info));
+
+            info.AddValue("Status", this.Status);
+            info.AddValue("ExceptionType", this.ExceptionType);
+            base.GetObjectData(info, context);
+        }
 	}
 }
diff --git a/src/Elasticsearch.Net/Exceptions/MaxRetryException.cs b/src/Elasticsearch.Net/Exceptions/MaxRetryException.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 
 namespace Elasticsearch.Net.Exceptions
@@ -9,38 +10,46 @@ namespace Elasticsearch.Net.Exceptions
 	/// <summary>
 	/// Thrown when a request has depleeded its max retry setting
 	/// </summary>
+	[Serializable]
 	public class MaxRetryException : Exception
 	{
 
 		public MaxRetryException(string message) : base(message) { }
 
 		public MaxRetryException(string message, Exception innerException) : base(message, innerException) { }
 		public MaxRetryException(Exception innerException) : base(innerException.Message, innerException) { }
+
+        protected MaxRetryException(SerializationInfo info, StreamingContext context) 
+            : base(info, context) { }
+
 	}
 	
 	/// <summary>
 	/// Thrown when a sniff operation itself caused a maxrety exception
 	/// </summary>
+	[Serializable]
 	public class SniffException : Exception
 	{
-
 		public SniffException(MaxRetryException innerException) 
-			: base("Sniffing known nodes in the cluster caused a maxretry exception of its own", innerException)
-		{
-			
-		}
+			: base("Sniffing known nodes in the cluster caused a maxretry exception of its own", innerException) { }
+
+        protected SniffException(SerializationInfo info, StreamingContext context) 
+            : base(info, context) { }
+
 	}
 	
 	/// <summary>
 	/// Thrown when a ping operation itself caused a maxrety exception
 	/// </summary>
+	[Serializable]
 	public class PingException : Exception
 	{
 
 		public PingException(Uri baseURi, Exception innerException) 
-			: base("Pinging {0} caused an exception".F(baseURi.ToString()), innerException)
-		{
-			
-		}
+			: base("Pinging {0} caused an exception".F(baseURi.ToString()), innerException) { }
+
+        protected PingException(SerializationInfo info, StreamingContext context) 
+            : base(info, context) { }
+
 	}
 }
diff --git a/src/Nest/Exception/DispatchException.cs b/src/Nest/Exception/DispatchException.cs
@@ -1,17 +1,21 @@
+using System;
+using System.Runtime.Serialization;
+
 namespace Nest
 {
 	/// <summary>
 	/// Occurs when an IElasticClient call does not have 
 	/// enough information to dispatch into the raw client.
 	/// </summary>
-	public class DispatchException : System.Exception
+	[Serializable]
+	public class DispatchException : Exception
 	{
-		public DispatchException(string msg) : base(msg)
-		{
-		}
+		public DispatchException(string msg) : base(msg) { }
+
+		public DispatchException(string msg, System.Exception exp) : base(msg, exp) { }
+
+        protected DispatchException(SerializationInfo info, StreamingContext context) 
+            : base(info, context) { }
 
-		public DispatchException(string msg, System.Exception exp) : base(msg, exp)
-		{
-		}
 	}
 }
diff --git a/src/Nest/Exception/DslException.cs b/src/Nest/Exception/DslException.cs
@@ -1,13 +1,15 @@
+using System;
+using System.Runtime.Serialization;
+
 namespace Nest
 {
-	public class DslException : System.Exception
+	[Serializable]
+	public class DslException : Exception
 	{
-		public DslException(string msg) : base(msg)
-		{
-		}
+		public DslException(string msg) : base(msg) { }
+
+		public DslException(string msg, System.Exception exp) : base(msg, exp) { }
 
-		public DslException(string msg, System.Exception exp) : base(msg, exp)
-		{
-		}
+		protected DslException(SerializationInfo info, StreamingContext context) : base(info, context) { }
 	}
 }
diff --git a/src/Nest/Exception/ReindexException.cs b/src/Nest/Exception/ReindexException.cs
@@ -1,8 +1,11 @@
 ﻿using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using Elasticsearch.Net;
 
 namespace Nest
 {
+	[Serializable]
 	public class ReindexException: Exception
 	{
 		public IElasticsearchResponse Status { get; private set; }
@@ -11,5 +14,9 @@ public ReindexException(IElasticsearchResponse status, string message = null) :
 		{
 			this.Status = status;
 		}
+
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected ReindexException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
 	}
 }
diff --git a/src/Nest/Exception/RestoreException.cs b/src/Nest/Exception/RestoreException.cs
@@ -1,8 +1,11 @@
 ﻿using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using Elasticsearch.Net;
 
 namespace Nest
 {
+	[Serializable]
 	public class RestoreException : Exception
 	{
 		public IElasticsearchResponse Status { get; private set; }
@@ -12,5 +15,9 @@ public RestoreException(IElasticsearchResponse status, string message = null)
 		{
 			this.Status = status;
 		}
+
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected RestoreException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
 	}
 }
diff --git a/src/Nest/Exception/SnapshotException.cs b/src/Nest/Exception/SnapshotException.cs
@@ -1,8 +1,11 @@
 ﻿using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using Elasticsearch.Net;
 
 namespace Nest
 {
+	[Serializable]
 	public class SnapshotException : Exception
 	{
 		public IElasticsearchResponse Status { get; private set; }
@@ -12,5 +15,9 @@ public SnapshotException(IElasticsearchResponse status, string message)
 		{
 			Status = status;
 		}
+
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        protected SnapshotException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
 	}
 }
diff --git a/src/Tests/Nest.Tests.Unit/Extensions/SerializableExceptionTests.cs b/src/Tests/Nest.Tests.Unit/Extensions/SerializableExceptionTests.cs
diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,33 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Net;`
	`4`	`+using System.Runtime.Serialization;`
	`5`	`+using System.Security.Permissions;`
`3`	`6`
`4`	`7`	`namespace Elasticsearch.Net.Connection`
`5`	`8`	`{`
`6`		`- public class ConnectionException : System.Exception`
	`9`	`+ [Serializable]`
	`10`	`+ public class ConnectionException : Exception`
`7`	`11`	`{`
`8`	`12`	`public int HttpStatusCode { get; private set; }`
`9`	`13`	`public ConnectionException(int statusCode = -1, string response = null) : base(Enum.GetName(typeof(HttpStatusCode), statusCode))`
`10`	`14`	`{`
`11`	`15`	`this.HttpStatusCode = statusCode;`
`12`	`16`	`}`
	`17`	`+`
	`18`	`+ [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]`
	`19`	`+ protected ConnectionException(SerializationInfo info, StreamingContext context) : base(info, context)`
	`20`	`+ {`
	`21`	`+ this.HttpStatusCode = info.GetInt32("HttpStatusCode");`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]`
	`25`	`+ public override void GetObjectData(SerializationInfo info, StreamingContext context)`
	`26`	`+ {`
	`27`	`+ if (info == null) throw new ArgumentNullException(nameof(info));`
	`28`	`+`
	`29`	`+ info.AddValue("HttpStatusCode", this.HttpStatusCode);`
	`30`	`+ base.GetObjectData(info, context);`
	`31`	`+ }`
`13`	`32`	`}`
`14`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
	`1`	`+using System;`
	`2`	`+using System.Runtime.Serialization;`
	`3`	`+`
`1`	`4`	`namespace Nest`
`2`	`5`	`{`
`3`		`- public class DslException : System.Exception`
	`6`	`+ [Serializable]`
	`7`	`+ public class DslException : Exception`
`4`	`8`	`{`
`5`		`- public DslException(string msg) : base(msg)`
`6`		`- {`
`7`		`- }`
	`9`	`+ public DslException(string msg) : base(msg) { }`
	`10`	`+`
	`11`	`+ public DslException(string msg, System.Exception exp) : base(msg, exp) { }`
`8`	`12`
`9`		`- public DslException(string msg, System.Exception exp) : base(msg, exp)`
`10`		`- {`
`11`		`- }`
	`13`	`+ protected DslException(SerializationInfo info, StreamingContext context) : base(info, context) { }`
`12`	`14`	`}`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Runtime.Serialization;`
	`3`	`+using System.Security.Permissions;`
`2`	`4`	`using Elasticsearch.Net;`
`3`	`5`
`4`	`6`	`namespace Nest`
`5`	`7`	`{`
	`8`	`+ [Serializable]`
`6`	`9`	`public class ReindexException: Exception`
`7`	`10`	`{`
`8`	`11`	`public IElasticsearchResponse Status { get; private set; }`
`@@ -11,5 +14,9 @@ public ReindexException(IElasticsearchResponse status, string message = null) :`
`11`	`14`	`{`
`12`	`15`	`this.Status = status;`
`13`	`16`	`}`
	`17`	`+`
	`18`	`+ [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]`
	`19`	`+ protected ReindexException(SerializationInfo info, StreamingContext context) : base(info, context) { }`
	`20`	`+`
`14`	`21`	`}`
`15`	`22`	`}`