Skip to content

Make .NET core HttpConnection implementation more extensible #2110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2016
Merged

Make .NET core HttpConnection implementation more extensible #2110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,14 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
return await builder.ToResponseAsync().ConfigureAwait(false);
}

private static HttpRequestMessage CreateHttpRequestMessage(RequestData requestData)
protected virtual HttpRequestMessage CreateHttpRequestMessage(RequestData requestData)
{
var request = this.CreateRequestMessage(requestData);
SetBasicAuthenticationIfNeeded(request, requestData);
return request;
}

protected virtual HttpRequestMessage CreateRequestMessage(RequestData requestData)
{
var method = ConvertHttpMethod(requestData.Method);
var requestMessage = new HttpRequestMessage(method, requestData.Uri);
Expand All @@ -132,17 +139,6 @@ private static HttpRequestMessage CreateHttpRequestMessage(RequestData requestDa
if (!requestData.RunAs.IsNullOrEmpty())
requestMessage.Headers.Add("es-shield-runas-user", requestData.RunAs);

string userInfo = null;
if (!requestData.Uri.UserInfo.IsNullOrEmpty())
userInfo = Uri.UnescapeDataString(requestData.Uri.UserInfo);
else if (requestData.BasicAuthorizationCredentials != null)
userInfo = requestData.BasicAuthorizationCredentials.ToString();
if (!userInfo.IsNullOrEmpty())
{
var credentials = Convert.ToBase64String(Encoding.UTF8.GetBytes(userInfo));
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
}

var data = requestData.PostData;

if (data != null)
Expand Down Expand Up @@ -174,6 +170,21 @@ private static HttpRequestMessage CreateHttpRequestMessage(RequestData requestDa
return requestMessage;
}

protected virtual void SetBasicAuthenticationIfNeeded(HttpRequestMessage requestMessage, RequestData requestData)
{
string userInfo = null;
if (!requestData.Uri.UserInfo.IsNullOrEmpty())
userInfo = Uri.UnescapeDataString(requestData.Uri.UserInfo);
else if (requestData.BasicAuthorizationCredentials != null)
userInfo = requestData.BasicAuthorizationCredentials.ToString();
if (!userInfo.IsNullOrEmpty())
{
var credentials = Convert.ToBase64String(Encoding.UTF8.GetBytes(userInfo));
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
}
}


private static System.Net.Http.HttpMethod ConvertHttpMethod(HttpMethod httpMethod)
{
switch (httpMethod)
Expand Down