OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: do tell and log denied access to estate

LSLKeyTest
UbitUmarov 2015-12-13 12:42:15 +00:00
parent 5d6da6bb35
commit 36e53b0e03
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -4457,53 +4457,53 @@ namespace OpenSim.Region.Framework.Scenes
return true; return true;
// finally test groups // finally test groups
bool groupAccess = false;
if (m_groupsModule == null) // if no groups refuse // some say GOTO is ugly
return false; if(m_groupsModule == null) // if no groups refuse
goto Label_GroupsDone;
UUID[] estateGroups = RegionInfo.EstateSettings.EstateGroups; UUID[] estateGroups = RegionInfo.EstateSettings.EstateGroups;
if (estateGroups == null) if(estateGroups == null)
{ {
m_log.ErrorFormat("[CONNECTION BEGIN]: Estate GroupMembership is null!"); m_log.ErrorFormat("[CONNECTION BEGIN]: Estate GroupMembership is null!");
return false; goto Label_GroupsDone;
} }
if(estateGroups.Length == 0) if(estateGroups.Length == 0)
{ goto Label_GroupsDone;
return false;
}
List<UUID> agentGroups = new List<UUID>(); List<UUID> agentGroups = new List<UUID>();
GroupMembershipData[] GroupMembership = m_groupsModule.GetMembershipData(agent.AgentID); GroupMembershipData[] GroupMembership = m_groupsModule.GetMembershipData(agent.AgentID);
if (GroupMembership == null) if(GroupMembership == null)
{ {
m_log.ErrorFormat("[CONNECTION BEGIN]: GroupMembership is null!"); m_log.ErrorFormat("[CONNECTION BEGIN]: GroupMembership is null!");
return false; goto Label_GroupsDone;
} }
if(GroupMembership.Length == 0) if(GroupMembership.Length == 0)
return false; goto Label_GroupsDone;
for (int i = 0; i < GroupMembership.Length; i++) for(int i = 0;i < GroupMembership.Length;i++)
agentGroups.Add(GroupMembership[i].GroupID); agentGroups.Add(GroupMembership[i].GroupID);
bool groupAccess = false; foreach(UUID group in estateGroups)
foreach (UUID group in estateGroups)
{ {
if (agentGroups.Contains(group)) if(agentGroups.Contains(group))
{ {
groupAccess = true; groupAccess = true;
break; break;
} }
} }
Label_GroupsDone:
if (!groupAccess) if (!groupAccess)
{ {
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the estate", m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the estate",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
reason = String.Format("Denied access to private region {0}: You are not on the access list for that region.", reason = String.Format("Denied access to private region {0}: You are do not have access to that region.",
RegionInfo.RegionName); RegionInfo.RegionName);
return false; return false;
} }