shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More admin panel work.

Browse source
This commit is contained in:
Michael 2017-02-12 18:35:15 -05:00
parent f5ef64e87d
commit f54f014941
9 changed files with 405 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ShiftOS.Objects/Save.cs
View file

@ -27,6 +27,10 @@ namespace ShiftOS.Objects
private dynamic _settings = new SettingsObject();
public Guid ID { get; set; }
public bool IsMUDAdmin { get; set; }
public dynamic Settings
{
get

370
ShiftOS.Server.WebAdmin/Program.cs
View file

@ -45,6 +45,24 @@ namespace ShiftOS.Server.WebAdmin
{
templateParams.Add("{logout}", "<li><a href=\"/mudadmin/logout\">Log out</a></li>");
}
if (SystemManager.MudIsRunning())
{
templateParams.Add("{mud_power}", "<li><a href='/mudadmin/poweroff'><span class='glyphicon glyphicon-power-off'></span> Power off</a></li>");
templateParams.Add("{mud_restart}", "<li><a href='/mudadmin/restart'><span class='glyphicon glyphicon-refresh'></span> Restart</a></li>");
}
else
{
templateParams.Add("{mud_power}", "<li><a href='/mudadmin/poweron'><span class='glyphicon glyphicon-power-on'></span> Power on</a></li>");
templateParams.Add("{mud_restart}", "");
}
if(templateParams["{logout}"] == "")
{
templateParams["{mud_power}"] = "";
templateParams["{mud_restart}"] = "";
}
switch (page)
{
case "status":
@ -97,23 +115,61 @@ namespace ShiftOS.Server.WebAdmin
public static class SystemManager
{
public static bool MudIsRunning()
{
var processes = System.Diagnostics.Process.GetProcessesByName("ShiftOS.Server");
return processes.Length > 0;
}
public static void KillMud()
{
var processes = System.Diagnostics.Process.GetProcessesByName("ShiftOS.Server");
for(int i = 0; i < processes.Length; i++)
{
try
{
processes[i].Kill();
}
catch
{
}
}
}
public static List<string> GetClaims(string username)
{
foreach (var user in JsonConvert.DeserializeObject<List<MudUser>>(ShiftOS.Server.Program.ReadEncFile("users.json")))
foreach(var save in GetSaves())
{
if(user.Username == username)
if (save.IsMUDAdmin)
{
return user.Claims;
return new List<string> { "User", "Admin" };
}
}
return new List<string>(new[] { "User" });
}
public static Save[] GetSaves()
{
List<Save> saves = new List<Save>();
if (Directory.Exists("saves"))
{
foreach(var saveFile in Directory.GetFiles("saves"))
{
try
{
saves.Add(JsonConvert.DeserializeObject<Save>(Server.Program.ReadEncFile(saveFile)));
}
catch { }
}
}
return saves.ToArray();
}
public static bool Login(string username, string password, out Guid id)
{
foreach (var user in JsonConvert.DeserializeObject<List<MudUser>>(ShiftOS.Server.Program.ReadEncFile("users.json")))
foreach (var user in GetSaves())
{
if (user.Username == username && user.Password == Encryption.Encrypt(password))
if (user.Username == username && user.Password == password)
{
id = user.ID;
return true;
@ -184,6 +240,40 @@ namespace ShiftOS.Server.WebAdmin
return new Channel();
}
public static string BuildSaveListing(Save[] list)
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("<table class=\"table\">");
sb.AppendLine(@"<tr>
<td><strong>Username</strong></td>
<td><strong>System Name</strong></td>
<td><strong>Codepoints</strong></td>
<td><strong>Shiftorium Upgrades</strong></td>
<td><strong>Is MUD Admin</strong></td>
<td><strong>Actions</strong></td>
</tr>");
foreach(var save in list)
{
sb.AppendLine($@"<tr>
<td>{save.Username}</td>
<td>{save.SystemName}</td>
<td>{save.Codepoints}</td>
<td>{save.CountUpgrades()} installed, {save.Upgrades.Count} total</td>
<td>{save.IsMUDAdmin}</td>
<td>
<a href=""/mudadmin/toggleadmin/{save.ID}"" class=""btn btn-danger"">Toggle admin</a>
<a href=""/mudadmin/deletesave/{save.Username}"" class=""btn btn-danger"">Delete save</a>
</td>
</tr>");
}
sb.AppendLine("</table>");
return sb.ToString();
}
public static string GetAllChats()
{
StringBuilder sb = new StringBuilder();
@ -208,15 +298,40 @@ namespace ShiftOS.Server.WebAdmin
<td>{chat.DiscordBotToken}</td>
<td>
<a href=""/mudadmin/editchat/{chat.ID}"" class=""btn btn-default""><span class=""glyphicon glyphicon-pencil""></span>Edit</a>
<a href=""/mudadmin/deletechat/{chat.ID}"" class=""btn btn-default""><span class=""glyphicon glyphicon-delete""></span>Delete</a>
<a href=""#"" class=""btn btn-default"" data-toggle=""modal"" data-target=""#modal_{chat.ID}""><span class=""glyphicon glyphicon-delete""></span> Delete</a>
</td>
</tr>");
sb.AppendLine(CreateModal(chat.ID, "Delete " + chat.Name + "?", "Are you sure you want to delete this chat?", "/deletechat/" + chat.ID));
}
}
sb.AppendLine("</table>");
return sb.ToString();
}
public static string CreateModal(string id, string title, string msg, string callbackUrl)
{
return $@"<div id=""modal_{id}"" class=""modal fade"" role=""dialog"">
<div class=""modal-dialog"">
<!-- Modal content-->
<div class=""modal-content"">
<div class=""modal-header"">
<button type=""button"" class=""close"" data-dismiss=""modal"">&times;</button>
<h4 class=""modal-title"">{title}</h4>
</div>
<div class=""modal-body"">
<p>{msg}</p>
</div>
<div class=""modal-footer"">
<a href=""/mudadmin{callbackUrl}"" class=""btn btn-danger"">Yes</a>
<button type=""button"" class=""btn btn-default"" data-dismiss=""modal"">No</button>
</div>
</div>
</div>
</div>";
}
public static string GetCPWorth()
{
if (System.IO.Directory.Exists("saves"))
@ -253,7 +368,7 @@ namespace ShiftOS.Server.WebAdmin
public static MudUserIdentity GetIdentity(Guid id)
{
foreach (var user in JsonConvert.DeserializeObject<List<MudUser>>(ShiftOS.Server.Program.ReadEncFile("users.json")))
foreach (var user in GetSaves())
{
if (user.ID == id)
{
@ -262,13 +377,50 @@ namespace ShiftOS.Server.WebAdmin
}
return null;
}
internal static void MakeAdmin(string username)
{
Save sav = null;
foreach(var save in GetSaves())
{
if (save.Username == username)
sav = save;
}
if(sav != null)
{
sav.IsMUDAdmin = true;
Server.Program.WriteEncFile("saves/" + username + ".save", JsonConvert.SerializeObject(sav));
}
}
internal static Save[] GetAdmins()
{
var saves = new List<Save>();
foreach(var save in GetSaves())
{
if(save.IsMUDAdmin == true)
{
saves.Add(save);
}
}
return saves.ToArray();
}
}
public class MudUser
{
[FriendlyName("Username")]
[FriendlyDescription("The username you will appear as in-game.")]
public string Username { get; set; }
[FriendlyName("Password")]
[FriendlyDescription("A password that you will use to log in to the admin panel and the game.")]
public string Password { get; set; }
public List<string> Claims { get; set; }
[FriendlyName("System name")]
[FriendlyDescription("An in-game hostname for your account. In ShiftOS, your user ID is always yourusername@yoursystemname. Be creative.")]
public string SystemName { get; set; }
public Guid ID { get; set; }
}
@ -299,18 +451,30 @@ namespace ShiftOS.Server.WebAdmin
{
Get["/login"] = parameters =>
{
if (System.IO.File.Exists("users.json"))
if (SystemManager.GetSaves().Length > 0)
{
return PageBuilder.Build("login", new Dictionary<string, string>
if (SystemManager.GetAdmins().Length > 0)
{
return PageBuilder.Build("login", new Dictionary<string, string>
{
{"{logout}", "" }
});
}
else
{
return PageBuilder.Build("initialsetup", new Dictionary<string, string>
{
{"{logout}", "" },
{"{savelist}", BuildSaveList() }
});
}
}
else
{
return PageBuilder.Build("initialsetup", new Dictionary<string, string>
return PageBuilder.Build("bla", new Dictionary<string, string>
{
{"{logout}", "" }
{"{body}", Properties.Resources.NoUsersFound },
{"{user_create_form}", SystemManager.BuildFormFromObject(new MudUser()) }
});
}
};
@ -322,54 +486,169 @@ namespace ShiftOS.Server.WebAdmin
Post["/login"] = parameters =>
{
var p = this.Bind<LoginRequest>();
Guid id = new Guid();
if (System.IO.File.Exists("users.json"))
if (SystemManager.GetSaves().Length > 0)
{
if (SystemManager.Login(p.username, p.password, out id) == true)
if (SystemManager.GetAdmins().Length == 0)
{
return this.Login(id);
var user = this.Bind<LoginRequest>();
SystemManager.MakeAdmin(user.username);
Guid id = new Guid();
if(SystemManager.Login(user.username, user.password, out id) == true)
{
return this.Login(id);
}
return new UserModule().Redirect("/login");
}
else
{
return PageBuilder.Build("loginFailed", new Dictionary<string, string>
{
{"{logout}", "" }
});
var user = this.Bind<LoginRequest>();
Guid id = new Guid();
if (SystemManager.Login(user.username, user.password, out id) == true)
{
return this.Login(id);
}
return new UserModule().Redirect("/login");
}
}
else
{
var mudUser = new MudUser();
mudUser.Username = p.username;
mudUser.Password = Encryption.Encrypt(p.password);
mudUser.Claims = new List<string>(new[] { "Admin" });
mudUser.ID = Guid.NewGuid();
id = mudUser.ID;
List<MudUser> users = new List<MudUser>(new[] { mudUser });
ShiftOS.Server.Program.WriteEncFile("users.json", JsonConvert.SerializeObject(users, Formatting.Indented));
return this.Login(id);
var newUser = this.Bind<MudUser>();
var save = new Save();
save.Username = newUser.Username;
save.SystemName = newUser.SystemName;
save.Password = newUser.Password;
save.Codepoints = 0;
save.MyShop = "";
save.Upgrades = new Dictionary<string, bool>();
save.IsMUDAdmin = true;
save.StoryPosition = 1;
if (!Directory.Exists("saves"))
Directory.CreateDirectory("saves");
save.ID = Guid.NewGuid();
Server.Program.WriteEncFile("saves/" + save.Username + ".save", JsonConvert.SerializeObject(save));
return this.Login(save.ID);
}
};
}
private string BuildSaveList()
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("<table class='table'>");
sb.AppendLine($@"<tr>
<td><strong>Username</strong></td>
<td><strong>System name</strong></td>
<td><strong>Codepoints</strong></td>
<td><strong>Actions</strong></td>
</tr>");
foreach(var save in SystemManager.GetSaves())
{
sb.AppendLine($@"<tr>
<td>{save.Username}</td>
<td>{save.SystemName}</td>
<td>{save.Codepoints}</td>
<td><form method='post' action=''>
<input type='hidden' name='username' value='{save.Username}'/><input type='hidden' name='password' value='{save.Password}'/>
<input type='submit' value='Choose' class='btn btn-default'/>
</form></td>
</tr>");
}
sb.AppendLine("</table>");
return sb.ToString();
}
}
public class UserModule : NancyModule
{
public string Redirect(string url)
{
return $@"<html>
<head>
<meta http-equiv=""refresh"" content=""0; url=/mudadmin{url}"" />
</ head>
</html>";
}
public UserModule()
{
this.RequiresAuthentication();
this.RequiresClaims("Admin");
Get["/"] = _ =>
{
return statusBuilder();
return Redirect("/status");
};
Get["/toggleadmin/{id}"] = parameters =>
{
string id = parameters.id;
for (int i = 0; i < SystemManager.GetSaves().Length; i++)
{
var save = SystemManager.GetSaves()[i];
if(save.ID.ToString() == id)
{
save.IsMUDAdmin = !save.IsMUDAdmin;
Server.Program.WriteEncFile("saves/" + save.Username + ".save", JsonConvert.SerializeObject(save));
}
}
return Redirect("/saves");
};
Get["/deletesave/{username}"] = parameters =>
{
string id = parameters.username;
for (int i = 0; i < SystemManager.GetSaves().Length; i++)
{
if (SystemManager.GetSaves()[i].Username.ToString() == id)
{
File.Delete("saves/" + SystemManager.GetSaves()[i].Username + ".save");
}
}
return Redirect("/saves");
};
Get["/saves"] = _ =>
{
return PageBuilder.Build("bla", new Dictionary<string, string>
{
{ "{body}", Properties.Resources.GenericTableList },
{ "{listtitle}", "Test subjects" },
{ "{listdesc}", "Below is a list of test subjects (save files) on your multi-user domain. You can see their username, system name, Codepoints, amount of installed upgrades, and you can also perform basic actions on each save." },
{ "{list}", SystemManager.BuildSaveListing(SystemManager.GetSaves()) }
});
};
Get["/status"] = _ =>
{
return statusBuilder();
};
Get["/deletechat/{id}"] = parameters =>
{
string chatID = parameters.id;
var chats = JsonConvert.DeserializeObject<List<Channel>>(File.ReadAllText("chats.json"));
for(int i = 0; i < chats.Count; i++)
{
try
{
if (chats[i].ID == chatID)
chats.RemoveAt(i);
}
catch { }
}
File.WriteAllText("chats.json", JsonConvert.SerializeObject(chats, Formatting.Indented));
return Redirect("/chats");
};
Get["/chats"] = _ =>
{
return chatsListBuilder();
@ -410,7 +689,7 @@ namespace ShiftOS.Server.WebAdmin
File.WriteAllText("chats.json", JsonConvert.SerializeObject(chats, Formatting.Indented));
return chatsListBuilder();
return Redirect("/chats");
};
Get["/editchat/{id}"] = parameters =>
@ -447,9 +726,34 @@ namespace ShiftOS.Server.WebAdmin
}
File.WriteAllText("chats.json", JsonConvert.SerializeObject(chats, Formatting.Indented));
return chatsListBuilder();
return Redirect("/chats");
};
Get["/poweron"] = _ =>
{
if (!SystemManager.MudIsRunning())
{
System.Diagnostics.Process.Start("ShiftOS.Server.exe");
}
return Redirect("/");
};
Get["/poweroff"] = _ =>
{
if (SystemManager.MudIsRunning())
{
SystemManager.KillMud();
}
return Redirect("/");
};
Get["/restart"] = _ =>
{
if (SystemManager.MudIsRunning())
{
SystemManager.KillMud();
}
return Redirect("/poweron");
};
}
private string statusBuilder()

37
ShiftOS.Server.WebAdmin/Properties/Resources.Designer.cs generated
View file

@ -88,6 +88,19 @@ namespace ShiftOS.Server.WebAdmin.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to &lt;h3&gt;{listtitle}&lt;/h3&gt;
///
///&lt;p&gt;{listdesc}&lt;/p&gt;
///
///{list}.
/// </summary>
internal static string GenericTableList {
get {
return ResourceManager.GetString("GenericTableList", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt;html&gt;
/// &lt;head&gt;
@ -97,7 +110,7 @@ namespace ShiftOS.Server.WebAdmin.Properties {
/// &lt;link rel=&quot;stylesheet&quot; href=&quot;http://getshiftos.ml/css/theme.css&quot;/&gt;
///
/// &lt;!-- Latest compiled and minified JavaScript --&gt;
/// &lt;script src=&quot;https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js&quot; integrity=&quot;sha384-Tc5I [rest of string was truncated]&quot;;.
/// &lt;script src=&quot;https://code.jquery.com/jquery-3.1.1.js&quot; integrity=&quot;sha256-16cdPddA6VdVInumRGo6IbivbERE8p7C [rest of string was truncated]&quot;;.
/// </summary>
internal static string HtmlTemplate {
get {
@ -127,17 +140,25 @@ namespace ShiftOS.Server.WebAdmin.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to &lt;h3&gt;No users found.&lt;/h3&gt;
///
///&lt;p&gt;Your multi-user domain is newly-created. Before you can use the admin panel, you must create a ShiftOS user to act as the administrator of the MUD.&lt;/p&gt;
///
///{user_create_form}.
/// </summary>
internal static string NoUsersFound {
get {
return ResourceManager.GetString("NoUsersFound", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt;h1&gt;Initial setup&lt;/h1&gt;
///
///&lt;p&gt;Welcome to your multi-user domain. If you are seeing this screen, it means that the web administration panel is successfully running and listening for requests. Before you can start using the admin panel you must create an Admin account. This account will let you log in and manage other authorized users, manage saves, Shiftnet pages and other information.&lt;/p&gt;
///&lt;p&gt;This multi-user domain contains some users, however none of them are administrators. Please choose your user to make it an admin.&lt;/p&gt;
///
///&lt;p&gt;To continue, type a username and password.&lt;/p&gt;
///
///&lt;form method=&quot;post&quot; action=&quot;&quot;&gt;
/// &lt;table class=&quot;table&quot;&gt;
/// &lt;tr&gt;
/// [rest of string was truncated]&quot;;.
///{savelist}.
/// </summary>
internal static string SetupView {
get {

6
ShiftOS.Server.WebAdmin/Properties/Resources.resx
View file

@ -124,12 +124,18 @@
<data name="ChatListView" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ChatListView.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="GenericTableList" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GenericTableList.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="HtmlTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\HtmlTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="LoginView" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\LoginView.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="NoUsersFound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\NoUsersFound.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="SetupView" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SetupView.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>

5
ShiftOS.Server.WebAdmin/Resources/GenericTableList.txt Normal file
View file

@ -0,0 +1,5 @@
<h3>{listtitle}</h3>
<p>{listdesc}</p>
{list}

19
ShiftOS.Server.WebAdmin/Resources/HtmlTemplate.txt
View file

@ -6,6 +6,7 @@
<link rel="stylesheet" href="http://getshiftos.ml/css/theme.css"/>
<!-- Latest compiled and minified JavaScript -->
<script src="https://code.jquery.com/jquery-3.1.1.js" integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
</head>
<body>
@ -21,34 +22,36 @@
<a href="/mudadmin/saves">Test subjects</a>
</li>
<li>
<a href="/mudadmin/shiftnet">Shiftnet</a>
<a href="#">Shiftnet (NYI)</a>
</li>
<li>
<a href="/mudadmin/scripts">Scripts</a>
<a href="#">Scripts (NYI)</a>
</li>
<li>
<a href="/mudadmin/legions">Legions</a>
<a href="#">Legions (NYI)</a>
</li>
<li>
<a href="/mudadmin/chats">Chats</a>
</li>
<li>
<a href="/mudadmin/shops">Shops</a>
</li>
<li>
<a href="/mudadmin/help">Help</a>
<a href="#">Shops (NYI)</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
{mud_restart}
{mud_power}
{logout}
</ul>
</div>
<!-- /#sidebar-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container-fluid">
<div class="container-fluid content">
{body}
<p style="text-align:center;"><em>ShiftOS - MUD admin panel - Copyright &copy; 2017 ShiftOS developers</em></p>
</div>
</div>
</body>

5
ShiftOS.Server.WebAdmin/Resources/NoUsersFound.txt Normal file
View file

@ -0,0 +1,5 @@
<h3>No users found.</h3>
<p>Your multi-user domain is newly-created. Before you can use the admin panel, you must create a ShiftOS user to act as the administrator of the MUD.</p>
{user_create_form}

21
ShiftOS.Server.WebAdmin/Resources/SetupView.txt
View file

@ -1,22 +1,5 @@
<h1>Initial setup</h1>
<p>Welcome to your multi-user domain. If you are seeing this screen, it means that the web administration panel is successfully running and listening for requests. Before you can start using the admin panel you must create an Admin account. This account will let you log in and manage other authorized users, manage saves, Shiftnet pages and other information.</p>
<p>This multi-user domain contains some users, however none of them are administrators. Please choose your user to make it an admin.</p>
<p>To continue, type a username and password.</p>
<form method="post" action="">
<table class="table">
<tr>
<td><strong>Username:</strong></td>
<td><input class="form-control" type="text" name="username"/></td>
</tr>
<tr>
<td><strong>Password:</strong></td>
<td><input class="form-control" type="password" name="password"/></td>
</tr>
<tr>
<td></td>
<td><input type="submit" class="btn btn-default"/></td>
</tr>
</table>
</form>
{savelist}

6
ShiftOS.Server.WebAdmin/ShiftOS.Server.WebAdmin.csproj
View file

@ -109,6 +109,12 @@
<ItemGroup>
<None Include="Resources\ChatEditTemplate.txt" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\NoUsersFound.txt" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GenericTableList.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.