ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8396: on access control, change viewer string to match so it does include the viewer name, not just version

Browse Source
This commit is contained in:
UbitUmarov
2018-11-09 15:22:15 +00:00
parent 492b9e3326
commit f9a2fbed83
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -301,16 +301,22 @@ namespace OpenSim.Services.LLLoginService
//
// Check client
//
string clientNameToCheck;
if(clientVersion.Contains(" "))
clientNameToCheck = clientVersion;
else
clientNameToCheck = channel + " " + clientVersion;
if (!String.IsNullOrWhiteSpace(m_AllowedClients))
{
Regex arx = new Regex(m_AllowedClients);
Match am = arx.Match(clientVersion);
Match am = arx.Match(clientNameToCheck);
if (!am.Success)
{
m_log.InfoFormat(
"[LLOGIN SERVICE]: Login failed for {0} {1}, reason: client {2} is not allowed",
firstName, lastName, clientVersion);
firstName, lastName, clientNameToCheck);
return LLFailedLoginResponse.LoginBlockedProblem;
}
}
@@ -318,13 +324,13 @@ namespace OpenSim.Services.LLLoginService
if (!String.IsNullOrWhiteSpace(m_DeniedClients))
{
Regex drx = new Regex(m_DeniedClients);
Match dm = drx.Match(clientVersion);
Match dm = drx.Match(clientNameToCheck);
if (dm.Success)
{
m_log.InfoFormat(
"[LLOGIN SERVICE]: Login failed for {0} {1}, reason: client {2} is denied",
firstName, lastName, clientVersion);
firstName, lastName, clientNameToCheck);
return LLFailedLoginResponse.LoginBlockedProblem;
}
}