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
2022-03-04 19:03:57 +00:00
parent 1e7369382e
commit 9f02542244
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/AuthController.cs
View File

@@ -676,7 +676,7 @@ namespace AyaNova.Api.Controllers
{ "exp", exp.ToUnixTimeSeconds().ToString() },//in payload exp must be in unix epoch time per standard { "exp", exp.ToUnixTimeSeconds().ToString() },//in payload exp must be in unix epoch time per standard
{ "iss", "ayanova.com" }, { "iss", "ayanova.com" },
{ "id", "1"}, { "id", "1"},
{ "int","1" } { "j","1" }
}; };
return Jose.JWT.Encode(payload, secretKey, Jose.JwsAlgorithm.HS256); return Jose.JWT.Encode(payload, secretKey, Jose.JwsAlgorithm.HS256);
} }

21
server/AyaNova/Startup.cs
View File

@@ -257,7 +257,7 @@ namespace AyaNova
//so in that case users need to specify an AyaNova_JWT_SECRET environment variable //so in that case users need to specify an AyaNova_JWT_SECRET environment variable
if (string.IsNullOrWhiteSpace(secretKey)) if (string.IsNullOrWhiteSpace(secretKey))
{ {
_newLog.LogWarning("AYANOVA_JWT_SECRET configuration setting is missing; AyaNova will randomly generate one. Any Users who were logged in when the server restarted will need to login to get a fresh auth token. See manual 'AYANOVA_JWT_SECRET' page for details."); _newLog.LogWarning("AYANOVA_JWT_SECRET configuration setting is missing; AyaNova will randomly generate one. Any Users who were logged in when the server restarted will need to login to get a fresh auth token. See manual 'AYANOVA_JWT_SECRET' page for details.");
secretKey = Util.Hasher.GenerateSalt(); secretKey = Util.Hasher.GenerateSalt();
} }
//WAS "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4" //WAS "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4"
@@ -469,7 +469,7 @@ namespace AyaNova
context.Request.HttpContext.Items["AY_TRANSLATION_ID"] = u.translationId; context.Request.HttpContext.Items["AY_TRANSLATION_ID"] = u.translationId;
context.Request.HttpContext.Items["AY_USER_TYPE"] = u.UserType; context.Request.HttpContext.Items["AY_USER_TYPE"] = u.UserType;
var currentAuthToken=u.currentAuthToken; var currentAuthToken = u.currentAuthToken;
//turned out didn't need this for v8 migrate so far, but keeping in case it turns out to be handy down the road //turned out didn't need this for v8 migrate so far, but keeping in case it turns out to be handy down the road
// //Is import mode header set? // //Is import mode header set?
@@ -484,6 +484,21 @@ namespace AyaNova
u.currentAuthToken != JWT u.currentAuthToken != JWT
)//except "/api/v8/auth" and prelogin notify/hello routes so user can login )//except "/api/v8/auth" and prelogin notify/hello routes so user can login
{ {
//It may be a local report render request from a job
if (context.Request.Host.Host == "127.0.0.1")
{
//check if token has j value set
if (context.Request.IsLocal())
{
if (context.User.Claims.FirstOrDefault(c => c.Type == "j") != null)
{
//it's a local request, the jwt already passed earlier so we issued it and it has the correct claim set so allow it
await next.Invoke();
}
}
}
context.Response.StatusCode = 401; context.Response.StatusCode = 401;
context.Response.Headers.Add("X-AyaNova-Authorization-Error", "E2004 - Authorization token replaced by more recent login"); context.Response.Headers.Add("X-AyaNova-Authorization-Error", "E2004 - Authorization token replaced by more recent login");
await context.Response.WriteAsync("E2004 - Authorization token replaced by more recent login"); await context.Response.WriteAsync("E2004 - Authorization token replaced by more recent login");
@@ -610,7 +625,7 @@ namespace AyaNova
AyaNova.Core.License.FetchKeyAsync(apiServerState, dbContext, _newLog, true, true).Wait(); AyaNova.Core.License.FetchKeyAsync(apiServerState, dbContext, _newLog, true, true).Wait();
var seed = new Util.Seeder(); var seed = new Util.Seeder();
seed.SeedDatabaseAsync(Seeder.Level.StringToSeedLevel(ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL), ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET).Wait(); seed.SeedDatabaseAsync(Seeder.Level.StringToSeedLevel(ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL), ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET).Wait();
// _newLog.LogInformation("Seeding completed"); // _newLog.LogInformation("Seeding completed");
} }
#endif #endif