diff --git a/Assembly/ASMInfo.cs b/Assembly/ASMInfo.cs index 864dbc3..568574e 100644 --- a/Assembly/ASMInfo.cs +++ b/Assembly/ASMInfo.cs @@ -7,7 +7,7 @@ using LibZNI; [assembly: AssemblyCompany("ZNI")] [assembly: AssemblyAlgorithmId(System.Configuration.Assemblies.AssemblyHashAlgorithm.MD5)] [assembly: AssemblyCopyright("(C) 2020 Tara Piccari")] -[assembly: AssemblyFileVersion("5.0.5.1255")] +[assembly: AssemblyFileVersion("5.0.5.1256")] [assembly: AssemblyDescription("Second Life Bot - BotCore5")] [assembly: AutoUpdater("/job/Bot", "!os!.tar")] @@ -16,7 +16,7 @@ namespace Bot.Assemble public class ASMInfo { public static string BotName = "ZBotCore"; - public static string BotVer = "5.0.5.1255"; + public static string BotVer = "5.0.5.1256"; public static string GitPassword { get diff --git a/BotCore5.csproj b/BotCore5.csproj index 60d97a7..75762eb 100644 --- a/BotCore5.csproj +++ b/BotCore5.csproj @@ -14,10 +14,12 @@ + + diff --git a/ChatLogger.cs b/ChatLogger.cs index 9f6fc75..fbce430 100644 --- a/ChatLogger.cs +++ b/ChatLogger.cs @@ -1,8 +1,5 @@ using Bot.CommandSystem; using OpenMetaverse; -using System; -using System.Collections.Generic; -using System.Text; namespace Bot { diff --git a/GroupKeepAlive.cs b/GroupKeepAlive.cs index 4918b91..f13b74f 100644 --- a/GroupKeepAlive.cs +++ b/GroupKeepAlive.cs @@ -3,7 +3,6 @@ using OpenMetaverse; using System; using System.Collections.Generic; using System.IO; -using System.Text; using System.Threading; namespace Bot diff --git a/WebHookServer/HookCmds.cs b/WebHookServer/HookCmds.cs index 0f3aa13..c69d371 100644 --- a/WebHookServer/HookCmds.cs +++ b/WebHookServer/HookCmds.cs @@ -31,7 +31,7 @@ namespace Bot.WebHookServer StreamReader SR = new StreamReader(body, CTX.Request.ContentEncoding); string Response = SR.ReadToEnd(); - if (!Directory.Exists("request_log")) Directory.CreateDirectory("request_log"); + if (!Directory.Exists("BotData/request_log")) Directory.CreateDirectory("BotData/request_log"); string RequestPath = CTX.Request.RawUrl; @@ -45,7 +45,7 @@ namespace Bot.WebHookServer CustomReplyStr = reply.ReplyString; byte[] buffer = Encoding.UTF8.GetBytes("\n" + CustomReplyStr); CTX.Response.ContentLength64 = buffer.Length; - CTX.Response.AddHeader("Server", "1.6"); + CTX.Response.AddHeader("Server", "1.7"); CTX.Response.StatusCode = reply.Status; if (reply.ReturnContentType != "" && reply.ReturnContentType != null) { diff --git a/WebHookServer/WebHookServer.cs b/WebHookServer/WebHookServer.cs index 2a53a0d..f4914cd 100644 --- a/WebHookServer/WebHookServer.cs +++ b/WebHookServer/WebHookServer.cs @@ -19,12 +19,15 @@ using System.Net; using Newtonsoft.Json; using System.Security.Cryptography.X509Certificates; using System.Reflection; +using System.Net.Sockets; +using LibZNI; namespace Bot.WebHookServer { class GitServer : IProgram { public HttpListener listener; + //public Socket skt; public string ProgramName { get { return "GitServer"; } @@ -32,7 +35,7 @@ namespace Bot.WebHookServer public float ProgramVersion { - get { return 1.7f; } + get { return 1.8f; } } public void getTick() @@ -63,14 +66,19 @@ namespace Bot.WebHookServer if (MainConfiguration.Instance.UseSSL) { - X509Certificate cert = new X509Certificate2("BotData/"+MainConfiguration.Instance.SSLCertificatePFX, MainConfiguration.Instance.SSLCertificatePWD); + /* + * Removed because SSL is apparently windows only, and this implementation is not supported on windows... Use of netsh is pretty much required + */ + /* + X509Certificate cert = new X509Certificate2("BotData/" + MainConfiguration.Instance.SSLCertificatePFX, MainConfiguration.Instance.SSLCertificatePWD); + Type hepmType = Type.GetType("System.Net.HttpEndPointManager, System.Net.HttpListener"); Type heplType = Type.GetType("System.Net.HttpEndPointListener, System.Net.HttpListener"); MethodInfo getEPListener = hepmType.GetMethod("GetEPListener", BindingFlags.Static | BindingFlags.NonPublic); FieldInfo heplCert = heplType.GetField("_cert", BindingFlags.NonPublic | BindingFlags.Instance); object epl = getEPListener.Invoke(null, new object[] { "+", MainConfiguration.Instance.WebServerPort, listener, true }); - heplCert.SetValue(epl, cert); + heplCert.SetValue(epl, cert);*/ listener.Prefixes.Add($"https://*:{MainConfiguration.Instance.WebServerPort}/"); } else @@ -91,11 +99,13 @@ namespace Bot.WebHookServer //MessageFactory.Post(Destinations.DEST_LOCAL, "Error: Program could not escalate to Admin Privileges. WebHook engine not running\n\n" + e.Message + "\n" + e.StackTrace, UUID.Zero); } + } private void CurrentDomain_ProcessExit(object sender, EventArgs e) { listener.Stop(); + //skt.Close(); } } }