add more classes
Christopher
parent
3b42a89af5
commit
3920c4fae5
|
|
@ -0,0 +1,232 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using log4net;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.ServiceAuth;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenSim.Server.Base;
|
||||
using OpenMetaverse;
|
||||
|
||||
namespace OpenSim.Services.Connectors
|
||||
{
|
||||
public class AuthenticationServicesConnector : BaseServiceConnector, IAuthenticationService
|
||||
{
|
||||
private static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private List<String> m_authServers = new List<String>();
|
||||
|
||||
public AuthenticationServicesConnector()
|
||||
{
|
||||
}
|
||||
|
||||
public AuthenticationServicesConnector(string serverURI)
|
||||
{
|
||||
m_authServers.Add(serverURI.TrimEnd('/'));
|
||||
}
|
||||
|
||||
public AuthenticationServicesConnector(IConfigSource source)
|
||||
: base(source, "AuthenticationService")
|
||||
{
|
||||
Initialise(source);
|
||||
}
|
||||
|
||||
public virtual void Initialise(IConfigSource source)
|
||||
{
|
||||
IConfig assetConfig = source.Configs["AuthenticationService"];
|
||||
if (assetConfig == null)
|
||||
{
|
||||
m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
|
||||
throw new Exception("Authentication connector init error");
|
||||
}
|
||||
|
||||
string serviceURI = assetConfig.GetString("AuthenticationServerURI",
|
||||
String.Empty);
|
||||
|
||||
if (serviceURI == String.Empty)
|
||||
{
|
||||
m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService");
|
||||
throw new Exception("Authentication connector init error");
|
||||
}
|
||||
|
||||
m_authServers.AddRange(serviceURI.Split(';'));
|
||||
|
||||
base.Initialise(source, "AuthenticationService");
|
||||
}
|
||||
|
||||
public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
|
||||
{
|
||||
realID = UUID.Zero;
|
||||
|
||||
foreach (String serverURL in m_authServers)
|
||||
{
|
||||
String result = Authenticate(serverURL, principalID, password, lifetime, out realID);
|
||||
|
||||
if (result != String.Empty)
|
||||
return result;
|
||||
}
|
||||
|
||||
return String.Empty;
|
||||
}
|
||||
|
||||
public string Authenticate(String m_ServerURI, UUID principalID, string password, int lifetime, out UUID realID)
|
||||
{
|
||||
realID = UUID.Zero;
|
||||
|
||||
return Authenticate(m_ServerURI, principalID, password, lifetime);
|
||||
}
|
||||
|
||||
public string Authenticate(UUID principalID, string password, int lifetime)
|
||||
{
|
||||
foreach (String serverURL in m_authServers)
|
||||
{
|
||||
String result = Authenticate(serverURL, principalID, password, lifetime);
|
||||
|
||||
if (result != String.Empty)
|
||||
return result;
|
||||
}
|
||||
|
||||
return String.Empty;
|
||||
}
|
||||
|
||||
public string Authenticate(String m_ServerURI, UUID principalID, string password, int lifetime)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
sendData["LIFETIME"] = lifetime.ToString();
|
||||
sendData["PRINCIPAL"] = principalID.ToString();
|
||||
sendData["PASSWORD"] = password;
|
||||
|
||||
sendData["METHOD"] = "authenticate";
|
||||
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
m_ServerURI + "/auth/plain",
|
||||
ServerUtils.BuildQueryString(sendData), m_Auth);
|
||||
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
|
||||
reply);
|
||||
|
||||
if (replyData["Result"].ToString() != "Success")
|
||||
return String.Empty;
|
||||
|
||||
return replyData["Token"].ToString();
|
||||
}
|
||||
|
||||
public bool Verify(UUID principalID, string token, int lifetime)
|
||||
{
|
||||
foreach (String serverURL in m_authServers)
|
||||
{
|
||||
bool result = Verify(serverURL, principalID, token, lifetime);
|
||||
|
||||
if (result == true)
|
||||
return result;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool Verify(String m_ServerURI, UUID principalID, string token, int lifetime)
|
||||
{
|
||||
// m_log.Error("[XXX]: Verify");
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
sendData["LIFETIME"] = lifetime.ToString();
|
||||
sendData["PRINCIPAL"] = principalID.ToString();
|
||||
sendData["TOKEN"] = token;
|
||||
|
||||
sendData["METHOD"] = "verify";
|
||||
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
m_ServerURI + "/auth/plain",
|
||||
ServerUtils.BuildQueryString(sendData), m_Auth);
|
||||
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
|
||||
reply);
|
||||
|
||||
if (replyData["Result"].ToString() != "Success")
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool Release(UUID principalID, string token)
|
||||
{
|
||||
foreach (String serverURL in m_authServers)
|
||||
{
|
||||
bool result = Release(serverURL, principalID, token);
|
||||
|
||||
if (result == true)
|
||||
return result;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool Release(String m_ServerURI, UUID principalID, string token)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
sendData["PRINCIPAL"] = principalID.ToString();
|
||||
sendData["TOKEN"] = token;
|
||||
|
||||
sendData["METHOD"] = "release";
|
||||
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
m_ServerURI + "/auth/plain",
|
||||
ServerUtils.BuildQueryString(sendData), m_Auth);
|
||||
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData["Result"].ToString() != "Success")
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool SetPassword(UUID principalID, string passwd)
|
||||
{
|
||||
// nope, we don't do this
|
||||
return false;
|
||||
}
|
||||
|
||||
public AuthInfo GetAuthInfo(UUID principalID)
|
||||
{
|
||||
// not done from remote simulators
|
||||
return null;
|
||||
}
|
||||
|
||||
public bool SetAuthInfo(AuthInfo info)
|
||||
{
|
||||
// not done from remote simulators
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,332 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using log4net;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Console;
|
||||
|
||||
using OpenSim.Framework.ServiceAuth;
|
||||
using OpenSim.Server.Base;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenMetaverse;
|
||||
using OpenMetaverse.StructuredData;
|
||||
|
||||
namespace OpenSim.Services.Connectors
|
||||
{
|
||||
public class MapImageServicesConnector : BaseServiceConnector, IMapImageService
|
||||
{
|
||||
private static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private List<String> m_mapServers = new List<String>();
|
||||
|
||||
public MapImageServicesConnector()
|
||||
{
|
||||
}
|
||||
|
||||
public MapImageServicesConnector(string serverURI)
|
||||
{
|
||||
m_mapServers.Add(serverURI.TrimEnd('/'));
|
||||
}
|
||||
|
||||
public MapImageServicesConnector(IConfigSource source)
|
||||
{
|
||||
Initialise(source);
|
||||
}
|
||||
|
||||
public virtual void Initialise(IConfigSource source)
|
||||
{
|
||||
IConfig config = source.Configs["MapImageService"];
|
||||
if (config == null)
|
||||
{
|
||||
m_log.Error("[MAP IMAGE CONNECTOR]: MapImageService missing");
|
||||
throw new Exception("MapImage connector init error");
|
||||
}
|
||||
|
||||
string serviceURI = config.GetString("MapImageServerURI",
|
||||
String.Empty);
|
||||
|
||||
if (serviceURI == String.Empty)
|
||||
{
|
||||
m_log.Error("[MAP IMAGE CONNECTOR]: No Server URI named in section MapImageService");
|
||||
throw new Exception("MapImage connector init error");
|
||||
}
|
||||
|
||||
m_mapServers.AddRange(serviceURI.Split(';'));
|
||||
|
||||
base.Initialise(source, "MapImageService");
|
||||
}
|
||||
|
||||
public bool RemoveMapTile(int x, int y, out string reason)
|
||||
{
|
||||
reason = string.Empty;
|
||||
foreach (String serverURL in m_mapServers)
|
||||
{
|
||||
bool result = RemoveMapTile(serverURL, x, y, out reason);
|
||||
|
||||
if (result != true)
|
||||
return result;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool RemoveMapTile(String m_ServerURI, int x, int y, out string reason)
|
||||
{
|
||||
reason = string.Empty;
|
||||
int tickstart = Util.EnvironmentTickCount();
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
sendData["X"] = x.ToString();
|
||||
sendData["Y"] = y.ToString();
|
||||
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/removemap";
|
||||
|
||||
try
|
||||
{
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply != string.Empty)
|
||||
{
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "success"))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure"))
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Delete failed: {0}", replyData["Message"].ToString());
|
||||
reason = replyData["Message"].ToString();
|
||||
return false;
|
||||
}
|
||||
else if (!replyData.ContainsKey("Result"))
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: reply data does not contain result field");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
|
||||
reason = "Unexpected result " + replyData["Result"].ToString();
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message);
|
||||
}
|
||||
finally
|
||||
{
|
||||
// This just dumps a warning for any operation that takes more than 100 ms
|
||||
int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile deleted in {0}ms", tickdiff);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool RemoveMapTile(int x, int y, UUID scopeID, out string reason)
|
||||
{
|
||||
reason = string.Empty;
|
||||
foreach (String serverURL in m_mapServers)
|
||||
{
|
||||
bool result = RemoveMapTile(serverURL, x, y, scopeID, out reason);
|
||||
|
||||
if (result != true)
|
||||
return result;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool RemoveMapTile(String m_ServerURI, int x, int y, UUID scopeID, out string reason)
|
||||
{
|
||||
reason = string.Empty;
|
||||
int tickstart = Util.EnvironmentTickCount();
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
sendData["X"] = x.ToString();
|
||||
sendData["Y"] = y.ToString();
|
||||
sendData["SCOPE"] = scopeID.ToString();
|
||||
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/removemap";
|
||||
|
||||
try
|
||||
{
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString);
|
||||
if (reply != string.Empty)
|
||||
{
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "success"))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure"))
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Delete failed: {0}", replyData["Message"].ToString());
|
||||
reason = replyData["Message"].ToString();
|
||||
return false;
|
||||
}
|
||||
else if (!replyData.ContainsKey("Result"))
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: reply data does not contain result field");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
|
||||
reason = "Unexpected result " + replyData["Result"].ToString();
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message);
|
||||
}
|
||||
finally
|
||||
{
|
||||
// This just dumps a warning for any operation that takes more than 100 ms
|
||||
int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile deleted in {0}ms", tickdiff);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool AddMapTile(int x, int y, byte[] jpgData, UUID scopeID, out string reason)
|
||||
{
|
||||
reason = string.Empty;
|
||||
foreach (String serverURL in m_mapServers)
|
||||
{
|
||||
bool result = AddMapTile(serverURL, x, y, jpgData, scopeID, out reason);
|
||||
|
||||
if (result != true)
|
||||
return result;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool AddMapTile(String m_ServerURI, int x, int y, byte[] jpgData, UUID scopeID, out string reason)
|
||||
{
|
||||
reason = string.Empty;
|
||||
int tickstart = Util.EnvironmentTickCount();
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
sendData["X"] = x.ToString();
|
||||
sendData["Y"] = y.ToString();
|
||||
sendData["SCOPE"] = scopeID.ToString();
|
||||
sendData["TYPE"] = "image/jpeg";
|
||||
sendData["DATA"] = Convert.ToBase64String(jpgData);
|
||||
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/map";
|
||||
|
||||
try
|
||||
{
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString,
|
||||
30,
|
||||
m_Auth);
|
||||
if (reply != string.Empty)
|
||||
{
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "success"))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure"))
|
||||
{
|
||||
reason = string.Format("Map post to {0} failed: {1}", uri, replyData["Message"].ToString());
|
||||
m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
|
||||
|
||||
return false;
|
||||
}
|
||||
else if (!replyData.ContainsKey("Result"))
|
||||
{
|
||||
reason = string.Format("Reply data from {0} does not contain result field", uri);
|
||||
m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
|
||||
}
|
||||
else
|
||||
{
|
||||
reason = string.Format("Unexpected result {0} from {1}" + replyData["Result"].ToString(), uri);
|
||||
m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
reason = string.Format("Map post received null reply from {0}", uri);
|
||||
m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
reason = string.Format("Exception when posting to map server at {0}: {1}", uri, e.Message);
|
||||
m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
|
||||
}
|
||||
finally
|
||||
{
|
||||
// This just dumps a warning for any operation that takes more than 100 ms
|
||||
int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
|
||||
m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile upload time {0}ms", tickdiff);
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
public byte[] GetMapTile(string fileName, UUID scopeID, out string format)
|
||||
{
|
||||
format = string.Empty;
|
||||
new Exception("GetMapTile method not Implemented");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,557 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using log4net;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
|
||||
using OpenSim.Framework.ServiceAuth;
|
||||
using OpenSim.Server.Base;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenMetaverse;
|
||||
|
||||
namespace OpenSim.Services.Connectors
|
||||
{
|
||||
public class UserAccountServicesConnector : BaseServiceConnector, IUserAccountService
|
||||
{
|
||||
private static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private List<String> m_accountServers = new List<String>();
|
||||
|
||||
public UserAccountServicesConnector()
|
||||
{
|
||||
}
|
||||
|
||||
public UserAccountServicesConnector(string serverURI)
|
||||
{
|
||||
m_accountServers.Add(serverURI.TrimEnd('/'));
|
||||
}
|
||||
|
||||
public UserAccountServicesConnector(IConfigSource source)
|
||||
{
|
||||
Initialise(source);
|
||||
}
|
||||
|
||||
public virtual void Initialise(IConfigSource source)
|
||||
{
|
||||
IConfig assetConfig = source.Configs["UserAccountService"];
|
||||
if (assetConfig == null)
|
||||
{
|
||||
m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
|
||||
throw new Exception("User account connector init error");
|
||||
}
|
||||
|
||||
string serviceURI = assetConfig.GetString("UserAccountServerURI",
|
||||
String.Empty);
|
||||
|
||||
if (serviceURI == String.Empty)
|
||||
{
|
||||
m_log.Error("[ACCOUNT CONNECTOR]: No Server URI named in section UserAccountService");
|
||||
throw new Exception("User account connector init error");
|
||||
}
|
||||
|
||||
m_accountServers.AddRange(serviceURI.Split(';'));
|
||||
|
||||
base.Initialise(source, "UserAccountService");
|
||||
}
|
||||
|
||||
public virtual UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
|
||||
{
|
||||
foreach(String serverURL in m_accountServers)
|
||||
{
|
||||
UserAccount result = GetUserAccount(serverURL, scopeID, firstName, lastName);
|
||||
|
||||
if(result != null)
|
||||
{
|
||||
result.ServiceURLs["MultiGridRegion_UserAccountServerURL"] = serverURL;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public virtual UserAccount GetUserAccount(String m_ServerURI, UUID scopeID, string firstName, string lastName)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "getaccount";
|
||||
|
||||
sendData["ScopeID"] = scopeID;
|
||||
sendData["FirstName"] = firstName.ToString();
|
||||
sendData["LastName"] = lastName.ToString();
|
||||
|
||||
return SendAndGetReply(m_ServerURI, sendData);
|
||||
}
|
||||
|
||||
public virtual UserAccount GetUserAccount(UUID scopeID, string email)
|
||||
{
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
UserAccount result = GetUserAccount(serverURL, scopeID, email);
|
||||
|
||||
if (result != null)
|
||||
{
|
||||
result.ServiceURLs["MultiGridRegion_UserAccountServerURL"] = serverURL;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public virtual UserAccount GetUserAccount(String m_ServerURI, UUID scopeID, string email)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "getaccount";
|
||||
|
||||
sendData["ScopeID"] = scopeID;
|
||||
sendData["Email"] = email;
|
||||
|
||||
return SendAndGetReply(m_ServerURI, sendData);
|
||||
}
|
||||
|
||||
public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID)
|
||||
{
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
UserAccount result = GetUserAccount(serverURL, scopeID, userID);
|
||||
|
||||
if (result != null)
|
||||
{
|
||||
result.ServiceURLs["MultiGridRegion_UserAccountServerURL"] = serverURL;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public virtual UserAccount GetUserAccount(String m_ServerURI, UUID scopeID, UUID userID)
|
||||
{
|
||||
//m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID);
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "getaccount";
|
||||
|
||||
sendData["ScopeID"] = scopeID;
|
||||
sendData["UserID"] = userID.ToString();
|
||||
|
||||
return SendAndGetReply(m_ServerURI, sendData);
|
||||
}
|
||||
|
||||
public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
|
||||
{
|
||||
List<UserAccount> accounts = new List<UserAccount>();
|
||||
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
List<UserAccount> results = GetUserAccounts(serverURL, scopeID, query);
|
||||
|
||||
foreach (UserAccount account in results)
|
||||
{
|
||||
account.ServiceURLs["MultiGridRegion_UserAccountServerURL"] = serverURL;
|
||||
accounts.Add(account);
|
||||
}
|
||||
}
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
public List<UserAccount> GetUserAccounts(String m_ServerURI, UUID scopeID, string query)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "getaccounts";
|
||||
|
||||
sendData["ScopeID"] = scopeID.ToString();
|
||||
sendData["query"] = query;
|
||||
|
||||
string reply = string.Empty;
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/accounts";
|
||||
// m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
|
||||
try
|
||||
{
|
||||
reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
|
||||
}
|
||||
|
||||
List<UserAccount> accounts = new List<UserAccount>();
|
||||
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData != null)
|
||||
{
|
||||
if (replyData.ContainsKey("result") && replyData["result"].ToString() == "null")
|
||||
{
|
||||
return accounts;
|
||||
}
|
||||
|
||||
Dictionary<string, object>.ValueCollection accountList = replyData.Values;
|
||||
//m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetAgents returned {0} elements", pinfosList.Count);
|
||||
foreach (object acc in accountList)
|
||||
{
|
||||
if (acc is Dictionary<string, object>)
|
||||
{
|
||||
UserAccount pinfo = new UserAccount((Dictionary<string, object>)acc);
|
||||
accounts.Add(pinfo);
|
||||
}
|
||||
else
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received invalid response type {0}",
|
||||
acc.GetType());
|
||||
}
|
||||
}
|
||||
else
|
||||
m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccounts received null response");
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
public virtual List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
|
||||
{
|
||||
List<UserAccount> accounts = new List<UserAccount>();
|
||||
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
List<UserAccount> results = GetUserAccounts(serverURL, scopeID, IDs);
|
||||
|
||||
foreach (UserAccount account in results)
|
||||
{
|
||||
account.ServiceURLs["MultiGridRegion_UserAccountServerURL"] = serverURL;
|
||||
accounts.Add(account);
|
||||
}
|
||||
}
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
public virtual List<UserAccount> GetUserAccounts(String m_ServerURI, UUID scopeID, List<string> IDs)
|
||||
{
|
||||
List<UserAccount> accs = new List<UserAccount>();
|
||||
bool multisuported = true;
|
||||
accs = doGetMultiUserAccounts(m_ServerURI, scopeID, IDs, out multisuported);
|
||||
if (multisuported)
|
||||
return accs;
|
||||
|
||||
// service does not do multi accounts so need to do it one by one
|
||||
|
||||
UUID uuid = UUID.Zero;
|
||||
foreach (string id in IDs)
|
||||
{
|
||||
if (UUID.TryParse(id, out uuid) && uuid != UUID.Zero)
|
||||
accs.Add(GetUserAccount(m_ServerURI, scopeID, uuid));
|
||||
}
|
||||
|
||||
return accs;
|
||||
}
|
||||
|
||||
private List<UserAccount> doGetMultiUserAccounts(UUID scopeID, List<string> IDs, out bool suported)
|
||||
{
|
||||
List<UserAccount> accounts = new List<UserAccount>();
|
||||
suported = true;
|
||||
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
List<UserAccount> results = doGetMultiUserAccounts(serverURL, scopeID, IDs, out suported);
|
||||
|
||||
foreach (UserAccount account in results)
|
||||
{
|
||||
account.ServiceURLs["MultiGridRegion_UserAccountServerURL"] = serverURL;
|
||||
accounts.Add(account);
|
||||
}
|
||||
}
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
private List<UserAccount> doGetMultiUserAccounts(String m_ServerURI, UUID scopeID, List<string> IDs, out bool suported)
|
||||
{
|
||||
suported = true;
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "getmultiaccounts";
|
||||
|
||||
sendData["ScopeID"] = scopeID.ToString();
|
||||
sendData["IDS"] = new List<string>(IDs);
|
||||
|
||||
string reply = string.Empty;
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/accounts";
|
||||
// m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
|
||||
try
|
||||
{
|
||||
reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetMultiUserAccounts received null or empty reply");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
|
||||
}
|
||||
|
||||
List<UserAccount> accounts = new List<UserAccount>();
|
||||
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData != null)
|
||||
{
|
||||
if (replyData.ContainsKey("result"))
|
||||
{
|
||||
if (replyData["result"].ToString() == "null")
|
||||
return accounts;
|
||||
|
||||
if (replyData["result"].ToString() == "Failure")
|
||||
{
|
||||
suported = false;
|
||||
return accounts;
|
||||
}
|
||||
}
|
||||
|
||||
Dictionary<string, object>.ValueCollection accountList = replyData.Values;
|
||||
//m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetAgents returned {0} elements", pinfosList.Count);
|
||||
foreach (object acc in accountList)
|
||||
{
|
||||
if (acc is Dictionary<string, object>)
|
||||
{
|
||||
UserAccount pinfo = new UserAccount((Dictionary<string, object>)acc);
|
||||
accounts.Add(pinfo);
|
||||
}
|
||||
else
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetMultiUserAccounts received invalid response type {0}",
|
||||
acc.GetType());
|
||||
}
|
||||
}
|
||||
else
|
||||
m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetMultiUserAccounts received null response");
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
|
||||
public void InvalidateCache(UUID userID)
|
||||
{
|
||||
}
|
||||
|
||||
public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
|
||||
{
|
||||
return null; // Not implemented for regions
|
||||
}
|
||||
|
||||
public virtual bool StoreUserAccount(UserAccount data)
|
||||
{
|
||||
if (data.ServiceURLs.ContainsKey("MultiGridRegion_UserAccountServerURL"))
|
||||
return StoreUserAccount(data.ServiceURLs["MultiGridRegion_UserAccountServerURL"].ToString(), data);
|
||||
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
if (StoreUserAccount(serverURL, data) == true)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public virtual bool StoreUserAccount(String serverURL, UserAccount data)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "setaccount";
|
||||
|
||||
Dictionary<string, object> structData = data.ToKeyValuePairs();
|
||||
|
||||
foreach (KeyValuePair<string, object> kvp in structData)
|
||||
{
|
||||
if (kvp.Value == null)
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Null value for {0}", kvp.Key);
|
||||
continue;
|
||||
}
|
||||
sendData[kvp.Key] = kvp.Value.ToString();
|
||||
}
|
||||
|
||||
if (SendAndGetReply(serverURL, sendData) != null)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Create user remotely. Note this this is not part of the IUserAccountsService
|
||||
/// </summary>
|
||||
/// <param name="first"></param>
|
||||
/// <param name="last"></param>
|
||||
/// <param name="password"></param>
|
||||
/// <param name="email"></param>
|
||||
/// <param name="scopeID"></param>
|
||||
/// <returns></returns>
|
||||
///
|
||||
public virtual UserAccount CreateUser(string first, string last, string password, string email, UUID scopeID)
|
||||
{
|
||||
foreach (String serverURL in m_accountServers)
|
||||
{
|
||||
UserAccount result = CreateUser(first, last, password, email, scopeID);
|
||||
|
||||
if (result != null)
|
||||
return result;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public virtual UserAccount CreateUser(String m_ServerURI, string first, string last, string password, string email, UUID scopeID)
|
||||
{
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
//sendData["SCOPEID"] = scopeID.ToString();
|
||||
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
|
||||
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
|
||||
sendData["METHOD"] = "createuser";
|
||||
|
||||
sendData["FirstName"] = first;
|
||||
sendData["LastName"] = last;
|
||||
sendData["Password"] = password;
|
||||
if (!string.IsNullOrEmpty(email))
|
||||
sendData["Email"] = first;
|
||||
sendData["ScopeID"] = scopeID.ToString();
|
||||
|
||||
return SendAndGetReply(m_ServerURI, sendData);
|
||||
}
|
||||
|
||||
private UserAccount SendAndGetReply(String m_ServerURI, Dictionary<string, object> sendData)
|
||||
{
|
||||
string reply = string.Empty;
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/accounts";
|
||||
// m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
|
||||
try
|
||||
{
|
||||
reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
|
||||
}
|
||||
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
UserAccount account = null;
|
||||
|
||||
if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
|
||||
{
|
||||
if (replyData["result"] is Dictionary<string, object>)
|
||||
{
|
||||
account = new UserAccount((Dictionary<string, object>)replyData["result"]);
|
||||
}
|
||||
}
|
||||
|
||||
return account;
|
||||
|
||||
}
|
||||
|
||||
private bool SendAndGetBoolReply(String m_ServerURI, Dictionary<string, object> sendData)
|
||||
{
|
||||
string reqString = ServerUtils.BuildQueryString(sendData);
|
||||
string uri = m_ServerURI + "/accounts";
|
||||
//m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
|
||||
try
|
||||
{
|
||||
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply != string.Empty)
|
||||
{
|
||||
//m_log.DebugFormat("[ACCOUNTS CONNECTOR]: reply = {0}", reply);
|
||||
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
|
||||
|
||||
if (replyData.ContainsKey("result"))
|
||||
{
|
||||
if (replyData["result"].ToString().ToLower() == "success")
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
else
|
||||
m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount reply data does not contain result field");
|
||||
|
||||
}
|
||||
else
|
||||
m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount received empty reply");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue