ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Re-sync repo"

Browse Source 
This reverts commit 1c214566f3.
This commit is contained in:
Adil El Farissi
2024-08-21 02:52:29 +00:00
parent 1c214566f3
commit c2eb8083cb
20 changed files with 3829 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -566,4 +566,4 @@ ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL DEFAU
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
COMMIT;
COMMIT;

2
OpenSim/Data/PGSQL/PGSQLMuteListData.cs
View File

@@ -69,4 +69,4 @@ namespace OpenSim.Data.PGSQL
}
}
}
}
}

2
OpenSim/Data/PGSQL/Resources/MuteListStore.migrations
View File

@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS MuteList (
CONSTRAINT unique_agent_2 UNIQUE ("AgentID", "MuteId", "MuteName")
);
COMMIT;
COMMIT;

2
OpenSim/Framework/Util.cs
View File

@@ -1417,7 +1417,7 @@ namespace OpenSim.Framework
}
}
return $"{Convert.ToHexString(iv)}:{Convert.ToHexString(encryptedText).ToLower()}";
return $"{Convert.ToHexString(iv)}:{Convert.ToHexString(encryptedText)}";
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

21
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -2481,7 +2481,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
UserAgentServiceConnector userConnection = new(serverURI);
if (userConnection is not null)
if (userConnection is not null && serverURI.StartsWith("http://"))
{
userID = userConnection.GetUUID(realFirstName, realLastName);
if (!userID.IsZero())
@@ -2490,6 +2490,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return userID.ToString();
}
}
else
{
// Override hardcoded http in Util.ParseForeignAvatarName
string SSLserverURI = serverURI.Replace("http://", "https://");
userConnection = new(SSLserverURI);
if (userConnection is not null)
{
userID = userConnection.GetUUID(realFirstName, realLastName);
if (!userID.IsZero())
{
userManager.AddUser(userID, realFirstName, realLastName, SSLserverURI);
return userID.ToString();
}
}
}
}
catch (Exception /*e*/)
{
@@ -6549,7 +6564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLShoutError("osAESEncrypt: Failed to encrypt!");
return LSL_String.Empty;
}
return ret.ToString();
return ret.ToString().ToLower();
}
public LSL_String osAESDecrypt(string secret, string encryptedText)
@@ -6577,7 +6592,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLShoutError("osAESEncryptTo: Failed to encrypt!");
return LSL_String.Empty;
}
return ret.ToString();
return ret.ToString().ToLower();
}
public LSL_String osAESDecryptFrom(string secret, string encryptedText, string ivString)

8
OpenSim/Services/GridService/HypergridLinker.cs
View File

@@ -617,7 +617,7 @@ namespace OpenSim.Services.GridService
}
//this should be the prefererred way of setting up hg links now
if (cmdparams[2].StartsWith("http"))
if (cmdparams[2].StartsWith("http") || cmdparams[2].StartsWith("https"))
{
RunLinkRegionCommand(cmdparams);
}
@@ -632,7 +632,11 @@ namespace OpenSim.Services.GridService
parameters.Insert(3, parts[2]);
cmdparams = (string[])parameters.ToArray(typeof(string));
}
cmdparams[2] = "http://" + parts[0] + ':' + parts[1];
string uri = cmdparams[2].StartsWith("https")
? "https://" + parts[0] + ':' + parts[1]
: "http://" + parts[0] + ':' + parts[1];
cmdparams[2] = uri;
RunLinkRegionCommand(cmdparams);
}