From 57eb9b3a7e1b6696d378d164f534face32258bbd Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 5 Mar 2020 22:20:17 -0800 Subject: [PATCH] Added server config page. --- README.md | 2 +- .../Pages/Account/Manage/Index.cshtml | 2 +- .../Pages/Account/Manage/ManageNavPages.cs | 4 + .../Pages/Account/Manage/Options.cshtml | 18 +- .../Pages/Account/Manage/Organization.cshtml | 14 +- .../Pages/Account/Manage/ServerConfig.cshtml | 255 +++++++ .../Account/Manage/ServerConfig.cshtml.cs | 205 ++++++ .../Pages/Account/Manage/_ManageNav.cshtml | 17 +- .../Identity/Pages/Account/Register.cshtml.cs | 7 +- ...6013915_IsServerAdmin property.Designer.cs | 662 ++++++++++++++++++ .../20200306013915_IsServerAdmin property.cs | 22 + .../ApplicationDbContextModelSnapshot.cs | 3 + Server/Server.csproj | 2 + Server/wwwroot/css/site.css | 5 + Server/wwwroot/scripts/Pages/ServerConfig.js | 76 ++ .../wwwroot/scripts/Pages/ServerConfig.js.map | 1 + Server/wwwroot/scripts/Pages/ServerConfig.ts | 90 +++ Shared/Models/RemotelyUser.cs | 2 +- 18 files changed, 1362 insertions(+), 25 deletions(-) create mode 100644 Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml create mode 100644 Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs create mode 100644 Server/Migrations/20200306013915_IsServerAdmin property.Designer.cs create mode 100644 Server/Migrations/20200306013915_IsServerAdmin property.cs create mode 100644 Server/wwwroot/scripts/Pages/ServerConfig.js create mode 100644 Server/wwwroot/scripts/Pages/ServerConfig.js.map create mode 100644 Server/wwwroot/scripts/Pages/ServerConfig.ts diff --git a/README.md b/README.md index 5a691486..a1cf284c 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ Note: To retain your settings between upgrades, copy your settings to appsetting * RemoteControlSessionLimit: How many concurrent remote control sessions are allowed per organization. * RemoteControlRequiresAuthentication: Whether the remote control page requires authentication to establish a connection. * Require2FA: Require users to set up 2FA before they can use the main app. -* AllowApiLogin: Whether to allow logging in via the API (see below). +* AllowApiLogin: Whether to allow logging in via the API controller. API access tokens are recommended over this approach. * TrustedCorsOrigins: For cross-origin API requests via JavaScript. The websites listed in this array with be allowed to make requests to the API. This does not grant authentication, which is still required on most endpoints. * KnownProxies: If your Nginx server is on a different machine and is forwarding requests to the Remotely server, you will need to add the IP of the Nginx server to this array. * Smpt*: SMTP settings for auto-generated system emails (such as registration and password reset). diff --git a/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml index ae71694f..2cf76332 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml +++ b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml @@ -36,7 +36,7 @@ - + diff --git a/Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs index db68ae85..288d6dc2 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs +++ b/Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs @@ -27,6 +27,8 @@ namespace Remotely.Server.Areas.Identity.Pages.Account.Manage public static string ServerLogs => "ServerLogs"; + public static string ServerConfig => "ServerConfig"; + public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index); public static string ChangePasswordNavClass(ViewContext viewContext) => PageNavClass(viewContext, ChangePassword); @@ -45,6 +47,8 @@ namespace Remotely.Server.Areas.Identity.Pages.Account.Manage public static string ApiTokensNavClass(ViewContext viewContext) => PageNavClass(viewContext, ApiTokens); public static string ServerLogsNavClass(ViewContext viewContext) => PageNavClass(viewContext, ServerLogs); + public static string ServerConfigNavClass(ViewContext viewContext) => PageNavClass(viewContext, ServerConfig); + public static string PageNavClass(ViewContext viewContext, string page) { var activePage = viewContext.ViewData["ActivePage"] as string diff --git a/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml index e2798ffa..dfb87626 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml +++ b/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml @@ -9,14 +9,14 @@
-
+


- +
@@ -25,7 +25,7 @@

- +
@@ -40,39 +40,39 @@

- +


- +


- +


- +


- +
- +
diff --git a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml index cb491ac2..76807064 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml +++ b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml @@ -61,9 +61,7 @@
- - - +
@@ -161,7 +159,7 @@
- +
@@ -210,11 +208,9 @@
- - - +
diff --git a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml new file mode 100644 index 00000000..93e6eaed --- /dev/null +++ b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml @@ -0,0 +1,255 @@ +@page +@using Remotely.Server.Areas.Identity.Pages.Account.Manage +@model ServerConfigModel +@{ + ViewData["Title"] = "Server Config"; +} + +

@ViewData["Title"]

+ +@if (Model.IsServerAdmin) +{ + +
+
+
+
+ +

Application Settings

+ + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+
+ + +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ + +

Connection Strings

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ + +

Server Admins

+ +
+ +
+ +
+ +
+
+ + +
+ +
+ + +
+ +
+
+
+
+ + + +} +else +{ +
Only organization administrators can view this page.
+} \ No newline at end of file diff --git a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs new file mode 100644 index 00000000..914ee484 --- /dev/null +++ b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs @@ -0,0 +1,205 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Dynamic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.Extensions.Configuration; +using Remotely.Server.Services; +using Remotely.Shared.Enums; +using Remotely.Shared.Models; + +namespace Remotely.Server.Areas.Identity.Pages.Account.Manage +{ + public class ServerConfigModel : PageModel + { + public ServerConfigModel(IConfiguration configuration, IWebHostEnvironment hostEnv, UserManager userManager) + { + Configuration = configuration; + HostEnv = hostEnv; + UserManager = userManager; + } + + + public IConfiguration Configuration { get; } + public IWebHostEnvironment HostEnv { get; } + + [BindProperty] + public AppSettingsModel AppSettingsInput { get; set; } = new AppSettingsModel(); + + [BindProperty] + [Display(Name = "Server Admins")] + public List ServerAdmins { get; set; } = new List(); + + [BindProperty] + public ConnectionStringsModel ConnectionStrings { get; set; } = new ConnectionStringsModel(); + + public bool IsServerAdmin { get; set; } + + [TempData] + public string StatusMessage { get; set; } + + public UserManager UserManager { get; } + public async Task OnGet() + { + IsServerAdmin = (await UserManager.GetUserAsync(User)).IsServerAdmin; + if (!IsServerAdmin) + { + return Unauthorized(); + } + + Configuration.Bind("ApplicationOptions", AppSettingsInput); + Configuration.Bind("ConnectionStrings", ConnectionStrings); + + return Page(); + } + public async Task OnPost() + { + IsServerAdmin = (await UserManager.GetUserAsync(User)).IsServerAdmin; + if (!IsServerAdmin) + { + return Unauthorized(); + } + + if (!ModelState.IsValid) + { + return Page(); + } + + await SaveAppSettings(); + + return RedirectToPage(); + + } + + private async Task SaveAppSettings() + { + string savePath; + var prodSettings = HostEnv.ContentRootFileProvider.GetFileInfo("appsettings.Production.json"); + var settings = HostEnv.ContentRootFileProvider.GetFileInfo("appsettings.json"); + if (prodSettings.Exists) + { + savePath = prodSettings.PhysicalPath; + } + else if (settings.Exists) + { + savePath = settings.PhysicalPath; + } + else + { + return; + } + + var settingsJson = JsonSerializer.Deserialize>(await System.IO.File.ReadAllTextAsync(savePath)); + + settingsJson["ApplicationOptions"] = AppSettingsInput; + settingsJson["ConnectionStrings"] = ConnectionStrings; + + await System.IO.File.WriteAllTextAsync(savePath, JsonSerializer.Serialize(settingsJson, new JsonSerializerOptions() { WriteIndented = true })); + + // TODO: Save server admins. + } + + + public class AppSettingsModel + { + [Display(Name = "Allow API Login")] + public bool AllowApiLogin { get; set; } + + [Display(Name = "Data Retention (days)")] + public double DataRetentionInDays { get; set; } + + [Display(Name = "Database Provider")] + [JsonConverter(typeof(JsonStringEnumConverter))] + public DBProviders DBProvider { get; set; } + + [Display(Name = "Default Prompt")] + public string DefaultPrompt { get; set; } + + [Display(Name = "Enable Windows Event Log")] + public bool EnableWindowsEventLog { get; set; } + + [Display(Name = "Known Proxies")] + public string[] KnownProxies { get; set; } + + [Display(Name = "Max Organizations")] + public int MaxOrganizationCount { get; set; } + [Display(Name = "Record Remote Control Sessions")] + public bool RecordRemoteControlSessions { get; set; } + + [Display(Name = "Redirect To HTTPS")] + public bool RedirectToHttps { get; set; } + + [Display(Name = "Remote Control Requires Authentication")] + public bool RemoteControlRequiresAuthentication { get; set; } + + [Display(Name = "Remote Control Session Limit")] + public double RemoteControlSessionLimit { get; set; } + + [Display(Name = "Require 2FA")] + public bool Require2FA { get; set; } + + [Display(Name = "SMTP Display Name")] + public string SmtpDisplayName { get; set; } + + [Display(Name = "SMTP Email")] + [EmailAddress] + public string SmtpEmail { get; set; } + + [Display(Name = "SMTP Enable SSL")] + public bool SmtpEnableSsl { get; set; } + + [Display(Name = "SMTP Host")] + public string SmtpHost { get; set; } + + [Display(Name = "SMTP Password")] + public string SmtpPassword { get; set; } + + [Display(Name = "SMTP Port")] + public int SmtpPort { get; set; } + + [Display(Name = "SMTP Username")] + public string SmtpUserName { get; set; } + + [Display(Name = "Theme")] + [JsonConverter(typeof(JsonStringEnumConverter))] + public Theme Theme { get; set; } + + [Display(Name = "Trusted CORS Origins")] + public string[] TrustedCorsOrigins { get; set; } + + [Display(Name = "Use HSTS")] + public bool UseHsts { get; set; } + + [Display(Name = "Use WebRTC")] + public bool UseWebRtc { get; set; } + } + + public class ConnectionStringsModel + { + [Display(Name = "PostgreSQL")] + public string PostgreSQL { get; set; } + + [Display(Name = "SQLite")] + public string SQLite { get; set; } + + + [Display(Name = "SQL Server")] + public string SQLServer { get; set; } + + } + + public enum DBProviders + { + PostgreSQL, + SQLite, + SQLServer + } + } +} diff --git a/Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml index 11b591a7..7f55a3da 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml +++ b/Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml @@ -1,15 +1,26 @@ @inject SignInManager SignInManager +@inject UserManager UserManager @{ var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any(); + var user = await UserManager.GetUserAsync(User); }
  • Profile
  • Password
  • Options
    • -
  • Organization
    • -
  • API Access
    • -
  • Server Logs
    • + @if (user.IsAdministrator) + { +
  • Organization
    • +
  • API Access
    • +
  • Server Logs
    • + } + + @if (user.IsServerAdmin) + { +
  • Server Config
    • + } + @if (hasExternalLogins) { diff --git a/Server/Areas/Identity/Pages/Account/Register.cshtml.cs b/Server/Areas/Identity/Pages/Account/Register.cshtml.cs index ca29e958..235b2ab8 100644 --- a/Server/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/Server/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -88,7 +88,12 @@ namespace Remotely.Server.Areas.Identity.Pages.Account ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList(); if (ModelState.IsValid) { - var user = new RemotelyUser { UserName = Input.Email, Email = Input.Email }; + var user = new RemotelyUser + { + UserName = Input.Email, + Email = Input.Email , + IsServerAdmin = organizationCount == 0 + }; var result = await _userManager.CreateAsync(user, Input.Password); if (result.Succeeded) { diff --git a/Server/Migrations/20200306013915_IsServerAdmin property.Designer.cs b/Server/Migrations/20200306013915_IsServerAdmin property.Designer.cs new file mode 100644 index 00000000..e8dc0590 --- /dev/null +++ b/Server/Migrations/20200306013915_IsServerAdmin property.Designer.cs @@ -0,0 +1,662 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Remotely.Server.Data; + +namespace Remotely.Server.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20200306013915_IsServerAdmin property")] + partial class IsServerAdminproperty + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.2"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Email") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex"); + + b.ToTable("RemotelyUsers"); + + b.HasDiscriminator("Discriminator").HasValue("IdentityUser"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("LoginProvider") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.ApiToken", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Secret") + .HasColumnType("TEXT"); + + b.Property("Token") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.HasIndex("Token"); + + b.ToTable("ApiTokens"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.CommandResult", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("CommandMode") + .HasColumnType("TEXT"); + + b.Property("CommandResults") + .HasColumnType("TEXT"); + + b.Property("CommandText") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("PSCoreResults") + .HasColumnType("TEXT"); + + b.Property("SenderConnectionID") + .HasColumnType("TEXT"); + + b.Property("SenderUserID") + .HasColumnType("TEXT"); + + b.Property("TargetDeviceIDs") + .HasColumnType("TEXT"); + + b.Property("TimeStamp") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("CommandResults"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Device", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("AgentVersion") + .HasColumnType("TEXT"); + + b.Property("Alias") + .HasColumnType("TEXT") + .HasMaxLength(100); + + b.Property("CpuUtilization") + .HasColumnType("REAL"); + + b.Property("CurrentUser") + .HasColumnType("TEXT"); + + b.Property("DeviceGroupID") + .HasColumnType("TEXT"); + + b.Property("DeviceName") + .HasColumnType("TEXT"); + + b.Property("Drives") + .HasColumnType("TEXT"); + + b.Property("Is64Bit") + .HasColumnType("INTEGER"); + + b.Property("IsOnline") + .HasColumnType("INTEGER"); + + b.Property("LastOnline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("OSArchitecture") + .HasColumnType("INTEGER"); + + b.Property("OSDescription") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("TEXT"); + + b.Property("ProcessorCount") + .HasColumnType("INTEGER"); + + b.Property("ServerVerificationToken") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("TotalMemory") + .HasColumnType("REAL"); + + b.Property("TotalStorage") + .HasColumnType("REAL"); + + b.Property("UsedMemory") + .HasColumnType("REAL"); + + b.Property("UsedStorage") + .HasColumnType("REAL"); + + b.HasKey("ID"); + + b.HasIndex("DeviceGroupID"); + + b.HasIndex("DeviceName"); + + b.HasIndex("OrganizationID"); + + b.ToTable("Devices"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.DeviceGroup", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("DeviceGroups"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.EventLog", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("EventType") + .HasColumnType("INTEGER"); + + b.Property("Message") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("TimeStamp") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("EventLogs"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.InviteLink", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("DateSent") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("InvitedUser") + .HasColumnType("TEXT"); + + b.Property("IsAdmin") + .HasColumnType("INTEGER"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("ResetUrl") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("InviteLinks"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Organization", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("OrganizationName") + .HasColumnType("TEXT") + .HasMaxLength(25); + + b.HasKey("ID"); + + b.ToTable("Organizations"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.SharedFile", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("ContentType") + .HasColumnType("TEXT"); + + b.Property("FileContents") + .HasColumnType("BLOB"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("SharedFiles"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.UserDevicePermission", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("DeviceGroupID") + .HasColumnType("TEXT"); + + b.Property("UserID") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("DeviceGroupID"); + + b.HasIndex("UserID"); + + b.ToTable("PermissionLinks"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.RemotelyUser", b => + { + b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser"); + + b.Property("IsAdministrator") + .HasColumnType("INTEGER"); + + b.Property("IsServerAdmin") + .HasColumnType("INTEGER"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("UserOptions") + .HasColumnType("TEXT"); + + b.HasIndex("OrganizationID"); + + b.HasIndex("UserName"); + + b.HasDiscriminator().HasValue("RemotelyUser"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Remotely.Shared.Models.ApiToken", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("ApiTokens") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.CommandResult", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("CommandResults") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Device", b => + { + b.HasOne("Remotely.Shared.Models.DeviceGroup", "DeviceGroup") + .WithMany("Devices") + .HasForeignKey("DeviceGroupID"); + + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("Devices") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.DeviceGroup", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("DeviceGroups") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.EventLog", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("EventLogs") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.InviteLink", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("InviteLinks") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.SharedFile", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("SharedFiles") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.UserDevicePermission", b => + { + b.HasOne("Remotely.Shared.Models.DeviceGroup", "DeviceGroup") + .WithMany("PermissionLinks") + .HasForeignKey("DeviceGroupID"); + + b.HasOne("Remotely.Shared.Models.RemotelyUser", "User") + .WithMany("PermissionLinks") + .HasForeignKey("UserID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.RemotelyUser", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("RemotelyUsers") + .HasForeignKey("OrganizationID"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Server/Migrations/20200306013915_IsServerAdmin property.cs b/Server/Migrations/20200306013915_IsServerAdmin property.cs new file mode 100644 index 00000000..2482c9cd --- /dev/null +++ b/Server/Migrations/20200306013915_IsServerAdmin property.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Remotely.Server.Migrations +{ + public partial class IsServerAdminproperty : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsServerAdmin", + table: "RemotelyUsers", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsServerAdmin", + table: "RemotelyUsers"); + } + } +} diff --git a/Server/Migrations/ApplicationDbContextModelSnapshot.cs b/Server/Migrations/ApplicationDbContextModelSnapshot.cs index c45f7d99..6327d8f3 100644 --- a/Server/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Server/Migrations/ApplicationDbContextModelSnapshot.cs @@ -517,6 +517,9 @@ namespace Remotely.Server.Migrations b.Property("IsAdministrator") .HasColumnType("INTEGER"); + b.Property("IsServerAdmin") + .HasColumnType("INTEGER"); + b.Property("OrganizationID") .HasColumnType("TEXT"); diff --git a/Server/Server.csproj b/Server/Server.csproj index 1653f18e..af4aa881 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -50,6 +50,7 @@ + @@ -161,6 +162,7 @@ + diff --git a/Server/wwwroot/css/site.css b/Server/wwwroot/css/site.css index 66561e9b..11ef6445 100644 --- a/Server/wwwroot/css/site.css +++ b/Server/wwwroot/css/site.css @@ -19,6 +19,11 @@ h6 { font-size: 1rem !important; } +input[type='checkbox'] { + width: 25px; + height: 25px; +} + .container { max-width: 95vw !important; diff --git a/Server/wwwroot/scripts/Pages/ServerConfig.js b/Server/wwwroot/scripts/Pages/ServerConfig.js new file mode 100644 index 00000000..c8edd70b --- /dev/null +++ b/Server/wwwroot/scripts/Pages/ServerConfig.js @@ -0,0 +1,76 @@ +var trustedCorsAddButton = document.getElementById("trustedCorsAddButton"); +var trustedCorsRemoveButton = document.getElementById("trustedCorsRemoveButton"); +var trustedCorsInput = document.getElementById("trustedCorsInput"); +var trustedCorsSelect = document.getElementById("trustedCorsSelect"); +var knownProxiesAddButton = document.getElementById("knownProxiesAddButton"); +var knownProxiesRemoveButton = document.getElementById("knownProxiesRemoveButton"); +var knownProxiesInput = document.getElementById("knownProxiesInput"); +var knownProxiesSelect = document.getElementById("knownProxiesSelect"); +var serverAdminsAddButton = document.getElementById("serverAdminsAddButton"); +var serverAdminsRemoveButton = document.getElementById("serverAdminsRemoveButton"); +var serverAdminsInput = document.getElementById("serverAdminsInput"); +var serverAdminsSelect = document.getElementById("serverAdminsSelect"); +trustedCorsAddButton.addEventListener("click", ev => { + if (trustedCorsInput.value.length > 0) { + var option = document.createElement("option"); + option.value = trustedCorsInput.value; + option.text = trustedCorsInput.value; + trustedCorsSelect.add(option); + trustedCorsInput.value = ""; + } +}); +trustedCorsInput.addEventListener("keypress", ev => { + if (ev.key.toLowerCase() == "enter") { + ev.preventDefault(); + ev.stopPropagation(); + trustedCorsAddButton.click(); + } +}); +trustedCorsRemoveButton.addEventListener("click", ev => { + while (trustedCorsSelect.selectedOptions.length > 0) { + trustedCorsSelect.selectedOptions[0].remove(); + } +}); +knownProxiesAddButton.addEventListener("click", ev => { + if (knownProxiesInput.value.length > 0) { + var option = document.createElement("option"); + option.value = knownProxiesInput.value; + option.text = knownProxiesInput.value; + knownProxiesSelect.add(option); + knownProxiesInput.value = ""; + } +}); +knownProxiesInput.addEventListener("keypress", ev => { + if (ev.key.toLowerCase() == "enter") { + ev.preventDefault(); + ev.stopPropagation(); + knownProxiesAddButton.click(); + } +}); +knownProxiesRemoveButton.addEventListener("click", ev => { + while (knownProxiesSelect.selectedOptions.length > 0) { + knownProxiesSelect.selectedOptions[0].remove(); + } +}); +serverAdminsAddButton.addEventListener("click", ev => { + if (serverAdminsInput.value.length > 0) { + var option = document.createElement("option"); + option.value = serverAdminsInput.value; + option.text = serverAdminsInput.value; + serverAdminsSelect.add(option); + serverAdminsInput.value = ""; + } +}); +serverAdminsInput.addEventListener("keypress", ev => { + if (ev.key.toLowerCase() == "enter") { + ev.preventDefault(); + ev.stopPropagation(); + serverAdminsAddButton.click(); + } +}); +serverAdminsRemoveButton.addEventListener("click", ev => { + while (serverAdminsSelect.selectedOptions.length > 0) { + serverAdminsSelect.selectedOptions[0].remove(); + } +}); +//# sourceMappingURL=ServerConfig.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/Pages/ServerConfig.js.map b/Server/wwwroot/scripts/Pages/ServerConfig.js.map new file mode 100644 index 00000000..5f283b95 --- /dev/null +++ b/Server/wwwroot/scripts/Pages/ServerConfig.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ServerConfig.js","sourceRoot":"","sources":["ServerConfig.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Pages/ServerConfig.ts b/Server/wwwroot/scripts/Pages/ServerConfig.ts new file mode 100644 index 00000000..e5eafc65 --- /dev/null +++ b/Server/wwwroot/scripts/Pages/ServerConfig.ts @@ -0,0 +1,90 @@ +var trustedCorsAddButton = document.getElementById("trustedCorsAddButton") as HTMLButtonElement; +var trustedCorsRemoveButton = document.getElementById("trustedCorsRemoveButton") as HTMLButtonElement; +var trustedCorsInput = document.getElementById("trustedCorsInput") as HTMLInputElement; +var trustedCorsSelect = document.getElementById("trustedCorsSelect") as HTMLSelectElement; + +var knownProxiesAddButton = document.getElementById("knownProxiesAddButton") as HTMLButtonElement; +var knownProxiesRemoveButton = document.getElementById("knownProxiesRemoveButton") as HTMLButtonElement; +var knownProxiesInput = document.getElementById("knownProxiesInput") as HTMLInputElement; +var knownProxiesSelect = document.getElementById("knownProxiesSelect") as HTMLSelectElement; + +var serverAdminsAddButton = document.getElementById("serverAdminsAddButton") as HTMLButtonElement; +var serverAdminsRemoveButton = document.getElementById("serverAdminsRemoveButton") as HTMLButtonElement; +var serverAdminsInput = document.getElementById("serverAdminsInput") as HTMLInputElement; +var serverAdminsSelect = document.getElementById("serverAdminsSelect") as HTMLSelectElement; + + + +trustedCorsAddButton.addEventListener("click", ev => { + if (trustedCorsInput.value.length > 0) { + var option = document.createElement("option"); + option.value = trustedCorsInput.value; + option.text = trustedCorsInput.value; + trustedCorsSelect.add(option); + trustedCorsInput.value = ""; + } +}); + +trustedCorsInput.addEventListener("keypress", ev => { + if (ev.key.toLowerCase() == "enter") { + ev.preventDefault(); + ev.stopPropagation(); + trustedCorsAddButton.click(); + } +}) + +trustedCorsRemoveButton.addEventListener("click", ev => { + while (trustedCorsSelect.selectedOptions.length > 0) { + trustedCorsSelect.selectedOptions[0].remove(); + } +}); + + +knownProxiesAddButton.addEventListener("click", ev => { + if (knownProxiesInput.value.length > 0) { + var option = document.createElement("option"); + option.value = knownProxiesInput.value; + option.text = knownProxiesInput.value; + knownProxiesSelect.add(option); + knownProxiesInput.value = ""; + } +}); + +knownProxiesInput.addEventListener("keypress", ev => { + if (ev.key.toLowerCase() == "enter") { + ev.preventDefault(); + ev.stopPropagation(); + knownProxiesAddButton.click(); + } +}) + +knownProxiesRemoveButton.addEventListener("click", ev => { + while (knownProxiesSelect.selectedOptions.length > 0) { + knownProxiesSelect.selectedOptions[0].remove(); + } +}); + + +serverAdminsAddButton.addEventListener("click", ev => { + if (serverAdminsInput.value.length > 0) { + var option = document.createElement("option"); + option.value = serverAdminsInput.value; + option.text = serverAdminsInput.value; + serverAdminsSelect.add(option); + serverAdminsInput.value = ""; + } +}); + +serverAdminsInput.addEventListener("keypress", ev => { + if (ev.key.toLowerCase() == "enter") { + ev.preventDefault(); + ev.stopPropagation(); + serverAdminsAddButton.click(); + } +}) + +serverAdminsRemoveButton.addEventListener("click", ev => { + while (serverAdminsSelect.selectedOptions.length > 0) { + serverAdminsSelect.selectedOptions[0].remove(); + } +}); diff --git a/Shared/Models/RemotelyUser.cs b/Shared/Models/RemotelyUser.cs index ee6b3c61..2af1e2d8 100644 --- a/Shared/Models/RemotelyUser.cs +++ b/Shared/Models/RemotelyUser.cs @@ -22,7 +22,7 @@ namespace Remotely.Shared.Models public string OrganizationID { get; set; } public bool IsAdministrator { get; set; } = true; - + public bool IsServerAdmin { get; set; } public List PermissionLinks { get; set; } } }