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

robust: add exclude by id0; pre compile some regex searchs. not that user block by id0 or mac is not very effective and may even block wrong users!

Browse Source
This commit is contained in:
UbitUmarov
2023-01-08 19:10:50 +00:00
parent 3422ae3be1
commit 8ba1441eb1
8 changed files with 176 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@@ -195,7 +195,12 @@ namespace OpenSim.Services.HypergridService
string[] parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string s in parts)
exceptions[level].Add(s.Trim());
{
string ss = s.Trim();
if(!ss.EndsWith("/"))
ss += '/';
exceptions[level].Add(ss);
}
}
}
}
@@ -682,26 +687,22 @@ namespace OpenSim.Services.HypergridService
private bool IsException(string dest, int level, Dictionary<int, List<string>> exceptions)
{
if (!exceptions.ContainsKey(level))
if (string.IsNullOrEmpty(dest))
return false;
if (!exceptions.TryGetValue(level, out List<string> excep) || excep.Count == 0)
return false;
bool exception = false;
if (exceptions[level].Count > 0) // we have exceptions
{
string destination = dest;
if (!destination.EndsWith("/"))
destination += "/";
string destination = dest;
if (!destination.EndsWith("/"))
destination += "/";
if (exceptions[level].Find(delegate(string s)
{
if (!s.EndsWith("/"))
s += "/";
return s == destination;
}) != null)
exception = true;
foreach(string s in excep)
{
if (destination.Equals(s))
return true;
}
return exception;
return false;
}
private void StoreTravelInfo(TravelingAgentInfo travel)