ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

split usermanagement adduser into simpler per case methods

Browse Source
This commit is contained in:
UbitUmarov
2020-11-26 12:14:00 +00:00
parent fe33ace3b2
commit 9d0d82ab6e
10 changed files with 72 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Framework/GridInfo.cs
View File

@@ -39,6 +39,7 @@ namespace OpenSim.Framework
None = 0,
ValidHost = 1,
Resolved = 1 << 1,
Empty = 1 << 2,
ValidResolved = ValidHost | Resolved
}
@@ -56,7 +57,7 @@ namespace OpenSim.Framework
public OSHTTPURI(string uri, bool withDNSResolve = false)
{
Flags = OSHTTPURIFlags.None;
Flags = OSHTTPURIFlags.Empty;
Port = -1;
IP = null;
Host = string.Empty;
@@ -67,6 +68,7 @@ namespace OpenSim.Framework
if (string.IsNullOrEmpty(uri))
return;
Flags = OSHTTPURIFlags.None;
try
{
Uri m_checkuri = new Uri(uri);
@@ -114,12 +116,12 @@ namespace OpenSim.Framework
public bool IsValidHost
{
get { return Flags != OSHTTPURIFlags.None;}
get { return (Flags & OSHTTPURIFlags.ValidHost) != 0; }
}
public bool ValidAndResolved(out string error)
{
if (Flags == OSHTTPURIFlags.None)
if ((Flags & OSHTTPURIFlags.ValidHost) == 0)
{
error = "failed to parse uri";
return false;
@@ -180,7 +182,7 @@ namespace OpenSim.Framework
public OSHHTPHost(string url, bool withDNSResolve = false)
{
Flags = OSHTTPURIFlags.None;
Flags = OSHTTPURIFlags.Empty;
Port = 80;
IP = null;
Host = string.Empty;
@@ -191,8 +193,9 @@ namespace OpenSim.Framework
if (string.IsNullOrEmpty(url))
return;
url = url.ToLowerInvariant();
Flags = OSHTTPURIFlags.None;
url = url.ToLowerInvariant();
try
{
int urllen = url.Length;
@@ -285,7 +288,7 @@ namespace OpenSim.Framework
public bool IsValidHost
{
get { return Flags != OSHTTPURIFlags.None; }
get { return (Flags & OSHTTPURIFlags.ValidHost) != 0; }
}
public bool IsResolvedHost
@@ -295,7 +298,7 @@ namespace OpenSim.Framework
public bool ValidAndResolved(out string error)
{
if (Flags == OSHTTPURIFlags.None)
if ((Flags & OSHTTPURIFlags.ValidHost) == 0)
{
error = "failed to parse uri";
return false;
@@ -365,7 +368,7 @@ namespace OpenSim.Framework
{
string[] sections = new string[] {"Const", "Startup", "Hypergrid"};
string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", sections, String.Empty);
string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", sections, string.Empty);
if (string.IsNullOrEmpty(gatekeeper))
{
IConfig serverConfig = config.Configs["GatekeeperService"];
@@ -441,7 +444,7 @@ namespace OpenSim.Framework
throw new Exception("HomeURI configuration error");
}
string homeAlias = Util.GetConfigVarFromSections<string>(config, "HomeURIAlias", sections, String.Empty);
string homeAlias = Util.GetConfigVarFromSections<string>(config, "HomeURIAlias", sections, string.Empty);
if (!string.IsNullOrWhiteSpace(homeAlias))
{
string[] alias = homeAlias.Split(',');
@@ -582,7 +585,7 @@ namespace OpenSim.Framework
{
OSHHTPHost tmp = new OSHHTPHost(othergatekeeper, false);
if (!tmp.IsValidHost)
return -1;
return ((tmp.Flags & OSHTTPURIFlags.Empty) == 0) ? -1 : 1;
if (tmp.Equals(m_gateKeeperURL))
return 1;
if (m_gateKeeperAlias != null && m_gateKeeperAlias.Contains(tmp))
@@ -594,7 +597,7 @@ namespace OpenSim.Framework
{
OSHHTPHost tmp = new OSHHTPHost(othergatekeeper, false);
if (!tmp.IsValidHost)
return -1;
return ((tmp.Flags & OSHTTPURIFlags.Empty) == 0) ? -1 : 1;
if (tmp.Equals(m_gateKeeperURL))
return 1;
if (m_gateKeeperAlias != null && m_gateKeeperAlias.Contains(tmp))
@@ -611,7 +614,8 @@ namespace OpenSim.Framework
public int IsLocalGrid(OSHHTPHost othergatekeeper)
{
if (!othergatekeeper.IsValidHost)
return -1;
return ((othergatekeeper.Flags & OSHTTPURIFlags.Empty) == 0) ? -1 : 1;
if (othergatekeeper.Equals(m_gateKeeperURL))
return 1;
if (m_gateKeeperAlias != null && m_gateKeeperAlias.Contains(othergatekeeper))
@@ -623,7 +627,7 @@ namespace OpenSim.Framework
{
OSHHTPHost tmp = new OSHHTPHost(otherhome, false);
if (!tmp.IsValidHost)
return -1;
return ((tmp.Flags & OSHTTPURIFlags.Empty) == 0) ? -1 : 1;
if (tmp.Equals(m_homeURL))
return 1;
if (m_homeURLAlias != null && m_homeURLAlias.Contains(tmp))
@@ -635,7 +639,7 @@ namespace OpenSim.Framework
{
OSHHTPHost tmp = new OSHHTPHost(otherhome, false);
if (!tmp.IsValidHost)
return -1;
return ((tmp.Flags & OSHTTPURIFlags.Empty) == 0) ? -1 : 1;
if (tmp.Equals(m_homeURL))
return 1;
if (m_homeURLAlias != null && m_homeURLAlias.Contains(tmp))
@@ -643,8 +647,6 @@ namespace OpenSim.Framework
if (withResolveCheck)
{
if (tmp.IsResolvedHost)
return 0;
return tmp.ResolveDNS() ? 0 : -2;
}
return 0;

6
OpenSim/Framework/Util.cs
View File

@@ -1022,13 +1022,9 @@ namespace OpenSim.Framework
{
m_log.ErrorFormat(
"[UTIL]: Couldn't find native Windows library at {0}", nativeLibraryPath);
return false;
}
else
{
return true;
}
return true;
}
public static bool IsEnvironmentSupported(ref string reason)