tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update Public IP urls

Browse source
This commit is contained in:
Brett Hewitson 2021-12-15 17:27:57 +10:00
parent 2b838c6337
commit 89a03123bb
9 changed files with 104 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Plugin.Discord/Config.Designer.cs generated
View file

@ -12,7 +12,7 @@ namespace ServerManagerTool.Plugin.Discord {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
internal sealed partial class Config : global::System.Configuration.ApplicationSettingsBase {
private static Config defaultInstance = ((Config)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Config())));
@ -32,15 +32,6 @@ namespace ServerManagerTool.Plugin.Discord {
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
public string PublicIPCheckUrl {
get {
return ((string)(this["PublicIPCheckUrl"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("12")]
@ -154,5 +145,23 @@ namespace ServerManagerTool.Plugin.Discord {
return ((string)(this["VersionBetaFeedUrl"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("https://api.ipify.org")]
public string PublicIPCheckUrl1 {
get {
return ((string)(this["PublicIPCheckUrl1"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
public string PublicIPCheckUrl2 {
get {
return ((string)(this["PublicIPCheckUrl2"]));
}
}
}
}

9
src/Plugin.Discord/Config.settings
View file

@ -5,9 +5,6 @@
<Setting Name="PluginCallUrlFormat" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://servermanager.azurewebsites.net/api/plugin/call/{0}/{1}/</Value>
</Setting>
<Setting Name="PublicIPCheckUrl" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://whatismyip.akamai.com/</Value>
</Setting>
<Setting Name="CallHomeDelay" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">12</Value>
</Setting>
@ -44,5 +41,11 @@
<Setting Name="VersionBetaFeedUrl" Type="System.String" Scope="Application">
<Value Profile="(Default)">https://raw.githubusercontent.com/Bletch1971/ServerManagers/master/Plugins/Discord/beta/VersionFeed.xml</Value>
</Setting>
<Setting Name="PublicIPCheckUrl1" Type="System.String" Scope="Application">
<Value Profile="(Default)">https://api.ipify.org</Value>
</Setting>
<Setting Name="PublicIPCheckUrl2" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://whatismyip.akamai.com/</Value>
</Setting>
</Settings>
</SettingsFile>

13
src/Plugin.Discord/Utils/NetworkUtils.cs
View file

@ -13,10 +13,17 @@ namespace ServerManagerTool.Plugin.Discord
{
try
{
var publicIP = await webClient.DownloadStringTaskAsync(Config.Default.PublicIPCheckUrl);
var publicIP = await webClient.DownloadStringTaskAsync(Config.Default.PublicIPCheckUrl1);
if (IPAddress.TryParse(publicIP, out IPAddress address1))
{
return address1;
}
if (IPAddress.TryParse(publicIP, out IPAddress address))
return address;
publicIP = await webClient.DownloadStringTaskAsync(Config.Default.PublicIPCheckUrl2);
if (IPAddress.TryParse(publicIP, out IPAddress address2))
{
return address2;
}
return IPAddress.None;
}

9
src/Plugin.Discord/app.config
View file

@ -10,9 +10,6 @@
<setting name="PluginCallUrlFormat" serializeAs="String">
<value>http://servermanager.azurewebsites.net/api/plugin/call/{0}/{1}/</value>
</setting>
<setting name="PublicIPCheckUrl" serializeAs="String">
<value>http://whatismyip.akamai.com/</value>
</setting>
<setting name="CallHomeDelay" serializeAs="String">
<value>12</value>
</setting>
@ -49,6 +46,12 @@
<setting name="VersionBetaFeedUrl" serializeAs="String">
<value>https://raw.githubusercontent.com/Bletch1971/ServerManagers/master/Plugins/Discord/beta/VersionFeed.xml</value>
</setting>
<setting name="PublicIPCheckUrl1" serializeAs="String">
<value>https://api.ipify.org</value>
</setting>
<setting name="PublicIPCheckUrl2" serializeAs="String">
<value>http://whatismyip.akamai.com/</value>
</setting>
</ServerManagerTool.Plugin.Discord.Config>
</applicationSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

29
src/ServerManager.Common/CommonConfig.Designer.cs generated
View file

@ -12,7 +12,7 @@ namespace ServerManagerTool.Common {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
public sealed partial class CommonConfig : global::System.Configuration.ApplicationSettingsBase {
private static CommonConfig defaultInstance = ((CommonConfig)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new CommonConfig())));
@ -23,15 +23,6 @@ namespace ServerManagerTool.Common {
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
public string PublicIPCheckUrl {
get {
return ((string)(this["PublicIPCheckUrl"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("SteamCMD")]
@ -160,5 +151,23 @@ namespace ServerManagerTool.Common {
this["SteamCmdRemoveQuit"] = value;
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("https://api.ipify.org")]
public string PublicIPCheckUrl1 {
get {
return ((string)(this["PublicIPCheckUrl1"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://whatismyip.akamai.com/")]
public string PublicIPCheckUrl2 {
get {
return ((string)(this["PublicIPCheckUrl2"]));
}
}
}
}

9
src/ServerManager.Common/CommonConfig.settings
View file

@ -2,9 +2,6 @@
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="ServerManagerTool.Common" GeneratedClassName="CommonConfig">
<Profiles />
<Settings>
<Setting Name="PublicIPCheckUrl" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://whatismyip.akamai.com/</Value>
</Setting>
<Setting Name="SteamCmdRelativePath" Type="System.String" Scope="Application">
<Value Profile="(Default)">SteamCMD</Value>
</Setting>
@ -44,5 +41,11 @@
<Setting Name="SteamCmdRemoveQuit" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="PublicIPCheckUrl1" Type="System.String" Scope="Application">
<Value Profile="(Default)">https://api.ipify.org</Value>
</Setting>
<Setting Name="PublicIPCheckUrl2" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://whatismyip.akamai.com/</Value>
</Setting>
</Settings>
</SettingsFile>

13
src/ServerManager.Common/ServerManager.Common.csproj
View file

@ -43,4 +43,17 @@
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Update="CommonConfig.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>CommonConfig.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="CommonConfig.settings">
<Generator>PublicSettingsSingleFileGenerator</Generator>
<LastGenOutput>CommonConfig.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
</Project>

20
src/ServerManager.Common/Utils/NetworkUtils.cs
View file

@ -81,8 +81,14 @@ namespace ServerManagerTool.Common.Utils
{
try
{
var publicIP = webClient.DownloadString(CommonConfig.Default.PublicIPCheckUrl);
if (IPAddress.TryParse(publicIP, out IPAddress address))
var publicIP = webClient.DownloadString(CommonConfig.Default.PublicIPCheckUrl1);
if (IPAddress.TryParse(publicIP, out IPAddress address1))
{
return publicIP;
}
publicIP = webClient.DownloadString(CommonConfig.Default.PublicIPCheckUrl2);
if (IPAddress.TryParse(publicIP, out IPAddress address2))
{
return publicIP;
}
@ -102,8 +108,14 @@ namespace ServerManagerTool.Common.Utils
{
try
{
var publicIP = await webClient.DownloadStringTaskAsync(CommonConfig.Default.PublicIPCheckUrl);
if (IPAddress.TryParse(publicIP, out IPAddress address))
var publicIP = await webClient.DownloadStringTaskAsync(CommonConfig.Default.PublicIPCheckUrl1);
if (IPAddress.TryParse(publicIP, out IPAddress address1))
{
return publicIP;
}
publicIP = await webClient.DownloadStringTaskAsync(CommonConfig.Default.PublicIPCheckUrl2);
if (IPAddress.TryParse(publicIP, out IPAddress address2))
{
return publicIP;
}

15
src/ServerManager.Common/app.config
View file

@ -10,9 +10,6 @@
</configSections>
<applicationSettings>
<ServerManagerTool.Common.CommonConfig>
<setting name="PublicIPCheckUrl" serializeAs="String">
<value>http://whatismyip.akamai.com/</value>
</setting>
<setting name="SteamCmdRelativePath" serializeAs="String">
<value>SteamCMD</value>
</setting>
@ -29,7 +26,7 @@
<value>+login anonymous +quit</value>
</setting>
<setting name="DefaultSteamAPIKey" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SteamAPIKeyUrl" serializeAs="String">
<value>https://steamcommunity.com/dev/apikey</value>
@ -40,15 +37,21 @@
<setting name="SteamProcessName" serializeAs="String">
<value>Steam</value>
</setting>
<setting name="PublicIPCheckUrl1" serializeAs="String">
<value>https://api.ipify.org</value>
</setting>
<setting name="PublicIPCheckUrl2" serializeAs="String">
<value>http://whatismyip.akamai.com/</value>
</setting>
</ServerManagerTool.Common.CommonConfig>
</applicationSettings>
<userSettings>
<ServerManagerTool.Common.CommonConfig>
<setting name="SteamAPIKey" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SteamClientFile" serializeAs="String">
<value/>
<value />
</setting>
<setting name="UpgradeConfig" serializeAs="String">
<value>True</value>