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

comment out direct HG tp at login option that just does not work

Browse Source
This commit is contained in:
UbitUmarov
2020-12-26 00:10:33 +00:00
parent a0d0bbacb2
commit f5e6159c22
1 changed files with 67 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,30 +101,30 @@ namespace OpenSim.Services.LLLoginService
{
m_LoginServerConfig = config.Configs["LoginService"];
if (m_LoginServerConfig == null)
throw new Exception(String.Format("No section LoginService in config file"));
throw new Exception(string.Format("No section LoginService in config file"));
string accountService = m_LoginServerConfig.GetString("UserAccountService", String.Empty);
string gridUserService = m_LoginServerConfig.GetString("GridUserService", String.Empty);
string agentService = m_LoginServerConfig.GetString("UserAgentService", String.Empty);
string authService = m_LoginServerConfig.GetString("AuthenticationService", String.Empty);
string invService = m_LoginServerConfig.GetString("InventoryService", String.Empty);
string gridService = m_LoginServerConfig.GetString("GridService", String.Empty);
string presenceService = m_LoginServerConfig.GetString("PresenceService", String.Empty);
string libService = m_LoginServerConfig.GetString("LibraryService", String.Empty);
string friendsService = m_LoginServerConfig.GetString("FriendsService", String.Empty);
string avatarService = m_LoginServerConfig.GetString("AvatarService", String.Empty);
string simulationService = m_LoginServerConfig.GetString("SimulationService", String.Empty);
string accountService = m_LoginServerConfig.GetString("UserAccountService", string.Empty);
string gridUserService = m_LoginServerConfig.GetString("GridUserService", string.Empty);
string agentService = m_LoginServerConfig.GetString("UserAgentService", string.Empty);
string authService = m_LoginServerConfig.GetString("AuthenticationService", string.Empty);
string invService = m_LoginServerConfig.GetString("InventoryService", string.Empty);
string gridService = m_LoginServerConfig.GetString("GridService", string.Empty);
string presenceService = m_LoginServerConfig.GetString("PresenceService", string.Empty);
string libService = m_LoginServerConfig.GetString("LibraryService", string.Empty);
string friendsService = m_LoginServerConfig.GetString("FriendsService", string.Empty);
string avatarService = m_LoginServerConfig.GetString("AvatarService", string.Empty);
string simulationService = m_LoginServerConfig.GetString("SimulationService", string.Empty);
m_DefaultRegionName = m_LoginServerConfig.GetString("DefaultRegion", String.Empty);
m_DefaultRegionName = m_LoginServerConfig.GetString("DefaultRegion", string.Empty);
m_WelcomeMessage = m_LoginServerConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true);
m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty);
new string[] { "Startup", "Hypergrid", "LoginService" }, string.Empty);
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", string.Empty);
m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
@@ -153,7 +153,7 @@ namespace OpenSim.Services.LLLoginService
}
// Clean up some of these vars
if (m_MapTileURL != String.Empty)
if (m_MapTileURL != string.Empty)
{
m_MapTileURL = m_MapTileURL.Trim();
if (!m_MapTileURL.EndsWith("/"))
@@ -162,7 +162,7 @@ namespace OpenSim.Services.LLLoginService
IConfig messagingConfig = config.Configs["Messaging"];
if (messagingConfig != null)
m_messageKey = messagingConfig.GetString("MessageKey", String.Empty);
m_messageKey = messagingConfig.GetString("MessageKey", string.Empty);
// These are required; the others aren't
if (accountService == string.Empty || authService == string.Empty)
throw new Exception("LoginService is missing service specifications");
@@ -170,33 +170,33 @@ namespace OpenSim.Services.LLLoginService
// replace newlines in welcome message
m_WelcomeMessage = m_WelcomeMessage.Replace("\\n", "\n");
Object[] args = new Object[] { config };
object[] args = new object[] { config };
m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
Object[] authArgs = new Object[] { config, m_UserAccountService };
object[] authArgs = new object[] { config, m_UserAccountService };
m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, authArgs);
m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
if (gridService != string.Empty)
if (!string.IsNullOrWhiteSpace(gridService))
m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
if (presenceService != string.Empty)
if (!string.IsNullOrWhiteSpace(presenceService))
m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
if (avatarService != string.Empty)
if (!string.IsNullOrWhiteSpace(avatarService))
m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarService, args);
if (friendsService != string.Empty)
if (!string.IsNullOrWhiteSpace(friendsService))
m_FriendsService = ServerUtils.LoadPlugin<IFriendsService>(friendsService, args);
if (simulationService != string.Empty)
if (!string.IsNullOrWhiteSpace(simulationService))
m_RemoteSimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
if (agentService != string.Empty)
if (!string.IsNullOrWhiteSpace(agentService))
m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args);
// Get the Hypergrid inventory service (exists only if Hypergrid is enabled)
string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
if (hgInvServicePlugin != string.Empty)
string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", string.Empty);
if (!string.IsNullOrWhiteSpace(hgInvServicePlugin))
{
// TODO: Remove HGInventoryServiceConstructorArg after 0.9 release
string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
if (hgInvServiceArg != String.Empty)
string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", string.Empty);
if (string.IsNullOrWhiteSpace(hgInvServiceArg))
{
m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax.");
hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin;
@@ -308,7 +308,7 @@ namespace OpenSim.Services.LLLoginService
else
clientNameToCheck = channel + " " + clientVersion;
if (!String.IsNullOrWhiteSpace(m_AllowedClients))
if (!string.IsNullOrWhiteSpace(m_AllowedClients))
{
Regex arx = new Regex(m_AllowedClients);
Match am = arx.Match(clientNameToCheck);
@@ -322,7 +322,7 @@ namespace OpenSim.Services.LLLoginService
}
}
if (!String.IsNullOrWhiteSpace(m_DeniedClients))
if (!string.IsNullOrWhiteSpace(m_DeniedClients))
{
Regex drx = new Regex(m_DeniedClients);
Match dm = drx.Match(clientNameToCheck);
@@ -336,7 +336,7 @@ namespace OpenSim.Services.LLLoginService
}
}
if (!String.IsNullOrWhiteSpace(m_DeniedMacs))
if (!string.IsNullOrWhiteSpace(m_DeniedMacs))
{
m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
if (m_DeniedMacs.Contains(curMac))
@@ -397,7 +397,7 @@ namespace OpenSim.Services.LLLoginService
UUID realID;
string token = m_AuthenticationService.Authenticate(account.PrincipalID, passwd, 30, out realID);
UUID secureSession = UUID.Zero;
if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out secureSession)))
if (string.IsNullOrWhiteSpace(token) || !UUID.TryParse(token, out secureSession))
{
m_log.InfoFormat(
"[LLOGIN SERVICE]: Login failed for {0} {1}, reason: authentication failed",
@@ -405,8 +405,6 @@ namespace OpenSim.Services.LLLoginService
return LLFailedLoginResponse.UserProblem;
}
string PrincipalIDstr = account.PrincipalID.ToString();
GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(PrincipalIDstr);
@@ -481,18 +479,19 @@ namespace OpenSim.Services.LLLoginService
// spamming the console.
if (guinfo != null)
{
if (guinfo.HomeRegionID == UUID.Zero && startLocation == "home")
if (guinfo.HomeRegionID == UUID.Zero)
{
m_log.WarnFormat(
"[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location but they have none set",
account.Name);
if(startLocation == "home")
m_log.WarnFormat(
"[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location but they have none set",
account.Name);
}
else if (m_GridService != null)
{
home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
if (home == null && startLocation == "home")
if (home == null)
{
if (startLocation == "home")
m_log.WarnFormat(
"[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location with ID {1} but this was not found.",
account.Name, guinfo.HomeRegionID);
@@ -573,7 +572,7 @@ namespace OpenSim.Services.LLLoginService
//
// Finally, fill out the response and return it
//
if (m_MessageUrl != String.Empty)
if (m_MessageUrl != string.Empty)
{
using(WebClient client = new WebClient())
processedMessage = client.DownloadString(m_MessageUrl);
@@ -629,46 +628,32 @@ namespace OpenSim.Services.LLLoginService
if (pinfo == null)
return null;
GridRegion region = null;
bool tryDefaults = false;
if (home == null)
if(home != null)
{
tryDefaults = true;
}
else
{
region = home;
position = pinfo.HomePosition;
lookAt = pinfo.HomeLookAt;
flags |= TeleportFlags.ViaHome;
return home;
}
if (tryDefaults)
List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
if (defaults != null && defaults.Count > 0)
{
List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
if (defaults != null && defaults.Count > 0)
{
flags |= TeleportFlags.ViaRegionID;
region = defaults[0];
where = "safe";
}
else
{
m_log.WarnFormat("[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations. Attempting to find random region",
account.FirstName, account.LastName);
region = FindAlternativeRegion(scopeID);
if (region != null)
{
flags |= TeleportFlags.ViaRegionID;
where = "safe";
}
}
flags |= TeleportFlags.ViaRegionID;
where = "safe";
return defaults[0];
}
return region;
m_log.WarnFormat("[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations. Attempting to find random region",
account.FirstName, account.LastName);
GridRegion region = FindAlternativeRegion(scopeID);
if (region != null)
{
flags |= TeleportFlags.ViaRegionID;
where = "safe";
return region;
}
return null;
}
else if (startLocation.Equals("last"))
{
@@ -763,6 +748,12 @@ namespace OpenSim.Services.LLLoginService
}
else
{
m_log.Info("[LLLOGIN SERVICE]: Got Custom direct HG Login URI no longer supported");
return null;
/*
*direct HG tp no longer works due to current use of tp flags
* suitcase can also fail badly
if (m_UserAgentService == null)
{
m_log.WarnFormat("[LLLOGIN SERVICE]: This llogin service is not running a user agent service, as such it can't lauch agents at foreign grids");
@@ -786,6 +777,7 @@ namespace OpenSim.Services.LLLoginService
region = FindForeignRegion(domainName, regionport, regionName, account, out gatekeeper);
return region;
*/
}
}
else
@@ -832,6 +824,7 @@ namespace OpenSim.Services.LLLoginService
return null;
}
/*
private GridRegion FindForeignRegion(string domainName, uint port, string regionName, UserAccount account, out GridRegion gatekeeper)
{
m_log.Debug("[LLLOGIN SERVICE]: attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName);
@@ -860,6 +853,7 @@ namespace OpenSim.Services.LLLoginService
return null;
}
*/
private string hostName = string.Empty;
private int port = 0;