diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj index 5557884b1d..cd30e841b4 100644 --- a/src/Admin/Admin.csproj +++ b/src/Admin/Admin.csproj @@ -1,4 +1,4 @@ - + bitwarden-Admin @@ -24,8 +24,4 @@ - - - - diff --git a/src/Admin/Controllers/LogsController.cs b/src/Admin/Controllers/LogsController.cs deleted file mode 100644 index d3934cb8e5..0000000000 --- a/src/Admin/Controllers/LogsController.cs +++ /dev/null @@ -1,94 +0,0 @@ -using Bit.Admin.Models; -using Bit.Admin.Utilities; -using Bit.Core.Settings; -using Bit.Core.Utilities; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Azure.Cosmos; -using Microsoft.Azure.Cosmos.Linq; -using Serilog.Events; - -namespace Bit.Admin.Controllers; - -[Authorize] -[SelfHosted(NotSelfHostedOnly = true)] -[RequirePermission(Enums.Permission.Logs_View)] -public class LogsController : Controller -{ - private const string Database = "Diagnostics"; - private const string Container = "Logs"; - - private readonly GlobalSettings _globalSettings; - - public LogsController(GlobalSettings globalSettings) - { - _globalSettings = globalSettings; - } - - public async Task Index(string cursor = null, int count = 50, - LogEventLevel? level = null, string project = null, DateTime? start = null, DateTime? end = null) - { - using (var client = new CosmosClient(_globalSettings.DocumentDb.Uri, - _globalSettings.DocumentDb.Key)) - { - var cosmosContainer = client.GetContainer(Database, Container); - var query = cosmosContainer.GetItemLinqQueryable( - requestOptions: new QueryRequestOptions() - { - MaxItemCount = count - }, - continuationToken: cursor - ).AsQueryable(); - - if (level.HasValue) - { - query = query.Where(l => l.Level == level.Value.ToString()); - } - if (!string.IsNullOrWhiteSpace(project)) - { - query = query.Where(l => l.Properties != null && l.Properties["Project"] == (object)project); - } - if (start.HasValue) - { - query = query.Where(l => l.Timestamp >= start.Value); - } - if (end.HasValue) - { - query = query.Where(l => l.Timestamp <= end.Value); - } - var feedIterator = query.OrderByDescending(l => l.Timestamp).ToFeedIterator(); - var response = await feedIterator.ReadNextAsync(); - - return View(new LogsModel - { - Level = level, - Project = project, - Start = start, - End = end, - Items = response.ToList(), - Count = count, - Cursor = cursor, - NextCursor = response.ContinuationToken - }); - } - } - - public async Task View(Guid id) - { - using (var client = new CosmosClient(_globalSettings.DocumentDb.Uri, - _globalSettings.DocumentDb.Key)) - { - var cosmosContainer = client.GetContainer(Database, Container); - var query = cosmosContainer.GetItemLinqQueryable() - .AsQueryable() - .Where(l => l.Id == id.ToString()); - - var response = await query.ToFeedIterator().ReadNextAsync(); - if (response == null || response.Count == 0) - { - return RedirectToAction("Index"); - } - return View(response.First()); - } - } -} diff --git a/src/Admin/Enums/Permissions.cs b/src/Admin/Enums/Permissions.cs index 2354e9435c..6b73ba4205 100644 --- a/src/Admin/Enums/Permissions.cs +++ b/src/Admin/Enums/Permissions.cs @@ -47,7 +47,5 @@ public enum Permission Tools_GenerateLicenseFile, Tools_ManageTaxRates, Tools_ManageStripeSubscriptions, - Tools_CreateEditTransaction, - - Logs_View + Tools_CreateEditTransaction } diff --git a/src/Admin/Models/LogModel.cs b/src/Admin/Models/LogModel.cs deleted file mode 100644 index 8967025d12..0000000000 --- a/src/Admin/Models/LogModel.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Microsoft.Azure.Documents; -using Newtonsoft.Json.Linq; - -namespace Bit.Admin.Models; - -public class LogModel : Resource -{ - public long EventIdHash { get; set; } - public string Level { get; set; } - public string Message { get; set; } - public string MessageTruncated => Message.Length > 200 ? $"{Message.Substring(0, 200)}..." : Message; - public string MessageTemplate { get; set; } - public IDictionary Properties { get; set; } - public string Project => Properties?.ContainsKey("Project") ?? false ? Properties["Project"].ToString() : null; -} - -public class LogDetailsModel : LogModel -{ - public JObject Exception { get; set; } - - public string ExceptionToString(JObject e) - { - if (e == null) - { - return null; - } - - var val = string.Empty; - if (e["Message"] != null && e["Message"].ToObject() != null) - { - val += "Message:\n"; - val += e["Message"] + "\n"; - } - - if (e["StackTrace"] != null && e["StackTrace"].ToObject() != null) - { - val += "\nStack Trace:\n"; - val += e["StackTrace"]; - } - else if (e["StackTraceString"] != null && e["StackTraceString"].ToObject() != null) - { - val += "\nStack Trace String:\n"; - val += e["StackTraceString"]; - } - - if (e["InnerException"] != null && e["InnerException"].ToObject() != null) - { - val += "\n\n=== Inner Exception ===\n\n"; - val += ExceptionToString(e["InnerException"].ToObject()); - } - - return val; - } -} diff --git a/src/Admin/Models/LogsModel.cs b/src/Admin/Models/LogsModel.cs deleted file mode 100644 index c5527a3191..0000000000 --- a/src/Admin/Models/LogsModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Serilog.Events; - -namespace Bit.Admin.Models; - -public class LogsModel : CursorPagedModel -{ - public LogEventLevel? Level { get; set; } - public string Project { get; set; } - public DateTime? Start { get; set; } - public DateTime? End { get; set; } -} diff --git a/src/Admin/Utilities/RolePermissionMapping.cs b/src/Admin/Utilities/RolePermissionMapping.cs index a9b2d3dfc7..1dee17c05c 100644 --- a/src/Admin/Utilities/RolePermissionMapping.cs +++ b/src/Admin/Utilities/RolePermissionMapping.cs @@ -47,8 +47,7 @@ public static class RolePermissionMapping Permission.Tools_PromoteAdmin, Permission.Tools_GenerateLicenseFile, Permission.Tools_ManageTaxRates, - Permission.Tools_ManageStripeSubscriptions, - Permission.Logs_View + Permission.Tools_ManageStripeSubscriptions } }, { "admin", new List @@ -94,8 +93,7 @@ public static class RolePermissionMapping Permission.Tools_GenerateLicenseFile, Permission.Tools_ManageTaxRates, Permission.Tools_ManageStripeSubscriptions, - Permission.Tools_CreateEditTransaction, - Permission.Logs_View + Permission.Tools_CreateEditTransaction } }, { "cs", new List @@ -123,8 +121,7 @@ public static class RolePermissionMapping Permission.Org_Billing_View, Permission.Org_Billing_LaunchGateway, Permission.Provider_List_View, - Permission.Provider_View, - Permission.Logs_View + Permission.Provider_View } }, { "billing", new List @@ -163,8 +160,7 @@ public static class RolePermissionMapping Permission.Tools_GenerateLicenseFile, Permission.Tools_ManageTaxRates, Permission.Tools_ManageStripeSubscriptions, - Permission.Tools_CreateEditTransaction, - Permission.Logs_View + Permission.Tools_CreateEditTransaction } }, { "sales", new List @@ -193,8 +189,7 @@ public static class RolePermissionMapping Permission.Provider_Create, Permission.Provider_Edit, Permission.Provider_View, - Permission.Provider_ResendEmailInvite, - Permission.Logs_View + Permission.Provider_ResendEmailInvite } }, }; diff --git a/src/Admin/Views/Logs/Index.cshtml b/src/Admin/Views/Logs/Index.cshtml deleted file mode 100644 index 93eeb05e4c..0000000000 --- a/src/Admin/Views/Logs/Index.cshtml +++ /dev/null @@ -1,91 +0,0 @@ -@model LogsModel -@{ - ViewData["Title"] = "Logs"; -} - -

Logs

- -

Current UTC time: @DateTime.UtcNow.ToString()

- -
- - - - - - - -
- -
- - - - - - - - - - - - @if(!Model.Items.Any()) - { - - - - } - else - { - @foreach(var log in Model.Items) - { - - - - - - - - } - } - -
 TimestampProjectLevelMessage
No results to list.
- - - - @log.Timestamp.ToString()@(string.IsNullOrWhiteSpace(log.Project) ? "-" : log.Project)@log.Level@log.MessageTruncated
-
- - diff --git a/src/Admin/Views/Logs/View.cshtml b/src/Admin/Views/Logs/View.cshtml deleted file mode 100644 index 86ca77164d..0000000000 --- a/src/Admin/Views/Logs/View.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@model LogDetailsModel -@{ - ViewData["Title"] = "Log: " + Model.Id; -} - -

Log @Model.Id

- -

Information

-
-
Id
-
@Model.Id
- -
Event Id Hash
-
@Model.EventIdHash
- -
Timestamp
-
@Model.Timestamp.ToString()
- -
Level
-
@Model.Level
-
- -

Message

-
@Model.Message
- -@if(Model.Exception != null) -{ -

Exception

- 
@Model.ExceptionToString(Model.Exception)
-} - -@if(Model.Properties != null && Model.Properties.Count > 0) -{ -

Properties

-
- @foreach(var prop in Model.Properties) - { -
@prop.Key
-
@(prop.Value?.ToString() ?? "-")
- } -
-} diff --git a/src/Admin/Views/Shared/_Layout.cshtml b/src/Admin/Views/Shared/_Layout.cshtml index 55a380da07..37b893e643 100644 --- a/src/Admin/Views/Shared/_Layout.cshtml +++ b/src/Admin/Views/Shared/_Layout.cshtml @@ -1,4 +1,4 @@ -@using Bit.Admin.Enums; +@using Bit.Admin.Enums; @inject SignInManager SignInManager @inject Bit.Core.Settings.GlobalSettings GlobalSettings @@ -8,7 +8,6 @@ var canViewUsers = AccessControlService.UserHasPermission(Permission.User_List_View); var canViewOrgs = AccessControlService.UserHasPermission(Permission.Org_List_View); var canViewProviders = AccessControlService.UserHasPermission(Permission.Provider_List_View); - var canViewLogs = AccessControlService.UserHasPermission(Permission.Logs_View); var canChargeBraintree = AccessControlService.UserHasPermission(Permission.Tools_ChargeBrainTreeCustomer); var canCreateTransaction = AccessControlService.UserHasPermission(Permission.Tools_CreateEditTransaction); var canPromoteAdmin = AccessControlService.UserHasPermission(Permission.Tools_PromoteAdmin); @@ -121,12 +120,6 @@ } - @if (canViewLogs) - { -
  • - Logs -
    • - } } } @if (GlobalSettings.SelfHosted) diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index b73641ebfd..642900e26c 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -34,6 +34,7 @@ + @@ -48,7 +49,6 @@ - diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs index d32aab654a..efa44c440b 100644 --- a/src/Core/Settings/GlobalSettings.cs +++ b/src/Core/Settings/GlobalSettings.cs @@ -61,7 +61,6 @@ public class GlobalSettings : IGlobalSettings public virtual FileStorageSettings Send { get; set; } public virtual IdentityServerSettings IdentityServer { get; set; } = new IdentityServerSettings(); public virtual DataProtectionSettings DataProtection { get; set; } - public virtual DocumentDbSettings DocumentDb { get; set; } = new DocumentDbSettings(); public virtual SentrySettings Sentry { get; set; } = new SentrySettings(); public virtual SyslogSettings Syslog { get; set; } = new SyslogSettings(); public virtual ILogLevelSettings MinLogLevel { get; set; } = new LogLevelSettings(); @@ -351,12 +350,6 @@ public class GlobalSettings : IGlobalSettings } } - public class DocumentDbSettings - { - public string Uri { get; set; } - public string Key { get; set; } - } - public class SentrySettings { public string Dsn { get; set; } diff --git a/src/Core/Utilities/LoggerFactoryExtensions.cs b/src/Core/Utilities/LoggerFactoryExtensions.cs index 25a6f42477..1d8d2a0c84 100644 --- a/src/Core/Utilities/LoggerFactoryExtensions.cs +++ b/src/Core/Utilities/LoggerFactoryExtensions.cs @@ -60,16 +60,7 @@ public static class LoggerFactoryExtensions .Enrich.FromLogContext() .Filter.ByIncludingOnly(inclusionPredicate); - if (CoreHelpers.SettingHasValue(globalSettings?.DocumentDb.Uri) && - CoreHelpers.SettingHasValue(globalSettings?.DocumentDb.Key)) - { - config.WriteTo.AzureCosmosDB(new Uri(globalSettings.DocumentDb.Uri), - globalSettings.DocumentDb.Key, timeToLive: TimeSpan.FromDays(7), - partitionKey: "_partitionKey") - .Enrich.FromLogContext() - .Enrich.WithProperty("Project", globalSettings.ProjectName); - } - else if (CoreHelpers.SettingHasValue(globalSettings?.Sentry.Dsn)) + if (CoreHelpers.SettingHasValue(globalSettings?.Sentry.Dsn)) { config.WriteTo.Sentry(globalSettings.Sentry.Dsn) .Enrich.FromLogContext()