daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Make it possible to connect to the database with ssl enabled

Browse source
This commit is contained in:
runebaas 2020-06-19 21:46:19 +02:00
parent 4655424fb0
commit a0b1ec44f6
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Geekbot.net/Database/DatabaseInitializer.cs
View file

@ -35,7 +35,9 @@ namespace Geekbot.net.Database
Port = _runParameters.DbPort, Port = _runParameters.DbPort,
Database = _runParameters.DbDatabase, Database = _runParameters.DbDatabase,
Username = _runParameters.DbUser, Username = _runParameters.DbUser,
Password = _runParameters.DbPassword Password = _runParameters.DbPassword,
RequireSsl = _runParameters.DbSsl,
TrustServerCertificate = _runParameters.DbTrustCert
}); });
} }
} }

5
Geekbot.net/Database/SqlConnectionString.cs
View file

@ -7,10 +7,13 @@
public string Database { get; set; } public string Database { get; set; }
public string Username { get; set; } public string Username { get; set; }
public string Password { get; set; } public string Password { get; set; }
public bool RequireSsl { get; set; }
public bool TrustServerCertificate { get; set; }
public override string ToString() public override string ToString()
{ {
return $"Server={Host};Port={Port};Database={Database};Uid={Username};Pwd={Password};"; var sslMode = RequireSsl ? "Require" : "Prefer";
return $"ApplicationName=Geekbot;Server={Host};Port={Port};Database={Database};Uid={Username};Pwd={Password};SSLMode={sslMode};TrustServerCertificate={TrustServerCertificate.ToString()};";
} }
} }
} }

6
Geekbot.net/Lib/RunParameters.cs
View file

@ -43,6 +43,12 @@ namespace Geekbot.net.Lib
[Option("db-password", HelpText = "Set a posgresql password (default: empty) (env: DB_PASSWORD)")] [Option("db-password", HelpText = "Set a posgresql password (default: empty) (env: DB_PASSWORD)")]
public string DbPassword { get; set; } = ParamFallback("DB_PASSWORD", ""); public string DbPassword { get; set; } = ParamFallback("DB_PASSWORD", "");
[Option("db-require-ssl", HelpText = "Require SSL to connect to the database (default: false) (env: DB_REQUIRE_SSL)")]
public bool DbSsl { get; set; } = ParamFallback("DB_REQUIRE_SSL", false);
[Option("db-trust-cert", HelpText = "Trust the database certificate, regardless if it is valid (default: false) (env: DB_TRUST_CERT)")]
public bool DbTrustCert { get; set; } = ParamFallback("DB_TRUST_CERT", false);
// Logging // Logging
[Option("db-logging", HelpText = "Enable database logging (default: false) (env: DB_LOGGING)")] [Option("db-logging", HelpText = "Enable database logging (default: false) (env: DB_LOGGING)")]