holy ashit

8 files changed, 380 insertions, 69 deletions

diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 57d1d34..dc0b3a2 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -276,6 +276,17 @@ namespace ShiftOS.Engine
             return true;
         }
 
+        [Command("restart")]
+        public static bool Restart()
+        {
+            SaveSystem.CurrentSave.Upgrades = new Dictionary<string, bool>();
+            SaveSystem.CurrentSave.Codepoints = 0;
+            SaveSystem.CurrentSave.StoriesExperienced.Clear();
+            SaveSystem.CurrentSave.StoriesExperienced.Add("mud_fundamentals");
+            SaveSystem.SaveGame();
+            Shiftorium.InvokeUpgradeInstalled();
+            return true;
+        }
 
         [Command("freecp")]
         public static bool FreeCodepoints(Dictionary<string, object> args)
@@ -283,8 +294,8 @@ namespace ShiftOS.Engine
             if (args.ContainsKey("amount"))
                 try
                 {
-                    Int64 codepointsToAdd = Convert.ToInt64(args["amount"].ToString());
-                    SaveSystem.TransferCodepointsFrom("dev", codepointsToAdd);
+                    long codepointsToAdd = Convert.ToInt64(args["amount"].ToString());
+                    SaveSystem.CurrentSave.Codepoints += codepointsToAdd;
                     return true;
                 }
                 catch (Exception ex)
@@ -293,7 +304,7 @@ namespace ShiftOS.Engine
                     return true;
                 }
 
-            SaveSystem.TransferCodepointsFrom("dev", 1000);
+            SaveSystem.CurrentSave.Codepoints += 1000;
             return true;
         }
 
diff --git a/ShiftOS_TheReturn/LoginManager.cs b/ShiftOS_TheReturn/LoginManager.cs
new file mode 100644
index 0000000..d326f2c
--- /dev/null
+++ b/ShiftOS_TheReturn/LoginManager.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ShiftOS.Objects;
+
+namespace ShiftOS.Engine
+{
+    public static class LoginManager
+    {
+        private static ILoginFrontend _login = null;
+
+        public static void Init(ILoginFrontend login)
+        {
+            _login = login;
+        }
+
+        public static void PromptForLogin()
+        {
+            _login.LoginComplete += (user) =>
+            {
+                LoginComplete?.Invoke(user);
+            };
+            _login.Login();
+        }
+
+        public static bool ShouldUseGUILogin
+        {
+            get
+            {
+                if (_login == null)
+                    return false;
+                return _login.UseGUILogin;
+            }
+        }
+
+        public static event Action<ClientSave> LoginComplete;
+    }
+
+    /// <summary>
+    /// Interface for GUI-based logins.
+    /// </summary>
+    public interface ILoginFrontend
+    {
+        /// <summary>
+        /// When implemented, shows the login UI.
+        /// </summary>
+        void Login();
+        
+        /// <summary>
+        /// Gets whether the ShiftOS engine should use a GUI-based login system or the default one.
+        /// </summary>
+        bool UseGUILogin { get; }
+
+
+        /// <summary>
+        /// Occurs when the login is complete.
+        /// </summary>
+        event Action<ClientSave> LoginComplete;
+
+        
+
+    }
+}
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index 945869b..31db58a 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -70,7 +70,7 @@ namespace ShiftOS.Engine
             {
                 var root = new ShiftOS.Objects.ShiftFS.Directory();
                 root.Name = "System";
-                root.permissions = Permissions.All;
+                root.permissions = UserPermissions.Guest;
                 System.IO.File.WriteAllText(Paths.SaveFile, JsonConvert.SerializeObject(root));
             }
 
@@ -98,13 +98,25 @@ namespace ShiftOS.Engine
                 }
 
                 Thread.Sleep(350);
-                Console.WriteLine("Initiating kernel...");
+                Console.WriteLine("ShiftKernel v0.4.2");
+                Console.WriteLine("(MIT) DevX 2017, Very Little Rights Reserved");
+                Console.WriteLine("");
+                Console.WriteLine("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR");
+                Console.WriteLine("IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,");
+                Console.WriteLine("FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE");
+                Console.WriteLine("AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER");
+                Console.WriteLine("LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,");
+                Console.WriteLine("OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE");
+                Console.WriteLine("SOFTWARE.");
+                Console.WriteLine("");
                 Thread.Sleep(250);
-                Console.WriteLine("Reading filesystem...");
+                Console.WriteLine("[init] Kernel boot complete.");
+                Console.WriteLine("[sfs] Loading SFS driver v3");
                 Thread.Sleep(100);
-                Console.WriteLine("Reading configuration...");
+                Console.WriteLine("[sfs] 4096 blocks read.");
+                Console.WriteLine("[simpl-conf] Reading configuration files (global-3.conf)");
 
-                Console.WriteLine("{CONNECTING_TO_MUD}");
+                Console.WriteLine("[inetd] Connecting to network...");
 
                 if (defaultConf.ConnectToMud == true)
                 {
@@ -113,32 +125,32 @@ namespace ShiftOS.Engine
                     {
                         //Connection successful! Stop waiting!
                         guidReceived = true;
-                        Console.WriteLine("Connection successful.");
+                        Console.WriteLine("[inetd] Connection successful.");
                     };
 
                     try
                     {
                         
-                        ServerManager.Initiate("secondary4162.cloudapp.net", 13370);
+                        ServerManager.Initiate(UserConfig.Get().DigitalSocietyAddress, UserConfig.Get().DigitalSocietyPort);
                         //This haults the client until the connection is successful.
                         while (ServerManager.thisGuid == new Guid())
                         {
                             Thread.Sleep(10);
                         }
-                        Console.WriteLine("GUID received - bootstrapping complete.");
+                        Console.WriteLine("[inetd] DHCP GUID recieved, finished setup");
                         FinishBootstrap();
                     }
                     catch (Exception ex)
                     {
                         //No errors, this never gets called.
-                        Console.WriteLine("{ERROR}: " + ex.Message);
+                        Console.WriteLine("[inetd] SEVERE: " + ex.Message);
                         Thread.Sleep(3000);
                         ServerManager.StartLANServer();
                         while (ServerManager.thisGuid == new Guid())
                         {
                             Thread.Sleep(10);
                         }
-                        Console.WriteLine("GUID received - bootstrapping complete.");
+                        Console.WriteLine("[inetd] DHCP GUID recieved, finished setup");
                         FinishBootstrap();
                     }
                 }
@@ -196,14 +208,60 @@ namespace ShiftOS.Engine
             Thread.Sleep(75);
 
             Thread.Sleep(50);
-            Console.WriteLine("{SYSTEM_INITIATED}");
+            Console.WriteLine("[usr-man] Accepting logins on local tty 1.");
 
+            Sysname:
+            bool waitingForNewSysName = false;
+            bool gobacktosysname = false;
+
+            if (string.IsNullOrWhiteSpace(CurrentSave.SystemName))
+            {
+                Infobox.PromptText("Enter a system name", "Your system does not have a name. All systems within the digital society must have a name. Please enter one.", (name) =>
+                {
+                    if (string.IsNullOrWhiteSpace(name))
+                        Infobox.Show("Invalid name", "Please enter a valid name.", () =>
+                        {
+                            gobacktosysname = true;
+                            waitingForNewSysName = false;
+                        });
+                    else if (name.Length < 5)
+                        Infobox.Show("Value too small.", "Your system name must have at least 5 characters in it.", () =>
+                        {
+                            gobacktosysname = true;
+                            waitingForNewSysName = false;
+                        });
+                    else
+                    {
+                        CurrentSave.SystemName = name;
+                        if (!string.IsNullOrWhiteSpace(CurrentSave.UniteAuthToken))
+                        {
+                            var unite = new Unite.UniteClient("http://getshiftos.ml", CurrentSave.UniteAuthToken);
+                            unite.SetSysName(name);
+                        }
+                        SaveSystem.SaveGame();
+                        gobacktosysname = false;
+                        waitingForNewSysName = false;
+                    }
+                });
+
+
+            }
+
+            while (waitingForNewSysName)
+            {
+                Thread.Sleep(10);
+            }
+
+            if (gobacktosysname)
+            {
+                goto Sysname;
+            }
 
             if (CurrentSave.Users == null)
                 CurrentSave.Users = new List<ClientSave>();
 
 
-            if(CurrentSave.Users.Count == 0)
+            if (CurrentSave.Users.Count == 0)
             {
                 CurrentSave.Users.Add(new ClientSave
                 {
@@ -211,76 +269,101 @@ namespace ShiftOS.Engine
                     Password = "",
                     Permissions = UserPermissions.Root
                 });
-                Console.WriteLine("No users found. Creating new user with username \"root\", with no password.");
+                Console.WriteLine("[usr-man] WARN: No users found. Creating new user with username \"root\", with no password.");
             }
             TerminalBackend.InStory = false;
 
             TerminalBackend.PrefixEnabled = false;
 
-            Login:
-            string username = "";
-            int progress = 0;
-            bool goback = false;
-            TextSentEventHandler ev = null;
-            ev = (text) =>
+            if (LoginManager.ShouldUseGUILogin)
+            {
+                Action<ClientSave> Completed = null;
+                Completed += (user) =>
+                {
+                    CurrentUser = user;
+                    LoginManager.LoginComplete -= Completed;
+                };
+                LoginManager.LoginComplete += Completed;
+                Desktop.InvokeOnWorkerThread(() =>
+                {
+                    LoginManager.PromptForLogin();
+                });
+                while (CurrentUser == null)
+                {
+                    Thread.Sleep(10);
+                }
+            }
+            else
             {
-                if (progress == 0)
+
+                Login:
+                string username = "";
+                int progress = 0;
+                bool goback = false;
+                TextSentEventHandler ev = null;
+                ev = (text) =>
                 {
-                    if (!string.IsNullOrWhiteSpace(text))
+                    if (progress == 0)
                     {
-                        if (CurrentSave.Users.FirstOrDefault(x => x.Username == text) == null)
+                        string loginstr = CurrentSave.SystemName + " login: ";
+                        string getuser = text.Remove(0, loginstr.Length);
+                        if (!string.IsNullOrWhiteSpace(getuser))
                         {
-                            Console.WriteLine("User not found.");
-                            goback = true;
+                            if (CurrentSave.Users.FirstOrDefault(x => x.Username == getuser) == null)
+                            {
+                                Console.WriteLine("User not found.");
+                                goback = true;
+                                progress++;
+                                TerminalBackend.TextSent -= ev;
+                                return;
+                            }
+                            username = getuser;
                             progress++;
+                        }
+                        else
+                        {
+                            Console.WriteLine("Username not provided.");
                             TerminalBackend.TextSent -= ev;
-                            return;
+                            goback = true;
+                            progress++;
                         }
-                        username = text;
-                        progress++;
                     }
-                    else
+                    else if (progress == 1)
                     {
-                        Console.WriteLine("Username not provided.");
+                        string passwordstr = "password: ";
+                        string getpass = text.Remove(0, passwordstr.Length);
+                        var user = CurrentSave.Users.FirstOrDefault(x => x.Username == username);
+                        if (user.Password == getpass)
+                        {
+                            Console.WriteLine("Welcome to ShiftOS.");
+                            CurrentUser = user;
+                            Thread.Sleep(2000);
+                            progress++;
+                        }
+                        else
+                        {
+                            Console.WriteLine("Access denied.");
+                            goback = true;
+                            progress++;
+                        }
                         TerminalBackend.TextSent -= ev;
-                        goback = true;
-                        progress++;
                     }
-                }
-                else if (progress == 1)
+                };
+                TerminalBackend.TextSent += ev;
+
+                Console.Write(CurrentSave.SystemName + " login: ");
+                while (progress == 0)
                 {
-                    var user = CurrentSave.Users.FirstOrDefault(x => x.Username == username);
-                    if (user.Password == text)
-                    {
-                        Console.WriteLine("Welcome to ShiftOS.");
-                        CurrentUser = user;
-                        Thread.Sleep(2000);
-                        progress++;
-                    }
-                    else
-                    {
-                        Console.WriteLine("Access denied.");
-                        goback = true;
-                        progress++;
-                    }
-                    TerminalBackend.TextSent -= ev;
+                    Thread.Sleep(10);
                 }
-            };
-            TerminalBackend.TextSent += ev;
-            Console.WriteLine(CurrentSave.SystemName + " login:");
-            while(progress == 0)
-            {
-                Thread.Sleep(10);
+                if (goback)
+                    goto Login;
+                Console.Write("password: ");
+                while (progress == 1)
+                    Thread.Sleep(10);
+                if (goback)
+                    goto Login;
             }
-            if (goback)
-                goto Login;
-            Console.WriteLine("password:");
-            while (progress == 1)
-                Thread.Sleep(10);
-            if (goback)
-                goto Login;
-
-
             TerminalBackend.PrefixEnabled = true;
             Shiftorium.LogOrphanedUpgrades = true;
             Desktop.InvokeOnWorkerThread(new Action(() =>
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs
index 0bdfcd9..825064b 100644
--- a/ShiftOS_TheReturn/ServerManager.cs
+++ b/ShiftOS_TheReturn/ServerManager.cs
@@ -35,6 +35,7 @@ using ShiftOS;
 using static ShiftOS.Engine.SaveSystem;
 using Newtonsoft.Json;
 using System.Net.Sockets;
+using System.Diagnostics;
 
 namespace ShiftOS.Engine
 {
@@ -54,6 +55,12 @@ namespace ShiftOS.Engine
         private static NetObjectClient client { get; set; }
         private static bool UserDisconnect = false;
 
+        public static long DigitalSocietyPing
+        {
+            get;
+            private set;
+        }
+
         public static void Disconnect()
         {
             UserDisconnect = true;
@@ -139,6 +146,11 @@ namespace ShiftOS.Engine
             };
             client.OnReceived += (o, a) =>
             {
+                if (PingTimer.IsRunning)
+                {
+                    DigitalSocietyPing = PingTimer.ElapsedMilliseconds;
+                    PingTimer.Reset();
+                }
                 var msg = a.Data.Object as ServerMessage;
                 if (msg.Name == "Welcome")
                 {
@@ -207,6 +219,8 @@ namespace ShiftOS.Engine
             }
         }
 
+        private static Stopwatch PingTimer = new Stopwatch();
+
         public static void SendMessage(string name, string contents)
         {
             var sMsg = new ServerMessage
@@ -215,7 +229,7 @@ namespace ShiftOS.Engine
                 Contents = contents,
                 GUID = thisGuid.ToString(),
             };
-
+            PingTimer.Start();
             client.Send(new NetObject("msg", sMsg));
 
         }
diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index fb33dc5..3b5eadd 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -111,6 +111,7 @@
     <Compile Include="IShiftOSWindow.cs" />
     <Compile Include="KernelWatchdog.cs" />
     <Compile Include="Localization.cs" />
+    <Compile Include="LoginManager.cs" />
     <Compile Include="NotificationDaemon.cs" />
     <Compile Include="OutOfBoxExperience.cs" />
     <Compile Include="Paths.cs" />
diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index 4cc9bbd..b731c4f 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/ShiftOS_TheReturn/Skinning.cs
@@ -267,6 +267,22 @@ namespace ShiftOS.Engine
         [ShifterHidden]
         public Dictionary<string, byte[]> AppIcons = new Dictionary<string, byte[]>();
 
+        [ShifterMeta("System")]
+        [ShifterCategory("Login Screen")]
+        [RequiresUpgrade("gui_based_login_screen")]
+        [ShifterName("Login Screen Background Color")]
+        [ShifterDescription("Change the background color of the login screen.")]
+        public Color LoginScreenColor = Skin.DesktopBG;
+
+        [ShifterMeta("System")]
+        [ShifterCategory("Login Screen")]
+        [RequiresUpgrade("skinning;gui_based_login_screen")]
+        [ShifterName("Login Screen Background Image")]
+        [ShifterDescription("Set an image as your login screen!")]
+        [Image("login")]
+        public byte[] LoginScreenBG = null;
+
+
         [RequiresUpgrade("shift_screensaver")]
         [ShifterMeta("System")]
         [ShifterCategory("Screen saver")]
diff --git a/ShiftOS_TheReturn/UniteClient.cs b/ShiftOS_TheReturn/UniteClient.cs
index 1136b5c..8d6a58d 100644
--- a/ShiftOS_TheReturn/UniteClient.cs
+++ b/ShiftOS_TheReturn/UniteClient.cs
@@ -5,13 +5,20 @@ using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using ShiftOS.Objects;
 
 namespace ShiftOS.Unite
 {
     public class UniteClient
     {
         public string Token { get; private set; }
-        public string BaseURL { get; private set; }
+        public string BaseURL
+        {
+            get
+            {
+                return UserConfig.Get().UniteUrl;
+            }
+        }
 
         public string GetDisplayNameId(string id)
         {
@@ -25,7 +32,8 @@ namespace ShiftOS.Unite
 
         public UniteClient(string baseurl, string usertoken)
         {
-            BaseURL = baseurl;
+            //Handled by the servers.json file
+            //BaseURL = baseurl;
             Token = usertoken;
         }
 
diff --git a/ShiftOS_TheReturn/UserManagementCommands.cs b/ShiftOS_TheReturn/UserManagementCommands.cs
index 62735a3..5702e08 100644
--- a/ShiftOS_TheReturn/UserManagementCommands.cs
+++ b/ShiftOS_TheReturn/UserManagementCommands.cs
@@ -47,6 +47,11 @@ namespace ShiftOS.Engine
             }
 
             var user = SaveSystem.CurrentSave.Users.FirstOrDefault(x => x.Username == name);
+            if(user.Username != SaveSystem.CurrentUser.Username)
+            {
+                Console.WriteLine("Error: Cannot remove yourself.");
+                return true;
+            }
             SaveSystem.CurrentSave.Users.Remove(user);
             Console.WriteLine($"Removing user \"{name}\" from system...");
             SaveSystem.SaveGame();
@@ -55,13 +60,121 @@ namespace ShiftOS.Engine
 
 
 
+
+        [Command("set_acl")]
+        [RequiresArgument("user")]
+        [RequiresArgument("val")]
+        public static bool SetUserPermission(Dictionary<string, object> args)
+        {
+            int permission = 0;
+            string username = args["user"].ToString();
+            try 
+            {
+                permission = Convert.ToInt32(args["val"].ToString());
+            }
+            catch
+            {
+                Console.WriteLine("Error: Permission value must be an integer.");
+                return true;
+            }
+
+            if(SaveSystem.CurrentSave.Users.FirstOrDefault(x=>x.Username==username) == null)
+            {
+                Console.WriteLine("Error: User not found.");
+                return true;
+            }
+
+            UserPermissions uperm = UserPermissions.Guest;
+
+            switch (permission)
+            {
+                case 0:
+                    uperm = UserPermissions.Guest;
+                    break;
+                case 1:
+                    uperm = UserPermissions.User;
+                    break;
+                case 2:
+                    uperm = UserPermissions.Admin;
+                    break;
+                case 3:
+                    uperm = UserPermissions.Root;
+                    break;
+                default:
+                    Console.WriteLine("Permission value must be between 0 and 4.");
+                    return true;
+            }
+
+            //Permissions are backwards... oops...
+            if(uperm < SaveSystem.CurrentUser.Permissions)
+            {
+                Console.WriteLine("Error: Cannot set user permissions to values greater than your own!");
+                return true;
+            }
+
+            var oldperm = SaveSystem.Users.FirstOrDefault(x => x.Username == username).Permissions;
+            if (SaveSystem.CurrentUser.Permissions > oldperm)
+            {
+                Console.WriteLine("Error: Can't set the permission of this user. They have more rights than you.");
+                return true;
+            }
+
+            SaveSystem.CurrentSave.Users.FirstOrDefault(x => x.Username == username).Permissions = uperm;
+            Console.WriteLine("User permissions updated.");
+            return true;
+        }
+
+
+        [Command("users", description = "Get a list of all users on the system.")]
+        public static bool GetUsers()
+        {
+            foreach (var u in SaveSystem.CurrentSave.Users)
+            {
+                if (u.Username == SaveSystem.CurrentUser.Username)
+                {
+                    ConsoleEx.ForegroundColor = ConsoleColor.Magenta;
+                    ConsoleEx.Bold = true;
+                }
+                else
+                {
+                    ConsoleEx.ForegroundColor = ConsoleColor.Gray;
+                    ConsoleEx.Bold = false;
+                }
+                Console.WriteLine(u.Username);
+            }
+            return true;
+        }
     }
 
     [Namespace("user")]
     [RequiresUpgrade("mud_fundamentals")]
     public static class UserManagementCommands
     {
+        [Command("login", description = "Log in as another user.")]
+        [RequiresArgument("user")]
+        [RequiresArgument("pass")]
+        public static bool Login(Dictionary<string, object> args)
+        {
+            string user = args["user"].ToString();
+            string pass = args["pass"].ToString();
+
+            var usr = SaveSystem.CurrentSave.Users.FirstOrDefault(x => x.Username == user);
+            if(usr==null)
+            {
+                Console.WriteLine("Error: No such user.");
+                return true;
+            }
 
+            if (usr.Password != pass)
+            {
+                Console.WriteLine("Access denied.");
+                return true;
+            }
+
+            SaveSystem.CurrentUser = usr;
+            Console.WriteLine("Access granted.");
+            return true;
+        }
 
         [Command("setpass", description ="Allows you to set your password to a new value.", usage ="old:,new:")]
         [RequiresArgument("old")]