Skip to content

Commit 10a3e8a

Browse files
MpdreamzMpdreamz
committed
SecurityPersmission on all things Serializable
1 parent c618406 commit 10a3e8a

File tree

9 files changed

+80
-66
lines changed

9 files changed

+80
-66
lines changed

‎src/Elasticsearch.Net/Exceptions/ConnectionException.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ public ConnectionException(int statusCode = -1, string response = null) : base(E
1616
}
1717

1818
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
19-
protected ConnectionException(SerializationInfo info, StreamingContext context) : base(info, context)
20-
{
21-
this.HttpStatusCode = info.GetInt32("HttpStatusCode");
22-
}
19+
protected ConnectionException(SerializationInfo info, StreamingContext context) : base(info, context)
20+
{
21+
this.HttpStatusCode = info.GetInt32("HttpStatusCode");
22+
}
2323

2424
[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
25-
public override void GetObjectData(SerializationInfo info, StreamingContext context)
26-
{
27-
if (info == null) throw new ArgumentNullException(nameof(info));
25+
public override void GetObjectData(SerializationInfo info, StreamingContext context)
26+
{
27+
if (info == null) throw new ArgumentNullException(nameof(info));
2828

29-
info.AddValue("HttpStatusCode", this.HttpStatusCode);
30-
base.GetObjectData(info, context);
31-
}
29+
info.AddValue("HttpStatusCode", this.HttpStatusCode);
30+
base.GetObjectData(info, context);
31+
}
3232
}
3333
}

‎src/Elasticsearch.Net/Exceptions/ElasticsearchAuthException.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ protected ElasticsearchAuthException(ElasticsearchResponse<Stream> response)
2020
}
2121

2222
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
23-
protected ElasticsearchAuthException(SerializationInfo info, StreamingContext context) : base(info, context)
24-
{
25-
}
23+
protected ElasticsearchAuthException(SerializationInfo info, StreamingContext context) : base(info, context)
24+
{
25+
}
2626

27-
internal ElasticsearchServerException ToElasticsearchServerException() =>
27+
internal ElasticsearchServerException ToElasticsearchServerException() =>
2828
this.Response == null ? null : new ElasticsearchServerException(this.StatusCode, this.ExceptionType);
2929

3030

@@ -40,19 +40,19 @@ public ElasticsearchAuthorizationException(ElasticsearchResponse<Stream> respons
4040
protected override int StatusCode => 403;
4141

4242
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
43-
protected ElasticsearchAuthorizationException(SerializationInfo info, StreamingContext context) : base(info, context)
44-
{
45-
}
43+
protected ElasticsearchAuthorizationException(SerializationInfo info, StreamingContext context) : base(info, context)
44+
{
45+
}
4646

4747
[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
48-
public override void GetObjectData(SerializationInfo info, StreamingContext context)
49-
{
50-
if (info == null) throw new ArgumentNullException(nameof(info));
51-
52-
info.AddValue("ExceptionType", this.ExceptionType);
53-
info.AddValue("StatusCode", this.StatusCode);
54-
base.GetObjectData(info, context);
55-
}
48+
public override void GetObjectData(SerializationInfo info, StreamingContext context)
49+
{
50+
if (info == null) throw new ArgumentNullException(nameof(info));
51+
52+
info.AddValue("ExceptionType", this.ExceptionType);
53+
info.AddValue("StatusCode", this.StatusCode);
54+
base.GetObjectData(info, context);
55+
}
5656
}
5757

5858

@@ -66,19 +66,19 @@ public class ElasticsearchAuthenticationException : ElasticsearchAuthException
6666
public ElasticsearchAuthenticationException(ElasticsearchResponse<Stream> response) : base(response) { }
6767

6868
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
69-
protected ElasticsearchAuthenticationException(SerializationInfo info, StreamingContext context) : base(info, context)
70-
{
71-
}
69+
protected ElasticsearchAuthenticationException(SerializationInfo info, StreamingContext context) : base(info, context)
70+
{
71+
}
7272

7373
[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
74-
public override void GetObjectData(SerializationInfo info, StreamingContext context)
75-
{
76-
if (info == null) throw new ArgumentNullException(nameof(info));
77-
78-
info.AddValue("ExceptionType", this.ExceptionType);
79-
info.AddValue("StatusCode", this.StatusCode);
80-
base.GetObjectData(info, context);
81-
}
74+
public override void GetObjectData(SerializationInfo info, StreamingContext context)
75+
{
76+
if (info == null) throw new ArgumentNullException(nameof(info));
77+
78+
info.AddValue("ExceptionType", this.ExceptionType);
79+
info.AddValue("StatusCode", this.StatusCode);
80+
base.GetObjectData(info, context);
81+
}
8282

8383
}
8484
}

‎src/Elasticsearch.Net/Exceptions/ElasticsearchServerException.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ private static string ParseError(ElasticsearchServerError error)
4141

4242

4343
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
44-
protected ElasticsearchServerException(SerializationInfo info, StreamingContext context) : base(info, context)
45-
{
46-
this.Status = info.GetInt32("Status");
47-
this.ExceptionType = info.GetString("ExceptionType");
48-
}
44+
protected ElasticsearchServerException(SerializationInfo info, StreamingContext context) : base(info, context)
45+
{
46+
this.Status = info.GetInt32("Status");
47+
this.ExceptionType = info.GetString("ExceptionType");
48+
}
4949

5050
[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
51-
public override void GetObjectData(SerializationInfo info, StreamingContext context)
52-
{
53-
if (info == null) throw new ArgumentNullException(nameof(info));
51+
public override void GetObjectData(SerializationInfo info, StreamingContext context)
52+
{
53+
if (info == null) throw new ArgumentNullException(nameof(info));
5454

55-
info.AddValue("Status", this.Status);
56-
info.AddValue("ExceptionType", this.ExceptionType);
57-
base.GetObjectData(info, context);
58-
}
55+
info.AddValue("Status", this.Status);
56+
info.AddValue("ExceptionType", this.ExceptionType);
57+
base.GetObjectData(info, context);
58+
}
5959
}
6060
}

‎src/Elasticsearch.Net/Exceptions/MaxRetryException.cs‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Runtime.Serialization;
5+
using System.Security.Permissions;
56
using System.Text;
67

78
namespace Elasticsearch.Net.Exceptions
@@ -19,37 +20,45 @@ public MaxRetryException(string message) : base(message) { }
1920
public MaxRetryException(string message, Exception innerException) : base(message, innerException) { }
2021
public MaxRetryException(Exception innerException) : base(innerException.Message, innerException) { }
2122

22-
protected MaxRetryException(SerializationInfo info, StreamingContext context)
23-
: base(info, context) { }
23+
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
24+
protected MaxRetryException(SerializationInfo info, StreamingContext context)
25+
: base(info, context)
26+
{ }
2427

2528
}
26-
29+
2730
/// <summary>
2831
/// Thrown when a sniff operation itself caused a maxrety exception
2932
/// </summary>
3033
[Serializable]
3134
public class SniffException : Exception
3235
{
33-
public SniffException(MaxRetryException innerException)
34-
: base("Sniffing known nodes in the cluster caused a maxretry exception of its own", innerException) { }
36+
public SniffException(MaxRetryException innerException)
37+
: base("Sniffing known nodes in the cluster caused a maxretry exception of its own", innerException)
38+
{ }
3539

36-
protected SniffException(SerializationInfo info, StreamingContext context)
37-
: base(info, context) { }
40+
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
41+
protected SniffException(SerializationInfo info, StreamingContext context)
42+
: base(info, context)
43+
{ }
3844

3945
}
40-
46+
4147
/// <summary>
4248
/// Thrown when a ping operation itself caused a maxrety exception
4349
/// </summary>
4450
[Serializable]
4551
public class PingException : Exception
4652
{
4753

48-
public PingException(Uri baseURi, Exception innerException)
49-
: base("Pinging {0} caused an exception".F(baseURi.ToString()), innerException) { }
54+
public PingException(Uri baseURi, Exception innerException)
55+
: base("Pinging {0} caused an exception".F(baseURi.ToString()), innerException)
56+
{ }
5057

51-
protected PingException(SerializationInfo info, StreamingContext context)
52-
: base(info, context) { }
58+
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
59+
protected PingException(SerializationInfo info, StreamingContext context)
60+
: base(info, context)
61+
{ }
5362

5463
}
5564
}

‎src/Nest/Exception/DispatchException.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Runtime.Serialization;
3+
using System.Security.Permissions;
34

45
namespace Nest
56
{
@@ -14,8 +15,10 @@ public DispatchException(string msg) : base(msg) { }
1415

1516
public DispatchException(string msg, System.Exception exp) : base(msg, exp) { }
1617

17-
protected DispatchException(SerializationInfo info, StreamingContext context)
18-
: base(info, context) { }
18+
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
19+
protected DispatchException(SerializationInfo info, StreamingContext context)
20+
: base(info, context)
21+
{ }
1922

2023
}
2124
}

‎src/Nest/Exception/DslException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Runtime.Serialization;
3+
using System.Security.Permissions;
34

45
namespace Nest
56
{
@@ -10,6 +11,7 @@ public DslException(string msg) : base(msg) { }
1011

1112
public DslException(string msg, System.Exception exp) : base(msg, exp) { }
1213

14+
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
1315
protected DslException(SerializationInfo info, StreamingContext context) : base(info, context) { }
1416
}
1517
}

‎src/Nest/Exception/ReindexException.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Nest
77
{
88
[Serializable]
9-
public class ReindexException: Exception
9+
public class ReindexException : Exception
1010
{
1111
public IElasticsearchResponse Status { get; private set; }
1212

@@ -16,7 +16,7 @@ public ReindexException(IElasticsearchResponse status, string message = null) :
1616
}
1717

1818
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
19-
protected ReindexException(SerializationInfo info, StreamingContext context) : base(info, context) { }
19+
protected ReindexException(SerializationInfo info, StreamingContext context) : base(info, context) { }
2020

2121
}
2222
}

‎src/Nest/Exception/RestoreException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public RestoreException(IElasticsearchResponse status, string message = null)
1717
}
1818

1919
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
20-
protected RestoreException(SerializationInfo info, StreamingContext context) : base(info, context) { }
20+
protected RestoreException(SerializationInfo info, StreamingContext context) : base(info, context) { }
2121

2222
}
2323
}

‎src/Nest/Exception/SnapshotException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public SnapshotException(IElasticsearchResponse status, string message)
1717
}
1818

1919
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
20-
protected SnapshotException(SerializationInfo info, StreamingContext context) : base(info, context) { }
20+
protected SnapshotException(SerializationInfo info, StreamingContext context) : base(info, context) { }
2121

2222
}
2323
}

0 commit comments

Comments
 (0)