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

From: Alan Webb <awebb@linux.vnet.ibm.com>

Browse Source 
The change makes two principal implementation changes:

[1] It removes the hard coded set of possible asset server client
implementations, allowing any arbitrary implementation that has been
identified to the PluginLoader as an appropriate extension. The
extension point for asset server client extension
is /OpenSim/AssetServerClient. All of the old configuration rules have
been preserved, and any of the legacy configuration values will still
work as they did before, except the implementation is now loaded as a
plug-in, rather than as a hard-coded instantiation of a specific class.
The re-hashing of IAssetServer as an extension of IPlugin made upgrading
of the implementation classes a necessity.

Caveat: I have not been able to meaningfully test the crypto-grid
clients. I believe they should work correctly, but the refactoring
necessary to handle plug-in based initialization (vs constructor-based
initialisation) admits the possibility of a problem.

[2] The asset cache implementation, previously introduce as a hard-code
class instantiation is now implemented as an IPlugin. Once again the
previous (configurationless) behavior has been preserved. But now it is
possible for those interested in experimenting with cache technologies
to do so simply by introducing a new extension for the asset cache
extension point (/OpenSim/AssetCache).

I've tested all of the configuration settings, after applying the patch
to a newly extracted tree, and they seem to work OK.
This commit is contained in:
Sean Dague
2009-02-16 12:20:31 +00:00
parent 81bb87168f
commit f4bec00057
15 changed files with 544 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
View File

@@ -44,9 +44,37 @@ namespace OpenSim.Framework.Communications.Cache
{
public class CryptoGridAssetClient : AssetServerBase
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string _assetServerUrl;
private bool m_encryptOnUpload;
private RjinKeyfile m_encryptKey;
private readonly Dictionary<string,RjinKeyfile> m_keyfiles = new Dictionary<string, RjinKeyfile>();
#region IPlugin
public override string Name
{
get { return "Crypto"; }
}
public override string Version
{
get { return "1.0"; }
}
public override void Initialise(ConfigSettings p_set, string p_url, string p_dir, bool p_t)
{
m_log.Debug("[CRYPTOGRID] Plugin configured initialisation");
Initialise(p_url, p_dir, p_t);
}
#endregion
#region Keyfile Classes
[Serializable]
private class RjinKeyfile
public class RjinKeyfile
{
public string Secret;
public string AlsoKnownAs;
@@ -94,7 +122,7 @@ namespace OpenSim.Framework.Communications.Cache
/// this may not be the most efficient way of handling encryption, so - as
/// soon as you feel comfortable with it - you may want to redesign this class.
/// </summary>
private class UtilRijndael
public class UtilRijndael
{
/// <summary>
/// Encrypts specified plaintext using Rijndael symmetric key algorithm
@@ -332,15 +360,19 @@ namespace OpenSim.Framework.Communications.Cache
}
#endregion
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly string _assetServerUrl;
private readonly bool m_encryptOnUpload;
private readonly RjinKeyfile m_encryptKey;
private readonly Dictionary<string,RjinKeyfile> m_keyfiles = new Dictionary<string, RjinKeyfile>();
public CryptoGridAssetClient() {}
public CryptoGridAssetClient(string serverUrl, string keydir, bool decOnly)
{
m_log.Debug("[CRYPTOGRID] Direct constructor");
Initialise(serverUrl, keydir, decOnly);
}
public void Initialise(string serverUrl, string keydir, bool decOnly)
{
m_log.Debug("[CRYPTOGRID] Common constructor");
_assetServerUrl = serverUrl;
string[] keys = Directory.GetFiles(keydir, "*.deckey");