rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improved http status warning

Browse source
This commit is contained in:
Madpeter 2020-05-03 22:25:35 +01:00
parent 618eeb3c17
commit db188cb179
2 changed files with 50 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
BSBshared/Json/JsonConfigApi.cs
View file

@ -1,5 +1,6 @@
using BetterSecondBotShared.API; using BetterSecondBotShared.API;
using BetterSecondBotShared.logs; using BetterSecondBotShared.logs;
using BetterSecondBotShared.Static;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -107,21 +108,21 @@ namespace BetterSecondBotShared.Json
case "discord": { return new[] { "\"https://discordapp.com/api/webhooks/XXXX/YYYY\"" }; } case "discord": { return new[] { "\"https://discordapp.com/api/webhooks/XXXX/YYYY\"" }; }
case "allowrlv": { return new[] { "False" }; } case "allowrlv": { return new[] { "False" }; }
case "code": { return new[] { "\"DontTellAnyoneThis\"" }; } case "code": { return new[] { "\"DontTellAnyoneThis\"" }; }
case "enablehttp": { return new[] { "False" }; } case "enablehttp": { return new[] { "false" }; }
case "httpport": { return new[] { "8080" }; } case "httpport": { return new[] { "8080" }; }
case "httpkey": { return new[] { "\"ThisIsAKeyYo\"" }; } case "httpkey": { return new[] { "\"ThisIsAKeyYo\"" }; }
case "httprequiresigned": { return new[] { "False" }; } case "httprequiresigned": { return new[] { "false" }; }
case "httphost": { return new[] { "\"http://localhost\"" }; } case "httphost": { return new[] { "\"http://localhost\"" }; }
case "httpascnc": { return new[] { "False" }; } case "httpascnc": { return new[] { "false" }; }
case "discordfullserver": { return new[] { "False" }; } case "discordfullserver": { return new[] { "false" }; }
case "discordclienttoken": { return new[] { "https://discordapp.com/developers/ Bot" }; } case "discordclienttoken": { return new[] { "https://discordapp.com/developers/ Bot" }; }
case "discordserverid": { return new[] { "1234567890" }; } case "discordserverid": { return new[] { "1234567890" }; }
case "discordserverimhistoryhours": { return new[] { "24" }; } case "discordserverimhistoryhours": { return new[] { "24" }; }
case "defaultsituuid": { return new[] { "\"" + OpenMetaverse.UUID.Zero + "\"" }; } case "defaultsituuid": { return new[] { "\"" + OpenMetaverse.UUID.Zero + "\"" }; }
case "commandstoconsole": { return new[] { "False" }; } case "commandstoconsole": { return new[] { "false" }; }
case "maxcommandhistory": { return new[] { "250" }; } case "maxcommandhistory": { return new[] { "250" }; }
case "relayimtoavatar": { return new[] { "\"" + OpenMetaverse.UUID.Zero + "\"" }; } case "relayimtoavatar": { return new[] { "\"" + OpenMetaverse.UUID.Zero + "\"" }; }
case "athomesimonly": { return new[] { "False" }; } case "athomesimonly": { return new[] { "false" }; }
case "athomesimposmaxrange": { return new[] { "10.0" }; } case "athomesimposmaxrange": { return new[] { "10.0" }; }
default: { return new string[] { }; } default: { return new string[] { }; }
} }
@ -210,21 +211,39 @@ namespace BetterSecondBotShared.Json
public static JsonConfig http_config_check(JsonConfig jsonConfig) public static JsonConfig http_config_check(JsonConfig jsonConfig)
{ {
if ((jsonConfig.Httpkey != null) && (jsonConfig.HttpHost != null)) if (helpers.notempty(jsonConfig.Httpkey) == true)
{ {
if ((jsonConfig.Httpport < 80) || (jsonConfig.Httpkey.Length < 12) || (jsonConfig.HttpHost.StartsWith("http") == false)) if (helpers.notempty(jsonConfig.HttpHost) == true)
{ {
jsonConfig.EnableHttp = false; jsonConfig.EnableHttp = false;
if (jsonConfig.Httpkey.Length < 12)
{
ConsoleLog.Warn("Http disabled: Httpkey length must be 12 or more");
}
else if (jsonConfig.Httpport < 81)
{
ConsoleLog.Warn("Http disabled: Httpport range below protected range - Given: (" + jsonConfig.Httpport + ")");
}
else if ((jsonConfig.HttpHost != "docker") && (jsonConfig.HttpHost.StartsWith("http") == false))
{
ConsoleLog.Warn("Http disabled: HttpHost must be vaild: http://XXXXXX or \"docker\" - Given: ("+jsonConfig.HttpHost+")");
}
else
{
jsonConfig.EnableHttp = true;
}
}
else
{
ConsoleLog.Warn("Http disabled: HttpHost is null");
jsonConfig.EnableHttp = false;
} }
} }
else else
{ {
ConsoleLog.Warn("Http disabled: Httpkey is null");
jsonConfig.EnableHttp = false; jsonConfig.EnableHttp = false;
} }
if (jsonConfig.EnableHttp == false)
{
jsonConfig.HttpAsCnC = false;
}
return jsonConfig; return jsonConfig;
} }

25
CLI/HttpServer/http_server.cs
View file

@ -185,12 +185,25 @@ namespace BetterSecondBot.HttpServer
post_controler = new HTTPCommandsInterfacePost(Bot,this); post_controler = new HTTPCommandsInterfacePost(Bot,this);
Thread t = new Thread(delegate (object _) Thread t = new Thread(delegate (object _)
{ {
listener = new HttpListener(); bool ok = true;
listener.Prefixes.Add(url); try
listener.Start(); {
ConsoleLog.Status("Listening for connections on " + url + ""); listener = new HttpListener();
Task listenTask = HandleIncomingConnections(); listener.Prefixes.Add(url);
listenTask.GetAwaiter().GetResult(); listener.Start();
}
catch (Exception e)
{
ok = false;
ConsoleLog.Crit("Unable to setup http service: "+e.Message+"");
ConsoleLog.Crit("if running on windows please check: https://docs.microsoft.com/en-us/dotnet/framework/wcf/feature-details/configuring-http-and-https?redirectedfrom=MSDN");
}
if (ok == true)
{
ConsoleLog.Status("Listening for connections on " + url + "");
Task listenTask = HandleIncomingConnections();
listenTask.GetAwaiter().GetResult();
}
listener.Close(); listener.Close();
}) })
{ {