OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties.

0.6.6-post-fixes
Jeff Ames 2009-05-17 10:26:00 +00:00
parent 0379dbe2fd
commit 5cfd84c924
11 changed files with 569 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Data/MySQL/Resources/002_GridStore.sql
View File

@ -1,5 +1,5 @@
BEGIN; BEGIN;
ALTER TABLE regions add column access integer unsigned default 1; ALTER TABLE regions add column access integer unsigned default 1;
COMMIT; COMMIT;

24
OpenSim/Framework/Client/IClientIPEndpoint.cs
View File

@ -1,12 +1,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Text; using System.Text;
namespace OpenSim.Framework.Client namespace OpenSim.Framework.Client
{ {
public interface IClientIPEndpoint public interface IClientIPEndpoint
{ {
IPAddress EndPoint { get; } IPAddress EndPoint { get; }
} }
} }

162
OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
View File

@ -1,81 +1,81 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Agent.IPBan namespace OpenSim.Region.CoreModules.Agent.IPBan
{ {
public class IPBanModule : IRegionModule public class IPBanModule : IRegionModule
{ {
#region Implementation of IRegionModule #region Implementation of IRegionModule
private List<string> m_bans = new List<string>(); private List<string> m_bans = new List<string>();
public void Initialise(Scene scene, IConfigSource source) public void Initialise(Scene scene, IConfigSource source)
{ {
new SceneBanner(scene, m_bans); new SceneBanner(scene, m_bans);
lock(m_bans) lock(m_bans)
{ {
foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans) foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans)
{ {
if(!String.IsNullOrEmpty(ban.BannedHostIPMask)) if(!String.IsNullOrEmpty(ban.BannedHostIPMask))
m_bans.Add(ban.BannedHostIPMask); m_bans.Add(ban.BannedHostIPMask);
if (!String.IsNullOrEmpty(ban.BannedHostNameMask)) if (!String.IsNullOrEmpty(ban.BannedHostNameMask))
m_bans.Add(ban.BannedHostNameMask); m_bans.Add(ban.BannedHostNameMask);
} }
} }
} }
public void PostInitialise() public void PostInitialise()
{ {
if(File.Exists("bans.txt")) if(File.Exists("bans.txt"))
{ {
string[] bans = File.ReadAllLines("bans.txt"); string[] bans = File.ReadAllLines("bans.txt");
foreach (string ban in bans) foreach (string ban in bans)
{ {
m_bans.Add(ban); m_bans.Add(ban);
} }
} }
} }
public void Close() public void Close()
{ {
} }
public string Name public string Name
{ {
get { return "IPBanModule"; } get { return "IPBanModule"; }
} }
public bool IsSharedModule public bool IsSharedModule
{ {
get { return true; } get { return true; }
} }
#endregion #endregion
/// <summary> /// <summary>
/// Bans all users from the specified network from connecting. /// Bans all users from the specified network from connecting.
/// DNS bans are in the form "somewhere.com" will block ANY /// DNS bans are in the form "somewhere.com" will block ANY
/// matching domain (including "betasomewhere.com", "beta.somewhere.com", /// matching domain (including "betasomewhere.com", "beta.somewhere.com",
/// "somewhere.com.beta") - make sure to be reasonably specific in DNS /// "somewhere.com.beta") - make sure to be reasonably specific in DNS
/// bans. /// bans.
/// ///
/// IP address bans match on first characters, so, /// IP address bans match on first characters, so,
/// "127.0.0.1" will ban only that address, /// "127.0.0.1" will ban only that address,
/// "127.0.1" will ban "127.0.10.0" /// "127.0.1" will ban "127.0.10.0"
/// but "127.0.1." will ban only the "127.0.1.*" network /// but "127.0.1." will ban only the "127.0.1.*" network
/// </summary> /// </summary>
/// <param name="host">See summary for explanation of parameter</param> /// <param name="host">See summary for explanation of parameter</param>
public void Ban(string host) public void Ban(string host)
{ {
m_bans.Add(host); m_bans.Add(host);
} }
} }
} }

104
OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
View File

@ -1,52 +1,52 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Agent.IPBan namespace OpenSim.Region.CoreModules.Agent.IPBan
{ {
internal class SceneBanner internal class SceneBanner
{ {
private static readonly log4net.ILog m_log private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private List<string> bans; private List<string> bans;
private SceneBase m_scene; private SceneBase m_scene;
public SceneBanner(SceneBase scene, List<string> banList) public SceneBanner(SceneBase scene, List<string> banList)
{ {
scene.EventManager.OnClientConnect += EventManager_OnClientConnect; scene.EventManager.OnClientConnect += EventManager_OnClientConnect;
bans = banList; bans = banList;
m_scene = scene; m_scene = scene;
} }
void EventManager_OnClientConnect(IClientCore client) void EventManager_OnClientConnect(IClientCore client)
{ {
IClientIPEndpoint ipEndpoint; IClientIPEndpoint ipEndpoint;
if(client.TryGet(out ipEndpoint)) if(client.TryGet(out ipEndpoint))
{ {
IPAddress end = ipEndpoint.EndPoint; IPAddress end = ipEndpoint.EndPoint;
try try
{ {
IPHostEntry rDNS = Dns.GetHostEntry(end); IPHostEntry rDNS = Dns.GetHostEntry(end);
foreach (string ban in bans) foreach (string ban in bans)
{ {
if (rDNS.HostName.Contains(ban) || if (rDNS.HostName.Contains(ban) ||
end.ToString().StartsWith(ban)) end.ToString().StartsWith(ban))
{ {
client.Disconnect("Banned - network \"" + ban + "\" is not allowed to connect to this server."); client.Disconnect("Banned - network \"" + ban + "\" is not allowed to connect to this server.");
m_log.Warn("[IPBAN] Disconnected '" + end + "' due to '" + ban + "' ban."); m_log.Warn("[IPBAN] Disconnected '" + end + "' due to '" + ban + "' ban.");
return; return;
} }
} }
} }
catch (System.Net.Sockets.SocketException sex) catch (System.Net.Sockets.SocketException sex)
{ {
m_log.WarnFormat("[IPBAN] IP address \"{0}\" cannot be resolved via DNS", end); m_log.WarnFormat("[IPBAN] IP address \"{0}\" cannot be resolved via DNS", end);
} }
m_log.WarnFormat("[IPBAN] User \"{0}\" not in any ban lists. Allowing connection.", end); m_log.WarnFormat("[IPBAN] User \"{0}\" not in any ban lists. Allowing connection.", end);
} }
} }
} }
} }

12
OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs
View File

@ -45,14 +45,14 @@ namespace OpenSim.Servers.Connectors
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty; private string m_ServerURI = String.Empty;
private IImprovedAssetCache m_Cache = null; private IImprovedAssetCache m_Cache = null;
public AssetServicesConnector() public AssetServicesConnector()
{ {
} }
public AssetServicesConnector(string serverURI) public AssetServicesConnector(string serverURI)
{ {
m_ServerURI = serverURI; m_ServerURI = serverURI;
} }
@ -201,7 +201,7 @@ namespace OpenSim.Servers.Connectors
if (newID != String.Empty) if (newID != String.Empty)
{ {
// Placing this here, so that this work with old asset servers that don't send any reply back // Placing this here, so that this work with old asset servers that don't send any reply back
// SynchronousRestObjectRequester returns somethins that is not an empty string // SynchronousRestObjectRequester returns somethins that is not an empty string
if (newID != null) if (newID != null)
asset.ID = newID; asset.ID = newID;

246
OpenSim/SimulatorServices/RegionAssetService.cs
View File

@ -1,123 +1,123 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Servers.AssetServer.Handlers; using OpenSim.Servers.AssetServer.Handlers;
namespace OpenSim.Region.SimulatorServices namespace OpenSim.Region.SimulatorServices
{ {
public class RegionAssetService : IRegionModule public class RegionAssetService : IRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool initialized = false; private static bool initialized = false;
private static bool enabled = false; private static bool enabled = false;
private bool m_gridMode = false; private bool m_gridMode = false;
Scene m_scene; Scene m_scene;
#region IRegionModule interface #region IRegionModule interface
public void Initialise(Scene scene, IConfigSource config) public void Initialise(Scene scene, IConfigSource config)
{ {
if (!initialized) if (!initialized)
{ {
initialized = true; initialized = true;
m_scene = scene; m_scene = scene;
// This module is only on for standalones in hypergrid mode // This module is only on for standalones in hypergrid mode
enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
config.Configs["Startup"].GetBoolean("hypergrid", true)) || config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
m_gridMode = config.Configs["Startup"].GetBoolean("gridmode", true); m_gridMode = config.Configs["Startup"].GetBoolean("gridmode", true);
} }
} }
public void PostInitialise() public void PostInitialise()
{ {
if (enabled) if (enabled)
{ {
m_log.Info("[RegionAssetService]: Starting..."); m_log.Info("[RegionAssetService]: Starting...");
new AssetService(m_scene,m_gridMode); new AssetService(m_scene,m_gridMode);
} }
} }
public void Close() public void Close()
{ {
} }
public string Name public string Name
{ {
get { return "RegionAssetService"; } get { return "RegionAssetService"; }
} }
public bool IsSharedModule public bool IsSharedModule
{ {
get { return true; } get { return true; }
} }
#endregion #endregion
} }
public class AssetService public class AssetService
{ {
private bool m_doLookup = false; private bool m_doLookup = false;
private bool m_gridMode = false; private bool m_gridMode = false;
public bool DoLookup public bool DoLookup
{ {
get { return m_doLookup; } get { return m_doLookup; }
set { m_doLookup = value; } set { m_doLookup = value; }
} }
// private static readonly ILog m_log // private static readonly ILog m_log
// = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public AssetService(Scene m_scene, bool gridMode) public AssetService(Scene m_scene, bool gridMode)
{ {
m_gridMode = gridMode; m_gridMode = gridMode;
AddHttpHandlers(m_scene); AddHttpHandlers(m_scene);
} }
protected void AddHttpHandlers(Scene m_scene) protected void AddHttpHandlers(Scene m_scene)
{ {
IHttpServer httpServer = m_scene.CommsManager.HttpServer; IHttpServer httpServer = m_scene.CommsManager.HttpServer;
httpServer.AddStreamHandler(new AssetServerGetHandler(m_scene.AssetService)); httpServer.AddStreamHandler(new AssetServerGetHandler(m_scene.AssetService));
httpServer.AddStreamHandler(new AssetServerPostHandler(m_scene.AssetService)); httpServer.AddStreamHandler(new AssetServerPostHandler(m_scene.AssetService));
httpServer.AddStreamHandler(new AssetServerDeleteHandler(m_scene.AssetService)); httpServer.AddStreamHandler(new AssetServerDeleteHandler(m_scene.AssetService));
} }
} }
} }

66
OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
View File

@ -1,34 +1,34 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Tests.Common.Mock namespace OpenSim.Tests.Common.Mock
{ {
public class BaseAssetRepository public class BaseAssetRepository
{ {
protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>(); protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>();
public AssetBase FetchAsset(UUID uuid) public AssetBase FetchAsset(UUID uuid)
{ {
if (ExistsAsset(uuid)) if (ExistsAsset(uuid))
return Assets[uuid]; return Assets[uuid];
else else
return null; return null;
} }
public void CreateAsset(AssetBase asset) public void CreateAsset(AssetBase asset)
{ {
Assets[asset.FullID] = asset; Assets[asset.FullID] = asset;
} }
public void UpdateAsset(AssetBase asset) public void UpdateAsset(AssetBase asset)
{ {
CreateAsset(asset); CreateAsset(asset);
} }
public bool ExistsAsset(UUID uuid) public bool ExistsAsset(UUID uuid)
{ {
return Assets.ContainsKey(uuid); return Assets.ContainsKey(uuid);
} }
} }
} }

184
OpenSim/Tests/Common/Mock/TestAssetCache.cs
View File

@ -1,92 +1,92 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Tests.Common.Mock namespace OpenSim.Tests.Common.Mock
{ {
public class TestAssetCache : BaseAssetRepository, IAssetCache public class TestAssetCache : BaseAssetRepository, IAssetCache
{ {
public void AssetReceived(AssetBase asset, bool IsTexture) public void AssetReceived(AssetBase asset, bool IsTexture)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void AssetNotFound(UUID assetID, bool IsTexture) public void AssetNotFound(UUID assetID, bool IsTexture)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void Dispose() public void Dispose()
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string Version public string Version
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }
public string Name public string Name
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }
public void Initialise() public void Initialise()
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public IAssetServer AssetServer public IAssetServer AssetServer
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }
public void Initialise(ConfigSettings cs, IAssetServer server) public void Initialise(ConfigSettings cs, IAssetServer server)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void ShowState() public void ShowState()
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void Clear() public void Clear()
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public bool TryGetCachedAsset(UUID assetID, out AssetBase asset) public bool TryGetCachedAsset(UUID assetID, out AssetBase asset)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void GetAsset(UUID assetID, AssetRequestCallback callback, bool isTexture) public void GetAsset(UUID assetID, AssetRequestCallback callback, bool isTexture)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public AssetBase GetAsset(UUID assetID, bool isTexture) public AssetBase GetAsset(UUID assetID, bool isTexture)
{ {
return FetchAsset(assetID); return FetchAsset(assetID);
} }
public void AddAsset(AssetBase asset) public void AddAsset(AssetBase asset)
{ {
CreateAsset( asset ); CreateAsset( asset );
} }
public void ExpireAsset(UUID assetID) public void ExpireAsset(UUID assetID)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
} }

154
OpenSim/Tests/Common/Mock/TestAssetService.cs
View File

@ -1,78 +1,78 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
namespace OpenSim.Tests.Common.Mock namespace OpenSim.Tests.Common.Mock
{ {
public class TestAssetService : IAssetService public class TestAssetService : IAssetService
{ {
private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>(); private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>();
public AssetBase Get(string id) public AssetBase Get(string id)
{ {
return Assets[ id ]; return Assets[ id ];
} }
public AssetMetadata GetMetadata(string id) public AssetMetadata GetMetadata(string id)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public byte[] GetData(string id) public byte[] GetData(string id)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public bool Get(string id, object sender, AssetRetrieved handler) public bool Get(string id, object sender, AssetRetrieved handler)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string Store(AssetBase asset) public string Store(AssetBase asset)
{ {
Assets[asset.ID] = asset; Assets[asset.ID] = asset;
return asset.ID; return asset.ID;
} }
public bool UpdateContent(string id, byte[] data) public bool UpdateContent(string id, byte[] data)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public bool Delete(string id) public bool Delete(string id)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
} }
} }

48
OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
View File

@ -1,24 +1,24 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Tests.Common.Mock namespace OpenSim.Tests.Common.Mock
{ {
public class TestOSHttpResponse : OSHttpResponse public class TestOSHttpResponse : OSHttpResponse
{ {
private int m_statusCode; private int m_statusCode;
public override int StatusCode public override int StatusCode
{ {
get { return m_statusCode; } get { return m_statusCode; }
set { m_statusCode = value; } set { m_statusCode = value; }
} }
private string m_contentType; private string m_contentType;
public override string ContentType public override string ContentType
{ {
get { return m_contentType; } get { return m_contentType; }
set { m_contentType = value; } set { m_contentType = value; }
} }
} }
} }

128
OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs
View File

@ -1,64 +1,64 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Mock;
namespace OpenSim.Tests.Common.Setup namespace OpenSim.Tests.Common.Setup
{ {
public class GetAssetStreamHandlerTestHelpers public class GetAssetStreamHandlerTestHelpers
{ {
public static void BaseFetchExistingAssetXmlTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response) public static void BaseFetchExistingAssetXmlTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response)
{ {
byte[] expected = BaseGetAssetStreamHandler.GetXml(asset); byte[] expected = BaseGetAssetStreamHandler.GetXml(asset);
byte[] actual = handler.Handle("/assets/" + asset.ID , null, null, response); byte[] actual = handler.Handle("/assets/" + asset.ID , null, null, response);
Assert.Greater(actual.Length, 10, "Too short xml on fetching xml without trailing slash."); Assert.Greater(actual.Length, 10, "Too short xml on fetching xml without trailing slash.");
Assert.AreEqual(expected, actual, "Failed on fetching xml without trailing slash."); Assert.AreEqual(expected, actual, "Failed on fetching xml without trailing slash.");
// Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on first fetch."); // Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on first fetch.");
byte[] actual1 = handler.Handle("/assets/" + asset.ID + "/", null, null, response); byte[] actual1 = handler.Handle("/assets/" + asset.ID + "/", null, null, response);
Assert.Greater(actual1.Length, 10, "Too short xml on fetching xml with trailing slash."); Assert.Greater(actual1.Length, 10, "Too short xml on fetching xml with trailing slash.");
Assert.AreEqual(expected, actual1, "Failed on fetching xml with trailing slash."); Assert.AreEqual(expected, actual1, "Failed on fetching xml with trailing slash.");
// Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on second fetch."); // Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on second fetch.");
} }
public static void BaseFetchExistingAssetDataTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response) public static void BaseFetchExistingAssetDataTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response)
{ {
Assert.AreEqual(asset.Data, handler.Handle("/assets/" + asset.ID + "/data", null, null, response), "Failed on fetching data without trailing slash."); Assert.AreEqual(asset.Data, handler.Handle("/assets/" + asset.ID + "/data", null, null, response), "Failed on fetching data without trailing slash.");
Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on first fetch."); Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on first fetch.");
Assert.AreEqual(asset.Data, handler.Handle("/assets/" + asset.ID + "/data/", null, null, response), "Failed on fetching data with trailing slash."); Assert.AreEqual(asset.Data, handler.Handle("/assets/" + asset.ID + "/data/", null, null, response), "Failed on fetching data with trailing slash.");
Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on second fetch."); Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on second fetch.");
} }
public static AssetBase CreateCommonTestResources(out OSHttpResponse response) public static AssetBase CreateCommonTestResources(out OSHttpResponse response)
{ {
AssetBase asset = CreateTestAsset(); AssetBase asset = CreateTestAsset();
response = new TestOSHttpResponse(); response = new TestOSHttpResponse();
return asset; return asset;
} }
public static AssetBase CreateTestAsset() public static AssetBase CreateTestAsset()
{ {
byte[] expected = new byte[] { 1,2,3 }; byte[] expected = new byte[] { 1,2,3 };
AssetBase asset = new AssetBase( ); AssetBase asset = new AssetBase( );
asset.ID = Guid.NewGuid().ToString(); asset.ID = Guid.NewGuid().ToString();
asset.Data = expected; asset.Data = expected;
return asset; return asset;
} }
public static void BaseFetchMissingAsset(BaseGetAssetStreamHandler handler) public static void BaseFetchMissingAsset(BaseGetAssetStreamHandler handler)
{ {
Assert.AreEqual(BaseRequestHandlerTestHelper.EmptyByteArray, handler.Handle("/assets/" + Guid.NewGuid(), null, null, null), "Failed on bad guid."); Assert.AreEqual(BaseRequestHandlerTestHelper.EmptyByteArray, handler.Handle("/assets/" + Guid.NewGuid(), null, null, null), "Failed on bad guid.");
} }
} }
} }