Added option to userserver config, to be able disable/enable the LLSD Login support. As far as I know, the LLSD login method is currently only used by libsl based clients/bots. So could be useful to be able to disable this if a grid comes under a griefing attack from libsl bots.

0.6.0-stable
MW 2008-07-08 15:36:27 +00:00
parent 01904e66f2
commit 9a5a7b2614
2 changed files with 11 additions and 1 deletions

View File

@ -49,6 +49,8 @@ namespace OpenSim.Framework
public bool HttpSSL = DefaultHttpSSL;
public string InventoryUrl = String.Empty;
public bool EnableLLSDLogin = true;
public UserConfig()
{
// weird, but UserManagerBase needs this.
@ -93,6 +95,8 @@ namespace OpenSim.Framework
"Known good region X", "1000", false);
configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Known good region Y", "1000", false);
configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
"Enable LLSD login support? true/false", true.ToString(), false);
}
public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@ -132,6 +136,9 @@ namespace OpenSim.Framework
case "default_Y":
DefaultY = (uint) configuration_result;
break;
case "enable_llsd_login":
EnableLLSDLogin = (bool)configuration_result;
break;
}
return true;

View File

@ -120,7 +120,10 @@ namespace OpenSim.Grid.UserServer
m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin);
m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
if (Cfg.EnableLLSDLogin)
{
m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
}
m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
m_httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);