use string ids

This commit is contained in:
Bitl 2022-08-04 15:53:54 -07:00
parent 36846fcd02
commit d54bd58481
6 changed files with 12 additions and 8 deletions

View File

@ -2345,7 +2345,7 @@ public class GlobalFuncs
if (online) if (online)
{ {
GlobalVars.ServerID = SecurityFuncs.GenerateRandomNumber(); GlobalVars.ServerID = SecurityFuncs.RandomString(30) + SecurityFuncs.GenerateRandomNumber();
pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress + pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
"/list.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName + "/list.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName +
"&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) + "&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) +
@ -2358,7 +2358,7 @@ public class GlobalFuncs
{ {
pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress + pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
"/delist.php?id=" + GlobalVars.ServerID; "/delist.php?id=" + GlobalVars.ServerID;
GlobalVars.ServerID = 0; GlobalVars.ServerID = "N/A";
} }
#if LAUNCHER #if LAUNCHER
@ -2375,7 +2375,7 @@ public class GlobalFuncs
if (response.Contains("ERROR:")) if (response.Contains("ERROR:"))
{ {
GlobalVars.ServerID = 0; GlobalVars.ServerID = "N/A";
} }
} }

View File

@ -96,7 +96,7 @@ public static class GlobalVars
public static bool ColorsLoaded = false; public static bool ColorsLoaded = false;
public static int ValidatedExtraFiles = 0; public static int ValidatedExtraFiles = 0;
public static bool NoFileList = false; public static bool NoFileList = false;
public static int ServerID = 0; public static string ServerID = "N/A";
#endregion #endregion
} }
#endregion #endregion

View File

@ -1,3 +1,7 @@
1.3 Snapshot v22.8251.28463.2
Fixes:
- Replaced numeric IDs and with string IDs. (composed of a random string + random number)
----------------------------------------------------------------------------
1.3 Snapshot v22.8251.26754.1 1.3 Snapshot v22.8251.26754.1
Notes: Notes:
- Add the list.php and delist.php files to your master server if you would like to support future 1.3 versions. - Add the list.php and delist.php files to your master server if you would like to support future 1.3 versions.
@ -13,7 +17,7 @@ Enhancements:
- Made Master Server ping messages more verbose. - Made Master Server ping messages more verbose.
- Improved the stability of master server pings. - Improved the stability of master server pings.
- The Master Server has been split into 2 files: list.php and delist.php - The Master Server has been split into 2 files: list.php and delist.php
- Each server has a randomly generated ID that is only visible to the server host (in the console) and the master server host (in serverlist.txt) - Each server now has a randomly generated ID that is only visible to the server host (in the console) and the master server host (in serverlist.txt)
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
1.3 Snapshot v22.8245.27180.1 1.3 Snapshot v22.8245.27180.1
Notes: Notes:

View File

@ -19,7 +19,7 @@ Read it here https://github.com/Novetus/Novetus_src/blob/master/LICENSE-MASTER-S
//id //id
$id = $_GET["id"]; $id = $_GET["id"];
if (!empty($id) and is_numeric($id)) if (!empty($id))
{ {
$file = 'serverlist.txt'; $file = 'serverlist.txt';

View File

@ -30,7 +30,7 @@ $version = $_GET["version"];
//id //id
$id = $_GET["id"]; $id = $_GET["id"];
if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and !empty($client) and !empty($version) and !empty($id) and is_numeric($id)) if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and !empty($client) and !empty($version) and !empty($id))
{ {
//server ip //server ip
$ip = $_GET["ip"]; $ip = $_GET["ip"];

View File

@ -8,6 +8,6 @@ ExtendedVersionNumber=True
ExtendedVersionEditChangelog=True ExtendedVersionEditChangelog=True
//ExtendedVersionTemplate=%version% v?.2022.%extended-revision%%lite% //ExtendedVersionTemplate=%version% v?.2022.%extended-revision%%lite%
ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision% ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision%
ExtendedVersionRevision=1 ExtendedVersionRevision=2
IsLite=False IsLite=False
InitialBootup=False InitialBootup=False