admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-10-20 23:25:32 +00:00
parent 8fbbb2e73b
commit e130c290f5
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -47,8 +47,8 @@
// "AYANOVA_LOG_LEVEL": "Trace", // "AYANOVA_LOG_LEVEL": "Trace",
"AYANOVA_DEFAULT_TRANSLATION": "en", "AYANOVA_DEFAULT_TRANSLATION": "en",
//"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
//"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;",
"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;", //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",

2
server/AyaNova/util/AySchema.cs
View File

@@ -198,7 +198,7 @@ namespace AyaNova.Util
cm.CommandText = "CREATE TABLE aschemaversion (schema INTEGER NOT NULL, id TEXT NOT NULL);"; cm.CommandText = "CREATE TABLE aschemaversion (schema INTEGER NOT NULL, id TEXT NOT NULL);";
await cm.ExecuteNonQueryAsync(); await cm.ExecuteNonQueryAsync();
cm.CommandText = $"insert into aschemaversion (schema, id) values (0,'{AyaNova.Util.Hasher.GenerateSalt()}');"; cm.CommandText = $"insert into aschemaversion (schema, id) values (0,'{AyaNova.Util.Hasher.GenerateSalt()}');";//NOTE: this is where the dbid comes from originally
await cm.ExecuteNonQueryAsync(); await cm.ExecuteNonQueryAsync();
await ct.Database.CloseConnectionAsync(); await ct.Database.CloseConnectionAsync();

8
server/AyaNova/util/Hasher.cs
View File

@@ -26,8 +26,14 @@ namespace AyaNova.Util
} }
//Generate salt //Generate salt
/*
Used for many things:
DBID, JWT secret key when none provided, User Salt for login / password,
temporary 2fa codes, download tokens,
temporary user pw / login when newly created and haven't been set yet
*/
public static string GenerateSalt() public static string GenerateSalt()
{ {
var salt = new byte[32]; var salt = new byte[32];
var random = RandomNumberGenerator.Create(); var random = RandomNumberGenerator.Create();
random.GetNonZeroBytes(salt); random.GetNonZeroBytes(salt);