Skip to content
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.

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

Add support for basic authentication #7

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions trino-csharp/Trino.Client.Test/ConnectionStringTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,29 @@ public void LDAPAuth()
// verify the connection string can be regenerated
Assert.IsNotNull(connection.ConnectionString);
}

[TestMethod]
public void BasicAuth()
{
const string host = "host.trino.com";
const string auth = "BasicAuth";
const string user = "user";
const string defaultPort = "443";
const string scheme = "https";

string connectionString =
$"host={host};auth={auth};user={user}";

TrinoConnection connection = new TrinoConnection();
connection.ConnectionString = connectionString;
Assert.AreEqual(connection.ConnectionSession.Properties.Server.Host, host);
Assert.AreEqual(connection.ConnectionSession.Properties.Server.Port.ToString(), defaultPort);
Assert.AreEqual(connection.ConnectionSession.Properties.Server.Scheme, scheme);
Assert.AreEqual(connection.ConnectionSession.Auth.GetType().Name, auth, StringComparer.InvariantCultureIgnoreCase);
Assert.AreEqual(((BasicAuth)connection.ConnectionSession.Auth).User, user);

// verify the connection string can be regenerated
Assert.IsNotNull(connection.ConnectionString);
}
}
}
48 changes: 48 additions & 0 deletions trino-csharp/Trino.Client/Auth/BasicAuth.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
using System;
using System.Net.Http;
using System.Text;

namespace Trino.Client.Auth
{
/// <summary>
/// For setting up basic authentication with a username and optional password.
/// </summary>
public class BasicAuth : ITrinoAuth
{
public BasicAuth()
{
}

public string User
{
get;
set;
}

public string Password {
get;
set;
}

public virtual void AuthorizeAndValidate()
{
if (string.IsNullOrEmpty(User) )
{
throw new ArgumentException("BasicAuth: username property is null or empty");
}
}

/// <summary>
/// Modify the request with authentication
/// </summary>
/// <param name="httpRequestMessage">Http request message</param>
public virtual void AddCredentialToRequest(HttpRequestMessage httpRequestMessage)
{
var credentials = Convert.ToBase64String(string.IsNullOrEmpty(Password) ?
Encoding.ASCII.GetBytes($"{User}") :
Encoding.ASCII.GetBytes($"{User}:{Password}"));

httpRequestMessage.Headers.Add("Authorization", "Basic " + credentials);
}
}
}
26 changes: 2 additions & 24 deletions trino-csharp/Trino.Client/Auth/LDAPAuth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,18 @@

namespace Trino.Client.Auth
{
public class LDAPAuth : ITrinoAuth
public class LDAPAuth : BasicAuth
{
public LDAPAuth()
{
}

public string User
{
get;
set;
}

public string Password
{
get;
set;
}

public void AuthorizeAndValidate()
public override void AuthorizeAndValidate()
{
if (string.IsNullOrEmpty(User) || string.IsNullOrEmpty(Password))
{
throw new ArgumentException("LDAPAuth: username or password property is null or empty");
}
}

/// <summary>
/// Modify the request with authentication
/// </summary>
/// <param name="httpRequestMessage">Http request message</param>
public virtual void AddCredentialToRequest(HttpRequestMessage httpRequestMessage)
{
var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{User}:{Password}"));
httpRequestMessage.Headers.Add("Authorization", "Basic " + credentials);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ private static Dictionary<string, Type> BuildAuthTypesMap(IEnumerable<Type> addi
// JWT is built in, but additional auth providers can originate from other DLLs to keep dependencies minimal
Type jwtAuth = typeof(TrinoJWTAuth);
Type ldapAuth = typeof(LDAPAuth);
Dictionary<string, Type> authTypes = new Dictionary<string, Type>(StringComparer.InvariantCultureIgnoreCase) { { jwtAuth.Name, jwtAuth }, { ldapAuth.Name, ldapAuth } };
Type basicAuth = typeof(BasicAuth);
Dictionary<string, Type> authTypes = new Dictionary<string, Type>(StringComparer.InvariantCultureIgnoreCase) { { jwtAuth.Name, jwtAuth }, { ldapAuth.Name, ldapAuth }, {basicAuth.Name, basicAuth} };

if (additionalAuthProviders != null)
{
Expand Down