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

i'm dropping VerifyGod() and adding IsGod(OSHttpRequest) instead, which actually now 

takes a look at the HTTP request header and retrieves x-opensim-godkey (if it exists)
and compares that against the godkey from OpenSim.ini.

also, this makes AddStreamHandler() virtual so that it can be overridden.
0.6.0-stable
Dr Scofield 2008-05-19 17:54:31 +00:00
parent 3e8adc0d78
commit af46963176
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
View File

@ -211,6 +211,7 @@ namespace OpenSim.ApplicationPlugins.Rest
// Retrieve GOD key value, if any. // Retrieve GOD key value, if any.
_godkey = _config.GetString("god_key", String.Empty); _godkey = _config.GetString("god_key", String.Empty);
// Retrive prefix if any. // Retrive prefix if any.
_prefix = _config.GetString("prefix", "/admin"); _prefix = _config.GetString("prefix", "/admin");
@ -242,7 +243,7 @@ namespace OpenSim.ApplicationPlugins.Rest
private List<RestStreamHandler> _handlers = new List<RestStreamHandler>(); private List<RestStreamHandler> _handlers = new List<RestStreamHandler>();
public void AddRestStreamHandler(string httpMethod, string path, RestMethod method) public virtual void AddRestStreamHandler(string httpMethod, string path, RestMethod method)
{ {
if (!IsEnabled) return; if (!IsEnabled) return;
@ -258,13 +259,18 @@ namespace OpenSim.ApplicationPlugins.Rest
m_log.DebugFormat("{0} Added REST handler {1} {2}", MsgID, httpMethod, path); m_log.DebugFormat("{0} Added REST handler {1} {2}", MsgID, httpMethod, path);
} }
public bool AddAgentHandler(string agentname, IHttpAgentHandler handler)
protected bool VerifyGod(string key)
{ {
if (String.IsNullOrEmpty(key)) return false;
if (!IsEnabled) return false; if (!IsEnabled) return false;
return _httpd.AddAgentHandler(agentname, handler);
}
return key == _godkey; protected bool IsGod(OSHttpRequest request)
{
string[] keys = request.Headers.GetValues("x-opensim-godkey");
if (null == keys) return false;
// we take the last key supplied
return keys[keys.Length-1] == _godkey;
} }
public virtual void Close() public virtual void Close()