Skip to content

Fix authentication and database creation #1

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

Closed
sebastienros wants to merge 2 commits into from
Closed

Fix authentication and database creation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d73558c
Fix authentication and database creation
sebastienros Dec 4, 2023
fcdba79
Fix tests
sebastienros Dec 5, 2023
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
2 changes: 2 additions & 0 deletions src/Aspire.Hosting/MongoDB/MongoDBBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public static IResourceBuilder<MongoDBConnectionResource> AddMongoDBConnection(t
/// <returns>A reference to the <see cref="IResourceBuilder{MongoDBDatabaseResource}"/>.</returns>
public static IResourceBuilder<MongoDBDatabaseResource> AddDatabase(this IResourceBuilder<MongoDBContainerResource> builder, string name)
{
builder.WithEnvironment("MONGO_INITDB_DATABASE", name);

var mongoDBDatabase = new MongoDBDatabaseResource(name, builder.Resource);

return builder.ApplicationBuilder
Expand Down
4 changes: 3 additions & 1 deletion src/Aspire.Hosting/MongoDB/MongoDBConnectionStringBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace Aspire.Hosting.MongoDB;
internal class MongoDBConnectionStringBuilder
{
private const string Scheme = "mongodb";
private const string AuthenticationDatabase = "admin";

private string? _server;
private int _port;
Expand Down Expand Up @@ -54,7 +55,8 @@ public string Build()
Host = _server,
Port = _port,
UserName = _userName,
Password = _password
Password = _password,
Path = AuthenticationDatabase
};

return builder.ToString();
Expand Down
4 changes: 1 addition & 3 deletions src/Aspire.Hosting/MongoDB/MongoDBDatabaseResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ public class MongoDBDatabaseResource(string name, MongoDBContainerResource mongo
{
if (Parent.GetConnectionString() is { } connectionString)
{
return connectionString.EndsWith('/') ?
$"{connectionString}{Name}" :
$"{connectionString}/{Name}";
return connectionString;
}

throw new DistributedApplicationException("Parent resource connection string was null.");
Expand Down
2 changes: 1 addition & 1 deletion tests/Aspire.Hosting.Tests/MongoDB/AddMongoDBTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ public void MongoDBCreatesConnectionString()
var connectionStringResource = Assert.Single(appModel.Resources.OfType<MongoDBDatabaseResource>());
var connectionString = connectionStringResource.GetConnectionString();

Assert.Equal("mongodb://root:password@localhost:27017/mydatabase", connectionString);
Assert.Equal("mongodb://root:password@localhost:27017/admin", connectionString);
}
}
16 changes: 8 additions & 8 deletions tests/Aspire.Hosting.Tests/MongoDB/MongoDBContainerResourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ namespace Aspire.Hosting.Tests.MongoDB;
public class MongoDBContainerResourceTests
{
[Theory]
[InlineData("password", "mongodb://root:password@myserver:1000/")]
[InlineData("@abc!$", "mongodb://root:%40abc!$@myserver:1000/")]
[InlineData("mypasswordwitha\"inthemiddle", "mongodb://root:mypasswordwitha\"inthemiddle@myserver:1000/")]
[InlineData("mypasswordwitha\"attheend\"", "mongodb://root:mypasswordwitha\"attheend\"@myserver:1000/")]
[InlineData("\"mypasswordwitha\"atthestart", "mongodb://root:\"mypasswordwitha\"atthestart@myserver:1000/")]
[InlineData("mypasswordwitha'inthemiddle", "mongodb://root:mypasswordwitha'inthemiddle@myserver:1000/")]
[InlineData("mypasswordwitha'attheend'", "mongodb://root:mypasswordwitha'attheend'@myserver:1000/")]
[InlineData("'mypasswordwitha'atthestart", "mongodb://root:'mypasswordwitha'atthestart@myserver:1000/")]
[InlineData("password", "mongodb://root:password@myserver:1000/admin")]
[InlineData("@abc!$", "mongodb://root:%40abc!$@myserver:1000/admin")]
[InlineData("mypasswordwitha\"inthemiddle", "mongodb://root:mypasswordwitha\"inthemiddle@myserver:1000/admin")]
[InlineData("mypasswordwitha\"attheend\"", "mongodb://root:mypasswordwitha\"attheend\"@myserver:1000/admin")]
[InlineData("\"mypasswordwitha\"atthestart", "mongodb://root:\"mypasswordwitha\"atthestart@myserver:1000/admin")]
[InlineData("mypasswordwitha'inthemiddle", "mongodb://root:mypasswordwitha'inthemiddle@myserver:1000/admin")]
[InlineData("mypasswordwitha'attheend'", "mongodb://root:mypasswordwitha'attheend'@myserver:1000/admin")]
[InlineData("'mypasswordwitha'atthestart", "mongodb://root:'mypasswordwitha'atthestart@myserver:1000/admin")]
public void TestSpecialCharactersAndEscapeForPassword(string password, string expectedConnectionString)
{
var connectionString = new MongoDBConnectionStringBuilder()
Expand Down