From 31cc9148dd23737df16d8456a42d003cd31dd488 Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Sun, 21 May 2017 12:21:41 +0000 Subject: holy ashit --- ShiftOS.Server/SaveManager.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'ShiftOS.Server/SaveManager.cs') diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index 63aa2bf..acf28a5 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -189,7 +189,7 @@ namespace ShiftOS.Server //Update the shiftos website with the user's codepoints. if (!string.IsNullOrWhiteSpace(sav.UniteAuthToken)) { - var wreq = WebRequest.Create("http://getshiftos.ml/API/SetCodepoints/" + sav.Codepoints.ToString()); + var wreq = WebRequest.Create(UserConfig.Get().UniteUrl + "/API/SetCodepoints/" + sav.Codepoints.ToString()); wreq.Headers.Add("Authentication: Token " + sav.UniteAuthToken); wreq.GetResponse(); } @@ -216,6 +216,21 @@ namespace ShiftOS.Server WriteEncFile(savefile, JsonConvert.SerializeObject(save)); } + try + { + var wr = System.Net.HttpWebRequest.Create("http://getshiftos.ml/API/GetCodepoints"); + wr.Headers.Add("Authentication: Token " + save.UniteAuthToken); + var response = wr.GetResponse(); + using (var rstr = response.GetResponseStream()) + { + using (var sreader = new StreamReader(rstr)) + { + long cp = Convert.ToInt64(sreader.ReadToEnd()); + save.Codepoints = cp; + } + } + } + catch { } Program.server.DispatchTo(new Guid(guid), new NetObject("mud_savefile", new ServerMessage { -- cgit v1.2.3 From fe2a1a84c3a45c88c20fcea1e6970b0644279d52 Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Sun, 21 May 2017 13:09:07 +0000 Subject: I obsolesced something I made within an hour ago. --- ShiftOS.Server/SaveManager.cs | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'ShiftOS.Server/SaveManager.cs') diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index acf28a5..d81a1a7 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -216,21 +216,6 @@ namespace ShiftOS.Server WriteEncFile(savefile, JsonConvert.SerializeObject(save)); } - try - { - var wr = System.Net.HttpWebRequest.Create("http://getshiftos.ml/API/GetCodepoints"); - wr.Headers.Add("Authentication: Token " + save.UniteAuthToken); - var response = wr.GetResponse(); - using (var rstr = response.GetResponseStream()) - { - using (var sreader = new StreamReader(rstr)) - { - long cp = Convert.ToInt64(sreader.ReadToEnd()); - save.Codepoints = cp; - } - } - } - catch { } Program.server.DispatchTo(new Guid(guid), new NetObject("mud_savefile", new ServerMessage { -- cgit v1.2.3 From 505073b6938fc8be8b91807a69bd67e45ed4382f Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Mon, 29 May 2017 16:41:49 +0000 Subject: Fix server-side crash when kiading revoked api keys --- ShiftOS.Objects/Save.cs | 23 +++++++++++++---------- ShiftOS.Server/Program.cs | 13 +++++++++---- ShiftOS.Server/SaveManager.cs | 26 +++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 15 deletions(-) (limited to 'ShiftOS.Server/SaveManager.cs') diff --git a/ShiftOS.Objects/Save.cs b/ShiftOS.Objects/Save.cs index f4e1e09..8675a35 100644 --- a/ShiftOS.Objects/Save.cs +++ b/ShiftOS.Objects/Save.cs @@ -47,24 +47,27 @@ namespace ShiftOS.Objects { get { - if (!string.IsNullOrWhiteSpace(UniteAuthToken)) + try { var uc = new ShiftOS.Unite.UniteClient("", UniteAuthToken); return uc.GetCodepoints(); } - else + catch + { return _cp; + } } set { - if (!string.IsNullOrWhiteSpace(UniteAuthToken)) - { - var uc = new ShiftOS.Unite.UniteClient("", UniteAuthToken); - uc.SetCodepoints(value); - } - else - _cp = value; - + try + { + var uc = new ShiftOS.Unite.UniteClient("", UniteAuthToken); + uc.SetCodepoints(value); + } + catch + { + _cp = value; + } } } diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs index c880321..e1dcdf2 100644 --- a/ShiftOS.Server/Program.cs +++ b/ShiftOS.Server/Program.cs @@ -98,11 +98,16 @@ namespace ShiftOS.Server { if (server.IsOnline) { - server.DispatchAll(new NetObject("heartbeat", new ServerMessage + + try { - Name = "heartbeat", - GUID = "server" - })); + server.DispatchAll(new NetObject("heartbeat", new ServerMessage + { + Name = "heartbeat", + GUID = "server" + })); + } + catch { } } }; if (!Directory.Exists("saves")) diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index d81a1a7..bb71c71 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -207,7 +207,6 @@ namespace ShiftOS.Server { var save = JsonConvert.DeserializeObject(ReadEncFile(savefile)); - if (save.UniteAuthToken==token) { if (save.ID == new Guid()) @@ -216,6 +215,31 @@ namespace ShiftOS.Server WriteEncFile(savefile, JsonConvert.SerializeObject(save)); } + var wr = HttpWebRequest.Create(UserConfig.Get().UniteUrl + "/API/GetCodepoints"); + wr.Headers.Add("Authentication: Token " + save.UniteAuthToken); + try + { + using(var resp = wr.GetResponse()) + { + using(var str = resp.GetResponseStream()) + { + using(var reader = new StreamReader(str)) + { + Console.WriteLine("This user has " + reader.ReadToEnd() + " Codepoint(s)."); + } + } + } + } + catch (Exception ex) + { + Console.WriteLine(ex); + Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + { + Name = "mud_login_denied", + GUID = "server" + })); + return; + } Program.server.DispatchTo(new Guid(guid), new NetObject("mud_savefile", new ServerMessage { -- cgit v1.2.3 From b35e50e7ef0b34baa1151aa397311ae1f7865dd2 Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Tue, 30 May 2017 00:14:55 +0000 Subject: You scratch my back and I detach your back. --- ShiftOS.Server/SaveManager.cs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'ShiftOS.Server/SaveManager.cs') diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index bb71c71..2a94fb1 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -207,7 +207,7 @@ namespace ShiftOS.Server { var save = JsonConvert.DeserializeObject(ReadEncFile(savefile)); - if (save.UniteAuthToken==token) + if (save.UniteAuthToken == token) { if (save.ID == new Guid()) { @@ -219,11 +219,11 @@ namespace ShiftOS.Server wr.Headers.Add("Authentication: Token " + save.UniteAuthToken); try { - using(var resp = wr.GetResponse()) + using (var resp = wr.GetResponse()) { - using(var str = resp.GetResponseStream()) + using (var str = resp.GetResponseStream()) { - using(var reader = new StreamReader(str)) + using (var reader = new StreamReader(str)) { Console.WriteLine("This user has " + reader.ReadToEnd() + " Codepoint(s)."); } @@ -252,15 +252,11 @@ namespace ShiftOS.Server } catch { } } - try + Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage { - Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage - { - Name = "mud_login_denied", - GUID = "server" - })); - } - catch { } + Name = "mud_login_denied", + GUID = "server" + })); } [MudRequest("delete_save", typeof(ClientSave))] -- cgit v1.2.3 From c6e3d0e905d9c87483f4b8887be6c4d68dcb6f9f Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Tue, 30 May 2017 00:20:19 +0000 Subject: Really you long-ass nerd, Michael... --- ShiftOS.Server/RandomUserGenerator.cs | 2 +- ShiftOS.Server/SaveManager.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ShiftOS.Server/SaveManager.cs') diff --git a/ShiftOS.Server/RandomUserGenerator.cs b/ShiftOS.Server/RandomUserGenerator.cs index 3a62f9c..6da891d 100644 --- a/ShiftOS.Server/RandomUserGenerator.cs +++ b/ShiftOS.Server/RandomUserGenerator.cs @@ -111,7 +111,7 @@ namespace ShiftOS.Server break; } - sve.Codepoints = rnd.Next(startCP, maxAmt); + sve.Codepoints = (ulong)rnd.Next(startCP, maxAmt); //FS treasure generation. /* diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index 2a94fb1..cb2e1ba 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -288,7 +288,7 @@ namespace ShiftOS.Server { args["username"] = args["username"].ToString().ToLower(); string userName = args["username"] as string; - long cpAmount = (long)args["amount"]; + ulong cpAmount = (ulong)args["amount"]; if (Directory.Exists("saves")) { @@ -322,7 +322,7 @@ namespace ShiftOS.Server args["username"] = args["username"].ToString().ToLower(); string userName = args["username"] as string; string passw = args["password"] as string; - int cpAmount = (int)args["amount"]; + ulong cpAmount = (ulong)args["amount"]; if (Directory.Exists("saves")) { @@ -335,7 +335,7 @@ namespace ShiftOS.Server WriteEncFile(saveFile, JsonConvert.SerializeObject(saveFileContents, Formatting.Indented)); Program.ClientDispatcher.Broadcast("update_your_cp", new { username = userName, - amount = -cpAmount + amount = -(long)cpAmount }); Program.ClientDispatcher.DispatchTo("update_your_cp", guid, new { -- cgit v1.2.3