Compare commits
73 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
388deacf60 | ||
|
|
aa547038de | ||
|
|
17e3345b8a | ||
|
|
f95312c1e3 | ||
|
|
2144ca3823 | ||
|
|
de45ff40d8 | ||
|
|
606085c012 | ||
|
|
00525d8099 | ||
|
|
26617d67f5 | ||
|
|
600bec3417 | ||
|
|
4e85d1755a | ||
|
|
0832936933 | ||
|
|
ecda2ec6d1 | ||
|
|
6f3765a3bf | ||
|
|
29002d3445 | ||
|
|
6d0456a008 | ||
|
|
3e698123bb | ||
|
|
f3fb86819a | ||
|
|
e2248a8444 | ||
|
|
2cf2b77090 | ||
|
|
fedc9278d4 | ||
|
|
f29206a69b | ||
|
|
0658e55a78 | ||
|
|
21bea974a9 | ||
|
|
33ef09433e | ||
|
|
173bff67df | ||
|
|
512a989609 | ||
|
|
2d7dac5089 | ||
|
|
11708fbc3b | ||
|
|
daeb4dd5b9 | ||
|
|
daba4cba04 | ||
|
|
1cd0f0f96f | ||
|
|
6a30db07a7 | ||
|
|
6c8754d008 | ||
|
|
356ba94592 | ||
|
|
d3b55d155b | ||
|
|
0015001d7c | ||
|
|
0a86aa8aa4 | ||
|
|
74d4ee729d | ||
|
|
178ff36e86 | ||
|
|
f852df5807 | ||
|
|
90f4b04857 | ||
|
|
244e87ed18 | ||
|
|
80ea5a543f | ||
|
|
5baba05f5f | ||
|
|
591da6de5c | ||
|
|
c1ddff4ae3 | ||
|
|
67d78d7104 | ||
|
|
52f4b00f84 | ||
|
|
8f028e2ac6 | ||
|
|
5bd6f15203 | ||
|
|
4c39ad6170 | ||
|
|
12392d4f47 | ||
|
|
b75147e4c0 | ||
|
|
8f9508f30b | ||
|
|
428e2668d3 | ||
|
|
c1cfb35c86 | ||
|
|
d6777c463e | ||
|
|
f9126bffe0 | ||
|
|
0488e83a38 | ||
|
|
d87ddc90e3 | ||
|
|
151bc82998 | ||
|
|
e4c21c74a5 | ||
|
|
13741a2be9 | ||
|
|
c866e89b72 | ||
|
|
8be93bc53c | ||
|
|
384b6a3e7d | ||
|
|
ba2de54c60 | ||
|
|
bd5567e24f | ||
|
|
b8e39824b5 | ||
|
|
d8c9bdbd8d | ||
|
|
80eb210af0 | ||
|
|
c0df8ac507 |
9
.gitattributes
vendored
9
.gitattributes
vendored
@@ -1,3 +1,10 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
# Auto detect text files and perform LF normalization
|
||||||
* text=auto
|
* text=auto
|
||||||
Moonlight/wwwroot/* linguist-vendored
|
Moonlight/wwwroot/** linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/js/scripts.bundle.js linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/js/widgets.bundle.js linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/js/theme.js linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/css/boxicons.min.css linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/css/style.bundle.css linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/plugins/** linguist-vendored
|
||||||
|
Moonlight/wwwroot/assets/fonts/** linguist-vendored
|
||||||
|
|||||||
@@ -17,6 +17,17 @@ public class ConfigV1
|
|||||||
[Description("The url moonlight is accesible with from the internet")]
|
[Description("The url moonlight is accesible with from the internet")]
|
||||||
public string AppUrl { get; set; } = "http://your-moonlight-url-without-slash";
|
public string AppUrl { get; set; } = "http://your-moonlight-url-without-slash";
|
||||||
|
|
||||||
|
[JsonProperty("EnableLatencyCheck")]
|
||||||
|
[Description(
|
||||||
|
"This will enable a latency check for connections to moonlight. Users with an too high latency will be warned that moonlight might be buggy for them")]
|
||||||
|
public bool EnableLatencyCheck { get; set; } = true;
|
||||||
|
|
||||||
|
[JsonProperty("LatencyCheckThreshold")]
|
||||||
|
[Description("Specify the latency threshold which has to be reached in order to trigger the warning message")]
|
||||||
|
public int LatencyCheckThreshold { get; set; } = 500;
|
||||||
|
|
||||||
|
[JsonProperty("Auth")] public AuthData Auth { get; set; } = new();
|
||||||
|
|
||||||
[JsonProperty("Database")] public DatabaseData Database { get; set; } = new();
|
[JsonProperty("Database")] public DatabaseData Database { get; set; } = new();
|
||||||
|
|
||||||
[JsonProperty("DiscordBotApi")] public DiscordBotApiData DiscordBotApi { get; set; } = new();
|
[JsonProperty("DiscordBotApi")] public DiscordBotApiData DiscordBotApi { get; set; } = new();
|
||||||
@@ -37,10 +48,7 @@ public class ConfigV1
|
|||||||
|
|
||||||
[JsonProperty("Cleanup")] public CleanupData Cleanup { get; set; } = new();
|
[JsonProperty("Cleanup")] public CleanupData Cleanup { get; set; } = new();
|
||||||
|
|
||||||
[JsonProperty("Subscriptions")] public SubscriptionsData Subscriptions { get; set; } = new();
|
[JsonProperty("DiscordNotifications")] public DiscordNotificationsData DiscordNotifications { get; set; } = new();
|
||||||
|
|
||||||
[JsonProperty("DiscordNotifications")]
|
|
||||||
public DiscordNotificationsData DiscordNotifications { get; set; } = new();
|
|
||||||
|
|
||||||
[JsonProperty("Statistics")] public StatisticsData Statistics { get; set; } = new();
|
[JsonProperty("Statistics")] public StatisticsData Statistics { get; set; } = new();
|
||||||
|
|
||||||
@@ -49,6 +57,35 @@ public class ConfigV1
|
|||||||
[JsonProperty("SmartDeploy")] public SmartDeployData SmartDeploy { get; set; } = new();
|
[JsonProperty("SmartDeploy")] public SmartDeployData SmartDeploy { get; set; } = new();
|
||||||
|
|
||||||
[JsonProperty("Sentry")] public SentryData Sentry { get; set; } = new();
|
[JsonProperty("Sentry")] public SentryData Sentry { get; set; } = new();
|
||||||
|
|
||||||
|
[JsonProperty("Stripe")] public StripeData Stripe { get; set; } = new();
|
||||||
|
|
||||||
|
[JsonProperty("Tickets")] public TicketsData Tickets { get; set; } = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TicketsData
|
||||||
|
{
|
||||||
|
[JsonProperty("WelcomeMessage")]
|
||||||
|
[Description("The message that will be sent when a user created a ticket")]
|
||||||
|
public string WelcomeMessage { get; set; } = "Welcome to the support";
|
||||||
|
}
|
||||||
|
|
||||||
|
public class StripeData
|
||||||
|
{
|
||||||
|
[JsonProperty("ApiKey")]
|
||||||
|
[Description("Put here your stripe api key if you add subscriptions. Currently the only billing option is stripe which is enabled by default and cannot be turned off. This feature is still experimental")]
|
||||||
|
public string ApiKey { get; set; } = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public class AuthData
|
||||||
|
{
|
||||||
|
[JsonProperty("DenyLogin")]
|
||||||
|
[Description("Prevent every new login")]
|
||||||
|
public bool DenyLogin { get; set; } = false;
|
||||||
|
|
||||||
|
[JsonProperty("DenyRegister")]
|
||||||
|
[Description("Prevent every new user to register")]
|
||||||
|
public bool DenyRegister { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CleanupData
|
public class CleanupData
|
||||||
@@ -257,6 +294,10 @@ public class ConfigV1
|
|||||||
[Blur]
|
[Blur]
|
||||||
public string Token { get; set; } = Guid.NewGuid().ToString();
|
public string Token { get; set; } = Guid.NewGuid().ToString();
|
||||||
|
|
||||||
|
[JsonProperty("BlockIpDuration")]
|
||||||
|
[Description("The duration in minutes a ip will be blocked by the anti ddos system")]
|
||||||
|
public int BlockIpDuration { get; set; } = 15;
|
||||||
|
|
||||||
[JsonProperty("ReCaptcha")] public ReCaptchaData ReCaptcha { get; set; } = new();
|
[JsonProperty("ReCaptcha")] public ReCaptchaData ReCaptcha { get; set; } = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -306,11 +347,6 @@ public class ConfigV1
|
|||||||
[JsonProperty("Wait")] public long Wait { get; set; } = 15;
|
[JsonProperty("Wait")] public long Wait { get; set; } = 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SubscriptionsData
|
|
||||||
{
|
|
||||||
[JsonProperty("SellPass")] public SellPassData SellPass { get; set; } = new();
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SellPassData
|
public class SellPassData
|
||||||
{
|
{
|
||||||
[JsonProperty("Enable")] public bool Enable { get; set; } = false;
|
[JsonProperty("Enable")] public bool Enable { get; set; } = false;
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Moonlight.App.Database.Entities;
|
using Moonlight.App.Database.Entities;
|
||||||
using Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
using Moonlight.App.Database.Entities.Notification;
|
using Moonlight.App.Database.Entities.Notification;
|
||||||
using Moonlight.App.Database.Interceptors;
|
using Moonlight.App.Database.Interceptors;
|
||||||
using Moonlight.App.Models.Misc;
|
|
||||||
using Moonlight.App.Services;
|
using Moonlight.App.Services;
|
||||||
|
|
||||||
namespace Moonlight.App.Database;
|
namespace Moonlight.App.Database;
|
||||||
@@ -27,10 +25,6 @@ public class DataContext : DbContext
|
|||||||
public DbSet<ServerVariable> ServerVariables { get; set; }
|
public DbSet<ServerVariable> ServerVariables { get; set; }
|
||||||
public DbSet<User> Users { get; set; }
|
public DbSet<User> Users { get; set; }
|
||||||
public DbSet<LoadingMessage> LoadingMessages { get; set; }
|
public DbSet<LoadingMessage> LoadingMessages { get; set; }
|
||||||
public DbSet<AuditLogEntry> AuditLog { get; set; }
|
|
||||||
public DbSet<ErrorLogEntry> ErrorLog { get; set; }
|
|
||||||
public DbSet<SecurityLogEntry> SecurityLog { get; set; }
|
|
||||||
|
|
||||||
public DbSet<SharedDomain> SharedDomains { get; set; }
|
public DbSet<SharedDomain> SharedDomains { get; set; }
|
||||||
public DbSet<Domain> Domains { get; set; }
|
public DbSet<Domain> Domains { get; set; }
|
||||||
public DbSet<Revoke> Revokes { get; set; }
|
public DbSet<Revoke> Revokes { get; set; }
|
||||||
@@ -46,6 +40,13 @@ public class DataContext : DbContext
|
|||||||
public DbSet<WebSpace> WebSpaces { get; set; }
|
public DbSet<WebSpace> WebSpaces { get; set; }
|
||||||
public DbSet<SupportChatMessage> SupportChatMessages { get; set; }
|
public DbSet<SupportChatMessage> SupportChatMessages { get; set; }
|
||||||
public DbSet<IpBan> IpBans { get; set; }
|
public DbSet<IpBan> IpBans { get; set; }
|
||||||
|
public DbSet<PermissionGroup> PermissionGroups { get; set; }
|
||||||
|
public DbSet<SecurityLog> SecurityLogs { get; set; }
|
||||||
|
public DbSet<BlocklistIp> BlocklistIps { get; set; }
|
||||||
|
public DbSet<WhitelistIp> WhitelistIps { get; set; }
|
||||||
|
|
||||||
|
public DbSet<Ticket> Tickets { get; set; }
|
||||||
|
public DbSet<TicketMessage> TicketMessages { get; set; }
|
||||||
|
|
||||||
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
|
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
|
||||||
{
|
{
|
||||||
|
|||||||
10
Moonlight/App/Database/Entities/BlocklistIp.cs
Normal file
10
Moonlight/App/Database/Entities/BlocklistIp.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
public class BlocklistIp
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string Ip { get; set; } = "";
|
||||||
|
public DateTime ExpiresAt { get; set; }
|
||||||
|
public long Packets { get; set; }
|
||||||
|
public DateTime CreatedAt { get; set; }
|
||||||
|
}
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
using Moonlight.App.Models.Misc;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
|
|
||||||
public class AuditLogEntry
|
|
||||||
{
|
|
||||||
public int Id { get; set; }
|
|
||||||
public AuditLogType Type { get; set; }
|
|
||||||
public string JsonData { get; set; } = "";
|
|
||||||
public bool System { get; set; }
|
|
||||||
public string Ip { get; set; } = "";
|
|
||||||
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
namespace Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
|
|
||||||
public class ErrorLogEntry
|
|
||||||
{
|
|
||||||
public int Id { get; set; }
|
|
||||||
public string Stacktrace { get; set; } = "";
|
|
||||||
public bool System { get; set; }
|
|
||||||
public string JsonData { get; set; } = "";
|
|
||||||
public string Ip { get; set; } = "";
|
|
||||||
public string Class { get; set; } = "";
|
|
||||||
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
using Moonlight.App.Models.Misc;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
|
|
||||||
public class SecurityLogEntry
|
|
||||||
{
|
|
||||||
public int Id { get; set; }
|
|
||||||
public bool System { get; set; }
|
|
||||||
public string Ip { get; set; } = "";
|
|
||||||
public SecurityLogType Type { get; set; }
|
|
||||||
public string JsonData { get; set; } = "";
|
|
||||||
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
|
|
||||||
}
|
|
||||||
8
Moonlight/App/Database/Entities/PermissionGroup.cs
Normal file
8
Moonlight/App/Database/Entities/PermissionGroup.cs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
public class PermissionGroup
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string Name { get; set; } = "";
|
||||||
|
public byte[] Permissions { get; set; } = Array.Empty<byte>();
|
||||||
|
}
|
||||||
8
Moonlight/App/Database/Entities/SecurityLog.cs
Normal file
8
Moonlight/App/Database/Entities/SecurityLog.cs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
public class SecurityLog
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string Text { get; set; } = "";
|
||||||
|
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
|
||||||
|
}
|
||||||
@@ -1,9 +1,16 @@
|
|||||||
namespace Moonlight.App.Database.Entities;
|
using Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
public class Subscription
|
public class Subscription
|
||||||
{
|
{
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public string Name { get; set; } = "";
|
public string Name { get; set; } = "";
|
||||||
public string Description { get; set; } = "";
|
public string Description { get; set; } = "";
|
||||||
|
public Currency Currency { get; set; } = Currency.USD;
|
||||||
|
public double Price { get; set; }
|
||||||
|
public string StripeProductId { get; set; } = "";
|
||||||
|
public string StripePriceId { get; set; } = "";
|
||||||
public string LimitsJson { get; set; } = "";
|
public string LimitsJson { get; set; } = "";
|
||||||
|
public int Duration { get; set; } = 30;
|
||||||
}
|
}
|
||||||
19
Moonlight/App/Database/Entities/Ticket.cs
Normal file
19
Moonlight/App/Database/Entities/Ticket.cs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
public class Ticket
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string IssueTopic { get; set; } = "";
|
||||||
|
public string IssueDescription { get; set; } = "";
|
||||||
|
public string IssueTries { get; set; } = "";
|
||||||
|
public User CreatedBy { get; set; }
|
||||||
|
public User? AssignedTo { get; set; }
|
||||||
|
public TicketPriority Priority { get; set; }
|
||||||
|
public TicketStatus Status { get; set; }
|
||||||
|
public TicketSubject Subject { get; set; }
|
||||||
|
public int SubjectId { get; set; }
|
||||||
|
public List<TicketMessage> Messages { get; set; } = new();
|
||||||
|
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
|
||||||
|
}
|
||||||
14
Moonlight/App/Database/Entities/TicketMessage.cs
Normal file
14
Moonlight/App/Database/Entities/TicketMessage.cs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
public class TicketMessage
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string Content { get; set; } = "";
|
||||||
|
public string? AttachmentUrl { get; set; }
|
||||||
|
public User? Sender { get; set; }
|
||||||
|
public bool IsSystemMessage { get; set; }
|
||||||
|
public bool IsEdited { get; set; }
|
||||||
|
public bool IsSupportMessage { get; set; }
|
||||||
|
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
|
||||||
|
public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using Moonlight.App.Models.Misc;
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
namespace Moonlight.App.Database.Entities;
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
@@ -39,6 +40,8 @@ public class User
|
|||||||
public bool TotpEnabled { get; set; } = false;
|
public bool TotpEnabled { get; set; } = false;
|
||||||
public string TotpSecret { get; set; } = "";
|
public string TotpSecret { get; set; } = "";
|
||||||
public DateTime TokenValidTime { get; set; } = DateTime.UtcNow;
|
public DateTime TokenValidTime { get; set; } = DateTime.UtcNow;
|
||||||
|
public byte[] Permissions { get; set; } = Array.Empty<byte>();
|
||||||
|
public PermissionGroup? PermissionGroup { get; set; }
|
||||||
|
|
||||||
// Discord
|
// Discord
|
||||||
public ulong DiscordId { get; set; }
|
public ulong DiscordId { get; set; }
|
||||||
@@ -51,8 +54,8 @@ public class User
|
|||||||
// Subscriptions
|
// Subscriptions
|
||||||
|
|
||||||
public Subscription? CurrentSubscription { get; set; } = null;
|
public Subscription? CurrentSubscription { get; set; } = null;
|
||||||
public DateTime SubscriptionSince { get; set; } = DateTime.Now;
|
public DateTime SubscriptionSince { get; set; } = DateTime.UtcNow;
|
||||||
public int SubscriptionDuration { get; set; }
|
public DateTime SubscriptionExpires { get; set; } = DateTime.UtcNow;
|
||||||
|
|
||||||
// Ip logs
|
// Ip logs
|
||||||
public string RegisterIp { get; set; } = "";
|
public string RegisterIp { get; set; } = "";
|
||||||
|
|||||||
7
Moonlight/App/Database/Entities/WhitelistIp.cs
Normal file
7
Moonlight/App/Database/Entities/WhitelistIp.cs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
public class WhitelistIp
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string Ip { get; set; } = "";
|
||||||
|
}
|
||||||
1105
Moonlight/App/Database/Migrations/20230705171914_AddedStripeIntegration.Designer.cs
generated
Normal file
1105
Moonlight/App/Database/Migrations/20230705171914_AddedStripeIntegration.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,96 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddedStripeIntegration : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "SubscriptionDuration",
|
||||||
|
table: "Users");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<DateTime>(
|
||||||
|
name: "SubscriptionExpires",
|
||||||
|
table: "Users",
|
||||||
|
type: "datetime(6)",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "Currency",
|
||||||
|
table: "Subscriptions",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "Duration",
|
||||||
|
table: "Subscriptions",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<double>(
|
||||||
|
name: "Price",
|
||||||
|
table: "Subscriptions",
|
||||||
|
type: "double",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0.0);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "StripePriceId",
|
||||||
|
table: "Subscriptions",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "StripeProductId",
|
||||||
|
table: "Subscriptions",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "SubscriptionExpires",
|
||||||
|
table: "Users");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Currency",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Duration",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Price",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "StripePriceId",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "StripeProductId",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "SubscriptionDuration",
|
||||||
|
table: "Users",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1109
Moonlight/App/Database/Migrations/20230715095531_AddPermissions.Designer.cs
generated
Normal file
1109
Moonlight/App/Database/Migrations/20230715095531_AddPermissions.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,28 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddPermissions : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<byte[]>(
|
||||||
|
name: "Permissions",
|
||||||
|
table: "Users",
|
||||||
|
type: "longblob",
|
||||||
|
nullable: false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Permissions",
|
||||||
|
table: "Users");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1139
Moonlight/App/Database/Migrations/20230715214550_AddPermissionGroup.Designer.cs
generated
Normal file
1139
Moonlight/App/Database/Migrations/20230715214550_AddPermissionGroup.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,68 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Metadata;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddPermissionGroup : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "PermissionGroupId",
|
||||||
|
table: "Users",
|
||||||
|
type: "int",
|
||||||
|
nullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "PermissionGroups",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
Name = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
Permissions = table.Column<byte[]>(type: "longblob", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_PermissionGroups", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Users_PermissionGroupId",
|
||||||
|
table: "Users",
|
||||||
|
column: "PermissionGroupId");
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_Users_PermissionGroups_PermissionGroupId",
|
||||||
|
table: "Users",
|
||||||
|
column: "PermissionGroupId",
|
||||||
|
principalTable: "PermissionGroups",
|
||||||
|
principalColumn: "Id");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_Users_PermissionGroups_PermissionGroupId",
|
||||||
|
table: "Users");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "PermissionGroups");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_Users_PermissionGroupId",
|
||||||
|
table: "Users");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "PermissionGroupId",
|
||||||
|
table: "Users");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1068
Moonlight/App/Database/Migrations/20230718123232_RemovedOldLogsAndAddedErrorLog.Designer.cs
generated
Normal file
1068
Moonlight/App/Database/Migrations/20230718123232_RemovedOldLogsAndAddedErrorLog.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,111 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Metadata;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class RemovedOldLogsAndAddedErrorLog : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "AuditLog");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "ErrorLog");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SecurityLog");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SecurityLogs",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
Text = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SecurityLogs", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SecurityLogs");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "AuditLog",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||||
|
Ip = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
JsonData = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
System = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||||
|
Type = table.Column<int>(type: "int", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_AuditLog", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "ErrorLog",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
Class = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||||
|
Ip = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
JsonData = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
Stacktrace = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
System = table.Column<bool>(type: "tinyint(1)", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_ErrorLog", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SecurityLog",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||||
|
Ip = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
JsonData = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
System = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||||
|
Type = table.Column<int>(type: "int", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SecurityLog", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1107
Moonlight/App/Database/Migrations/20230721201950_AddIpRules.Designer.cs
generated
Normal file
1107
Moonlight/App/Database/Migrations/20230721201950_AddIpRules.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,59 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Metadata;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddIpRules : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "BlocklistIps",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
Ip = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
ExpiresAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||||
|
Packets = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_BlocklistIps", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "WhitelistIps",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
Ip = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4")
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_WhitelistIps", x => x.Id);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "BlocklistIps");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "WhitelistIps");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1233
Moonlight/App/Database/Migrations/20230803012947_AddNewTicketModels.Designer.cs
generated
Normal file
1233
Moonlight/App/Database/Migrations/20230803012947_AddNewTicketModels.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,117 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Metadata;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Moonlight.App.Database.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddNewTicketModels : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Tickets",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
IssueTopic = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
IssueDescription = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
IssueTries = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
CreatedById = table.Column<int>(type: "int", nullable: false),
|
||||||
|
AssignedToId = table.Column<int>(type: "int", nullable: true),
|
||||||
|
Priority = table.Column<int>(type: "int", nullable: false),
|
||||||
|
Status = table.Column<int>(type: "int", nullable: false),
|
||||||
|
Subject = table.Column<int>(type: "int", nullable: false),
|
||||||
|
SubjectId = table.Column<int>(type: "int", nullable: false),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Tickets", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Tickets_Users_AssignedToId",
|
||||||
|
column: x => x.AssignedToId,
|
||||||
|
principalTable: "Users",
|
||||||
|
principalColumn: "Id");
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Tickets_Users_CreatedById",
|
||||||
|
column: x => x.CreatedById,
|
||||||
|
principalTable: "Users",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "TicketMessages",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
|
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||||
|
Content = table.Column<string>(type: "longtext", nullable: false)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
AttachmentUrl = table.Column<string>(type: "longtext", nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||||
|
SenderId = table.Column<int>(type: "int", nullable: true),
|
||||||
|
IsSystemMessage = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||||
|
IsEdited = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||||
|
IsSupportMessage = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||||
|
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||||
|
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||||
|
TicketId = table.Column<int>(type: "int", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_TicketMessages", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_TicketMessages_Tickets_TicketId",
|
||||||
|
column: x => x.TicketId,
|
||||||
|
principalTable: "Tickets",
|
||||||
|
principalColumn: "Id");
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_TicketMessages_Users_SenderId",
|
||||||
|
column: x => x.SenderId,
|
||||||
|
principalTable: "Users",
|
||||||
|
principalColumn: "Id");
|
||||||
|
})
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_TicketMessages_SenderId",
|
||||||
|
table: "TicketMessages",
|
||||||
|
column: "SenderId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_TicketMessages_TicketId",
|
||||||
|
table: "TicketMessages",
|
||||||
|
column: "TicketId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Tickets_AssignedToId",
|
||||||
|
table: "Tickets",
|
||||||
|
column: "AssignedToId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Tickets_CreatedById",
|
||||||
|
table: "Tickets",
|
||||||
|
column: "CreatedById");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "TicketMessages");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Tickets");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,6 +19,30 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
.HasAnnotation("ProductVersion", "7.0.3")
|
.HasAnnotation("ProductVersion", "7.0.3")
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 64);
|
.HasAnnotation("Relational:MaxIdentifierLength", 64);
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.BlocklistIp", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("ExpiresAt")
|
||||||
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<string>("Ip")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<long>("Packets")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("BlocklistIps");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.CloudPanel", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.CloudPanel", b =>
|
||||||
{
|
{
|
||||||
b.Property<int>("Id")
|
b.Property<int>("Id")
|
||||||
@@ -241,95 +265,6 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.ToTable("LoadingMessages");
|
b.ToTable("LoadingMessages");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("int");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedAt")
|
|
||||||
.HasColumnType("datetime(6)");
|
|
||||||
|
|
||||||
b.Property<string>("Ip")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<string>("JsonData")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<bool>("System")
|
|
||||||
.HasColumnType("tinyint(1)");
|
|
||||||
|
|
||||||
b.Property<int>("Type")
|
|
||||||
.HasColumnType("int");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("AuditLog");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("int");
|
|
||||||
|
|
||||||
b.Property<string>("Class")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedAt")
|
|
||||||
.HasColumnType("datetime(6)");
|
|
||||||
|
|
||||||
b.Property<string>("Ip")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<string>("JsonData")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<string>("Stacktrace")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<bool>("System")
|
|
||||||
.HasColumnType("tinyint(1)");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("ErrorLog");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("int");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedAt")
|
|
||||||
.HasColumnType("datetime(6)");
|
|
||||||
|
|
||||||
b.Property<string>("Ip")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<string>("JsonData")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("longtext");
|
|
||||||
|
|
||||||
b.Property<bool>("System")
|
|
||||||
.HasColumnType("tinyint(1)");
|
|
||||||
|
|
||||||
b.Property<int>("Type")
|
|
||||||
.HasColumnType("int");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("SecurityLog");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.MySqlDatabase", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.MySqlDatabase", b =>
|
||||||
{
|
{
|
||||||
b.Property<int>("Id")
|
b.Property<int>("Id")
|
||||||
@@ -475,6 +410,25 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.ToTable("NotificationClients");
|
b.ToTable("NotificationClients");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.PermissionGroup", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Permissions")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longblob");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("PermissionGroups");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b =>
|
||||||
{
|
{
|
||||||
b.Property<int>("Id")
|
b.Property<int>("Id")
|
||||||
@@ -490,6 +444,24 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.ToTable("Revokes");
|
b.ToTable("Revokes");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.SecurityLog", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<string>("Text")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("SecurityLogs");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
|
||||||
{
|
{
|
||||||
b.Property<int>("Id")
|
b.Property<int>("Id")
|
||||||
@@ -663,10 +635,16 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
.ValueGeneratedOnAdd()
|
.ValueGeneratedOnAdd()
|
||||||
.HasColumnType("int");
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<int>("Currency")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<string>("Description")
|
b.Property<string>("Description")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("longtext");
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<int>("Duration")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<string>("LimitsJson")
|
b.Property<string>("LimitsJson")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("longtext");
|
.HasColumnType("longtext");
|
||||||
@@ -675,6 +653,17 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("longtext");
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<double>("Price")
|
||||||
|
.HasColumnType("double");
|
||||||
|
|
||||||
|
b.Property<string>("StripePriceId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<string>("StripeProductId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
b.ToTable("Subscriptions");
|
b.ToTable("Subscriptions");
|
||||||
@@ -725,6 +714,97 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.ToTable("SupportChatMessages");
|
b.ToTable("SupportChatMessages");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.Ticket", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<int?>("AssignedToId")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<int>("CreatedById")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<string>("IssueDescription")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<string>("IssueTopic")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<string>("IssueTries")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<int>("Priority")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<int>("Subject")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<int>("SubjectId")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("AssignedToId");
|
||||||
|
|
||||||
|
b.HasIndex("CreatedById");
|
||||||
|
|
||||||
|
b.ToTable("Tickets");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.TicketMessage", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<string>("AttachmentUrl")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<string>("Content")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsEdited")
|
||||||
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsSupportMessage")
|
||||||
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsSystemMessage")
|
||||||
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
|
b.Property<int?>("SenderId")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<int?>("TicketId")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdatedAt")
|
||||||
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("SenderId");
|
||||||
|
|
||||||
|
b.HasIndex("TicketId");
|
||||||
|
|
||||||
|
b.ToTable("TicketMessages");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
|
||||||
{
|
{
|
||||||
b.Property<int>("Id")
|
b.Property<int>("Id")
|
||||||
@@ -781,6 +861,13 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("longtext");
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<int?>("PermissionGroupId")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Permissions")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longblob");
|
||||||
|
|
||||||
b.Property<int>("Rating")
|
b.Property<int>("Rating")
|
||||||
.HasColumnType("int");
|
.HasColumnType("int");
|
||||||
|
|
||||||
@@ -802,8 +889,8 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.Property<bool>("StreamerMode")
|
b.Property<bool>("StreamerMode")
|
||||||
.HasColumnType("tinyint(1)");
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
b.Property<int>("SubscriptionDuration")
|
b.Property<DateTime>("SubscriptionExpires")
|
||||||
.HasColumnType("int");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
b.Property<DateTime>("SubscriptionSince")
|
b.Property<DateTime>("SubscriptionSince")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
@@ -828,6 +915,8 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
|
|
||||||
b.HasIndex("CurrentSubscriptionId");
|
b.HasIndex("CurrentSubscriptionId");
|
||||||
|
|
||||||
|
b.HasIndex("PermissionGroupId");
|
||||||
|
|
||||||
b.ToTable("Users");
|
b.ToTable("Users");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -868,6 +957,21 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.ToTable("WebSpaces");
|
b.ToTable("WebSpaces");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.WhitelistIp", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<string>("Ip")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("WhitelistIps");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
|
b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
|
||||||
@@ -1026,13 +1130,49 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.Navigation("Sender");
|
b.Navigation("Sender");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.Ticket", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Moonlight.App.Database.Entities.User", "AssignedTo")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("AssignedToId");
|
||||||
|
|
||||||
|
b.HasOne("Moonlight.App.Database.Entities.User", "CreatedBy")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("CreatedById")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("AssignedTo");
|
||||||
|
|
||||||
|
b.Navigation("CreatedBy");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.TicketMessage", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("SenderId");
|
||||||
|
|
||||||
|
b.HasOne("Moonlight.App.Database.Entities.Ticket", null)
|
||||||
|
.WithMany("Messages")
|
||||||
|
.HasForeignKey("TicketId");
|
||||||
|
|
||||||
|
b.Navigation("Sender");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("Moonlight.App.Database.Entities.Subscription", "CurrentSubscription")
|
b.HasOne("Moonlight.App.Database.Entities.Subscription", "CurrentSubscription")
|
||||||
.WithMany()
|
.WithMany()
|
||||||
.HasForeignKey("CurrentSubscriptionId");
|
.HasForeignKey("CurrentSubscriptionId");
|
||||||
|
|
||||||
|
b.HasOne("Moonlight.App.Database.Entities.PermissionGroup", "PermissionGroup")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("PermissionGroupId");
|
||||||
|
|
||||||
b.Navigation("CurrentSubscription");
|
b.Navigation("CurrentSubscription");
|
||||||
|
|
||||||
|
b.Navigation("PermissionGroup");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
|
||||||
@@ -1075,6 +1215,11 @@ namespace Moonlight.App.Database.Migrations
|
|||||||
b.Navigation("Variables");
|
b.Navigation("Variables");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Moonlight.App.Database.Entities.Ticket", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Messages");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
|
modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("Databases");
|
b.Navigation("Databases");
|
||||||
|
|||||||
119
Moonlight/App/Helpers/BackupHelper.cs
Normal file
119
Moonlight/App/Helpers/BackupHelper.cs
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO.Compression;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Moonlight.App.Database;
|
||||||
|
using Moonlight.App.Services;
|
||||||
|
using MySql.Data.MySqlClient;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
public class BackupHelper
|
||||||
|
{
|
||||||
|
public async Task CreateBackup(string path)
|
||||||
|
{
|
||||||
|
Logger.Info("Started moonlight backup creation");
|
||||||
|
Logger.Info($"This backup will be saved to '{path}'");
|
||||||
|
|
||||||
|
var stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
|
||||||
|
var cachePath = PathBuilder.Dir("storage", "backups", "cache");
|
||||||
|
|
||||||
|
Directory.CreateDirectory(cachePath);
|
||||||
|
|
||||||
|
//
|
||||||
|
// Exporting database
|
||||||
|
//
|
||||||
|
|
||||||
|
Logger.Info("Exporting database");
|
||||||
|
|
||||||
|
var configService = new ConfigService(new());
|
||||||
|
var dataContext = new DataContext(configService);
|
||||||
|
|
||||||
|
await using MySqlConnection conn = new MySqlConnection(dataContext.Database.GetConnectionString());
|
||||||
|
await using MySqlCommand cmd = new MySqlCommand();
|
||||||
|
using MySqlBackup mb = new MySqlBackup(cmd);
|
||||||
|
|
||||||
|
cmd.Connection = conn;
|
||||||
|
await conn.OpenAsync();
|
||||||
|
mb.ExportToFile(PathBuilder.File(cachePath, "database.sql"));
|
||||||
|
await conn.CloseAsync();
|
||||||
|
|
||||||
|
//
|
||||||
|
// Saving config
|
||||||
|
//
|
||||||
|
|
||||||
|
Logger.Info("Saving configuration");
|
||||||
|
File.Copy(
|
||||||
|
PathBuilder.File("storage", "configs", "config.json"),
|
||||||
|
PathBuilder.File(cachePath, "config.json"));
|
||||||
|
|
||||||
|
//
|
||||||
|
// Saving all storage items needed to restore the panel
|
||||||
|
//
|
||||||
|
|
||||||
|
Logger.Info("Saving resources");
|
||||||
|
CopyDirectory(
|
||||||
|
PathBuilder.Dir("storage", "resources"),
|
||||||
|
PathBuilder.Dir(cachePath, "resources"));
|
||||||
|
|
||||||
|
Logger.Info("Saving logs");
|
||||||
|
CopyDirectory(
|
||||||
|
PathBuilder.Dir("storage", "logs"),
|
||||||
|
PathBuilder.Dir(cachePath, "logs"));
|
||||||
|
|
||||||
|
Logger.Info("Saving uploads");
|
||||||
|
CopyDirectory(
|
||||||
|
PathBuilder.Dir("storage", "uploads"),
|
||||||
|
PathBuilder.Dir(cachePath, "uploads"));
|
||||||
|
|
||||||
|
//
|
||||||
|
// Compressing the backup to a single file
|
||||||
|
//
|
||||||
|
|
||||||
|
Logger.Info("Compressing");
|
||||||
|
ZipFile.CreateFromDirectory(cachePath,
|
||||||
|
path,
|
||||||
|
CompressionLevel.Fastest,
|
||||||
|
false);
|
||||||
|
|
||||||
|
Directory.Delete(cachePath, true);
|
||||||
|
|
||||||
|
stopWatch.Stop();
|
||||||
|
Logger.Info($"Backup successfully created. Took {stopWatch.Elapsed.TotalSeconds} seconds");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CopyDirectory(string sourceDirName, string destDirName, bool copySubDirs = true)
|
||||||
|
{
|
||||||
|
DirectoryInfo dir = new DirectoryInfo(sourceDirName);
|
||||||
|
|
||||||
|
if (!dir.Exists)
|
||||||
|
{
|
||||||
|
throw new DirectoryNotFoundException($"Source directory does not exist or could not be found: {sourceDirName}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Directory.Exists(destDirName))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(destDirName);
|
||||||
|
}
|
||||||
|
|
||||||
|
FileInfo[] files = dir.GetFiles();
|
||||||
|
|
||||||
|
foreach (FileInfo file in files)
|
||||||
|
{
|
||||||
|
string tempPath = Path.Combine(destDirName, file.Name);
|
||||||
|
file.CopyTo(tempPath, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (copySubDirs)
|
||||||
|
{
|
||||||
|
DirectoryInfo[] dirs = dir.GetDirectories();
|
||||||
|
|
||||||
|
foreach (DirectoryInfo subdir in dirs)
|
||||||
|
{
|
||||||
|
string tempPath = Path.Combine(destDirName, subdir.Name);
|
||||||
|
CopyDirectory(subdir.FullName, tempPath, copySubDirs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
88
Moonlight/App/Helpers/BitHelper.cs
Normal file
88
Moonlight/App/Helpers/BitHelper.cs
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
namespace Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
public class BitHelper
|
||||||
|
{
|
||||||
|
public static bool ReadBit(byte[] byteArray, int bitIndex)
|
||||||
|
{
|
||||||
|
if (bitIndex < 0)
|
||||||
|
throw new ArgumentOutOfRangeException("bitIndex");
|
||||||
|
|
||||||
|
int byteIndex = bitIndex / 8;
|
||||||
|
if (byteIndex >= byteArray.Length)
|
||||||
|
throw new ArgumentOutOfRangeException("bitIndex");
|
||||||
|
|
||||||
|
int bitNumber = bitIndex % 8;
|
||||||
|
byte mask = (byte)(1 << bitNumber);
|
||||||
|
|
||||||
|
return (byteArray[byteIndex] & mask) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] WriteBit(byte[] byteArray, int bitIndex, bool value)
|
||||||
|
{
|
||||||
|
if (bitIndex < 0)
|
||||||
|
throw new ArgumentOutOfRangeException("bitIndex");
|
||||||
|
|
||||||
|
int byteIndex = bitIndex / 8;
|
||||||
|
byte[] resultArray;
|
||||||
|
|
||||||
|
if (byteIndex >= byteArray.Length)
|
||||||
|
{
|
||||||
|
// Create a new array with increased size and copy elements from old array
|
||||||
|
resultArray = new byte[byteIndex + 1];
|
||||||
|
Array.Copy(byteArray, resultArray, byteArray.Length);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Create a new array and copy elements from old array
|
||||||
|
resultArray = new byte[byteArray.Length];
|
||||||
|
Array.Copy(byteArray, resultArray, byteArray.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
int bitNumber = bitIndex % 8;
|
||||||
|
byte mask = (byte)(1 << bitNumber);
|
||||||
|
|
||||||
|
if (value)
|
||||||
|
resultArray[byteIndex] |= mask; // Set the bit to 1
|
||||||
|
else
|
||||||
|
resultArray[byteIndex] &= (byte)~mask; // Set the bit to 0
|
||||||
|
|
||||||
|
return resultArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] OverwriteByteArrays(byte[] targetArray, byte[] overwriteArray)
|
||||||
|
{
|
||||||
|
int targetLength = targetArray.Length;
|
||||||
|
int overwriteLength = overwriteArray.Length;
|
||||||
|
|
||||||
|
int maxLength = Math.Max(targetLength, overwriteLength);
|
||||||
|
|
||||||
|
byte[] resultArray = new byte[maxLength];
|
||||||
|
|
||||||
|
for (int i = 0; i < maxLength; i++)
|
||||||
|
{
|
||||||
|
byte targetByte = i < targetLength ? targetArray[i] : (byte)0;
|
||||||
|
byte overwriteByte = i < overwriteLength ? overwriteArray[i] : (byte)0;
|
||||||
|
|
||||||
|
for (int j = 0; j < 8; j++)
|
||||||
|
{
|
||||||
|
bool overwriteBit = (overwriteByte & (1 << j)) != 0;
|
||||||
|
if (i < targetLength)
|
||||||
|
{
|
||||||
|
bool targetBit = (targetByte & (1 << j)) != 0;
|
||||||
|
if (overwriteBit)
|
||||||
|
{
|
||||||
|
targetByte = targetBit ? (byte)(targetByte | (1 << j)) : (byte)(targetByte & ~(1 << j));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (overwriteBit)
|
||||||
|
{
|
||||||
|
targetByte |= (byte)(1 << j);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resultArray[i] = targetByte;
|
||||||
|
}
|
||||||
|
|
||||||
|
return resultArray;
|
||||||
|
}
|
||||||
|
}
|
||||||
56
Moonlight/App/Helpers/ByteSizeValue.cs
Normal file
56
Moonlight/App/Helpers/ByteSizeValue.cs
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
namespace Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
public class ByteSizeValue
|
||||||
|
{
|
||||||
|
public long Bytes { get; set; }
|
||||||
|
|
||||||
|
public long KiloBytes
|
||||||
|
{
|
||||||
|
get => Bytes / 1024;
|
||||||
|
set => Bytes = value * 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long MegaBytes
|
||||||
|
{
|
||||||
|
get => KiloBytes / 1024;
|
||||||
|
set => KiloBytes = value * 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long GigaBytes
|
||||||
|
{
|
||||||
|
get => MegaBytes / 1024;
|
||||||
|
set => MegaBytes = value * 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ByteSizeValue FromBytes(long bytes)
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
Bytes = bytes
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ByteSizeValue FromKiloBytes(long kiloBytes)
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
KiloBytes = kiloBytes
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ByteSizeValue FromMegaBytes(long megaBytes)
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
MegaBytes = megaBytes
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ByteSizeValue FromGigaBytes(long gigaBytes)
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
GigaBytes = gigaBytes
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
12
Moonlight/App/Helpers/ComponentHelper.cs
Normal file
12
Moonlight/App/Helpers/ComponentHelper.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
public class ComponentHelper
|
||||||
|
{
|
||||||
|
public static RenderFragment FromType(Type type) => builder =>
|
||||||
|
{
|
||||||
|
builder.OpenComponent(0, type);
|
||||||
|
builder.CloseComponent();
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -45,7 +45,9 @@ public class DatabaseCheckupService
|
|||||||
{
|
{
|
||||||
Logger.Info($"{migrations.Length} migrations pending. Updating now");
|
Logger.Info($"{migrations.Length} migrations pending. Updating now");
|
||||||
|
|
||||||
await BackupDatabase();
|
var backupHelper = new BackupHelper();
|
||||||
|
await backupHelper.CreateBackup(
|
||||||
|
PathBuilder.File("storage", "backups", $"{new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()}.zip"));
|
||||||
|
|
||||||
Logger.Info("Applying migrations");
|
Logger.Info("Applying migrations");
|
||||||
|
|
||||||
@@ -58,53 +60,4 @@ public class DatabaseCheckupService
|
|||||||
Logger.Info("Database is up-to-date. No migrations have been performed");
|
Logger.Info("Database is up-to-date. No migrations have been performed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task BackupDatabase()
|
|
||||||
{
|
|
||||||
Logger.Info("Creating backup from database");
|
|
||||||
|
|
||||||
var configService = new ConfigService(new StorageService());
|
|
||||||
var dateTimeService = new DateTimeService();
|
|
||||||
|
|
||||||
var config = configService.Get().Moonlight.Database;
|
|
||||||
|
|
||||||
var connectionString = $"host={config.Host};" +
|
|
||||||
$"port={config.Port};" +
|
|
||||||
$"database={config.Database};" +
|
|
||||||
$"uid={config.Username};" +
|
|
||||||
$"pwd={config.Password}";
|
|
||||||
|
|
||||||
string file = PathBuilder.File("storage", "backups", $"{dateTimeService.GetCurrentUnix()}-mysql.sql");
|
|
||||||
|
|
||||||
Logger.Info($"Saving it to: {file}");
|
|
||||||
Logger.Info("Starting backup...");
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var sw = new Stopwatch();
|
|
||||||
sw.Start();
|
|
||||||
|
|
||||||
await using MySqlConnection conn = new MySqlConnection(connectionString);
|
|
||||||
await using MySqlCommand cmd = new MySqlCommand();
|
|
||||||
using MySqlBackup mb = new MySqlBackup(cmd);
|
|
||||||
|
|
||||||
cmd.Connection = conn;
|
|
||||||
await conn.OpenAsync();
|
|
||||||
mb.ExportToFile(file);
|
|
||||||
await conn.CloseAsync();
|
|
||||||
|
|
||||||
sw.Stop();
|
|
||||||
Logger.Info($"Done. {sw.Elapsed.TotalSeconds}s");
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Logger.Fatal("-----------------------------------------------");
|
|
||||||
Logger.Fatal("Unable to create backup for moonlight database");
|
|
||||||
Logger.Fatal("Moonlight will start anyways in 30 seconds");
|
|
||||||
Logger.Fatal("-----------------------------------------------");
|
|
||||||
Logger.Fatal(e);
|
|
||||||
|
|
||||||
Thread.Sleep(TimeSpan.FromSeconds(30));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
71
Moonlight/App/Helpers/EggConverter.cs
Normal file
71
Moonlight/App/Helpers/EggConverter.cs
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
public static class EggConverter
|
||||||
|
{
|
||||||
|
public static Image Convert(string json)
|
||||||
|
{
|
||||||
|
var result = new Image();
|
||||||
|
|
||||||
|
var data = new ConfigurationBuilder().AddJsonStream(
|
||||||
|
new MemoryStream(Encoding.ASCII.GetBytes(json))
|
||||||
|
).Build();
|
||||||
|
|
||||||
|
result.Allocations = 1;
|
||||||
|
result.Description = data.GetValue<string>("description") ?? "";
|
||||||
|
result.Uuid = Guid.NewGuid();
|
||||||
|
result.Startup = data.GetValue<string>("startup") ?? "";
|
||||||
|
result.Name = data.GetValue<string>("name") ?? "Ptero Egg";
|
||||||
|
|
||||||
|
foreach (var variable in data.GetSection("variables").GetChildren())
|
||||||
|
{
|
||||||
|
result.Variables.Add(new()
|
||||||
|
{
|
||||||
|
Key = variable.GetValue<string>("env_variable") ?? "",
|
||||||
|
DefaultValue = variable.GetValue<string>("default_value") ?? ""
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
var configData = data.GetSection("config");
|
||||||
|
|
||||||
|
result.ConfigFiles = configData.GetValue<string>("files") ?? "{}";
|
||||||
|
|
||||||
|
var dImagesData = JObject.Parse(json);
|
||||||
|
var dImages = (JObject)dImagesData["docker_images"]!;
|
||||||
|
|
||||||
|
foreach (var dockerImage in dImages)
|
||||||
|
{
|
||||||
|
var di = new DockerImage()
|
||||||
|
{
|
||||||
|
Default = dockerImage.Key == dImages.Properties().Last().Name,
|
||||||
|
Name = dockerImage.Value!.ToString()
|
||||||
|
};
|
||||||
|
|
||||||
|
result.DockerImages.Add(di);
|
||||||
|
}
|
||||||
|
|
||||||
|
var installSection = data.GetSection("scripts").GetSection("installation");
|
||||||
|
|
||||||
|
result.InstallEntrypoint = installSection.GetValue<string>("entrypoint") ?? "bash";
|
||||||
|
result.InstallScript = installSection.GetValue<string>("script") ?? "";
|
||||||
|
result.InstallDockerImage = installSection.GetValue<string>("container") ?? "";
|
||||||
|
|
||||||
|
var rawJson = configData.GetValue<string>("startup");
|
||||||
|
|
||||||
|
var startupData = new ConfigurationBuilder().AddJsonStream(
|
||||||
|
new MemoryStream(Encoding.ASCII.GetBytes(rawJson!))
|
||||||
|
).Build();
|
||||||
|
|
||||||
|
result.StartupDetection = startupData.GetValue<string>("done", "") ?? "";
|
||||||
|
result.StopCommand = configData.GetValue<string>("stop") ?? "";
|
||||||
|
|
||||||
|
result.TagsJson = "[]";
|
||||||
|
result.BackgroundImageUrl = "";
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -43,19 +43,22 @@ public class WingsFileAccess : FileAccess
|
|||||||
$"api/servers/{Server.Uuid}/files/list-directory?directory={CurrentPath}"
|
$"api/servers/{Server.Uuid}/files/list-directory?directory={CurrentPath}"
|
||||||
);
|
);
|
||||||
|
|
||||||
var x = new List<FileData>();
|
var result = new List<FileData>();
|
||||||
|
|
||||||
foreach (var response in res)
|
foreach (var resGrouped in res.GroupBy(x => x.Directory))
|
||||||
{
|
{
|
||||||
x.Add(new()
|
foreach (var resItem in resGrouped.OrderBy(x => x.Name))
|
||||||
{
|
{
|
||||||
Name = response.Name,
|
result.Add(new()
|
||||||
Size = response.File ? response.Size : 0,
|
{
|
||||||
IsFile = response.File,
|
Name = resItem.Name,
|
||||||
|
Size = resItem.File ? resItem.Size : 0,
|
||||||
|
IsFile = resItem.File,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return x.ToArray();
|
return result.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Task Cd(string dir)
|
public override Task Cd(string dir)
|
||||||
|
|||||||
@@ -1,46 +1,70 @@
|
|||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using Moonlight.App.Database;
|
||||||
|
using Moonlight.App.Services;
|
||||||
|
using Moonlight.App.Services.Files;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
|
|
||||||
namespace Moonlight.App.Helpers;
|
namespace Moonlight.App.Helpers;
|
||||||
|
|
||||||
public static class Logger
|
public static class Logger
|
||||||
{
|
{
|
||||||
|
// The private static instance of the config service, because we have no di here
|
||||||
|
private static ConfigService ConfigService = new(new StorageService());
|
||||||
|
|
||||||
#region String method calls
|
#region String method calls
|
||||||
public static void Verbose(string message, string channel = "default")
|
public static void Verbose(string message, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Verbose("{Message}", message);
|
.Verbose("{Message}", message);
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Info(string message, string channel = "default")
|
public static void Info(string message, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Information("{Message}", message);
|
.Information("{Message}", message);
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Debug(string message, string channel = "default")
|
public static void Debug(string message, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Debug("{Message}", message);
|
.Debug("{Message}", message);
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Error(string message, string channel = "default")
|
public static void Error(string message, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Error("{Message}", message);
|
.Error("{Message}", message);
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Warn(string message, string channel = "default")
|
public static void Warn(string message, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Warning("{Message}", message);
|
.Warning("{Message}", message);
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Fatal(string message, string channel = "default")
|
public static void Fatal(string message, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Fatal("{Message}", message);
|
.Fatal("{Message}", message);
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(message);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -49,36 +73,54 @@ public static class Logger
|
|||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Verbose(exception, "");
|
.Verbose(exception, "");
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Info(Exception exception, string channel = "default")
|
public static void Info(Exception exception, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Information(exception, "");
|
.Information(exception, "");
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Debug(Exception exception, string channel = "default")
|
public static void Debug(Exception exception, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Debug(exception, "");
|
.Debug(exception, "");
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Error(Exception exception, string channel = "default")
|
public static void Error(Exception exception, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Error(exception, "");
|
.Error(exception, "");
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Warn(Exception exception, string channel = "default")
|
public static void Warn(Exception exception, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Warning(exception, "");
|
.Warning(exception, "");
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Fatal(Exception exception, string channel = "default")
|
public static void Fatal(Exception exception, string channel = "default")
|
||||||
{
|
{
|
||||||
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
Log.ForContext("SourceContext", GetNameOfCallingClass())
|
||||||
.Fatal(exception, "");
|
.Fatal(exception, "");
|
||||||
|
|
||||||
|
if(channel == "security")
|
||||||
|
LogSecurityInDb(exception);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -105,4 +147,25 @@ public static class Logger
|
|||||||
|
|
||||||
return fullName;
|
return fullName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static void LogSecurityInDb(Exception exception)
|
||||||
|
{
|
||||||
|
LogSecurityInDb(exception.ToStringDemystified());
|
||||||
|
}
|
||||||
|
private static void LogSecurityInDb(string text)
|
||||||
|
{
|
||||||
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
var dataContext = new DataContext(ConfigService);
|
||||||
|
|
||||||
|
dataContext.SecurityLogs.Add(new()
|
||||||
|
{
|
||||||
|
Text = text
|
||||||
|
});
|
||||||
|
|
||||||
|
dataContext.SaveChanges();
|
||||||
|
dataContext.Dispose();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,7 @@ public class AvatarController : Controller
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var url = GravatarController.GetImageUrl(user.Email, 100);
|
var url = GravatarController.GetImageUrl(user.Email.ToLower(), 100);
|
||||||
|
|
||||||
using var client = new HttpClient();
|
using var client = new HttpClient();
|
||||||
var res = await client.GetByteArrayAsync(url);
|
var res = await client.GetByteArrayAsync(url);
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Moonlight.App.Services;
|
||||||
|
using Moonlight.App.Services.Sessions;
|
||||||
|
using Stripe;
|
||||||
|
using Stripe.Checkout;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Http.Controllers.Api.Moonlight;
|
||||||
|
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/moonlight/billing")]
|
||||||
|
public class BillingController : Controller
|
||||||
|
{
|
||||||
|
private readonly IdentityService IdentityService;
|
||||||
|
private readonly BillingService BillingService;
|
||||||
|
|
||||||
|
public BillingController(
|
||||||
|
IdentityService identityService,
|
||||||
|
BillingService billingService)
|
||||||
|
{
|
||||||
|
IdentityService = identityService;
|
||||||
|
BillingService = billingService;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("cancel")]
|
||||||
|
public async Task<ActionResult> Cancel()
|
||||||
|
{
|
||||||
|
var user = IdentityService.User;
|
||||||
|
|
||||||
|
if (user == null)
|
||||||
|
return Redirect("/login");
|
||||||
|
|
||||||
|
return Redirect("/profile/subscriptions/close");
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("success")]
|
||||||
|
public async Task<ActionResult> Success()
|
||||||
|
{
|
||||||
|
var user = IdentityService.User;
|
||||||
|
|
||||||
|
if (user == null)
|
||||||
|
return Redirect("/login");
|
||||||
|
|
||||||
|
await BillingService.CompleteCheckout(user);
|
||||||
|
|
||||||
|
return Redirect("/profile/subscriptions/close");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,7 +25,7 @@ public class RegisterController : Controller
|
|||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<ActionResult<TokenRegister>> Register()
|
public async Task<ActionResult<TokenRegister>> Register()
|
||||||
{
|
{
|
||||||
var user = await IdentityService.Get();
|
var user = IdentityService.User;
|
||||||
|
|
||||||
if (user == null)
|
if (user == null)
|
||||||
return NotFound();
|
return NotFound();
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class OAuth2Controller : Controller
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var currentUser = await IdentityService.Get();
|
var currentUser = IdentityService.User;
|
||||||
|
|
||||||
if (currentUser != null)
|
if (currentUser != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using Moonlight.App.Database.Entities;
|
|||||||
using Moonlight.App.Events;
|
using Moonlight.App.Events;
|
||||||
using Moonlight.App.Http.Requests.Daemon;
|
using Moonlight.App.Http.Requests.Daemon;
|
||||||
using Moonlight.App.Repositories;
|
using Moonlight.App.Repositories;
|
||||||
|
using Moonlight.App.Services.Background;
|
||||||
|
|
||||||
namespace Moonlight.App.Http.Controllers.Api.Remote;
|
namespace Moonlight.App.Http.Controllers.Api.Remote;
|
||||||
|
|
||||||
@@ -10,19 +11,17 @@ namespace Moonlight.App.Http.Controllers.Api.Remote;
|
|||||||
[Route("api/remote/ddos")]
|
[Route("api/remote/ddos")]
|
||||||
public class DdosController : Controller
|
public class DdosController : Controller
|
||||||
{
|
{
|
||||||
private readonly NodeRepository NodeRepository;
|
private readonly Repository<Node> NodeRepository;
|
||||||
private readonly EventSystem Event;
|
private readonly DdosProtectionService DdosProtectionService;
|
||||||
private readonly DdosAttackRepository DdosAttackRepository;
|
|
||||||
|
|
||||||
public DdosController(NodeRepository nodeRepository, EventSystem eventSystem, DdosAttackRepository ddosAttackRepository)
|
public DdosController(Repository<Node> nodeRepository, DdosProtectionService ddosProtectionService)
|
||||||
{
|
{
|
||||||
NodeRepository = nodeRepository;
|
NodeRepository = nodeRepository;
|
||||||
Event = eventSystem;
|
DdosProtectionService = ddosProtectionService;
|
||||||
DdosAttackRepository = ddosAttackRepository;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost("update")]
|
[HttpPost("start")]
|
||||||
public async Task<ActionResult> Update([FromBody] DdosStatus ddosStatus)
|
public async Task<ActionResult> Start([FromBody] DdosStart ddosStart)
|
||||||
{
|
{
|
||||||
var tokenData = Request.Headers.Authorization.ToString().Replace("Bearer ", "");
|
var tokenData = Request.Headers.Authorization.ToString().Replace("Bearer ", "");
|
||||||
var id = tokenData.Split(".")[0];
|
var id = tokenData.Split(".")[0];
|
||||||
@@ -36,17 +35,25 @@ public class DdosController : Controller
|
|||||||
if (token != node.Token)
|
if (token != node.Token)
|
||||||
return Unauthorized();
|
return Unauthorized();
|
||||||
|
|
||||||
var ddosAttack = new DdosAttack()
|
await DdosProtectionService.ProcessDdosSignal(ddosStart.Ip, ddosStart.Packets);
|
||||||
|
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpPost("stop")]
|
||||||
|
public async Task<ActionResult> Stop([FromBody] DdosStop ddosStop)
|
||||||
{
|
{
|
||||||
Ongoing = ddosStatus.Ongoing,
|
var tokenData = Request.Headers.Authorization.ToString().Replace("Bearer ", "");
|
||||||
Data = ddosStatus.Data,
|
var id = tokenData.Split(".")[0];
|
||||||
Ip = ddosStatus.Ip,
|
var token = tokenData.Split(".")[1];
|
||||||
Node = node
|
|
||||||
};
|
|
||||||
|
|
||||||
ddosAttack = DdosAttackRepository.Add(ddosAttack);
|
var node = NodeRepository.Get().FirstOrDefault(x => x.TokenId == id);
|
||||||
|
|
||||||
await Event.Emit("node.ddos", ddosAttack);
|
if (node == null)
|
||||||
|
return NotFound();
|
||||||
|
|
||||||
|
if (token != node.Token)
|
||||||
|
return Unauthorized();
|
||||||
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|||||||
7
Moonlight/App/Http/Requests/Daemon/DdosStart.cs
Normal file
7
Moonlight/App/Http/Requests/Daemon/DdosStart.cs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Moonlight.App.Http.Requests.Daemon;
|
||||||
|
|
||||||
|
public class DdosStart
|
||||||
|
{
|
||||||
|
public string Ip { get; set; } = "";
|
||||||
|
public long Packets { get; set; }
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace Moonlight.App.Http.Requests.Daemon;
|
|
||||||
|
|
||||||
public class DdosStatus
|
|
||||||
{
|
|
||||||
public bool Ongoing { get; set; }
|
|
||||||
public long Data { get; set; }
|
|
||||||
public string Ip { get; set; } = "";
|
|
||||||
}
|
|
||||||
7
Moonlight/App/Http/Requests/Daemon/DdosStop.cs
Normal file
7
Moonlight/App/Http/Requests/Daemon/DdosStop.cs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Moonlight.App.Http.Requests.Daemon;
|
||||||
|
|
||||||
|
public class DdosStop
|
||||||
|
{
|
||||||
|
public string Ip { get; set; } = "";
|
||||||
|
public long Traffic { get; set; }
|
||||||
|
}
|
||||||
21
Moonlight/App/Models/Forms/CreateTicketDataModel.cs
Normal file
21
Moonlight/App/Models/Forms/CreateTicketDataModel.cs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Models.Forms;
|
||||||
|
|
||||||
|
public class CreateTicketDataModel
|
||||||
|
{
|
||||||
|
[Required(ErrorMessage = "You need to specify a issue topic")]
|
||||||
|
[MinLength(5, ErrorMessage = "The issue topic needs to be longer than 5 characters")]
|
||||||
|
public string IssueTopic { get; set; }
|
||||||
|
|
||||||
|
[Required(ErrorMessage = "You need to specify a issue description")]
|
||||||
|
[MinLength(10, ErrorMessage = "The issue description needs to be longer than 10 characters")]
|
||||||
|
public string IssueDescription { get; set; }
|
||||||
|
|
||||||
|
[Required(ErrorMessage = "You need to specify your tries to solve this issue")]
|
||||||
|
public string IssueTries { get; set; }
|
||||||
|
|
||||||
|
public TicketSubject Subject { get; set; }
|
||||||
|
public int SubjectId { get; set; }
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
namespace Moonlight.App.Models.Forms;
|
namespace Moonlight.App.Models.Forms;
|
||||||
|
|
||||||
@@ -10,4 +11,8 @@ public class SubscriptionDataModel
|
|||||||
|
|
||||||
[Required(ErrorMessage = "You need to enter a description")]
|
[Required(ErrorMessage = "You need to enter a description")]
|
||||||
public string Description { get; set; } = "";
|
public string Description { get; set; } = "";
|
||||||
|
|
||||||
|
public double Price { get; set; } = 0;
|
||||||
|
public Currency Currency { get; set; } = Currency.USD;
|
||||||
|
public int Duration { get; set; } = 30;
|
||||||
}
|
}
|
||||||
34
Moonlight/App/Models/Forms/UserEditDataModel.cs
Normal file
34
Moonlight/App/Models/Forms/UserEditDataModel.cs
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Models.Forms;
|
||||||
|
|
||||||
|
public class UserEditDataModel
|
||||||
|
{
|
||||||
|
[Required]
|
||||||
|
public string FirstName { get; set; } = "";
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string LastName { get; set; } = "";
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string Email { get; set; } = "";
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string Address { get; set; } = "";
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string City { get; set; } = "";
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string State { get; set; } = "";
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string Country { get; set; } = "";
|
||||||
|
|
||||||
|
public bool Admin { get; set; }
|
||||||
|
public bool TotpEnabled { get; set; }
|
||||||
|
public ulong DiscordId { get; set; }
|
||||||
|
public PermissionGroup? PermissionGroup { get; set; }
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
namespace Moonlight.App.Models.Misc;
|
|
||||||
|
|
||||||
public enum AuditLogType
|
|
||||||
{
|
|
||||||
Login,
|
|
||||||
Register,
|
|
||||||
ChangePassword,
|
|
||||||
ChangePowerState,
|
|
||||||
CreateBackup,
|
|
||||||
RestoreBackup,
|
|
||||||
DeleteBackup,
|
|
||||||
DownloadBackup,
|
|
||||||
CreateServer,
|
|
||||||
ReinstallServer,
|
|
||||||
CancelSubscription,
|
|
||||||
ApplySubscriptionCode,
|
|
||||||
EnableTotp,
|
|
||||||
DisableTotp,
|
|
||||||
AddDomainRecord,
|
|
||||||
UpdateDomainRecord,
|
|
||||||
DeleteDomainRecord,
|
|
||||||
PasswordReset,
|
|
||||||
CleanupEnabled,
|
|
||||||
CleanupDisabled,
|
|
||||||
CleanupTriggered,
|
|
||||||
PasswordChange,
|
|
||||||
}
|
|
||||||
7
Moonlight/App/Models/Misc/Currency.cs
Normal file
7
Moonlight/App/Models/Misc/Currency.cs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
public enum Currency
|
||||||
|
{
|
||||||
|
USD = 1,
|
||||||
|
EUR = 2
|
||||||
|
}
|
||||||
9
Moonlight/App/Models/Misc/MailTemplate.cs
Normal file
9
Moonlight/App/Models/Misc/MailTemplate.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
using Moonlight.App.Helpers.Files;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
public class MailTemplate // This is just for the blazor table at /admin/system/mail
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "";
|
||||||
|
public FileData File { get; set; }
|
||||||
|
}
|
||||||
6
Moonlight/App/Models/Misc/OfficialMoonlightPlugin.cs
Normal file
6
Moonlight/App/Models/Misc/OfficialMoonlightPlugin.cs
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
public class OfficialMoonlightPlugin
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
namespace Moonlight.App.Models.Misc;
|
|
||||||
|
|
||||||
public enum SecurityLogType
|
|
||||||
{
|
|
||||||
ManipulatedJwt,
|
|
||||||
PathTransversal,
|
|
||||||
SftpBruteForce,
|
|
||||||
LoginFail
|
|
||||||
}
|
|
||||||
9
Moonlight/App/Models/Misc/TicketPriority.cs
Normal file
9
Moonlight/App/Models/Misc/TicketPriority.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
public enum TicketPriority
|
||||||
|
{
|
||||||
|
Low = 0,
|
||||||
|
Medium = 1,
|
||||||
|
High = 2,
|
||||||
|
Critical = 3
|
||||||
|
}
|
||||||
9
Moonlight/App/Models/Misc/TicketStatus.cs
Normal file
9
Moonlight/App/Models/Misc/TicketStatus.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
public enum TicketStatus
|
||||||
|
{
|
||||||
|
Closed = 0,
|
||||||
|
Open = 1,
|
||||||
|
WaitingForUser = 2,
|
||||||
|
Pending = 3
|
||||||
|
}
|
||||||
9
Moonlight/App/Models/Misc/TicketSubject.cs
Normal file
9
Moonlight/App/Models/Misc/TicketSubject.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Moonlight.App.Models.Misc;
|
||||||
|
|
||||||
|
public enum TicketSubject
|
||||||
|
{
|
||||||
|
Webspace = 0,
|
||||||
|
Server = 1,
|
||||||
|
Domain = 2,
|
||||||
|
Other = 3
|
||||||
|
}
|
||||||
10
Moonlight/App/Perms/Permission.cs
Normal file
10
Moonlight/App/Perms/Permission.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
namespace Moonlight.App.Perms;
|
||||||
|
|
||||||
|
public class Permission
|
||||||
|
{
|
||||||
|
public int Index { get; set; } = 0;
|
||||||
|
public string Name { get; set; } = "";
|
||||||
|
public string Description { get; set; } = "";
|
||||||
|
|
||||||
|
public static implicit operator int(Permission permission) => permission.Index;
|
||||||
|
}
|
||||||
11
Moonlight/App/Perms/PermissionRequired.cs
Normal file
11
Moonlight/App/Perms/PermissionRequired.cs
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
namespace Moonlight.App.Perms;
|
||||||
|
|
||||||
|
public class PermissionRequired : Attribute
|
||||||
|
{
|
||||||
|
public string Name { get; private set; }
|
||||||
|
|
||||||
|
public PermissionRequired(string name)
|
||||||
|
{
|
||||||
|
Name = name;
|
||||||
|
}
|
||||||
|
}
|
||||||
55
Moonlight/App/Perms/PermissionStorage.cs
Normal file
55
Moonlight/App/Perms/PermissionStorage.cs
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
using System.Data;
|
||||||
|
using Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Perms;
|
||||||
|
|
||||||
|
public class PermissionStorage
|
||||||
|
{
|
||||||
|
public byte[] Data;
|
||||||
|
public bool IsReadyOnly;
|
||||||
|
|
||||||
|
public PermissionStorage(byte[] data, bool isReadyOnly = false)
|
||||||
|
{
|
||||||
|
Data = data;
|
||||||
|
IsReadyOnly = isReadyOnly;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool this[Permission permission]
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return BitHelper.ReadBit(Data, permission.Index);
|
||||||
|
}
|
||||||
|
catch (ArgumentOutOfRangeException)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Logger.Verbose("Error reading permissions. (Can be intentional)");
|
||||||
|
Logger.Verbose(e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (IsReadyOnly)
|
||||||
|
throw new ReadOnlyException();
|
||||||
|
|
||||||
|
Data = BitHelper.WriteBit(Data, permission.Index, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool HasAnyPermissions()
|
||||||
|
{
|
||||||
|
foreach (var permission in Permissions.GetAllPermissions())
|
||||||
|
{
|
||||||
|
if (this[permission])
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
438
Moonlight/App/Perms/Permissions.cs
Normal file
438
Moonlight/App/Perms/Permissions.cs
Normal file
@@ -0,0 +1,438 @@
|
|||||||
|
namespace Moonlight.App.Perms;
|
||||||
|
|
||||||
|
public static class Permissions
|
||||||
|
{
|
||||||
|
public static Permission AdminDashboard = new()
|
||||||
|
{
|
||||||
|
Index = 0,
|
||||||
|
Name = "Admin Dashboard",
|
||||||
|
Description = "Access the main admin dashboard page"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminStatistics = new()
|
||||||
|
{
|
||||||
|
Index = 1,
|
||||||
|
Name = "Admin Statistics",
|
||||||
|
Description = "View statistical information about the moonlight instance"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysPlugins = new()
|
||||||
|
{
|
||||||
|
Index = 2,
|
||||||
|
Name = "Admin system plugins",
|
||||||
|
Description = "View and install plugins"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminDomains = new()
|
||||||
|
{
|
||||||
|
Index = 4,
|
||||||
|
Name = "Admin Domains",
|
||||||
|
Description = "Manage domains in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewDomain = new()
|
||||||
|
{
|
||||||
|
Index = 5,
|
||||||
|
Name = "Admin New Domain",
|
||||||
|
Description = "Create a new domain in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSharedDomains = new()
|
||||||
|
{
|
||||||
|
Index = 6,
|
||||||
|
Name = "Admin Shared Domains",
|
||||||
|
Description = "Manage shared domains in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewSharedDomain = new()
|
||||||
|
{
|
||||||
|
Index = 7,
|
||||||
|
Name = "Admin New Shared Domain",
|
||||||
|
Description = "Create a new shared domain in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNodeEdit = new()
|
||||||
|
{
|
||||||
|
Index = 9,
|
||||||
|
Name = "Admin Node Edit",
|
||||||
|
Description = "Edit node settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNodes = new()
|
||||||
|
{
|
||||||
|
Index = 10,
|
||||||
|
Name = "Admin Node",
|
||||||
|
Description = "Access the node management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewNode = new()
|
||||||
|
{
|
||||||
|
Index = 11,
|
||||||
|
Name = "Admin New Node",
|
||||||
|
Description = "Create a new node in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNodeSetup = new()
|
||||||
|
{
|
||||||
|
Index = 12,
|
||||||
|
Name = "Admin Node Setup",
|
||||||
|
Description = "Set up a node in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNodeView = new()
|
||||||
|
{
|
||||||
|
Index = 13,
|
||||||
|
Name = "Admin Node View",
|
||||||
|
Description = "View node details in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNotificationDebugging = new()
|
||||||
|
{
|
||||||
|
Index = 14,
|
||||||
|
Name = "Admin Notification Debugging",
|
||||||
|
Description = "Manage debugging notifications in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerCleanup = new()
|
||||||
|
{
|
||||||
|
Index = 15,
|
||||||
|
Name = "Admin Server Cleanup",
|
||||||
|
Description = "Perform server cleanup tasks in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerEdit = new()
|
||||||
|
{
|
||||||
|
Index = 16,
|
||||||
|
Name = "Admin Server Edit",
|
||||||
|
Description = "Edit server settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServers = new()
|
||||||
|
{
|
||||||
|
Index = 17,
|
||||||
|
Name = "Admin Server",
|
||||||
|
Description = "Access the server management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerManager = new()
|
||||||
|
{
|
||||||
|
Index = 18,
|
||||||
|
Name = "Admin Server Manager",
|
||||||
|
Description = "Manage servers in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewServer = new()
|
||||||
|
{
|
||||||
|
Index = 19,
|
||||||
|
Name = "Admin New Server",
|
||||||
|
Description = "Create a new server in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerImageEdit = new()
|
||||||
|
{
|
||||||
|
Index = 20,
|
||||||
|
Name = "Admin Server Image Edit",
|
||||||
|
Description = "Edit server image settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerImages = new()
|
||||||
|
{
|
||||||
|
Index = 21,
|
||||||
|
Name = "Admin Server Images",
|
||||||
|
Description = "Access the server image management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerImageNew = new()
|
||||||
|
{
|
||||||
|
Index = 22,
|
||||||
|
Name = "Admin Server Image New",
|
||||||
|
Description = "Create a new server image in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewAllocations = new()
|
||||||
|
{
|
||||||
|
Index = 23,
|
||||||
|
Name = "Admin Server View Allocations",
|
||||||
|
Description = "View server allocations in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewArchive = new()
|
||||||
|
{
|
||||||
|
Index = 24,
|
||||||
|
Name = "Admin Server View Archive",
|
||||||
|
Description = "View server archive in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewDebug = new()
|
||||||
|
{
|
||||||
|
Index = 25,
|
||||||
|
Name = "Admin Server View Debug",
|
||||||
|
Description = "View server debugging information in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewImage = new()
|
||||||
|
{
|
||||||
|
Index = 26,
|
||||||
|
Name = "Admin Server View Image",
|
||||||
|
Description = "View server image details in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewIndex = new()
|
||||||
|
{
|
||||||
|
Index = 27,
|
||||||
|
Name = "Admin Server View",
|
||||||
|
Description = "Access the server view page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewOverview = new()
|
||||||
|
{
|
||||||
|
Index = 28,
|
||||||
|
Name = "Admin Server View Overview",
|
||||||
|
Description = "View server overview in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminServerViewResources = new()
|
||||||
|
{
|
||||||
|
Index = 29,
|
||||||
|
Name = "Admin Server View Resources",
|
||||||
|
Description = "View server resources in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSubscriptionEdit = new()
|
||||||
|
{
|
||||||
|
Index = 30,
|
||||||
|
Name = "Admin Subscription Edit",
|
||||||
|
Description = "Edit subscription settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSubscriptions = new()
|
||||||
|
{
|
||||||
|
Index = 31,
|
||||||
|
Name = "Admin Subscriptions",
|
||||||
|
Description = "Access the subscription management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewSubscription = new()
|
||||||
|
{
|
||||||
|
Index = 32,
|
||||||
|
Name = "Admin New Subscription",
|
||||||
|
Description = "Create a new subscription in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSupport = new()
|
||||||
|
{
|
||||||
|
Index = 33,
|
||||||
|
Name = "Admin Support",
|
||||||
|
Description = "Access the support page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSupportView = new()
|
||||||
|
{
|
||||||
|
Index = 34,
|
||||||
|
Name = "Admin Support View",
|
||||||
|
Description = "View support details in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysConfiguration = new()
|
||||||
|
{
|
||||||
|
Index = 35,
|
||||||
|
Name = "Admin system Configuration",
|
||||||
|
Description = "Access system configuration settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysDiscordBot = new()
|
||||||
|
{
|
||||||
|
Index = 36,
|
||||||
|
Name = "Admin system Discord Bot",
|
||||||
|
Description = "Manage Discord bot settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSystem = new()
|
||||||
|
{
|
||||||
|
Index = 37,
|
||||||
|
Name = "Admin system",
|
||||||
|
Description = "Access the system management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysMail = new()
|
||||||
|
{
|
||||||
|
Index = 38,
|
||||||
|
Name = "Admin system Mail",
|
||||||
|
Description = "Manage mail settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSecurityMalware = new()
|
||||||
|
{
|
||||||
|
Index = 39,
|
||||||
|
Name = "Admin security Malware",
|
||||||
|
Description = "Manage malware settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysResources = new()
|
||||||
|
{
|
||||||
|
Index = 40,
|
||||||
|
Name = "Admin system Resources",
|
||||||
|
Description = "View system resources in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSecurity = new()
|
||||||
|
{
|
||||||
|
Index = 41,
|
||||||
|
Name = "Admin Security",
|
||||||
|
Description = "View security logs in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysSentry = new()
|
||||||
|
{
|
||||||
|
Index = 42,
|
||||||
|
Name = "Admin system Sentry",
|
||||||
|
Description = "Manage Sentry settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysNewsEdit = new()
|
||||||
|
{
|
||||||
|
Index = 43,
|
||||||
|
Name = "Admin system News Edit",
|
||||||
|
Description = "Edit system news in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysNews = new()
|
||||||
|
{
|
||||||
|
Index = 44,
|
||||||
|
Name = "Admin system News",
|
||||||
|
Description = "Access the system news management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSysNewsNew = new()
|
||||||
|
{
|
||||||
|
Index = 45,
|
||||||
|
Name = "Admin system News New",
|
||||||
|
Description = "Create new system news in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminUserEdit = new()
|
||||||
|
{
|
||||||
|
Index = 46,
|
||||||
|
Name = "Admin User Edit",
|
||||||
|
Description = "Edit user settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminUsers = new()
|
||||||
|
{
|
||||||
|
Index = 47,
|
||||||
|
Name = "Admin Users",
|
||||||
|
Description = "Access the user management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewUser = new()
|
||||||
|
{
|
||||||
|
Index = 48,
|
||||||
|
Name = "Admin New User",
|
||||||
|
Description = "Create a new user in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminUserSessions = new()
|
||||||
|
{
|
||||||
|
Index = 49,
|
||||||
|
Name = "Admin User Sessions",
|
||||||
|
Description = "View user sessions in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminUserView = new()
|
||||||
|
{
|
||||||
|
Index = 50,
|
||||||
|
Name = "Admin User View",
|
||||||
|
Description = "View user details in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminWebspaces = new()
|
||||||
|
{
|
||||||
|
Index = 51,
|
||||||
|
Name = "Admin Webspaces",
|
||||||
|
Description = "Access the webspaces management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminNewWebspace = new()
|
||||||
|
{
|
||||||
|
Index = 52,
|
||||||
|
Name = "Admin New Webspace",
|
||||||
|
Description = "Create a new webspace in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminWebspacesServerEdit = new()
|
||||||
|
{
|
||||||
|
Index = 53,
|
||||||
|
Name = "Admin Webspaces Server Edit",
|
||||||
|
Description = "Edit webspace server settings in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminWebspacesServers = new()
|
||||||
|
{
|
||||||
|
Index = 54,
|
||||||
|
Name = "Admin Webspaces Servers",
|
||||||
|
Description = "Access the webspace server management page in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminWebspacesServerNew = new()
|
||||||
|
{
|
||||||
|
Index = 55,
|
||||||
|
Name = "Admin Webspaces Server New",
|
||||||
|
Description = "Create a new webspace server in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSecurityIpBans = new()
|
||||||
|
{
|
||||||
|
Index = 56,
|
||||||
|
Name = "Admin security ip bans",
|
||||||
|
Description = "Manage ip bans in the admin area"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSecurityPermissionGroups = new()
|
||||||
|
{
|
||||||
|
Index = 57,
|
||||||
|
Name = "Admin security permission groups",
|
||||||
|
Description = "View, add and delete permission groups"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSecurityLogs = new()
|
||||||
|
{
|
||||||
|
Index = 58,
|
||||||
|
Name = "Admin security logs",
|
||||||
|
Description = "View the security logs"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission AdminSecurityDdos = new()
|
||||||
|
{
|
||||||
|
Index = 59,
|
||||||
|
Name = "Admin security ddos",
|
||||||
|
Description = "Manage the integrated ddos protection"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Permission? FromString(string name)
|
||||||
|
{
|
||||||
|
var type = typeof(Permissions);
|
||||||
|
|
||||||
|
var field = type
|
||||||
|
.GetFields()
|
||||||
|
.FirstOrDefault(x => x.FieldType == typeof(Permission) && x.Name == name);
|
||||||
|
|
||||||
|
if (field != null)
|
||||||
|
{
|
||||||
|
var value = field.GetValue(null);
|
||||||
|
return value as Permission;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Permission[] GetAllPermissions()
|
||||||
|
{
|
||||||
|
var type = typeof(Permissions);
|
||||||
|
|
||||||
|
return type
|
||||||
|
.GetFields()
|
||||||
|
.Where(x => x.FieldType == typeof(Permission))
|
||||||
|
.Select(x => (x.GetValue(null) as Permission)!)
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
15
Moonlight/App/Plugin/MoonlightPlugin.cs
Normal file
15
Moonlight/App/Plugin/MoonlightPlugin.cs
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
using Moonlight.App.Plugin.UI.Servers;
|
||||||
|
using Moonlight.App.Plugin.UI.Webspaces;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Plugin;
|
||||||
|
|
||||||
|
public abstract class MoonlightPlugin
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "N/A";
|
||||||
|
public string Author { get; set; } = "N/A";
|
||||||
|
public string Version { get; set; } = "N/A";
|
||||||
|
|
||||||
|
public Func<ServerPageContext, Task>? OnBuildServerPage { get; set; }
|
||||||
|
public Func<WebspacePageContext, Task>? OnBuildWebspacePage { get; set; }
|
||||||
|
public Func<IServiceCollection, Task>? OnBuildServices { get; set; }
|
||||||
|
}
|
||||||
12
Moonlight/App/Plugin/UI/Servers/ServerPageContext.cs
Normal file
12
Moonlight/App/Plugin/UI/Servers/ServerPageContext.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Plugin.UI.Servers;
|
||||||
|
|
||||||
|
public class ServerPageContext
|
||||||
|
{
|
||||||
|
public List<ServerTab> Tabs { get; set; } = new();
|
||||||
|
public List<ServerSetting> Settings { get; set; } = new();
|
||||||
|
public Server Server { get; set; }
|
||||||
|
public User User { get; set; }
|
||||||
|
public string[] ImageTags { get; set; }
|
||||||
|
}
|
||||||
9
Moonlight/App/Plugin/UI/Servers/ServerSetting.cs
Normal file
9
Moonlight/App/Plugin/UI/Servers/ServerSetting.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Plugin.UI.Servers;
|
||||||
|
|
||||||
|
public class ServerSetting
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public RenderFragment Component { get; set; }
|
||||||
|
}
|
||||||
11
Moonlight/App/Plugin/UI/Servers/ServerTab.cs
Normal file
11
Moonlight/App/Plugin/UI/Servers/ServerTab.cs
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Plugin.UI.Servers;
|
||||||
|
|
||||||
|
public class ServerTab
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string Route { get; set; }
|
||||||
|
public string Icon { get; set; }
|
||||||
|
public RenderFragment Component { get; set; }
|
||||||
|
}
|
||||||
10
Moonlight/App/Plugin/UI/Webspaces/WebspacePageContext.cs
Normal file
10
Moonlight/App/Plugin/UI/Webspaces/WebspacePageContext.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Plugin.UI.Webspaces;
|
||||||
|
|
||||||
|
public class WebspacePageContext
|
||||||
|
{
|
||||||
|
public List<WebspaceTab> Tabs { get; set; } = new();
|
||||||
|
public User User { get; set; }
|
||||||
|
public WebSpace WebSpace { get; set; }
|
||||||
|
}
|
||||||
10
Moonlight/App/Plugin/UI/Webspaces/WebspaceTab.cs
Normal file
10
Moonlight/App/Plugin/UI/Webspaces/WebspaceTab.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Plugin.UI.Webspaces;
|
||||||
|
|
||||||
|
public class WebspaceTab
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "N/A";
|
||||||
|
public string Route { get; set; } = "/";
|
||||||
|
public RenderFragment Component { get; set; }
|
||||||
|
}
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Moonlight.App.Database;
|
|
||||||
using Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Repositories.LogEntries;
|
|
||||||
|
|
||||||
public class AuditLogEntryRepository : IDisposable
|
|
||||||
{
|
|
||||||
private readonly DataContext DataContext;
|
|
||||||
|
|
||||||
public AuditLogEntryRepository(DataContext dataContext)
|
|
||||||
{
|
|
||||||
DataContext = dataContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
public AuditLogEntry Add(AuditLogEntry entry)
|
|
||||||
{
|
|
||||||
var x = DataContext.AuditLog.Add(entry);
|
|
||||||
DataContext.SaveChanges();
|
|
||||||
return x.Entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DbSet<AuditLogEntry> Get()
|
|
||||||
{
|
|
||||||
return DataContext.AuditLog;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
DataContext.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Moonlight.App.Database;
|
|
||||||
using Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Repositories.LogEntries;
|
|
||||||
|
|
||||||
public class ErrorLogEntryRepository : IDisposable
|
|
||||||
{
|
|
||||||
private readonly DataContext DataContext;
|
|
||||||
|
|
||||||
public ErrorLogEntryRepository(DataContext dataContext)
|
|
||||||
{
|
|
||||||
DataContext = dataContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ErrorLogEntry Add(ErrorLogEntry errorLogEntry)
|
|
||||||
{
|
|
||||||
var x = DataContext.ErrorLog.Add(errorLogEntry);
|
|
||||||
DataContext.SaveChanges();
|
|
||||||
return x.Entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DbSet<ErrorLogEntry> Get()
|
|
||||||
{
|
|
||||||
return DataContext.ErrorLog;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
DataContext.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Moonlight.App.Database;
|
|
||||||
using Moonlight.App.Database.Entities.LogsEntries;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Repositories.LogEntries;
|
|
||||||
|
|
||||||
public class SecurityLogEntryRepository : IDisposable
|
|
||||||
{
|
|
||||||
private readonly DataContext DataContext;
|
|
||||||
|
|
||||||
public SecurityLogEntryRepository(DataContext dataContext)
|
|
||||||
{
|
|
||||||
DataContext = dataContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
public SecurityLogEntry Add(SecurityLogEntry securityLogEntry)
|
|
||||||
{
|
|
||||||
var x = DataContext.SecurityLog.Add(securityLogEntry);
|
|
||||||
DataContext.SaveChanges();
|
|
||||||
return x.Entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DbSet<SecurityLogEntry> Get()
|
|
||||||
{
|
|
||||||
return DataContext.SecurityLog;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
DataContext.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
129
Moonlight/App/Services/Background/DdosProtectionService.cs
Normal file
129
Moonlight/App/Services/Background/DdosProtectionService.cs
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
using Moonlight.App.ApiClients.Daemon;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Moonlight.App.Events;
|
||||||
|
using Moonlight.App.Helpers;
|
||||||
|
using Moonlight.App.Repositories;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Background;
|
||||||
|
|
||||||
|
public class DdosProtectionService
|
||||||
|
{
|
||||||
|
private readonly IServiceScopeFactory ServiceScopeFactory;
|
||||||
|
|
||||||
|
public DdosProtectionService(IServiceScopeFactory serviceScopeFactory)
|
||||||
|
{
|
||||||
|
ServiceScopeFactory = serviceScopeFactory;
|
||||||
|
|
||||||
|
Task.Run(UnBlocker);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task UnBlocker()
|
||||||
|
{
|
||||||
|
var periodicTimer = new PeriodicTimer(TimeSpan.FromMinutes(5));
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var blocklistIpRepo = scope.ServiceProvider.GetRequiredService<Repository<BlocklistIp>>();
|
||||||
|
|
||||||
|
var ips = blocklistIpRepo
|
||||||
|
.Get()
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
foreach (var ip in ips)
|
||||||
|
{
|
||||||
|
if (DateTime.UtcNow > ip.ExpiresAt)
|
||||||
|
{
|
||||||
|
blocklistIpRepo.Delete(ip);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var newCount = blocklistIpRepo
|
||||||
|
.Get()
|
||||||
|
.Count();
|
||||||
|
|
||||||
|
if (newCount != ips.Length)
|
||||||
|
{
|
||||||
|
await RebuildNodeFirewalls();
|
||||||
|
}
|
||||||
|
|
||||||
|
await periodicTimer.WaitForNextTickAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RebuildNodeFirewalls()
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var blocklistIpRepo = scope.ServiceProvider.GetRequiredService<Repository<BlocklistIp>>();
|
||||||
|
var nodeRepo = scope.ServiceProvider.GetRequiredService<Repository<Node>>();
|
||||||
|
var nodeService = scope.ServiceProvider.GetRequiredService<NodeService>();
|
||||||
|
|
||||||
|
var ips = blocklistIpRepo
|
||||||
|
.Get()
|
||||||
|
.Select(x => x.Ip)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
foreach (var node in nodeRepo.Get().ToArray())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await nodeService.RebuildFirewall(node, ips);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Logger.Warn($"Error rebuilding firewall on node {node.Name}");
|
||||||
|
Logger.Warn(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task ProcessDdosSignal(string ip, long packets)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
|
||||||
|
var blocklistRepo = scope.ServiceProvider.GetRequiredService<Repository<BlocklistIp>>();
|
||||||
|
var whitelistRepo = scope.ServiceProvider.GetRequiredService<Repository<WhitelistIp>>();
|
||||||
|
|
||||||
|
var whitelistIps = whitelistRepo.Get().ToArray();
|
||||||
|
|
||||||
|
if(whitelistIps.Any(x => x.Ip == ip))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var blocklistIps = blocklistRepo.Get().ToArray();
|
||||||
|
|
||||||
|
if(blocklistIps.Any(x => x.Ip == ip))
|
||||||
|
return;
|
||||||
|
|
||||||
|
await BlocklistIp(ip, packets);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task BlocklistIp(string ip, long packets)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var blocklistRepo = scope.ServiceProvider.GetRequiredService<Repository<BlocklistIp>>();
|
||||||
|
var configService = scope.ServiceProvider.GetRequiredService<ConfigService>();
|
||||||
|
var eventSystem = scope.ServiceProvider.GetRequiredService<EventSystem>();
|
||||||
|
|
||||||
|
var blocklistIp = blocklistRepo.Add(new()
|
||||||
|
{
|
||||||
|
Ip = ip,
|
||||||
|
Packets = packets,
|
||||||
|
ExpiresAt = DateTime.UtcNow.AddMinutes(configService.Get().Moonlight.Security.BlockIpDuration),
|
||||||
|
CreatedAt = DateTime.UtcNow
|
||||||
|
});
|
||||||
|
|
||||||
|
await RebuildNodeFirewalls();
|
||||||
|
await eventSystem.Emit("ddos.add", blocklistIp);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UnBlocklistIp(string ip)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var blocklistRepo = scope.ServiceProvider.GetRequiredService<Repository<BlocklistIp>>();
|
||||||
|
|
||||||
|
var blocklist = blocklistRepo.Get().First(x => x.Ip == ip);
|
||||||
|
blocklistRepo.Delete(blocklist);
|
||||||
|
|
||||||
|
await RebuildNodeFirewalls();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -35,6 +35,8 @@ public class DiscordNotificationService
|
|||||||
Event.On<SupportChatMessage>("supportChat.message", this, OnSupportChatMessage);
|
Event.On<SupportChatMessage>("supportChat.message", this, OnSupportChatMessage);
|
||||||
Event.On<User>("supportChat.close", this, OnSupportChatClose);
|
Event.On<User>("supportChat.close", this, OnSupportChatClose);
|
||||||
Event.On<User>("user.rating", this, OnUserRated);
|
Event.On<User>("user.rating", this, OnUserRated);
|
||||||
|
Event.On<User>("billing.completed", this, OnBillingCompleted);
|
||||||
|
Event.On<BlocklistIp>("ddos.add", this, OnIpBlockListed);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -42,6 +44,33 @@ public class DiscordNotificationService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task OnIpBlockListed(BlocklistIp blocklistIp)
|
||||||
|
{
|
||||||
|
await SendNotification("", builder =>
|
||||||
|
{
|
||||||
|
builder.Color = Color.Red;
|
||||||
|
builder.Title = "New ddos attack detected";
|
||||||
|
|
||||||
|
builder.AddField("IP", blocklistIp.Ip);
|
||||||
|
builder.AddField("Packets", blocklistIp.Packets);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task OnBillingCompleted(User user)
|
||||||
|
{
|
||||||
|
await SendNotification("", builder =>
|
||||||
|
{
|
||||||
|
builder.Color = Color.Red;
|
||||||
|
builder.Title = "New payment received";
|
||||||
|
|
||||||
|
builder.AddField("User", user.Email);
|
||||||
|
builder.AddField("Firstname", user.FirstName);
|
||||||
|
builder.AddField("Lastname", user.LastName);
|
||||||
|
builder.AddField("Amount", user.CurrentSubscription!.Price);
|
||||||
|
builder.AddField("Currency", user.CurrentSubscription!.Currency);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private async Task OnUserRated(User user)
|
private async Task OnUserRated(User user)
|
||||||
{
|
{
|
||||||
await SendNotification("", builder =>
|
await SendNotification("", builder =>
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ public class MalwareScanService
|
|||||||
private readonly IServiceScopeFactory ServiceScopeFactory;
|
private readonly IServiceScopeFactory ServiceScopeFactory;
|
||||||
|
|
||||||
public bool IsRunning { get; private set; }
|
public bool IsRunning { get; private set; }
|
||||||
|
public bool ScanAllServers { get; set; }
|
||||||
public readonly Dictionary<Server, MalwareScanResult[]> ScanResults;
|
public readonly Dictionary<Server, MalwareScanResult[]> ScanResults;
|
||||||
public string Status { get; private set; } = "N/A";
|
public string Status { get; private set; } = "N/A";
|
||||||
|
|
||||||
@@ -26,7 +27,6 @@ public class MalwareScanService
|
|||||||
{
|
{
|
||||||
ServiceScopeFactory = serviceScopeFactory;
|
ServiceScopeFactory = serviceScopeFactory;
|
||||||
Event = eventSystem;
|
Event = eventSystem;
|
||||||
|
|
||||||
ScanResults = new();
|
ScanResults = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,6 +42,7 @@ public class MalwareScanService
|
|||||||
|
|
||||||
private async Task Run()
|
private async Task Run()
|
||||||
{
|
{
|
||||||
|
// Clean results
|
||||||
IsRunning = true;
|
IsRunning = true;
|
||||||
Status = "Clearing last results";
|
Status = "Clearing last results";
|
||||||
await Event.Emit("malwareScan.status", IsRunning);
|
await Event.Emit("malwareScan.status", IsRunning);
|
||||||
@@ -53,6 +54,55 @@ public class MalwareScanService
|
|||||||
|
|
||||||
await Event.Emit("malwareScan.result");
|
await Event.Emit("malwareScan.result");
|
||||||
|
|
||||||
|
// Load servers to scan
|
||||||
|
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
|
||||||
|
// Load services from di scope
|
||||||
|
NodeRepository = scope.ServiceProvider.GetRequiredService<Repository<Node>>();
|
||||||
|
ServerRepository = scope.ServiceProvider.GetRequiredService<Repository<Server>>();
|
||||||
|
NodeService = scope.ServiceProvider.GetRequiredService<NodeService>();
|
||||||
|
ServerService = scope.ServiceProvider.GetRequiredService<ServerService>();
|
||||||
|
|
||||||
|
Status = "Fetching servers to scan";
|
||||||
|
await Event.Emit("malwareScan.status", IsRunning);
|
||||||
|
|
||||||
|
Server[] servers;
|
||||||
|
|
||||||
|
if (ScanAllServers)
|
||||||
|
servers = ServerRepository.Get().ToArray();
|
||||||
|
else
|
||||||
|
servers = await GetOnlineServers();
|
||||||
|
|
||||||
|
// Perform scan
|
||||||
|
|
||||||
|
int i = 1;
|
||||||
|
foreach (var server in servers)
|
||||||
|
{
|
||||||
|
Status = $"[{i} / {servers.Length}] Scanning server {server.Name}";
|
||||||
|
await Event.Emit("malwareScan.status", IsRunning);
|
||||||
|
|
||||||
|
var results = await PerformScanOnServer(server);
|
||||||
|
|
||||||
|
if (results.Any())
|
||||||
|
{
|
||||||
|
lock (ScanResults)
|
||||||
|
{
|
||||||
|
ScanResults.Add(server, results);
|
||||||
|
}
|
||||||
|
|
||||||
|
await Event.Emit("malwareScan.result");
|
||||||
|
}
|
||||||
|
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
IsRunning = false;
|
||||||
|
await Event.Emit("malwareScan.status", IsRunning);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<Server[]> GetOnlineServers()
|
||||||
|
{
|
||||||
using var scope = ServiceScopeFactory.CreateScope();
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
|
||||||
// Load services from di scope
|
// Load services from di scope
|
||||||
@@ -103,42 +153,10 @@ public class MalwareScanService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Perform scan
|
return containerServerMapped.Keys.ToArray();
|
||||||
var resultsMapped = new Dictionary<Server, MalwareScanResult[]>();
|
|
||||||
foreach (var mapping in containerServerMapped)
|
|
||||||
{
|
|
||||||
Logger.Verbose($"Scanning server {mapping.Key.Name} for malware");
|
|
||||||
|
|
||||||
Status = $"Scanning server {mapping.Key.Name} for malware";
|
|
||||||
await Event.Emit("malwareScan.status", IsRunning);
|
|
||||||
|
|
||||||
var results = await PerformScanOnServer(mapping.Key, mapping.Value);
|
|
||||||
|
|
||||||
if (results.Any())
|
|
||||||
{
|
|
||||||
resultsMapped.Add(mapping.Key, results);
|
|
||||||
Logger.Verbose($"{results.Length} findings on server {mapping.Key.Name}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Verbose($"Scan complete. Detected {resultsMapped.Count} servers with findings");
|
private async Task<MalwareScanResult[]> PerformScanOnServer(Server server)
|
||||||
|
|
||||||
IsRunning = false;
|
|
||||||
Status = $"Scan complete. Detected {resultsMapped.Count} servers with findings";
|
|
||||||
await Event.Emit("malwareScan.status", IsRunning);
|
|
||||||
|
|
||||||
lock (ScanResults)
|
|
||||||
{
|
|
||||||
foreach (var mapping in resultsMapped)
|
|
||||||
{
|
|
||||||
ScanResults.Add(mapping.Key, mapping.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await Event.Emit("malwareScan.result");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<MalwareScanResult[]> PerformScanOnServer(Server server, Container container)
|
|
||||||
{
|
{
|
||||||
var results = new List<MalwareScanResult>();
|
var results = new List<MalwareScanResult>();
|
||||||
|
|
||||||
@@ -162,6 +180,29 @@ public class MalwareScanService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async Task ScanMinerJar()
|
||||||
|
{
|
||||||
|
var access = await ServerService.CreateFileAccess(server, null!);
|
||||||
|
var fileElements = await access.Ls();
|
||||||
|
|
||||||
|
if (fileElements.Any(x => x.Name == "libraries" && !x.IsFile))
|
||||||
|
{
|
||||||
|
await access.Cd("libraries");
|
||||||
|
|
||||||
|
fileElements = await access.Ls();
|
||||||
|
|
||||||
|
if (fileElements.Any(x => x.Name == "jdk" && !x.IsFile))
|
||||||
|
{
|
||||||
|
results.Add(new ()
|
||||||
|
{
|
||||||
|
Title = "Found Miner",
|
||||||
|
Description = "Detected suspicious library directory which may contain a script for miners",
|
||||||
|
Author = "Marcel Baumgartner"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async Task ScanFakePlayerPlugins()
|
async Task ScanFakePlayerPlugins()
|
||||||
{
|
{
|
||||||
var access = await ServerService.CreateFileAccess(server, null!);
|
var access = await ServerService.CreateFileAccess(server, null!);
|
||||||
@@ -190,6 +231,7 @@ public class MalwareScanService
|
|||||||
// Execute scans
|
// Execute scans
|
||||||
await ScanSelfBot();
|
await ScanSelfBot();
|
||||||
await ScanFakePlayerPlugins();
|
await ScanFakePlayerPlugins();
|
||||||
|
await ScanMinerJar();
|
||||||
|
|
||||||
return results.ToArray();
|
return results.ToArray();
|
||||||
}
|
}
|
||||||
|
|||||||
37
Moonlight/App/Services/Background/TempMailService.cs
Normal file
37
Moonlight/App/Services/Background/TempMailService.cs
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
using System.Net.Mail;
|
||||||
|
using Moonlight.App.Helpers;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Background;
|
||||||
|
|
||||||
|
public class TempMailService
|
||||||
|
{
|
||||||
|
private string[] Domains = Array.Empty<string>();
|
||||||
|
|
||||||
|
public TempMailService()
|
||||||
|
{
|
||||||
|
Task.Run(Init);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task Init()
|
||||||
|
{
|
||||||
|
var client = new HttpClient();
|
||||||
|
var text = await client.GetStringAsync("https://raw.githubusercontent.com/disposable-email-domains/disposable-email-domains/master/disposable_email_blocklist.conf");
|
||||||
|
|
||||||
|
Domains = text
|
||||||
|
.Split("\n")
|
||||||
|
.Select(x => x.Trim())
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
Logger.Info($"Fetched {Domains.Length} temp mail domains");
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<bool> IsTempMail(string mail)
|
||||||
|
{
|
||||||
|
var address = new MailAddress(mail);
|
||||||
|
|
||||||
|
if (Domains.Contains(address.Host))
|
||||||
|
return Task.FromResult(true);
|
||||||
|
|
||||||
|
return Task.FromResult(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
127
Moonlight/App/Services/BillingService.cs
Normal file
127
Moonlight/App/Services/BillingService.cs
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Moonlight.App.Events;
|
||||||
|
using Moonlight.App.Exceptions;
|
||||||
|
using Moonlight.App.Repositories;
|
||||||
|
using Moonlight.App.Services.Mail;
|
||||||
|
using Moonlight.App.Services.Sessions;
|
||||||
|
using Stripe.Checkout;
|
||||||
|
using Subscription = Moonlight.App.Database.Entities.Subscription;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services;
|
||||||
|
|
||||||
|
public class BillingService
|
||||||
|
{
|
||||||
|
private readonly ConfigService ConfigService;
|
||||||
|
private readonly SubscriptionService SubscriptionService;
|
||||||
|
private readonly Repository<Subscription> SubscriptionRepository;
|
||||||
|
private readonly SessionServerService SessionServerService;
|
||||||
|
private readonly EventSystem Event;
|
||||||
|
private readonly MailService MailService;
|
||||||
|
|
||||||
|
public BillingService(
|
||||||
|
ConfigService configService,
|
||||||
|
SubscriptionService subscriptionService,
|
||||||
|
Repository<Subscription> subscriptionRepository,
|
||||||
|
EventSystem eventSystem,
|
||||||
|
SessionServerService sessionServerService,
|
||||||
|
MailService mailService)
|
||||||
|
{
|
||||||
|
ConfigService = configService;
|
||||||
|
SubscriptionService = subscriptionService;
|
||||||
|
SubscriptionRepository = subscriptionRepository;
|
||||||
|
Event = eventSystem;
|
||||||
|
SessionServerService = sessionServerService;
|
||||||
|
MailService = mailService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string> StartCheckout(User user, Subscription subscription)
|
||||||
|
{
|
||||||
|
var appUrl = ConfigService.Get().Moonlight.AppUrl;
|
||||||
|
var controllerUrl = appUrl + "/api/moonlight/billing";
|
||||||
|
|
||||||
|
var options = new SessionCreateOptions()
|
||||||
|
{
|
||||||
|
LineItems = new()
|
||||||
|
{
|
||||||
|
new()
|
||||||
|
{
|
||||||
|
Price = subscription.StripePriceId,
|
||||||
|
Quantity = 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Mode = "payment",
|
||||||
|
SuccessUrl = controllerUrl + "/success",
|
||||||
|
CancelUrl = controllerUrl + "/cancel",
|
||||||
|
AutomaticTax = new SessionAutomaticTaxOptions()
|
||||||
|
{
|
||||||
|
Enabled = true
|
||||||
|
},
|
||||||
|
CustomerEmail = user.Email.ToLower(),
|
||||||
|
Metadata = new()
|
||||||
|
{
|
||||||
|
{
|
||||||
|
"productId",
|
||||||
|
subscription.StripeProductId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var service = new SessionService();
|
||||||
|
|
||||||
|
var session = await service.CreateAsync(options);
|
||||||
|
|
||||||
|
return session.Url;
|
||||||
|
}
|
||||||
|
public async Task CompleteCheckout(User user)
|
||||||
|
{
|
||||||
|
var sessionService = new SessionService();
|
||||||
|
|
||||||
|
var sessionsPerUser = await sessionService.ListAsync(new SessionListOptions()
|
||||||
|
{
|
||||||
|
CustomerDetails = new()
|
||||||
|
{
|
||||||
|
Email = user.Email
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
var latestCompletedSession = sessionsPerUser
|
||||||
|
.Where(x => x.Status == "complete")
|
||||||
|
.Where(x => x.PaymentStatus == "paid")
|
||||||
|
.MaxBy(x => x.Created);
|
||||||
|
|
||||||
|
if (latestCompletedSession == null)
|
||||||
|
throw new DisplayException("No completed session found");
|
||||||
|
|
||||||
|
var productId = latestCompletedSession.Metadata["productId"];
|
||||||
|
|
||||||
|
var subscription = SubscriptionRepository
|
||||||
|
.Get()
|
||||||
|
.FirstOrDefault(x => x.StripeProductId == productId);
|
||||||
|
|
||||||
|
if (subscription == null)
|
||||||
|
throw new DisplayException("No subscription for this product found");
|
||||||
|
|
||||||
|
// if (await SubscriptionService.GetActiveSubscription(user) != null)
|
||||||
|
// {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
|
||||||
|
await SubscriptionService.SetActiveSubscription(user, subscription);
|
||||||
|
|
||||||
|
await MailService.SendMail(user, "checkoutComplete", values =>
|
||||||
|
{
|
||||||
|
values.Add("SubscriptionName", subscription.Name);
|
||||||
|
values.Add("SubscriptionPrice", subscription.Price
|
||||||
|
.ToString(CultureInfo.InvariantCulture));
|
||||||
|
values.Add("SubscriptionCurrency", subscription.Currency
|
||||||
|
.ToString());
|
||||||
|
values.Add("SubscriptionDuration", subscription.Duration
|
||||||
|
.ToString(CultureInfo.InvariantCulture));
|
||||||
|
});
|
||||||
|
|
||||||
|
await Event.Emit("billing.completed", user);
|
||||||
|
|
||||||
|
await SessionServerService.ReloadUserSessions(user);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ namespace Moonlight.App.Services;
|
|||||||
public class ConfigService
|
public class ConfigService
|
||||||
{
|
{
|
||||||
private readonly StorageService StorageService;
|
private readonly StorageService StorageService;
|
||||||
|
private readonly string Path;
|
||||||
private ConfigV1 Configuration;
|
private ConfigV1 Configuration;
|
||||||
|
|
||||||
public bool DebugMode { get; private set; } = false;
|
public bool DebugMode { get; private set; } = false;
|
||||||
@@ -18,6 +19,11 @@ public class ConfigService
|
|||||||
StorageService = storageService;
|
StorageService = storageService;
|
||||||
StorageService.EnsureCreated();
|
StorageService.EnsureCreated();
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ML_CONFIG_PATH")))
|
||||||
|
Path = Environment.GetEnvironmentVariable("ML_CONFIG_PATH")!;
|
||||||
|
else
|
||||||
|
Path = PathBuilder.File("storage", "configs", "config.json");
|
||||||
|
|
||||||
Reload();
|
Reload();
|
||||||
|
|
||||||
// Env vars
|
// Env vars
|
||||||
@@ -40,18 +46,16 @@ public class ConfigService
|
|||||||
|
|
||||||
public void Reload()
|
public void Reload()
|
||||||
{
|
{
|
||||||
var path = PathBuilder.File("storage", "configs", "config.json");
|
if (!File.Exists(Path))
|
||||||
|
|
||||||
if (!File.Exists(path))
|
|
||||||
{
|
{
|
||||||
File.WriteAllText(path, "{}");
|
File.WriteAllText(Path, "{}");
|
||||||
}
|
}
|
||||||
|
|
||||||
Configuration = JsonConvert.DeserializeObject<ConfigV1>(
|
Configuration = JsonConvert.DeserializeObject<ConfigV1>(
|
||||||
File.ReadAllText(path)
|
File.ReadAllText(Path)
|
||||||
) ?? new ConfigV1();
|
) ?? new ConfigV1();
|
||||||
|
|
||||||
File.WriteAllText(path, JsonConvert.SerializeObject(Configuration, Formatting.Indented));
|
File.WriteAllText(Path, JsonConvert.SerializeObject(Configuration, Formatting.Indented));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Save(ConfigV1 configV1)
|
public void Save(ConfigV1 configV1)
|
||||||
@@ -62,14 +66,12 @@ public class ConfigService
|
|||||||
|
|
||||||
public void Save()
|
public void Save()
|
||||||
{
|
{
|
||||||
var path = PathBuilder.File("storage", "configs", "config.json");
|
if (!File.Exists(Path))
|
||||||
|
|
||||||
if (!File.Exists(path))
|
|
||||||
{
|
{
|
||||||
File.WriteAllText(path, "{}");
|
File.WriteAllText(Path, "{}");
|
||||||
}
|
}
|
||||||
|
|
||||||
File.WriteAllText(path, JsonConvert.SerializeObject(Configuration, Formatting.Indented));
|
File.WriteAllText(Path, JsonConvert.SerializeObject(Configuration, Formatting.Indented));
|
||||||
|
|
||||||
Reload();
|
Reload();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ namespace Moonlight.App.Services;
|
|||||||
public class DomainService
|
public class DomainService
|
||||||
{
|
{
|
||||||
private readonly DomainRepository DomainRepository;
|
private readonly DomainRepository DomainRepository;
|
||||||
|
private readonly ConfigService ConfigService;
|
||||||
private readonly SharedDomainRepository SharedDomainRepository;
|
private readonly SharedDomainRepository SharedDomainRepository;
|
||||||
private readonly CloudFlareClient Client;
|
private readonly CloudFlareClient Client;
|
||||||
private readonly string AccountId;
|
private readonly string AccountId;
|
||||||
@@ -29,6 +30,7 @@ public class DomainService
|
|||||||
DomainRepository domainRepository,
|
DomainRepository domainRepository,
|
||||||
SharedDomainRepository sharedDomainRepository)
|
SharedDomainRepository sharedDomainRepository)
|
||||||
{
|
{
|
||||||
|
ConfigService = configService;
|
||||||
DomainRepository = domainRepository;
|
DomainRepository = domainRepository;
|
||||||
SharedDomainRepository = sharedDomainRepository;
|
SharedDomainRepository = sharedDomainRepository;
|
||||||
|
|
||||||
@@ -48,6 +50,9 @@ public class DomainService
|
|||||||
|
|
||||||
public Task<Domain> Create(string domain, SharedDomain sharedDomain, User user)
|
public Task<Domain> Create(string domain, SharedDomain sharedDomain, User user)
|
||||||
{
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
throw new DisplayException("This operation is disabled");
|
||||||
|
|
||||||
if (DomainRepository.Get().Where(x => x.SharedDomain.Id == sharedDomain.Id).Any(x => x.Name == domain))
|
if (DomainRepository.Get().Where(x => x.SharedDomain.Id == sharedDomain.Id).Any(x => x.Name == domain))
|
||||||
throw new DisplayException("A domain with this name does already exist for this shared domain");
|
throw new DisplayException("A domain with this name does already exist for this shared domain");
|
||||||
|
|
||||||
@@ -63,6 +68,9 @@ public class DomainService
|
|||||||
|
|
||||||
public Task Delete(Domain domain)
|
public Task Delete(Domain domain)
|
||||||
{
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
throw new DisplayException("This operation is disabled");
|
||||||
|
|
||||||
DomainRepository.Delete(domain);
|
DomainRepository.Delete(domain);
|
||||||
|
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
@@ -71,6 +79,9 @@ public class DomainService
|
|||||||
public async Task<Zone[]>
|
public async Task<Zone[]>
|
||||||
GetAvailableDomains() // This method returns all available domains which are not added as a shared domain
|
GetAvailableDomains() // This method returns all available domains which are not added as a shared domain
|
||||||
{
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
return Array.Empty<Zone>();
|
||||||
|
|
||||||
var domains = GetData(
|
var domains = GetData(
|
||||||
await Client.Zones.GetAsync(new()
|
await Client.Zones.GetAsync(new()
|
||||||
{
|
{
|
||||||
@@ -93,6 +104,9 @@ public class DomainService
|
|||||||
|
|
||||||
public async Task<DnsRecord[]> GetDnsRecords(Domain d)
|
public async Task<DnsRecord[]> GetDnsRecords(Domain d)
|
||||||
{
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
return Array.Empty<DnsRecord>();
|
||||||
|
|
||||||
var domain = EnsureData(d);
|
var domain = EnsureData(d);
|
||||||
|
|
||||||
var records = new List<CloudFlare.Client.Api.Zones.DnsRecord.DnsRecord>();
|
var records = new List<CloudFlare.Client.Api.Zones.DnsRecord.DnsRecord>();
|
||||||
@@ -146,7 +160,7 @@ public class DomainService
|
|||||||
Type = record.Type
|
Type = record.Type
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if (record.Name.EndsWith(rname))
|
else if (record.Name == rname)
|
||||||
{
|
{
|
||||||
result.Add(new()
|
result.Add(new()
|
||||||
{
|
{
|
||||||
@@ -165,6 +179,11 @@ public class DomainService
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async Task AddDnsRecord(Domain d, DnsRecord dnsRecord)
|
public async Task AddDnsRecord(Domain d, DnsRecord dnsRecord)
|
||||||
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
throw new DisplayException("This operation is disabled");
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var domain = EnsureData(d);
|
var domain = EnsureData(d);
|
||||||
|
|
||||||
@@ -219,12 +238,24 @@ public class DomainService
|
|||||||
Name = name
|
Name = name
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch (OverflowException)
|
||||||
|
{
|
||||||
|
throw new DisplayException("Invalid dns record values");
|
||||||
|
}
|
||||||
|
catch (FormatException)
|
||||||
|
{
|
||||||
|
throw new DisplayException("Invalid dns record values");
|
||||||
|
}
|
||||||
|
|
||||||
//TODO: AuditLog
|
//TODO: AuditLog
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task UpdateDnsRecord(Domain d, DnsRecord dnsRecord)
|
public async Task UpdateDnsRecord(Domain d, DnsRecord dnsRecord)
|
||||||
{
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
throw new DisplayException("This operation is disabled");
|
||||||
|
|
||||||
var domain = EnsureData(d);
|
var domain = EnsureData(d);
|
||||||
|
|
||||||
var rname = $"{domain.Name}.{domain.SharedDomain.Name}";
|
var rname = $"{domain.Name}.{domain.SharedDomain.Name}";
|
||||||
@@ -255,6 +286,9 @@ public class DomainService
|
|||||||
|
|
||||||
public async Task DeleteDnsRecord(Domain d, DnsRecord dnsRecord)
|
public async Task DeleteDnsRecord(Domain d, DnsRecord dnsRecord)
|
||||||
{
|
{
|
||||||
|
if (!ConfigService.Get().Moonlight.Domains.Enable)
|
||||||
|
throw new DisplayException("This operation is disabled");
|
||||||
|
|
||||||
var domain = EnsureData(d);
|
var domain = EnsureData(d);
|
||||||
|
|
||||||
GetData(
|
GetData(
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ public class StorageService
|
|||||||
Directory.CreateDirectory(PathBuilder.Dir("storage", "resources"));
|
Directory.CreateDirectory(PathBuilder.Dir("storage", "resources"));
|
||||||
Directory.CreateDirectory(PathBuilder.Dir("storage", "backups"));
|
Directory.CreateDirectory(PathBuilder.Dir("storage", "backups"));
|
||||||
Directory.CreateDirectory(PathBuilder.Dir("storage", "logs"));
|
Directory.CreateDirectory(PathBuilder.Dir("storage", "logs"));
|
||||||
|
Directory.CreateDirectory(PathBuilder.Dir("storage", "plugins"));
|
||||||
|
|
||||||
if(IsEmpty(PathBuilder.Dir("storage", "resources")))
|
if(IsEmpty(PathBuilder.Dir("storage", "resources")))
|
||||||
{
|
{
|
||||||
|
|||||||
18
Moonlight/App/Services/Interop/PopupService.cs
Normal file
18
Moonlight/App/Services/Interop/PopupService.cs
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
using Microsoft.JSInterop;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Interop;
|
||||||
|
|
||||||
|
public class PopupService
|
||||||
|
{
|
||||||
|
private readonly IJSRuntime JsRuntime;
|
||||||
|
|
||||||
|
public PopupService(IJSRuntime jsRuntime)
|
||||||
|
{
|
||||||
|
JsRuntime = jsRuntime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task ShowCentered(string url, string title, int width = 500, int height = 500)
|
||||||
|
{
|
||||||
|
await JsRuntime.InvokeVoidAsync("moonlight.popup.showCentered", url, title, width, height);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
using Moonlight.App.Database.Entities;
|
using Moonlight.App.Database.Entities;
|
||||||
using Moonlight.App.Exceptions;
|
using Moonlight.App.Exceptions;
|
||||||
using Moonlight.App.Helpers;
|
using Moonlight.App.Helpers;
|
||||||
|
using Moonlight.App.Repositories;
|
||||||
using SmtpClient = MailKit.Net.Smtp.SmtpClient;
|
using SmtpClient = MailKit.Net.Smtp.SmtpClient;
|
||||||
|
|
||||||
namespace Moonlight.App.Services.Mail;
|
namespace Moonlight.App.Services.Mail;
|
||||||
@@ -14,8 +15,14 @@ public class MailService
|
|||||||
private readonly int Port;
|
private readonly int Port;
|
||||||
private readonly bool Ssl;
|
private readonly bool Ssl;
|
||||||
|
|
||||||
public MailService(ConfigService configService)
|
private readonly Repository<User> UserRepository;
|
||||||
|
|
||||||
|
public MailService(
|
||||||
|
ConfigService configService,
|
||||||
|
Repository<User> userRepository)
|
||||||
{
|
{
|
||||||
|
UserRepository = userRepository;
|
||||||
|
|
||||||
var mailConfig = configService
|
var mailConfig = configService
|
||||||
.Get()
|
.Get()
|
||||||
.Moonlight.Mail;
|
.Moonlight.Mail;
|
||||||
@@ -27,28 +34,8 @@ public class MailService
|
|||||||
Ssl = mailConfig.Ssl;
|
Ssl = mailConfig.Ssl;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SendMail(
|
public Task SendMailRaw(User user, string html)
|
||||||
User user,
|
|
||||||
string name,
|
|
||||||
Action<Dictionary<string, string>> values
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
if (!File.Exists(PathBuilder.File("storage", "resources", "mail", $"{name}.html")))
|
|
||||||
{
|
|
||||||
Logger.Warn($"Mail template '{name}' not found. Make sure to place one in the resources folder");
|
|
||||||
throw new DisplayException("Mail template not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
var rawHtml = await File.ReadAllTextAsync(PathBuilder.File("storage", "resources", "mail", $"{name}.html"));
|
|
||||||
|
|
||||||
var val = new Dictionary<string, string>();
|
|
||||||
values.Invoke(val);
|
|
||||||
|
|
||||||
val.Add("FirstName", user.FirstName);
|
|
||||||
val.Add("LastName", user.LastName);
|
|
||||||
|
|
||||||
var parsed = ParseMail(rawHtml, val);
|
|
||||||
|
|
||||||
Task.Run(async () =>
|
Task.Run(async () =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -62,24 +49,70 @@ public class MailService
|
|||||||
|
|
||||||
var body = new BodyBuilder
|
var body = new BodyBuilder
|
||||||
{
|
{
|
||||||
HtmlBody = parsed
|
HtmlBody = html
|
||||||
};
|
};
|
||||||
mailMessage.Body = body.ToMessageBody();
|
mailMessage.Body = body.ToMessageBody();
|
||||||
|
|
||||||
using (var smtpClient = new SmtpClient())
|
using var smtpClient = new SmtpClient();
|
||||||
{
|
|
||||||
await smtpClient.ConnectAsync(Server, Port, Ssl);
|
await smtpClient.ConnectAsync(Server, Port, Ssl);
|
||||||
await smtpClient.AuthenticateAsync(Email, Password);
|
await smtpClient.AuthenticateAsync(Email, Password);
|
||||||
await smtpClient.SendAsync(mailMessage);
|
await smtpClient.SendAsync(mailMessage);
|
||||||
await smtpClient.DisconnectAsync(true);
|
await smtpClient.DisconnectAsync(true);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Logger.Warn("Error sending mail");
|
Logger.Warn("Error sending mail");
|
||||||
Logger.Warn(e);
|
Logger.Warn(e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SendMail(User user, string template, Action<Dictionary<string, string>> values)
|
||||||
|
{
|
||||||
|
if (!File.Exists(PathBuilder.File("storage", "resources", "mail", $"{template}.html")))
|
||||||
|
{
|
||||||
|
Logger.Warn($"Mail template '{template}' not found. Make sure to place one in the resources folder");
|
||||||
|
throw new DisplayException("Mail template not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
var rawHtml = await File.ReadAllTextAsync(PathBuilder.File("storage", "resources", "mail", $"{template}.html"));
|
||||||
|
|
||||||
|
var val = new Dictionary<string, string>();
|
||||||
|
values.Invoke(val);
|
||||||
|
|
||||||
|
val.Add("FirstName", user.FirstName);
|
||||||
|
val.Add("LastName", user.LastName);
|
||||||
|
|
||||||
|
var parsed = ParseMail(rawHtml, val);
|
||||||
|
|
||||||
|
await SendMailRaw(user, parsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SendEmailToAll(string template, Action<Dictionary<string, string>> values)
|
||||||
|
{
|
||||||
|
var users = UserRepository
|
||||||
|
.Get()
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
foreach (var user in users)
|
||||||
|
{
|
||||||
|
await SendMail(user, template, values);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SendEmailToAllAdmins(string template, Action<Dictionary<string, string>> values)
|
||||||
|
{
|
||||||
|
var users = UserRepository
|
||||||
|
.Get()
|
||||||
|
.Where(x => x.Admin)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
foreach (var user in users)
|
||||||
|
{
|
||||||
|
await SendMail(user, template, values);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private string ParseMail(string html, Dictionary<string, string> values)
|
private string ParseMail(string html, Dictionary<string, string> values)
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
using System.Net;
|
|
||||||
using Moonlight.App.Helpers;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Services.Mail;
|
|
||||||
|
|
||||||
public class TrashMailDetectorService
|
|
||||||
{
|
|
||||||
private string[] Domains;
|
|
||||||
|
|
||||||
public TrashMailDetectorService()
|
|
||||||
{
|
|
||||||
Logger.Info("Fetching trash mail list from github repository");
|
|
||||||
|
|
||||||
using var wc = new WebClient();
|
|
||||||
|
|
||||||
var lines = wc
|
|
||||||
.DownloadString("https://raw.githubusercontent.com/Endelon-Hosting/TrashMailDomainDetector/main/trashmail_domains.md")
|
|
||||||
.Replace("\r\n", "\n")
|
|
||||||
.Split(new [] { "\n" }, StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
|
|
||||||
Domains = GetDomains(lines).ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<string> GetDomains(string[] lines)
|
|
||||||
{
|
|
||||||
foreach (var line in lines)
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrWhiteSpace(line))
|
|
||||||
{
|
|
||||||
if (line.Contains("."))
|
|
||||||
{
|
|
||||||
var domain = line.Remove(0, line.IndexOf(".", StringComparison.Ordinal) + 1).Trim();
|
|
||||||
if (domain.Contains("."))
|
|
||||||
{
|
|
||||||
yield return domain;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsTrashEmail(string mail)
|
|
||||||
{
|
|
||||||
return Domains.Contains(mail.Split('@')[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -46,7 +46,7 @@ public class MoonlightService
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var client = new GitHubClient(new ProductHeaderValue("Moonlight"));
|
var client = new GitHubClient(new ProductHeaderValue("Moonlight-Panel"));
|
||||||
|
|
||||||
var pullRequests = await client.PullRequest.GetAllForRepository("Moonlight-Panel", "Moonlight", new PullRequestRequest
|
var pullRequests = await client.PullRequest.GetAllForRepository("Moonlight-Panel", "Moonlight", new PullRequestRequest
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ public class NodeService
|
|||||||
return await DaemonApiHelper.Get<DockerMetrics>(node, "metrics/docker");
|
return await DaemonApiHelper.Get<DockerMetrics>(node, "metrics/docker");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task RebuildFirewall(Node node, string[] ips)
|
||||||
|
{
|
||||||
|
await DaemonApiHelper.Post(node, "firewall/rebuild", ips);
|
||||||
|
}
|
||||||
|
|
||||||
public async Task Mount(Node node, string server, string serverPath, string path)
|
public async Task Mount(Node node, string server, string serverPath, string path)
|
||||||
{
|
{
|
||||||
await DaemonApiHelper.Post(node, "mount", new Mount()
|
await DaemonApiHelper.Post(node, "mount", new Mount()
|
||||||
|
|||||||
100
Moonlight/App/Services/Plugins/PluginService.cs
Normal file
100
Moonlight/App/Services/Plugins/PluginService.cs
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.Loader;
|
||||||
|
using Moonlight.App.Helpers;
|
||||||
|
using Moonlight.App.Plugin;
|
||||||
|
using Moonlight.App.Plugin.UI.Servers;
|
||||||
|
using Moonlight.App.Plugin.UI.Webspaces;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Plugins;
|
||||||
|
|
||||||
|
public class PluginService
|
||||||
|
{
|
||||||
|
public readonly List<MoonlightPlugin> Plugins = new();
|
||||||
|
public readonly Dictionary<MoonlightPlugin, string> PluginFiles = new();
|
||||||
|
|
||||||
|
public PluginService()
|
||||||
|
{
|
||||||
|
ReloadPlugins().Wait();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task ReloadPlugins()
|
||||||
|
{
|
||||||
|
PluginFiles.Clear();
|
||||||
|
Plugins.Clear();
|
||||||
|
|
||||||
|
// Try to update all plugins ending with .dll.cache
|
||||||
|
foreach (var pluginFile in Directory.EnumerateFiles(
|
||||||
|
PathBuilder.Dir(Directory.GetCurrentDirectory(), "storage", "plugins"))
|
||||||
|
.Where(x => x.EndsWith(".dll.cache")))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var realPath = pluginFile.Replace(".cache", "");
|
||||||
|
File.Copy(pluginFile, realPath, true);
|
||||||
|
File.Delete(pluginFile);
|
||||||
|
Logger.Info($"Updated plugin {realPath} on startup");
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// ignored
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var pluginType = typeof(MoonlightPlugin);
|
||||||
|
|
||||||
|
foreach (var pluginFile in Directory.EnumerateFiles(
|
||||||
|
PathBuilder.Dir(Directory.GetCurrentDirectory(), "storage", "plugins"))
|
||||||
|
.Where(x => x.EndsWith(".dll")))
|
||||||
|
{
|
||||||
|
var assembly = Assembly.LoadFile(pluginFile);
|
||||||
|
|
||||||
|
foreach (var type in assembly.GetTypes())
|
||||||
|
{
|
||||||
|
if (type.IsSubclassOf(pluginType))
|
||||||
|
{
|
||||||
|
var plugin = (Activator.CreateInstance(type) as MoonlightPlugin)!;
|
||||||
|
|
||||||
|
Logger.Info($"Loaded plugin '{plugin.Name}' ({plugin.Version}) by {plugin.Author}");
|
||||||
|
|
||||||
|
Plugins.Add(plugin);
|
||||||
|
PluginFiles.Add(plugin, pluginFile);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.Info($"Loaded {Plugins.Count} plugins");
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<ServerPageContext> BuildServerPage(ServerPageContext context)
|
||||||
|
{
|
||||||
|
foreach (var plugin in Plugins)
|
||||||
|
{
|
||||||
|
if (plugin.OnBuildServerPage != null)
|
||||||
|
await plugin.OnBuildServerPage.Invoke(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<WebspacePageContext> BuildWebspacePage(WebspacePageContext context)
|
||||||
|
{
|
||||||
|
foreach (var plugin in Plugins)
|
||||||
|
{
|
||||||
|
if (plugin.OnBuildWebspacePage != null)
|
||||||
|
await plugin.OnBuildWebspacePage.Invoke(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task BuildServices(IServiceCollection serviceCollection)
|
||||||
|
{
|
||||||
|
foreach (var plugin in Plugins)
|
||||||
|
{
|
||||||
|
if (plugin.OnBuildServices != null)
|
||||||
|
await plugin.OnBuildServices.Invoke(serviceCollection);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
63
Moonlight/App/Services/Plugins/PluginStoreService.cs
Normal file
63
Moonlight/App/Services/Plugins/PluginStoreService.cs
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Moonlight.App.Helpers;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
using Octokit;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Plugins;
|
||||||
|
|
||||||
|
public class PluginStoreService
|
||||||
|
{
|
||||||
|
private readonly GitHubClient Client;
|
||||||
|
private readonly PluginService PluginService;
|
||||||
|
|
||||||
|
public PluginStoreService(PluginService pluginService)
|
||||||
|
{
|
||||||
|
PluginService = pluginService;
|
||||||
|
Client = new(new ProductHeaderValue("Moonlight-Panel"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<OfficialMoonlightPlugin[]> GetPlugins()
|
||||||
|
{
|
||||||
|
var items = await Client.Repository.Content.GetAllContents("Moonlight-Panel", "OfficialPlugins");
|
||||||
|
|
||||||
|
if (items == null)
|
||||||
|
{
|
||||||
|
Logger.Fatal("Unable to read plugin repo contents");
|
||||||
|
return Array.Empty<OfficialMoonlightPlugin>();
|
||||||
|
}
|
||||||
|
|
||||||
|
return items
|
||||||
|
.Where(x => x.Type == ContentType.Dir)
|
||||||
|
.Select(x => new OfficialMoonlightPlugin()
|
||||||
|
{
|
||||||
|
Name = x.Name
|
||||||
|
})
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string> GetPluginReadme(OfficialMoonlightPlugin plugin)
|
||||||
|
{
|
||||||
|
var rawReadme = await Client.Repository.Content
|
||||||
|
.GetRawContent("Moonlight-Panel", "OfficialPlugins", $"{plugin.Name}/README.md");
|
||||||
|
|
||||||
|
if (rawReadme == null)
|
||||||
|
return "Error";
|
||||||
|
|
||||||
|
return Encoding.UTF8.GetString(rawReadme);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task InstallPlugin(OfficialMoonlightPlugin plugin, bool updating = false)
|
||||||
|
{
|
||||||
|
var rawPlugin = await Client.Repository.Content
|
||||||
|
.GetRawContent("Moonlight-Panel", "OfficialPlugins", $"{plugin.Name}/{plugin.Name}.dll");
|
||||||
|
|
||||||
|
if (updating)
|
||||||
|
{
|
||||||
|
await File.WriteAllBytesAsync(PathBuilder.File("storage", "plugins", $"{plugin.Name}.dll.cache"), rawPlugin);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await File.WriteAllBytesAsync(PathBuilder.File("storage", "plugins", $"{plugin.Name}.dll"), rawPlugin);
|
||||||
|
await PluginService.ReloadPlugins();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -39,7 +39,7 @@ public class RatingService
|
|||||||
if (!Enabled)
|
if (!Enabled)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
var user = await IdentityService.Get();
|
var user = IdentityService.User;
|
||||||
|
|
||||||
if (user == null)
|
if (user == null)
|
||||||
return false;
|
return false;
|
||||||
@@ -62,7 +62,7 @@ public class RatingService
|
|||||||
|
|
||||||
public async Task<bool> Rate(int rate)
|
public async Task<bool> Rate(int rate)
|
||||||
{
|
{
|
||||||
var user = await IdentityService.Get();
|
var user = IdentityService.User;
|
||||||
|
|
||||||
// Double check states:
|
// Double check states:
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
using JWT.Algorithms;
|
using JWT.Algorithms;
|
||||||
using JWT.Builder;
|
using JWT.Builder;
|
||||||
using JWT.Exceptions;
|
using JWT.Exceptions;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Moonlight.App.Database.Entities;
|
using Moonlight.App.Database.Entities;
|
||||||
using Moonlight.App.Helpers;
|
using Moonlight.App.Helpers;
|
||||||
using Moonlight.App.Models.Misc;
|
using Moonlight.App.Perms;
|
||||||
using Moonlight.App.Repositories;
|
using Moonlight.App.Repositories;
|
||||||
using UAParser;
|
using UAParser;
|
||||||
|
|
||||||
@@ -12,16 +13,21 @@ namespace Moonlight.App.Services.Sessions;
|
|||||||
|
|
||||||
public class IdentityService
|
public class IdentityService
|
||||||
{
|
{
|
||||||
private readonly UserRepository UserRepository;
|
private readonly Repository<User> UserRepository;
|
||||||
private readonly CookieService CookieService;
|
private readonly CookieService CookieService;
|
||||||
private readonly IHttpContextAccessor HttpContextAccessor;
|
private readonly IHttpContextAccessor HttpContextAccessor;
|
||||||
private readonly string Secret;
|
private readonly string Secret;
|
||||||
|
|
||||||
private User? UserCache;
|
public User User { get; private set; }
|
||||||
|
public string Ip { get; private set; } = "N/A";
|
||||||
|
public string Device { get; private set; } = "N/A";
|
||||||
|
public PermissionStorage Permissions { get; private set; }
|
||||||
|
public PermissionStorage UserPermissions { get; private set; }
|
||||||
|
public PermissionStorage GroupPermissions { get; private set; }
|
||||||
|
|
||||||
public IdentityService(
|
public IdentityService(
|
||||||
CookieService cookieService,
|
CookieService cookieService,
|
||||||
UserRepository userRepository,
|
Repository<User> userRepository,
|
||||||
IHttpContextAccessor httpContextAccessor,
|
IHttpContextAccessor httpContextAccessor,
|
||||||
ConfigService configService)
|
ConfigService configService)
|
||||||
{
|
{
|
||||||
@@ -34,13 +40,17 @@ public class IdentityService
|
|||||||
.Moonlight.Security.Token;
|
.Moonlight.Security.Token;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<User?> Get()
|
public async Task Load()
|
||||||
|
{
|
||||||
|
await LoadIp();
|
||||||
|
await LoadDevice();
|
||||||
|
await LoadUser();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task LoadUser()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (UserCache != null)
|
|
||||||
return UserCache;
|
|
||||||
|
|
||||||
var token = "none";
|
var token = "none";
|
||||||
|
|
||||||
// Load token via http context if available
|
// Load token via http context if available
|
||||||
@@ -60,13 +70,13 @@ public class IdentityService
|
|||||||
|
|
||||||
if (token == "none")
|
if (token == "none")
|
||||||
{
|
{
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(token))
|
if (string.IsNullOrEmpty(token))
|
||||||
return null;
|
return;
|
||||||
|
|
||||||
var json = "";
|
string json;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -77,18 +87,18 @@ public class IdentityService
|
|||||||
}
|
}
|
||||||
catch (TokenExpiredException)
|
catch (TokenExpiredException)
|
||||||
{
|
{
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
catch (SignatureVerificationException)
|
catch (SignatureVerificationException)
|
||||||
{
|
{
|
||||||
Logger.Warn($"Detected a manipulated JWT: {token}", "security");
|
Logger.Warn($"Detected a manipulated JWT: {token}", "security");
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Logger.Error("Error reading jwt");
|
Logger.Error("Error reading jwt");
|
||||||
Logger.Error(e);
|
Logger.Error(e);
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// To make it easier to use the json data
|
// To make it easier to use the json data
|
||||||
@@ -101,8 +111,9 @@ public class IdentityService
|
|||||||
|
|
||||||
if (user == null)
|
if (user == null)
|
||||||
{
|
{
|
||||||
Logger.Warn($"Cannot find user with the id '{userid}' in the database. Maybe the user has been deleted or a token has been successfully faked by a hacker");
|
Logger.Warn(
|
||||||
return null;
|
$"Cannot find user with the id '{userid}' in the database. Maybe the user has been deleted or a token has been successfully faked by a hacker", "security");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var iat = data.GetValue<long>("iat", -1);
|
var iat = data.GetValue<long>("iat", -1);
|
||||||
@@ -110,46 +121,54 @@ public class IdentityService
|
|||||||
if (iat == -1)
|
if (iat == -1)
|
||||||
{
|
{
|
||||||
Logger.Debug("Legacy token found (without the time the token has been issued at)");
|
Logger.Debug("Legacy token found (without the time the token has been issued at)");
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var iatD = DateTimeOffset.FromUnixTimeSeconds(iat).ToUniversalTime().DateTime;
|
var iatD = DateTimeOffset.FromUnixTimeSeconds(iat).ToUniversalTime().DateTime;
|
||||||
|
|
||||||
if (iatD < user.TokenValidTime)
|
if (iatD < user.TokenValidTime)
|
||||||
return null;
|
return;
|
||||||
|
|
||||||
UserCache = user;
|
User = user;
|
||||||
|
|
||||||
user.LastIp = GetIp();
|
ConstructPermissions();
|
||||||
UserRepository.Update(user);
|
|
||||||
|
|
||||||
return UserCache;
|
User.LastIp = Ip;
|
||||||
|
UserRepository.Update(User);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Logger.Error("Unexpected error while processing token");
|
Logger.Error("Unexpected error while processing token");
|
||||||
Logger.Error(e);
|
Logger.Error(e);
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string GetIp()
|
private Task LoadIp()
|
||||||
{
|
{
|
||||||
if (HttpContextAccessor.HttpContext == null)
|
if (HttpContextAccessor.HttpContext == null)
|
||||||
return "N/A";
|
|
||||||
|
|
||||||
if(HttpContextAccessor.HttpContext.Request.Headers.ContainsKey("X-Real-IP"))
|
|
||||||
{
|
{
|
||||||
return HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
|
Ip = "N/A";
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
|
if (HttpContextAccessor.HttpContext.Request.Headers.ContainsKey("X-Real-IP"))
|
||||||
|
{
|
||||||
|
Ip = HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string GetDevice()
|
Ip = HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task LoadDevice()
|
||||||
{
|
{
|
||||||
if (HttpContextAccessor.HttpContext == null)
|
if (HttpContextAccessor.HttpContext == null)
|
||||||
return "N/A";
|
{
|
||||||
|
Device = "N/A";
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -159,17 +178,86 @@ public class IdentityService
|
|||||||
{
|
{
|
||||||
var version = userAgent.Remove(0, "Moonlight.App/".Length).Split(' ').FirstOrDefault();
|
var version = userAgent.Remove(0, "Moonlight.App/".Length).Split(' ').FirstOrDefault();
|
||||||
|
|
||||||
return "Moonlight App " + version;
|
Device = "Moonlight App " + version;
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
var uaParser = Parser.GetDefault();
|
var uaParser = Parser.GetDefault();
|
||||||
var info = uaParser.Parse(userAgent);
|
var info = uaParser.Parse(userAgent);
|
||||||
|
|
||||||
return $"{info.OS} - {info.Device}";
|
Device = $"{info.OS} - {info.Device}";
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
return "UserAgent not present";
|
Device = "UserAgent not present";
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Task SavePermissions()
|
||||||
|
{
|
||||||
|
if (User != null)
|
||||||
|
{
|
||||||
|
User.Permissions = UserPermissions.Data;
|
||||||
|
UserRepository.Update(User);
|
||||||
|
ConstructPermissions();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ConstructPermissions()
|
||||||
|
{
|
||||||
|
if (User == null)
|
||||||
|
{
|
||||||
|
UserPermissions = new(Array.Empty<byte>());
|
||||||
|
GroupPermissions = new(Array.Empty<byte>(), true);
|
||||||
|
Permissions = new(Array.Empty<byte>(), true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = UserRepository
|
||||||
|
.Get()
|
||||||
|
.Include(x => x.PermissionGroup)
|
||||||
|
.First(x => x.Id == User.Id);
|
||||||
|
|
||||||
|
UserPermissions = new PermissionStorage(user.Permissions);
|
||||||
|
|
||||||
|
if (user.PermissionGroup == null)
|
||||||
|
GroupPermissions = new PermissionStorage(Array.Empty<byte>(), true);
|
||||||
|
else
|
||||||
|
GroupPermissions = new PermissionStorage(user.PermissionGroup.Permissions, true);
|
||||||
|
|
||||||
|
if (user.Admin)
|
||||||
|
{
|
||||||
|
Permissions = new PermissionStorage(Array.Empty<byte>());
|
||||||
|
|
||||||
|
foreach (var permission in Perms.Permissions.GetAllPermissions())
|
||||||
|
{
|
||||||
|
Permissions[permission] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Permissions.IsReadyOnly = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Permissions = new(Array.Empty<byte>());
|
||||||
|
|
||||||
|
foreach (var permission in Perms.Permissions.GetAllPermissions())
|
||||||
|
{
|
||||||
|
Permissions[permission] = GroupPermissions[permission];
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var permission in Perms.Permissions.GetAllPermissions())
|
||||||
|
{
|
||||||
|
if (UserPermissions[permission])
|
||||||
|
{
|
||||||
|
Permissions[permission] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Permissions.IsReadyOnly = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,7 @@ public class IpBanService
|
|||||||
|
|
||||||
public Task<bool> IsBanned()
|
public Task<bool> IsBanned()
|
||||||
{
|
{
|
||||||
var ip = IdentityService.GetIp();
|
var ip = IdentityService.Ip;
|
||||||
|
|
||||||
return Task.FromResult(
|
return Task.FromResult(
|
||||||
IpBanRepository
|
IpBanRepository
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class IpLocateService
|
|||||||
|
|
||||||
public async Task<string> GetLocation()
|
public async Task<string> GetLocation()
|
||||||
{
|
{
|
||||||
var ip = IdentityService.GetIp();
|
var ip = IdentityService.Ip;
|
||||||
var location = "N/A";
|
var location = "N/A";
|
||||||
|
|
||||||
if (ip != "N/A")
|
if (ip != "N/A")
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ public class SessionClientService
|
|||||||
public readonly Guid Uuid = Guid.NewGuid();
|
public readonly Guid Uuid = Guid.NewGuid();
|
||||||
public readonly DateTime CreateTimestamp = DateTime.UtcNow;
|
public readonly DateTime CreateTimestamp = DateTime.UtcNow;
|
||||||
public User? User { get; private set; }
|
public User? User { get; private set; }
|
||||||
|
public string Ip { get; private set; } = "N/A";
|
||||||
|
public string Device { get; private set; } = "N/A";
|
||||||
|
|
||||||
public readonly IdentityService IdentityService;
|
public readonly IdentityService IdentityService;
|
||||||
public readonly AlertService AlertService;
|
public readonly AlertService AlertService;
|
||||||
@@ -38,7 +40,9 @@ public class SessionClientService
|
|||||||
|
|
||||||
public async Task Start()
|
public async Task Start()
|
||||||
{
|
{
|
||||||
User = await IdentityService.Get();
|
User = IdentityService.User;
|
||||||
|
Ip = IdentityService.Ip;
|
||||||
|
Device = IdentityService.Device;
|
||||||
|
|
||||||
if (User != null) // Track users last visit
|
if (User != null) // Track users last visit
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
using Moonlight.App.Database.Entities;
|
|
||||||
using Moonlight.App.Models.Misc;
|
|
||||||
using Moonlight.App.Repositories;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace Moonlight.App.Services;
|
|
||||||
|
|
||||||
public class SubscriptionAdminService
|
|
||||||
{
|
|
||||||
private readonly SubscriptionRepository SubscriptionRepository;
|
|
||||||
private readonly OneTimeJwtService OneTimeJwtService;
|
|
||||||
|
|
||||||
public SubscriptionAdminService(OneTimeJwtService oneTimeJwtService, SubscriptionRepository subscriptionRepository)
|
|
||||||
{
|
|
||||||
OneTimeJwtService = oneTimeJwtService;
|
|
||||||
SubscriptionRepository = subscriptionRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<SubscriptionLimit[]> GetLimits(Subscription subscription)
|
|
||||||
{
|
|
||||||
return Task.FromResult(
|
|
||||||
JsonConvert.DeserializeObject<SubscriptionLimit[]>(subscription.LimitsJson)
|
|
||||||
?? Array.Empty<SubscriptionLimit>()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task SaveLimits(Subscription subscription, SubscriptionLimit[] limits)
|
|
||||||
{
|
|
||||||
subscription.LimitsJson = JsonConvert.SerializeObject(limits);
|
|
||||||
SubscriptionRepository.Update(subscription);
|
|
||||||
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<string> GenerateCode(Subscription subscription, int duration)
|
|
||||||
{
|
|
||||||
return Task.FromResult(
|
|
||||||
OneTimeJwtService.Generate(data =>
|
|
||||||
{
|
|
||||||
data.Add("subscription", subscription.Id.ToString());
|
|
||||||
data.Add("duration", duration.ToString());
|
|
||||||
}, TimeSpan.FromDays(10324))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,151 +1,200 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Moonlight.App.Database.Entities;
|
using Moonlight.App.Database.Entities;
|
||||||
using Moonlight.App.Exceptions;
|
|
||||||
using Moonlight.App.Helpers;
|
using Moonlight.App.Helpers;
|
||||||
using Moonlight.App.Models.Misc;
|
using Moonlight.App.Models.Misc;
|
||||||
using Moonlight.App.Repositories;
|
using Moonlight.App.Repositories;
|
||||||
using Moonlight.App.Services.Sessions;
|
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using Stripe;
|
||||||
|
using File = System.IO.File;
|
||||||
|
using Subscription = Moonlight.App.Database.Entities.Subscription;
|
||||||
|
|
||||||
namespace Moonlight.App.Services;
|
namespace Moonlight.App.Services;
|
||||||
|
|
||||||
public class SubscriptionService
|
public class SubscriptionService
|
||||||
{
|
{
|
||||||
private readonly SubscriptionRepository SubscriptionRepository;
|
private readonly Repository<Subscription> SubscriptionRepository;
|
||||||
private readonly OneTimeJwtService OneTimeJwtService;
|
private readonly Repository<User> UserRepository;
|
||||||
private readonly IdentityService IdentityService;
|
|
||||||
private readonly UserRepository UserRepository;
|
|
||||||
|
|
||||||
public SubscriptionService(
|
public SubscriptionService(
|
||||||
SubscriptionRepository subscriptionRepository,
|
Repository<Subscription> subscriptionRepository,
|
||||||
OneTimeJwtService oneTimeJwtService,
|
Repository<User> userRepository)
|
||||||
IdentityService identityService,
|
|
||||||
UserRepository userRepository
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
SubscriptionRepository = subscriptionRepository;
|
SubscriptionRepository = subscriptionRepository;
|
||||||
OneTimeJwtService = oneTimeJwtService;
|
|
||||||
IdentityService = identityService;
|
|
||||||
UserRepository = userRepository;
|
UserRepository = userRepository;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Subscription?> GetCurrent()
|
public async Task<Subscription> Create(string name, string description, Currency currency, double price, int duration)
|
||||||
{
|
{
|
||||||
var user = await GetCurrentUser();
|
var optionsProduct = new ProductCreateOptions
|
||||||
|
|
||||||
if (user == null || user.CurrentSubscription == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var subscriptionEnd = user.SubscriptionSince.ToUniversalTime().AddDays(user.SubscriptionDuration);
|
|
||||||
|
|
||||||
if (subscriptionEnd > DateTime.UtcNow)
|
|
||||||
{
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
DefaultPriceData = new()
|
||||||
|
{
|
||||||
|
UnitAmount = (long)(price * 100),
|
||||||
|
Currency = currency.ToString().ToLower()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var productService = new ProductService();
|
||||||
|
var product = await productService.CreateAsync(optionsProduct);
|
||||||
|
|
||||||
|
var subscription = new Subscription()
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Currency = currency,
|
||||||
|
Price = price,
|
||||||
|
Duration = duration,
|
||||||
|
LimitsJson = "[]",
|
||||||
|
StripeProductId = product.Id,
|
||||||
|
StripePriceId = product.DefaultPriceId
|
||||||
|
};
|
||||||
|
|
||||||
|
return SubscriptionRepository.Add(subscription);
|
||||||
|
}
|
||||||
|
public async Task Update(Subscription subscription)
|
||||||
|
{
|
||||||
|
// Create the new price object
|
||||||
|
|
||||||
|
var optionsPrice = new PriceCreateOptions
|
||||||
|
{
|
||||||
|
UnitAmount = (long)(subscription.Price * 100),
|
||||||
|
Currency = subscription.Currency.ToString().ToLower(),
|
||||||
|
Product = subscription.StripeProductId
|
||||||
|
};
|
||||||
|
|
||||||
|
var servicePrice = new PriceService();
|
||||||
|
var price = await servicePrice.CreateAsync(optionsPrice);
|
||||||
|
|
||||||
|
// Update the product
|
||||||
|
|
||||||
|
var productService = new ProductService();
|
||||||
|
var product = await productService.UpdateAsync(subscription.StripeProductId, new()
|
||||||
|
{
|
||||||
|
Name = subscription.Name,
|
||||||
|
Description = subscription.Description,
|
||||||
|
DefaultPrice = price.Id
|
||||||
|
});
|
||||||
|
|
||||||
|
// Disable old price
|
||||||
|
await servicePrice.UpdateAsync(subscription.StripePriceId, new()
|
||||||
|
{
|
||||||
|
Active = false
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update the model
|
||||||
|
|
||||||
|
subscription.StripeProductId = product.Id;
|
||||||
|
subscription.StripePriceId = product.DefaultPriceId;
|
||||||
|
|
||||||
|
SubscriptionRepository.Update(subscription);
|
||||||
|
}
|
||||||
|
public async Task Delete(Subscription subscription)
|
||||||
|
{
|
||||||
|
var productService = new ProductService();
|
||||||
|
await productService.DeleteAsync(subscription.StripeProductId);
|
||||||
|
|
||||||
|
SubscriptionRepository.Delete(subscription);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task UpdateLimits(Subscription subscription, SubscriptionLimit[] limits)
|
||||||
|
{
|
||||||
|
subscription.LimitsJson = JsonConvert.SerializeObject(limits);
|
||||||
|
SubscriptionRepository.Update(subscription);
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
public Task<SubscriptionLimit[]> GetLimits(Subscription subscription)
|
||||||
|
{
|
||||||
|
var limits =
|
||||||
|
JsonConvert.DeserializeObject<SubscriptionLimit[]>(subscription.LimitsJson) ?? Array.Empty<SubscriptionLimit>();
|
||||||
|
return Task.FromResult(limits);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Subscription?> GetActiveSubscription(User u)
|
||||||
|
{
|
||||||
|
var user = await EnsureData(u);
|
||||||
|
|
||||||
|
if (user.CurrentSubscription != null)
|
||||||
|
{
|
||||||
|
if (user.SubscriptionExpires < DateTime.UtcNow)
|
||||||
|
{
|
||||||
|
user.CurrentSubscription = null;
|
||||||
|
UserRepository.Update(user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return user.CurrentSubscription;
|
return user.CurrentSubscription;
|
||||||
}
|
}
|
||||||
|
public async Task CancelSubscription(User u)
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task ApplyCode(string code)
|
|
||||||
{
|
{
|
||||||
var data = await OneTimeJwtService.Validate(code);
|
var user = await EnsureData(u);
|
||||||
|
|
||||||
if (data == null)
|
|
||||||
throw new DisplayException("Invalid or expired subscription code");
|
|
||||||
|
|
||||||
var id = int.Parse(data["subscription"]);
|
|
||||||
var duration = int.Parse(data["duration"]);
|
|
||||||
|
|
||||||
var subscription = SubscriptionRepository
|
|
||||||
.Get()
|
|
||||||
.FirstOrDefault(x => x.Id == id);
|
|
||||||
|
|
||||||
if (subscription == null)
|
|
||||||
throw new DisplayException("The subscription the code is associated with does not exist");
|
|
||||||
|
|
||||||
var user = await GetCurrentUser();
|
|
||||||
|
|
||||||
if (user == null)
|
|
||||||
throw new DisplayException("Unable to determine current user");
|
|
||||||
|
|
||||||
user.CurrentSubscription = subscription;
|
|
||||||
user.SubscriptionDuration = duration;
|
|
||||||
user.SubscriptionSince = DateTime.UtcNow;
|
|
||||||
|
|
||||||
UserRepository.Update(user);
|
|
||||||
|
|
||||||
await OneTimeJwtService.Revoke(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task Cancel()
|
|
||||||
{
|
|
||||||
if (await GetCurrent() != null)
|
|
||||||
{
|
|
||||||
var user = await GetCurrentUser();
|
|
||||||
|
|
||||||
user.CurrentSubscription = null;
|
user.CurrentSubscription = null;
|
||||||
|
UserRepository.Update(user);
|
||||||
|
}
|
||||||
|
public async Task SetActiveSubscription(User u, Subscription subscription)
|
||||||
|
{
|
||||||
|
var user = await EnsureData(u);
|
||||||
|
|
||||||
|
user.SubscriptionSince = DateTime.UtcNow;
|
||||||
|
user.SubscriptionExpires = DateTime.UtcNow.AddDays(subscription.Duration);
|
||||||
|
user.CurrentSubscription = subscription;
|
||||||
|
|
||||||
UserRepository.Update(user);
|
UserRepository.Update(user);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<SubscriptionLimit> GetLimit(string identifier) // Cache, optimize sql code
|
public async Task<SubscriptionLimit[]> GetDefaultLimits()
|
||||||
{
|
|
||||||
var subscription = await GetCurrent();
|
|
||||||
var defaultLimits = await GetDefaultLimits();
|
|
||||||
|
|
||||||
if (subscription == null)
|
|
||||||
{
|
|
||||||
// If the default subscription limit with identifier is found, return it. if not, return empty
|
|
||||||
return defaultLimits.FirstOrDefault(x => x.Identifier == identifier) ?? new()
|
|
||||||
{
|
|
||||||
Identifier = identifier,
|
|
||||||
Amount = 0
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
var subscriptionLimits =
|
|
||||||
JsonConvert.DeserializeObject<SubscriptionLimit[]>(subscription.LimitsJson)
|
|
||||||
?? Array.Empty<SubscriptionLimit>();
|
|
||||||
|
|
||||||
var foundLimit = subscriptionLimits.FirstOrDefault(x => x.Identifier == identifier);
|
|
||||||
|
|
||||||
if (foundLimit != null)
|
|
||||||
return foundLimit;
|
|
||||||
|
|
||||||
// If the default subscription limit with identifier is found, return it. if not, return empty
|
|
||||||
return defaultLimits.FirstOrDefault(x => x.Identifier == identifier) ?? new()
|
|
||||||
{
|
|
||||||
Identifier = identifier,
|
|
||||||
Amount = 0
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<User?> GetCurrentUser()
|
|
||||||
{
|
|
||||||
var user = await IdentityService.Get();
|
|
||||||
|
|
||||||
if (user == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var userWithData = UserRepository
|
|
||||||
.Get()
|
|
||||||
.Include(x => x.CurrentSubscription)
|
|
||||||
.First(x => x.Id == user.Id);
|
|
||||||
|
|
||||||
return userWithData;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<SubscriptionLimit[]> GetDefaultLimits() // Add cache and reload option
|
|
||||||
{
|
{
|
||||||
var defaultSubscriptionJson = "[]";
|
var defaultSubscriptionJson = "[]";
|
||||||
|
var path = PathBuilder.File("storage", "configs", "default_subscription.json");
|
||||||
|
|
||||||
if (File.Exists(PathBuilder.File("storage", "configs", "default_subscription.json")))
|
if (File.Exists(path))
|
||||||
{
|
{
|
||||||
defaultSubscriptionJson =
|
defaultSubscriptionJson =
|
||||||
await File.ReadAllTextAsync(PathBuilder.File("storage", "configs", "default_subscription.json"));
|
await File.ReadAllTextAsync(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
return JsonConvert.DeserializeObject<SubscriptionLimit[]>(defaultSubscriptionJson) ?? Array.Empty<SubscriptionLimit>();
|
return JsonConvert.DeserializeObject<SubscriptionLimit[]>(defaultSubscriptionJson)
|
||||||
|
?? Array.Empty<SubscriptionLimit>();
|
||||||
|
}
|
||||||
|
public async Task<SubscriptionLimit> GetLimit(User u, string identifier)
|
||||||
|
{
|
||||||
|
var subscription = await GetActiveSubscription(u);
|
||||||
|
var defaultLimits = await GetDefaultLimits();
|
||||||
|
|
||||||
|
if (subscription != null) // User has a active subscriptions
|
||||||
|
{
|
||||||
|
var subscriptionLimits = await GetLimits(subscription);
|
||||||
|
|
||||||
|
var subscriptionLimit = subscriptionLimits
|
||||||
|
.FirstOrDefault(x => x.Identifier == identifier);
|
||||||
|
|
||||||
|
if (subscriptionLimit != null) // Found subscription limit for the user's subscription
|
||||||
|
return subscriptionLimit;
|
||||||
|
} // If were are here, the user's subscription has no limit for this identifier, so we fallback to default
|
||||||
|
|
||||||
|
var defaultSubscriptionLimit = defaultLimits
|
||||||
|
.FirstOrDefault(x => x.Identifier == identifier);
|
||||||
|
|
||||||
|
if (defaultSubscriptionLimit != null)
|
||||||
|
return defaultSubscriptionLimit; // Default subscription limit found
|
||||||
|
|
||||||
|
return new() // No default subscription limit found
|
||||||
|
{
|
||||||
|
Identifier = identifier,
|
||||||
|
Amount = 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task<User> EnsureData(User u)
|
||||||
|
{
|
||||||
|
var user = UserRepository
|
||||||
|
.Get()
|
||||||
|
.Include(x => x.CurrentSubscription)
|
||||||
|
.First(x => x.Id == u.Id);
|
||||||
|
|
||||||
|
return Task.FromResult(user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,7 +34,7 @@ public class SupportChatAdminService : IDisposable
|
|||||||
|
|
||||||
public async Task Start(User recipient)
|
public async Task Start(User recipient)
|
||||||
{
|
{
|
||||||
User = await IdentityService.Get();
|
User = IdentityService.User;
|
||||||
Recipient = recipient;
|
Recipient = recipient;
|
||||||
|
|
||||||
if (User != null)
|
if (User != null)
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class SupportChatClientService : IDisposable
|
|||||||
|
|
||||||
public async Task Start()
|
public async Task Start()
|
||||||
{
|
{
|
||||||
User = await IdentityService.Get();
|
User = IdentityService.User;
|
||||||
|
|
||||||
if (User != null)
|
if (User != null)
|
||||||
{
|
{
|
||||||
|
|||||||
95
Moonlight/App/Services/Tickets/TicketAdminService.cs
Normal file
95
Moonlight/App/Services/Tickets/TicketAdminService.cs
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
using Microsoft.AspNetCore.Components.Forms;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
using Moonlight.App.Services.Files;
|
||||||
|
using Moonlight.App.Services.Sessions;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Tickets;
|
||||||
|
|
||||||
|
public class TicketAdminService
|
||||||
|
{
|
||||||
|
private readonly TicketServerService TicketServerService;
|
||||||
|
private readonly IdentityService IdentityService;
|
||||||
|
private readonly BucketService BucketService;
|
||||||
|
|
||||||
|
public Ticket? Ticket { get; set; }
|
||||||
|
|
||||||
|
public TicketAdminService(
|
||||||
|
TicketServerService ticketServerService,
|
||||||
|
IdentityService identityService,
|
||||||
|
BucketService bucketService)
|
||||||
|
{
|
||||||
|
TicketServerService = ticketServerService;
|
||||||
|
IdentityService = identityService;
|
||||||
|
BucketService = bucketService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Dictionary<Ticket, TicketMessage?>> GetAssigned()
|
||||||
|
{
|
||||||
|
return await TicketServerService.GetUserAssignedTickets(IdentityService.User);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Dictionary<Ticket, TicketMessage?>> GetUnAssigned()
|
||||||
|
{
|
||||||
|
return await TicketServerService.GetUnAssignedTickets();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Ticket> Create(string issueTopic, string issueDescription, string issueTries,
|
||||||
|
TicketSubject subject, int subjectId)
|
||||||
|
{
|
||||||
|
return await TicketServerService.Create(
|
||||||
|
IdentityService.User,
|
||||||
|
issueTopic,
|
||||||
|
issueDescription,
|
||||||
|
issueTries,
|
||||||
|
subject,
|
||||||
|
subjectId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TicketMessage> Send(string content, IBrowserFile? file = null)
|
||||||
|
{
|
||||||
|
string? attachment = null;
|
||||||
|
|
||||||
|
if (file != null)
|
||||||
|
{
|
||||||
|
attachment = await BucketService.StoreFile(
|
||||||
|
"tickets",
|
||||||
|
file.OpenReadStream(1024 * 1024 * 5),
|
||||||
|
file.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await TicketServerService.SendMessage(
|
||||||
|
Ticket!,
|
||||||
|
IdentityService.User,
|
||||||
|
content,
|
||||||
|
attachment,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpdateStatus(TicketStatus status)
|
||||||
|
{
|
||||||
|
await TicketServerService.UpdateStatus(Ticket!, status);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpdatePriority(TicketPriority priority)
|
||||||
|
{
|
||||||
|
await TicketServerService.UpdatePriority(Ticket!, priority);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TicketMessage[]> GetMessages()
|
||||||
|
{
|
||||||
|
return await TicketServerService.GetMessages(Ticket!);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Claim()
|
||||||
|
{
|
||||||
|
await TicketServerService.Claim(Ticket!, IdentityService.User);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UnClaim()
|
||||||
|
{
|
||||||
|
await TicketServerService.Claim(Ticket!);
|
||||||
|
}
|
||||||
|
}
|
||||||
68
Moonlight/App/Services/Tickets/TicketClientService.cs
Normal file
68
Moonlight/App/Services/Tickets/TicketClientService.cs
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
using Microsoft.AspNetCore.Components.Forms;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
using Moonlight.App.Services.Files;
|
||||||
|
using Moonlight.App.Services.Sessions;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Tickets;
|
||||||
|
|
||||||
|
public class TicketClientService
|
||||||
|
{
|
||||||
|
private readonly TicketServerService TicketServerService;
|
||||||
|
private readonly IdentityService IdentityService;
|
||||||
|
private readonly BucketService BucketService;
|
||||||
|
|
||||||
|
public Ticket? Ticket { get; set; }
|
||||||
|
|
||||||
|
public TicketClientService(
|
||||||
|
TicketServerService ticketServerService,
|
||||||
|
IdentityService identityService,
|
||||||
|
BucketService bucketService)
|
||||||
|
{
|
||||||
|
TicketServerService = ticketServerService;
|
||||||
|
IdentityService = identityService;
|
||||||
|
BucketService = bucketService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Dictionary<Ticket, TicketMessage?>> Get()
|
||||||
|
{
|
||||||
|
return await TicketServerService.GetUserTickets(IdentityService.User);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Ticket> Create(string issueTopic, string issueDescription, string issueTries, TicketSubject subject, int subjectId)
|
||||||
|
{
|
||||||
|
return await TicketServerService.Create(
|
||||||
|
IdentityService.User,
|
||||||
|
issueTopic,
|
||||||
|
issueDescription,
|
||||||
|
issueTries,
|
||||||
|
subject,
|
||||||
|
subjectId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TicketMessage> Send(string content, IBrowserFile? file = null)
|
||||||
|
{
|
||||||
|
string? attachment = null;
|
||||||
|
|
||||||
|
if (file != null)
|
||||||
|
{
|
||||||
|
attachment = await BucketService.StoreFile(
|
||||||
|
"tickets",
|
||||||
|
file.OpenReadStream(1024 * 1024 * 5),
|
||||||
|
file.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await TicketServerService.SendMessage(
|
||||||
|
Ticket!,
|
||||||
|
IdentityService.User,
|
||||||
|
content,
|
||||||
|
attachment
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TicketMessage[]> GetMessages()
|
||||||
|
{
|
||||||
|
return await TicketServerService.GetMessages(Ticket!);
|
||||||
|
}
|
||||||
|
}
|
||||||
249
Moonlight/App/Services/Tickets/TicketServerService.cs
Normal file
249
Moonlight/App/Services/Tickets/TicketServerService.cs
Normal file
@@ -0,0 +1,249 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Moonlight.App.Database.Entities;
|
||||||
|
using Moonlight.App.Events;
|
||||||
|
using Moonlight.App.Models.Misc;
|
||||||
|
using Moonlight.App.Repositories;
|
||||||
|
|
||||||
|
namespace Moonlight.App.Services.Tickets;
|
||||||
|
|
||||||
|
public class TicketServerService
|
||||||
|
{
|
||||||
|
private readonly IServiceScopeFactory ServiceScopeFactory;
|
||||||
|
private readonly EventSystem Event;
|
||||||
|
private readonly ConfigService ConfigService;
|
||||||
|
|
||||||
|
public TicketServerService(
|
||||||
|
IServiceScopeFactory serviceScopeFactory,
|
||||||
|
EventSystem eventSystem,
|
||||||
|
ConfigService configService)
|
||||||
|
{
|
||||||
|
ServiceScopeFactory = serviceScopeFactory;
|
||||||
|
Event = eventSystem;
|
||||||
|
ConfigService = configService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Ticket> Create(User creator, string issueTopic, string issueDescription, string issueTries, TicketSubject subject, int subjectId)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
var userRepo = scope.ServiceProvider.GetRequiredService<Repository<User>>();
|
||||||
|
|
||||||
|
var creatorUser = userRepo
|
||||||
|
.Get()
|
||||||
|
.First(x => x.Id == creator.Id);
|
||||||
|
|
||||||
|
var ticket = ticketRepo.Add(new()
|
||||||
|
{
|
||||||
|
Priority = TicketPriority.Low,
|
||||||
|
Status = TicketStatus.Open,
|
||||||
|
AssignedTo = null,
|
||||||
|
IssueTopic = issueTopic,
|
||||||
|
IssueDescription = issueDescription,
|
||||||
|
IssueTries = issueTries,
|
||||||
|
Subject = subject,
|
||||||
|
SubjectId = subjectId,
|
||||||
|
CreatedBy = creatorUser
|
||||||
|
});
|
||||||
|
|
||||||
|
await Event.Emit("tickets.new", ticket);
|
||||||
|
|
||||||
|
// Do automatic stuff here
|
||||||
|
await SendSystemMessage(ticket, ConfigService.Get().Moonlight.Tickets.WelcomeMessage);
|
||||||
|
//TODO: Check for opening times
|
||||||
|
|
||||||
|
return ticket;
|
||||||
|
}
|
||||||
|
public async Task SendSystemMessage(Ticket t, string content, string? attachmentUrl = null)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var ticket = ticketRepo.Get().First(x => x.Id == t.Id);
|
||||||
|
|
||||||
|
var message = new TicketMessage()
|
||||||
|
{
|
||||||
|
Content = content,
|
||||||
|
Sender = null,
|
||||||
|
AttachmentUrl = attachmentUrl,
|
||||||
|
IsSystemMessage = true
|
||||||
|
};
|
||||||
|
|
||||||
|
ticket.Messages.Add(message);
|
||||||
|
ticketRepo.Update(ticket);
|
||||||
|
|
||||||
|
await Event.Emit("tickets.message", message);
|
||||||
|
await Event.Emit($"tickets.{ticket.Id}.message", message);
|
||||||
|
}
|
||||||
|
public async Task UpdatePriority(Ticket t, TicketPriority priority)
|
||||||
|
{
|
||||||
|
if(t.Priority == priority)
|
||||||
|
return;
|
||||||
|
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var ticket = ticketRepo.Get().First(x => x.Id == t.Id);
|
||||||
|
|
||||||
|
ticket.Priority = priority;
|
||||||
|
|
||||||
|
ticketRepo.Update(ticket);
|
||||||
|
|
||||||
|
await Event.Emit("tickets.status", ticket);
|
||||||
|
await Event.Emit($"tickets.{ticket.Id}.status", ticket);
|
||||||
|
|
||||||
|
await SendSystemMessage(ticket, $"The ticket priority has been changed to: {priority}");
|
||||||
|
}
|
||||||
|
public async Task UpdateStatus(Ticket t, TicketStatus status)
|
||||||
|
{
|
||||||
|
if(t.Status == status)
|
||||||
|
return;
|
||||||
|
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var ticket = ticketRepo.Get().First(x => x.Id == t.Id);
|
||||||
|
|
||||||
|
ticket.Status = status;
|
||||||
|
|
||||||
|
ticketRepo.Update(ticket);
|
||||||
|
|
||||||
|
await Event.Emit("tickets.status", ticket);
|
||||||
|
await Event.Emit($"tickets.{ticket.Id}.status", ticket);
|
||||||
|
|
||||||
|
await SendSystemMessage(ticket, $"The ticket status has been changed to: {status}");
|
||||||
|
}
|
||||||
|
public async Task<TicketMessage> SendMessage(Ticket t, User sender, string content, string? attachmentUrl = null, bool isSupportMessage = false)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
var userRepo = scope.ServiceProvider.GetRequiredService<Repository<User>>();
|
||||||
|
|
||||||
|
var ticket = ticketRepo.Get().First(x => x.Id == t.Id);
|
||||||
|
var user = userRepo.Get().First(x => x.Id == sender.Id);
|
||||||
|
|
||||||
|
var message = new TicketMessage()
|
||||||
|
{
|
||||||
|
Content = content,
|
||||||
|
Sender = user,
|
||||||
|
AttachmentUrl = attachmentUrl,
|
||||||
|
IsSupportMessage = isSupportMessage
|
||||||
|
};
|
||||||
|
|
||||||
|
ticket.Messages.Add(message);
|
||||||
|
ticketRepo.Update(ticket);
|
||||||
|
|
||||||
|
await Event.Emit("tickets.message", message);
|
||||||
|
await Event.Emit($"tickets.{ticket.Id}.message", message);
|
||||||
|
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
public Task<Dictionary<Ticket, TicketMessage?>> GetUserTickets(User u)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var tickets = ticketRepo
|
||||||
|
.Get()
|
||||||
|
.Include(x => x.CreatedBy)
|
||||||
|
.Include(x => x.Messages)
|
||||||
|
.Where(x => x.CreatedBy.Id == u.Id)
|
||||||
|
.Where(x => x.Status != TicketStatus.Closed)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
var result = new Dictionary<Ticket, TicketMessage?>();
|
||||||
|
|
||||||
|
foreach (var ticket in tickets)
|
||||||
|
{
|
||||||
|
var message = ticket.Messages
|
||||||
|
.OrderByDescending(x => x.Id)
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
|
result.Add(ticket, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.FromResult(result);
|
||||||
|
}
|
||||||
|
public Task<Dictionary<Ticket, TicketMessage?>> GetUserAssignedTickets(User u)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var tickets = ticketRepo
|
||||||
|
.Get()
|
||||||
|
.Include(x => x.CreatedBy)
|
||||||
|
.Include(x => x.Messages)
|
||||||
|
.Where(x => x.Status != TicketStatus.Closed)
|
||||||
|
.Where(x => x.AssignedTo.Id == u.Id)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
var result = new Dictionary<Ticket, TicketMessage?>();
|
||||||
|
|
||||||
|
foreach (var ticket in tickets)
|
||||||
|
{
|
||||||
|
var message = ticket.Messages
|
||||||
|
.OrderByDescending(x => x.Id)
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
|
result.Add(ticket, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.FromResult(result);
|
||||||
|
}
|
||||||
|
public Task<Dictionary<Ticket, TicketMessage?>> GetUnAssignedTickets()
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var tickets = ticketRepo
|
||||||
|
.Get()
|
||||||
|
.Include(x => x.CreatedBy)
|
||||||
|
.Include(x => x.Messages)
|
||||||
|
.Include(x => x.AssignedTo)
|
||||||
|
.Where(x => x.AssignedTo == null)
|
||||||
|
.Where(x => x.Status != TicketStatus.Closed)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
var result = new Dictionary<Ticket, TicketMessage?>();
|
||||||
|
|
||||||
|
foreach (var ticket in tickets)
|
||||||
|
{
|
||||||
|
var message = ticket.Messages
|
||||||
|
.OrderByDescending(x => x.Id)
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
|
result.Add(ticket, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.FromResult(result);
|
||||||
|
}
|
||||||
|
public Task<TicketMessage[]> GetMessages(Ticket ticket)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
|
||||||
|
var tickets = ticketRepo
|
||||||
|
.Get()
|
||||||
|
.Include(x => x.CreatedBy)
|
||||||
|
.Include(x => x.Messages)
|
||||||
|
.First(x => x.Id == ticket.Id);
|
||||||
|
|
||||||
|
return Task.FromResult(tickets.Messages.ToArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Claim(Ticket t, User? u = null)
|
||||||
|
{
|
||||||
|
using var scope = ServiceScopeFactory.CreateScope();
|
||||||
|
var ticketRepo = scope.ServiceProvider.GetRequiredService<Repository<Ticket>>();
|
||||||
|
var userRepo = scope.ServiceProvider.GetRequiredService<Repository<User>>();
|
||||||
|
|
||||||
|
var ticket = ticketRepo.Get().Include(x => x.AssignedTo).First(x => x.Id == t.Id);
|
||||||
|
var user = u == null ? u : userRepo.Get().First(x => x.Id == u.Id);
|
||||||
|
|
||||||
|
ticket.AssignedTo = user;
|
||||||
|
|
||||||
|
ticketRepo.Update(ticket);
|
||||||
|
|
||||||
|
await Event.Emit("tickets.status", ticket);
|
||||||
|
await Event.Emit($"tickets.{ticket.Id}.status", ticket);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,32 +25,30 @@ public class TotpService
|
|||||||
return Task.FromResult(codeserver == code);
|
return Task.FromResult(codeserver == code);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<bool> GetEnabled()
|
public Task<bool> GetEnabled()
|
||||||
{
|
{
|
||||||
var user = await IdentityService.Get();
|
return Task.FromResult(IdentityService.User.TotpEnabled);
|
||||||
|
|
||||||
return user!.TotpEnabled;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<string> GetSecret()
|
public Task<string> GetSecret()
|
||||||
{
|
{
|
||||||
var user = await IdentityService.Get();
|
return Task.FromResult(IdentityService.User.TotpSecret);
|
||||||
|
|
||||||
return user!.TotpSecret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task GenerateSecret()
|
public Task GenerateSecret()
|
||||||
{
|
{
|
||||||
var user = (await IdentityService.Get())!;
|
var user = IdentityService.User;
|
||||||
|
|
||||||
user.TotpSecret = Base32Encoding.ToString(KeyGeneration.GenerateRandomKey(20));;
|
user.TotpSecret = Base32Encoding.ToString(KeyGeneration.GenerateRandomKey(20));;
|
||||||
|
|
||||||
UserRepository.Update(user);
|
UserRepository.Update(user);
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task Enable(string code)
|
public async Task Enable(string code)
|
||||||
{
|
{
|
||||||
var user = (await IdentityService.Get())!;
|
var user = IdentityService.User;
|
||||||
|
|
||||||
if (!await Verify(user.TotpSecret, code))
|
if (!await Verify(user.TotpSecret, code))
|
||||||
{
|
{
|
||||||
@@ -61,9 +59,9 @@ public class TotpService
|
|||||||
UserRepository.Update(user);
|
UserRepository.Update(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task Disable()
|
public Task Disable()
|
||||||
{
|
{
|
||||||
var user = (await IdentityService.Get())!;
|
var user = IdentityService.User;
|
||||||
|
|
||||||
user.TotpEnabled = false;
|
user.TotpEnabled = false;
|
||||||
user.TotpSecret = "";
|
user.TotpSecret = "";
|
||||||
@@ -71,5 +69,7 @@ public class TotpService
|
|||||||
UserRepository.Update(user);
|
UserRepository.Update(user);
|
||||||
|
|
||||||
//TODO: AuditLog
|
//TODO: AuditLog
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@ using Moonlight.App.Exceptions;
|
|||||||
using Moonlight.App.Helpers;
|
using Moonlight.App.Helpers;
|
||||||
using Moonlight.App.Models.Misc;
|
using Moonlight.App.Models.Misc;
|
||||||
using Moonlight.App.Repositories;
|
using Moonlight.App.Repositories;
|
||||||
|
using Moonlight.App.Services.Background;
|
||||||
using Moonlight.App.Services.Mail;
|
using Moonlight.App.Services.Mail;
|
||||||
using Moonlight.App.Services.Sessions;
|
using Moonlight.App.Services.Sessions;
|
||||||
|
|
||||||
@@ -18,6 +19,8 @@ public class UserService
|
|||||||
private readonly IdentityService IdentityService;
|
private readonly IdentityService IdentityService;
|
||||||
private readonly IpLocateService IpLocateService;
|
private readonly IpLocateService IpLocateService;
|
||||||
private readonly DateTimeService DateTimeService;
|
private readonly DateTimeService DateTimeService;
|
||||||
|
private readonly ConfigService ConfigService;
|
||||||
|
private readonly TempMailService TempMailService;
|
||||||
|
|
||||||
private readonly string JwtSecret;
|
private readonly string JwtSecret;
|
||||||
|
|
||||||
@@ -28,14 +31,17 @@ public class UserService
|
|||||||
MailService mailService,
|
MailService mailService,
|
||||||
IdentityService identityService,
|
IdentityService identityService,
|
||||||
IpLocateService ipLocateService,
|
IpLocateService ipLocateService,
|
||||||
DateTimeService dateTimeService)
|
DateTimeService dateTimeService,
|
||||||
|
TempMailService tempMailService)
|
||||||
{
|
{
|
||||||
UserRepository = userRepository;
|
UserRepository = userRepository;
|
||||||
TotpService = totpService;
|
TotpService = totpService;
|
||||||
|
ConfigService = configService;
|
||||||
MailService = mailService;
|
MailService = mailService;
|
||||||
IdentityService = identityService;
|
IdentityService = identityService;
|
||||||
IpLocateService = ipLocateService;
|
IpLocateService = ipLocateService;
|
||||||
DateTimeService = dateTimeService;
|
DateTimeService = dateTimeService;
|
||||||
|
TempMailService = tempMailService;
|
||||||
|
|
||||||
JwtSecret = configService
|
JwtSecret = configService
|
||||||
.Get()
|
.Get()
|
||||||
@@ -44,6 +50,15 @@ public class UserService
|
|||||||
|
|
||||||
public async Task<string> Register(string email, string password, string firstname, string lastname)
|
public async Task<string> Register(string email, string password, string firstname, string lastname)
|
||||||
{
|
{
|
||||||
|
if (ConfigService.Get().Moonlight.Auth.DenyRegister)
|
||||||
|
throw new DisplayException("This operation was disabled");
|
||||||
|
|
||||||
|
if (await TempMailService.IsTempMail(email))
|
||||||
|
{
|
||||||
|
Logger.Warn($"A user tried to use a blacklisted domain to register. Email: '{email}'", "security");
|
||||||
|
throw new DisplayException("This email is blacklisted");
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the email is already taken
|
// Check if the email is already taken
|
||||||
var emailTaken = UserRepository.Get().FirstOrDefault(x => x.Email == email) != null;
|
var emailTaken = UserRepository.Get().FirstOrDefault(x => x.Email == email) != null;
|
||||||
|
|
||||||
@@ -52,16 +67,14 @@ public class UserService
|
|||||||
throw new DisplayException("The email is already in use");
|
throw new DisplayException("The email is already in use");
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Validation
|
|
||||||
|
|
||||||
// Add user
|
// Add user
|
||||||
var user = UserRepository.Add(new()
|
var user = UserRepository.Add(new()
|
||||||
{
|
{
|
||||||
Address = "",
|
Address = "",
|
||||||
Admin = false,
|
Admin = !UserRepository.Get().Any(),
|
||||||
City = "",
|
City = "",
|
||||||
Country = "",
|
Country = "",
|
||||||
Email = email,
|
Email = email.ToLower(),
|
||||||
Password = BCrypt.Net.BCrypt.HashPassword(password),
|
Password = BCrypt.Net.BCrypt.HashPassword(password),
|
||||||
FirstName = firstname,
|
FirstName = firstname,
|
||||||
LastName = lastname,
|
LastName = lastname,
|
||||||
@@ -73,8 +86,8 @@ public class UserService
|
|||||||
TotpSecret = "",
|
TotpSecret = "",
|
||||||
UpdatedAt = DateTimeService.GetCurrent(),
|
UpdatedAt = DateTimeService.GetCurrent(),
|
||||||
TokenValidTime = DateTimeService.GetCurrent().AddDays(-5),
|
TokenValidTime = DateTimeService.GetCurrent().AddDays(-5),
|
||||||
LastIp = IdentityService.GetIp(),
|
LastIp = IdentityService.Ip,
|
||||||
RegisterIp = IdentityService.GetIp()
|
RegisterIp = IdentityService.Ip
|
||||||
});
|
});
|
||||||
|
|
||||||
await MailService.SendMail(user!, "register", values => {});
|
await MailService.SendMail(user!, "register", values => {});
|
||||||
@@ -108,6 +121,9 @@ public class UserService
|
|||||||
|
|
||||||
public async Task<string> Login(string email, string password, string totpCode = "")
|
public async Task<string> Login(string email, string password, string totpCode = "")
|
||||||
{
|
{
|
||||||
|
if (ConfigService.Get().Moonlight.Auth.DenyLogin)
|
||||||
|
throw new DisplayException("This operation was disabled");
|
||||||
|
|
||||||
// First password check and check if totp is enabled
|
// First password check and check if totp is enabled
|
||||||
var needTotp = await CheckTotp(email, password);
|
var needTotp = await CheckTotp(email, password);
|
||||||
|
|
||||||
@@ -159,8 +175,8 @@ public class UserService
|
|||||||
|
|
||||||
await MailService.SendMail(user!, "passwordChange", values =>
|
await MailService.SendMail(user!, "passwordChange", values =>
|
||||||
{
|
{
|
||||||
values.Add("Ip", IdentityService.GetIp());
|
values.Add("Ip", IdentityService.Ip);
|
||||||
values.Add("Device", IdentityService.GetDevice());
|
values.Add("Device", IdentityService.Device);
|
||||||
values.Add("Location", location);
|
values.Add("Location", location);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -197,8 +213,8 @@ public class UserService
|
|||||||
{
|
{
|
||||||
await MailService.SendMail(user!, "login", values =>
|
await MailService.SendMail(user!, "login", values =>
|
||||||
{
|
{
|
||||||
values.Add("Ip", IdentityService.GetIp());
|
values.Add("Ip", IdentityService.Ip);
|
||||||
values.Add("Device", IdentityService.GetDevice());
|
values.Add("Device", IdentityService.Device);
|
||||||
values.Add("Location", location);
|
values.Add("Location", location);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -234,8 +250,8 @@ public class UserService
|
|||||||
|
|
||||||
await MailService.SendMail(user, "passwordReset", values =>
|
await MailService.SendMail(user, "passwordReset", values =>
|
||||||
{
|
{
|
||||||
values.Add("Ip", IdentityService.GetIp());
|
values.Add("Ip", IdentityService.Ip);
|
||||||
values.Add("Device", IdentityService.GetDevice());
|
values.Add("Device", IdentityService.Device);
|
||||||
values.Add("Location", location);
|
values.Add("Location", location);
|
||||||
values.Add("Password", newPassword);
|
values.Add("Password", newPassword);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,12 +2,19 @@
|
|||||||
|
|
||||||
<Router AppAssembly="@typeof(BlazorApp).Assembly">
|
<Router AppAssembly="@typeof(BlazorApp).Assembly">
|
||||||
<Found Context="routeData">
|
<Found Context="routeData">
|
||||||
|
<CascadingValue TValue="Type" Name="TargetPageType" Value="routeData.PageType">
|
||||||
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
|
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
|
||||||
|
</CascadingValue>
|
||||||
</Found>
|
</Found>
|
||||||
<NotFound>
|
<NotFound>
|
||||||
<PageTitle>Not found</PageTitle>
|
<PageTitle>Not found</PageTitle>
|
||||||
<LayoutView Layout="@typeof(NotFoundLayout)">
|
<LayoutView Layout="@typeof(NotFoundLayout)">
|
||||||
<p role="alert">Sorry, there's nothing at this address.</p>
|
<NotFoundAlert />
|
||||||
</LayoutView>
|
</LayoutView>
|
||||||
</NotFound>
|
</NotFound>
|
||||||
</Router>
|
</Router>
|
||||||
|
|
||||||
|
@code
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
@@ -40,12 +40,12 @@
|
|||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="MineStat" Version="3.1.1" />
|
<PackageReference Include="MineStat" Version="3.1.1" />
|
||||||
<PackageReference Include="MySqlBackup.NET" Version="2.3.8" />
|
<PackageReference Include="MySqlBackup.NET" Version="2.3.8" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3-beta1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Octokit" Version="6.0.0" />
|
<PackageReference Include="Octokit" Version="6.0.0" />
|
||||||
<PackageReference Include="Otp.NET" Version="1.3.0" />
|
<PackageReference Include="Otp.NET" Version="1.3.0" />
|
||||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
|
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
|
||||||
<PackageReference Include="QRCoder" Version="1.4.3" />
|
<PackageReference Include="QRCoder" Version="1.4.3" />
|
||||||
<PackageReference Include="RestSharp" Version="109.0.0-preview.1" />
|
<PackageReference Include="RestSharp" Version="110.2.1-alpha.0.10" />
|
||||||
<PackageReference Include="Sentry.AspNetCore" Version="3.33.1" />
|
<PackageReference Include="Sentry.AspNetCore" Version="3.33.1" />
|
||||||
<PackageReference Include="Sentry.Serilog" Version="3.33.1" />
|
<PackageReference Include="Sentry.Serilog" Version="3.33.1" />
|
||||||
<PackageReference Include="Serilog" Version="3.0.0" />
|
<PackageReference Include="Serilog" Version="3.0.0" />
|
||||||
@@ -53,6 +53,7 @@
|
|||||||
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00910" />
|
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00910" />
|
||||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
|
<PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
|
||||||
<PackageReference Include="SSH.NET" Version="2020.0.2" />
|
<PackageReference Include="SSH.NET" Version="2020.0.2" />
|
||||||
|
<PackageReference Include="Stripe.net" Version="41.23.0-beta.1" />
|
||||||
<PackageReference Include="UAParser" Version="3.1.47" />
|
<PackageReference Include="UAParser" Version="3.1.47" />
|
||||||
<PackageReference Include="XtermBlazor" Version="1.8.1" />
|
<PackageReference Include="XtermBlazor" Version="1.8.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -76,12 +77,20 @@
|
|||||||
<_ContentIncludedByDefault Remove="Shared\Views\Admin\Servers\Cleanup\Exceptions\Edit.razor" />
|
<_ContentIncludedByDefault Remove="Shared\Views\Admin\Servers\Cleanup\Exceptions\Edit.razor" />
|
||||||
<_ContentIncludedByDefault Remove="Shared\Components\News\NewsEditor.razor" />
|
<_ContentIncludedByDefault Remove="Shared\Components\News\NewsEditor.razor" />
|
||||||
<_ContentIncludedByDefault Remove="Shared\News\Edit.razor" />
|
<_ContentIncludedByDefault Remove="Shared\News\Edit.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Views\Admin\AaPanels\Index.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Views\Admin\Databases\Index.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Components\StateLogic\OnlyAdmin.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Components\AuditLogEntrys\AuditLogEntryChangePassword.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Components\AuditLogEntrys\AuditLogEntryChangePowerState.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Components\AuditLogEntrys\AuditLogEntryLogin.razor" />
|
||||||
|
<_ContentIncludedByDefault Remove="Shared\Components\AuditLogEntrys\AuditLogEntryRegister.razor" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="App\ApiClients\CloudPanel\Resources\" />
|
<Folder Include="App\ApiClients\CloudPanel\Resources\" />
|
||||||
<Folder Include="App\Http\Middleware" />
|
<Folder Include="App\Http\Middleware" />
|
||||||
<Folder Include="storage\backups\" />
|
<Folder Include="storage\backups\" />
|
||||||
|
<Folder Include="storage\plugins\" />
|
||||||
<Folder Include="storage\resources\public\background\" />
|
<Folder Include="storage\resources\public\background\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
@@ -103,12 +112,4 @@
|
|||||||
<AdditionalFiles Include="Shared\Views\Server\Settings\ServerResetSetting.razor" />
|
<AdditionalFiles Include="Shared\Views\Server\Settings\ServerResetSetting.razor" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Update="storage\configs\config.json.bak">
|
|
||||||
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using BlazorDownloadFile;
|
using BlazorDownloadFile;
|
||||||
using BlazorTable;
|
using BlazorTable;
|
||||||
using CurrieTechnologies.Razor.SweetAlert2;
|
|
||||||
using HealthChecks.UI.Client;
|
using HealthChecks.UI.Client;
|
||||||
using Moonlight.App.ApiClients.CloudPanel;
|
using Moonlight.App.ApiClients.CloudPanel;
|
||||||
using Moonlight.App.ApiClients.Daemon;
|
using Moonlight.App.ApiClients.Daemon;
|
||||||
@@ -16,7 +15,6 @@ using Moonlight.App.Helpers.Wings;
|
|||||||
using Moonlight.App.LogMigrator;
|
using Moonlight.App.LogMigrator;
|
||||||
using Moonlight.App.Repositories;
|
using Moonlight.App.Repositories;
|
||||||
using Moonlight.App.Repositories.Domains;
|
using Moonlight.App.Repositories.Domains;
|
||||||
using Moonlight.App.Repositories.LogEntries;
|
|
||||||
using Moonlight.App.Repositories.Servers;
|
using Moonlight.App.Repositories.Servers;
|
||||||
using Moonlight.App.Services;
|
using Moonlight.App.Services;
|
||||||
using Moonlight.App.Services.Addon;
|
using Moonlight.App.Services.Addon;
|
||||||
@@ -27,12 +25,16 @@ using Moonlight.App.Services.Interop;
|
|||||||
using Moonlight.App.Services.Mail;
|
using Moonlight.App.Services.Mail;
|
||||||
using Moonlight.App.Services.Minecraft;
|
using Moonlight.App.Services.Minecraft;
|
||||||
using Moonlight.App.Services.Notifications;
|
using Moonlight.App.Services.Notifications;
|
||||||
|
using Moonlight.App.Services.Plugins;
|
||||||
using Moonlight.App.Services.Sessions;
|
using Moonlight.App.Services.Sessions;
|
||||||
using Moonlight.App.Services.Statistics;
|
using Moonlight.App.Services.Statistics;
|
||||||
using Moonlight.App.Services.SupportChat;
|
using Moonlight.App.Services.SupportChat;
|
||||||
|
using Moonlight.App.Services.Tickets;
|
||||||
using Sentry;
|
using Sentry;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
|
using Stripe;
|
||||||
|
using SubscriptionService = Moonlight.App.Services.SubscriptionService;
|
||||||
|
|
||||||
namespace Moonlight
|
namespace Moonlight
|
||||||
{
|
{
|
||||||
@@ -103,8 +105,6 @@ namespace Moonlight
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Info($"Working dir: {Directory.GetCurrentDirectory()}");
|
|
||||||
|
|
||||||
Logger.Info("Running pre-init tasks");
|
Logger.Info("Running pre-init tasks");
|
||||||
var databaseCheckupService = new DatabaseCheckupService(configService);
|
var databaseCheckupService = new DatabaseCheckupService(configService);
|
||||||
|
|
||||||
@@ -112,6 +112,9 @@ namespace Moonlight
|
|||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
|
var pluginService = new PluginService();
|
||||||
|
await pluginService.BuildServices(builder.Services);
|
||||||
|
|
||||||
// Switch to logging.net injection
|
// Switch to logging.net injection
|
||||||
// TODO: Enable in production
|
// TODO: Enable in production
|
||||||
builder.Logging.ClearProviders();
|
builder.Logging.ClearProviders();
|
||||||
@@ -168,9 +171,6 @@ namespace Moonlight
|
|||||||
builder.Services.AddScoped<NewsEntryRepository>();
|
builder.Services.AddScoped<NewsEntryRepository>();
|
||||||
builder.Services.AddScoped<NodeAllocationRepository>();
|
builder.Services.AddScoped<NodeAllocationRepository>();
|
||||||
builder.Services.AddScoped<StatisticsRepository>();
|
builder.Services.AddScoped<StatisticsRepository>();
|
||||||
builder.Services.AddScoped<AuditLogEntryRepository>();
|
|
||||||
builder.Services.AddScoped<ErrorLogEntryRepository>();
|
|
||||||
builder.Services.AddScoped<SecurityLogEntryRepository>();
|
|
||||||
builder.Services.AddScoped(typeof(Repository<>));
|
builder.Services.AddScoped(typeof(Repository<>));
|
||||||
|
|
||||||
// Services
|
// Services
|
||||||
@@ -210,16 +210,17 @@ namespace Moonlight
|
|||||||
builder.Services.AddScoped<DynamicBackgroundService>();
|
builder.Services.AddScoped<DynamicBackgroundService>();
|
||||||
builder.Services.AddScoped<ServerAddonPluginService>();
|
builder.Services.AddScoped<ServerAddonPluginService>();
|
||||||
builder.Services.AddScoped<KeyListenerService>();
|
builder.Services.AddScoped<KeyListenerService>();
|
||||||
|
builder.Services.AddScoped<PopupService>();
|
||||||
builder.Services.AddScoped<SubscriptionService>();
|
builder.Services.AddScoped<SubscriptionService>();
|
||||||
builder.Services.AddScoped<SubscriptionAdminService>();
|
builder.Services.AddScoped<BillingService>();
|
||||||
|
builder.Services.AddSingleton<PluginStoreService>();
|
||||||
|
builder.Services.AddSingleton<TicketServerService>();
|
||||||
|
builder.Services.AddScoped<TicketClientService>();
|
||||||
|
builder.Services.AddScoped<TicketAdminService>();
|
||||||
|
|
||||||
builder.Services.AddScoped<SessionClientService>();
|
builder.Services.AddScoped<SessionClientService>();
|
||||||
builder.Services.AddSingleton<SessionServerService>();
|
builder.Services.AddSingleton<SessionServerService>();
|
||||||
|
|
||||||
// Loggers
|
|
||||||
builder.Services.AddScoped<MailService>();
|
builder.Services.AddScoped<MailService>();
|
||||||
builder.Services.AddSingleton<TrashMailDetectorService>();
|
|
||||||
|
|
||||||
// Support chat
|
// Support chat
|
||||||
builder.Services.AddSingleton<SupportChatServerService>();
|
builder.Services.AddSingleton<SupportChatServerService>();
|
||||||
@@ -246,6 +247,9 @@ namespace Moonlight
|
|||||||
builder.Services.AddSingleton<CleanupService>();
|
builder.Services.AddSingleton<CleanupService>();
|
||||||
builder.Services.AddSingleton<MalwareScanService>();
|
builder.Services.AddSingleton<MalwareScanService>();
|
||||||
builder.Services.AddSingleton<TelemetryService>();
|
builder.Services.AddSingleton<TelemetryService>();
|
||||||
|
builder.Services.AddSingleton<TempMailService>();
|
||||||
|
builder.Services.AddSingleton<DdosProtectionService>();
|
||||||
|
builder.Services.AddSingleton(pluginService);
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
builder.Services.AddSingleton<MoonlightService>();
|
builder.Services.AddSingleton<MoonlightService>();
|
||||||
@@ -255,6 +259,10 @@ namespace Moonlight
|
|||||||
builder.Services.AddBlazorContextMenu();
|
builder.Services.AddBlazorContextMenu();
|
||||||
builder.Services.AddBlazorDownloadFile();
|
builder.Services.AddBlazorDownloadFile();
|
||||||
|
|
||||||
|
StripeConfiguration.ApiKey = configService
|
||||||
|
.Get()
|
||||||
|
.Moonlight.Stripe.ApiKey;
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
// Configure the HTTP request pipeline.
|
// Configure the HTTP request pipeline.
|
||||||
@@ -291,7 +299,8 @@ namespace Moonlight
|
|||||||
_ = app.Services.GetRequiredService<DiscordNotificationService>();
|
_ = app.Services.GetRequiredService<DiscordNotificationService>();
|
||||||
_ = app.Services.GetRequiredService<MalwareScanService>();
|
_ = app.Services.GetRequiredService<MalwareScanService>();
|
||||||
_ = app.Services.GetRequiredService<TelemetryService>();
|
_ = app.Services.GetRequiredService<TelemetryService>();
|
||||||
|
_ = app.Services.GetRequiredService<TempMailService>();
|
||||||
|
_ = app.Services.GetRequiredService<DdosProtectionService>();
|
||||||
_ = app.Services.GetRequiredService<MoonlightService>();
|
_ = app.Services.GetRequiredService<MoonlightService>();
|
||||||
|
|
||||||
// Discord bot service
|
// Discord bot service
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
{
|
{
|
||||||
"profiles": {
|
"profiles":
|
||||||
"Moonlight": {
|
{
|
||||||
|
"Default":
|
||||||
|
{
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
@@ -10,41 +12,41 @@
|
|||||||
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
||||||
"dotnetRunMessages": true
|
"dotnetRunMessages": true
|
||||||
},
|
},
|
||||||
"Sql Debug": {
|
"Live DB":
|
||||||
|
{
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
"ML_SQL_DEBUG": "true",
|
"ML_DEBUG": "true",
|
||||||
"ML_DEBUG": "true"
|
"ML_CONFIG_PATH": "storage\\configs\\live_config.json"
|
||||||
},
|
},
|
||||||
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
||||||
"dotnetRunMessages": true
|
"dotnetRunMessages": true
|
||||||
},
|
},
|
||||||
"Discord Bot": {
|
"Dev DB 1":
|
||||||
|
{
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"launchBrowser": false,
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
|
||||||
"ML_SQL_DEBUG": "true",
|
|
||||||
"ML_DEBUG": "true"
|
|
||||||
},
|
|
||||||
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
|
||||||
"dotnetRunMessages": true
|
|
||||||
},
|
|
||||||
"Watch": {
|
|
||||||
"commandName": "Executable",
|
|
||||||
"executablePath": "dotnet",
|
|
||||||
"workingDirectory": "$(ProjectDir)",
|
|
||||||
"hotReloadEnabled": true,
|
|
||||||
"hotReloadProfile": "aspnetcore",
|
|
||||||
"commandLineArgs": "watch run",
|
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
"ML_DEBUG": "true"
|
"ML_DEBUG": "true",
|
||||||
|
"ML_CONFIG_PATH": "storage\\configs\\dev_1_config.json"
|
||||||
},
|
},
|
||||||
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118"
|
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
||||||
|
"dotnetRunMessages": true
|
||||||
|
},
|
||||||
|
"Dev DB 2":
|
||||||
|
{
|
||||||
|
"commandName": "Project",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ML_DEBUG": "true",
|
||||||
|
"ML_CONFIG_PATH": "storage\\configs\\dev_2_config.json"
|
||||||
|
},
|
||||||
|
"applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
|
||||||
|
"dotnetRunMessages": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user