Skip to content

Commit 26aaae0

Browse files
committed
fix #2394 xpack security run as header has changed
1 parent 68a2867 commit 26aaae0

File tree

5 files changed

+3
-4
lines changed

5 files changed

+3
-4
lines changed

src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected virtual HttpRequestMessage CreateRequestMessage(RequestData requestDat
143143
requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(requestData.Accept));
144144

145145
if (!requestData.RunAs.IsNullOrEmpty())
146-
requestMessage.Headers.Add("es-shield-runas-user", requestData.RunAs);
146+
requestMessage.Headers.Add(RequestData.RunAsSecurityHeader, requestData.RunAs);
147147

148148
var data = requestData.PostData;
149149

src/Elasticsearch.Net/Connection/HttpConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected virtual HttpWebRequest CreateWebRequest(RequestData requestData)
5252
request.Headers.Add("Content-Encoding", "gzip");
5353
}
5454
if (!requestData.RunAs.IsNullOrEmpty())
55-
request.Headers.Add("es-shield-runas-user", requestData.RunAs);
55+
request.Headers.Add(RequestData.RunAsSecurityHeader, requestData.RunAs);
5656

5757
if (requestData.Headers != null && requestData.Headers.HasKeys())
5858
request.Headers.Add(requestData.Headers);

src/Elasticsearch.Net/Transport/Pipeline/RequestData.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace Elasticsearch.Net
1111
public class RequestData
1212
{
1313
public const string MimeType = "application/json";
14+
public const string RunAsSecurityHeader = "es-security-runas-user";
1415

1516
public Uri Uri => new Uri(this.Node.Uri, this.Path).Purify();
1617

src/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ protected override void ExpectResponse(IPutRoleResponse response)
9393
}
9494
}
9595

96-
//TODO this might be a bug in xpack but more likely a misunderstanding on our part ignore for now
9796
public class PutRoleRunAsApiTests : PutRoleApiTests
9897
{
9998
public PutRoleRunAsApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }

src/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ protected override void ExpectResponse(IPutUserResponse response)
7575
}
7676
}
7777

78-
//TODO disabled for now pending bug report
7978
public class PutUserRunAsApiTests : PutUserApiTests
8079
{
8180
public PutUserRunAsApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage)

0 commit comments

Comments
 (0)