Better error handling to diagnose login problems.
Diva Canto
parent
25e7697987
commit
b2cdee5a14
|
|
@ -182,103 +182,125 @@ namespace OpenSim.Client.Linden
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public XmlRpcResponse ExpectUser(XmlRpcRequest request, IPEndPoint remoteClient)
|
public XmlRpcResponse ExpectUser(XmlRpcRequest request, IPEndPoint remoteClient)
|
||||||
{
|
{
|
||||||
Hashtable requestData = (Hashtable)request.Params[0];
|
|
||||||
AgentCircuitData agentData = new AgentCircuitData();
|
|
||||||
agentData.SessionID = new UUID((string)requestData["session_id"]);
|
|
||||||
agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
|
|
||||||
agentData.firstname = (string)requestData["firstname"];
|
|
||||||
agentData.lastname = (string)requestData["lastname"];
|
|
||||||
agentData.AgentID = new UUID((string)requestData["agent_id"]);
|
|
||||||
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
|
|
||||||
agentData.CapsPath = (string)requestData["caps_path"];
|
|
||||||
ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
|
|
||||||
|
|
||||||
// Appearance
|
|
||||||
if (requestData["appearance"] != null)
|
|
||||||
agentData.Appearance = new AvatarAppearance((Hashtable)requestData["appearance"]);
|
|
||||||
|
|
||||||
m_log.DebugFormat(
|
|
||||||
"[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}",
|
|
||||||
agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode);
|
|
||||||
|
|
||||||
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
|
|
||||||
{
|
|
||||||
//m_log.Debug("[CLIENT]: Child agent detected");
|
|
||||||
agentData.child = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//m_log.Debug("[CLIENT]: Main agent detected");
|
|
||||||
agentData.startpos =
|
|
||||||
new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
|
|
||||||
(float)Convert.ToDecimal((string)requestData["startpos_y"]),
|
|
||||||
(float)Convert.ToDecimal((string)requestData["startpos_z"]));
|
|
||||||
agentData.child = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
XmlRpcResponse resp = new XmlRpcResponse();
|
XmlRpcResponse resp = new XmlRpcResponse();
|
||||||
|
|
||||||
if (!RegionLoginsEnabled)
|
try
|
||||||
{
|
{
|
||||||
m_log.InfoFormat(
|
ulong regionHandle = 0;
|
||||||
"[CLIENT]: Denying access for user {0} {1} because region login is currently disabled",
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
agentData.firstname, agentData.lastname);
|
AgentCircuitData agentData = new AgentCircuitData();
|
||||||
|
if (requestData.ContainsKey("session_id"))
|
||||||
|
agentData.SessionID = new UUID((string)requestData["session_id"]);
|
||||||
|
if (requestData.ContainsKey("secure_session_id"))
|
||||||
|
agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
|
||||||
|
if (requestData.ContainsKey("firstname"))
|
||||||
|
agentData.firstname = (string)requestData["firstname"];
|
||||||
|
if (requestData.ContainsKey("lastname"))
|
||||||
|
agentData.lastname = (string)requestData["lastname"];
|
||||||
|
if (requestData.ContainsKey("agent_id"))
|
||||||
|
agentData.AgentID = new UUID((string)requestData["agent_id"]);
|
||||||
|
if (requestData.ContainsKey("circuit_code"))
|
||||||
|
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
|
||||||
|
if (requestData.ContainsKey("caps_path"))
|
||||||
|
agentData.CapsPath = (string)requestData["caps_path"];
|
||||||
|
if (requestData.ContainsKey("regionhandle"))
|
||||||
|
regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
|
||||||
|
else
|
||||||
|
m_log.Warn("[CLIENT]: request from login server did not contain regionhandle");
|
||||||
|
|
||||||
Hashtable respdata = new Hashtable();
|
// Appearance
|
||||||
respdata["success"] = "FALSE";
|
if (requestData.ContainsKey("appearance"))
|
||||||
respdata["reason"] = "region login currently disabled";
|
agentData.Appearance = new AvatarAppearance((Hashtable)requestData["appearance"]);
|
||||||
resp.Value = respdata;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
bool success = false;
|
|
||||||
string denyMess = "";
|
|
||||||
|
|
||||||
Scene scene;
|
m_log.DebugFormat(
|
||||||
if (TryGetRegion(regionHandle, out scene))
|
"[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}",
|
||||||
|
agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode);
|
||||||
|
|
||||||
|
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
|
||||||
{
|
{
|
||||||
if (scene.RegionInfo.EstateSettings.IsBanned(agentData.AgentID))
|
//m_log.Debug("[CLIENT]: Child agent detected");
|
||||||
|
agentData.child = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//m_log.Debug("[CLIENT]: Main agent detected");
|
||||||
|
agentData.startpos =
|
||||||
|
new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
|
||||||
|
(float)Convert.ToDecimal((string)requestData["startpos_y"]),
|
||||||
|
(float)Convert.ToDecimal((string)requestData["startpos_z"]));
|
||||||
|
agentData.child = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!RegionLoginsEnabled)
|
||||||
|
{
|
||||||
|
m_log.InfoFormat(
|
||||||
|
"[CLIENT]: Denying access for user {0} {1} because region login is currently disabled",
|
||||||
|
agentData.firstname, agentData.lastname);
|
||||||
|
|
||||||
|
Hashtable respdata = new Hashtable();
|
||||||
|
respdata["success"] = "FALSE";
|
||||||
|
respdata["reason"] = "region login currently disabled";
|
||||||
|
resp.Value = respdata;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bool success = false;
|
||||||
|
string denyMess = "";
|
||||||
|
|
||||||
|
Scene scene;
|
||||||
|
if (TryGetRegion(regionHandle, out scene))
|
||||||
{
|
{
|
||||||
denyMess = "User is banned from this region";
|
if (scene.RegionInfo.EstateSettings.IsBanned(agentData.AgentID))
|
||||||
m_log.InfoFormat(
|
|
||||||
"[CLIENT]: Denying access for user {0} {1} because user is banned",
|
|
||||||
agentData.firstname, agentData.lastname);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string reason;
|
|
||||||
if (scene.NewUserConnection(agentData, out reason))
|
|
||||||
{
|
{
|
||||||
success = true;
|
denyMess = "User is banned from this region";
|
||||||
|
m_log.InfoFormat(
|
||||||
|
"[CLIENT]: Denying access for user {0} {1} because user is banned",
|
||||||
|
agentData.firstname, agentData.lastname);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
denyMess = String.Format("Login refused by region: {0}", reason);
|
string reason;
|
||||||
m_log.InfoFormat(
|
if (scene.NewUserConnection(agentData, out reason))
|
||||||
"[CLIENT]: Denying access for user {0} {1} because user connection was refused by the region",
|
{
|
||||||
agentData.firstname, agentData.lastname);
|
success = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
denyMess = String.Format("Login refused by region: {0}", reason);
|
||||||
|
m_log.InfoFormat(
|
||||||
|
"[CLIENT]: Denying access for user {0} {1} because user connection was refused by the region",
|
||||||
|
agentData.firstname, agentData.lastname);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
denyMess = "Region not found";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (success)
|
||||||
|
{
|
||||||
|
Hashtable respdata = new Hashtable();
|
||||||
|
respdata["success"] = "TRUE";
|
||||||
|
resp.Value = respdata;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Hashtable respdata = new Hashtable();
|
||||||
|
respdata["success"] = "FALSE";
|
||||||
|
respdata["reason"] = denyMess;
|
||||||
|
resp.Value = respdata;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
{
|
catch (Exception e)
|
||||||
denyMess = "Region not found";
|
{
|
||||||
}
|
m_log.WarnFormat("[CLIENT]: Unable to receive user. Reason: {0}", e);
|
||||||
|
Hashtable respdata = new Hashtable();
|
||||||
if (success)
|
respdata["success"] = "FALSE";
|
||||||
{
|
respdata["reason"] = "Exception occurred";
|
||||||
Hashtable respdata = new Hashtable();
|
resp.Value = respdata;
|
||||||
respdata["success"] = "TRUE";
|
|
||||||
resp.Value = respdata;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Hashtable respdata = new Hashtable();
|
|
||||||
respdata["success"] = "FALSE";
|
|
||||||
respdata["reason"] = denyMess;
|
|
||||||
resp.Value = respdata;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return resp;
|
return resp;
|
||||||
|
|
|
||||||
|
|
@ -317,6 +317,7 @@ namespace OpenSim.Grid.UserServer.Modules
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[LOGIN]: Appearance not for {0} {1}. Creating default.", user.FirstName, user.SurName);
|
m_log.DebugFormat("[LOGIN]: Appearance not for {0} {1}. Creating default.", user.FirstName, user.SurName);
|
||||||
appearance = new AvatarAppearance(user.ID);
|
appearance = new AvatarAppearance(user.ID);
|
||||||
|
loginParams["appearance"] = appearance.ToHashTable();
|
||||||
}
|
}
|
||||||
|
|
||||||
ArrayList SendParams = new ArrayList();
|
ArrayList SendParams = new ArrayList();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue