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

more on end slash and uri handler determination

master
UbitUmarov 2020-05-11 13:01:27 +01:00
parent 2629d9d901
commit 6d92b75452
1 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -556,7 +556,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
IHttpClientContext context = (IHttpClientContext)source; IHttpClientContext context = (IHttpClientContext)source;
IHttpRequest request = args.Request; IHttpRequest request = args.Request;
if (TryGetPollServiceHTTPHandler(request.UriPath, out PollServiceEventArgs psEvArgs)) if (TryGetPollServiceHTTPHandler(Util.TrimEndSlash(request.UriPath), out PollServiceEventArgs psEvArgs))
{ {
psEvArgs.RequestsReceived++; psEvArgs.RequestsReceived++;
PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request); PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
@ -976,39 +976,35 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
private readonly string HANDLER_SEPARATORS = "/?&#-";
private bool TryGetStreamHandler(string handlerKey, out IRequestHandler streamHandler) private bool TryGetStreamHandler(string handlerKey, out IRequestHandler streamHandler)
{ {
if(m_streamHandlers.TryGetValue(handlerKey, out streamHandler)) if(m_streamHandlers.TryGetValue(handlerKey, out streamHandler))
return true; return true;
string bestMatch = null; string bestMatch = null;
bool hasbest=false;
lock (m_streamHandlers) lock (m_streamHandlers)
{ {
foreach (string pattern in m_streamHandlers.Keys) foreach (string pattern in m_streamHandlers.Keys)
{ {
if (handlerKey.StartsWith(pattern) && (HANDLER_SEPARATORS.IndexOf(handlerKey[pattern.Length]) >= 0)) if (handlerKey.StartsWith(pattern))
{ {
if (String.IsNullOrEmpty(bestMatch) || pattern.Length > bestMatch.Length) if (!hasbest || pattern.Length > bestMatch.Length)
{ {
bestMatch = pattern; bestMatch = pattern;
hasbest = true;
} }
} }
} }
if (String.IsNullOrEmpty(bestMatch))
{
streamHandler = null;
return false;
}
else
{
streamHandler = m_streamHandlers[bestMatch];
return true;
}
} }
if (hasbest)
{
streamHandler = m_streamHandlers[bestMatch];
return true;
}
streamHandler = null;
return false;
} }
private bool TryGetPollServiceHTTPHandler(string handlerKey, out PollServiceEventArgs oServiceEventArgs) private bool TryGetPollServiceHTTPHandler(string handlerKey, out PollServiceEventArgs oServiceEventArgs)
@ -1016,66 +1012,42 @@ namespace OpenSim.Framework.Servers.HttpServer
if(m_pollHandlers.TryGetValue(handlerKey, out oServiceEventArgs)) if(m_pollHandlers.TryGetValue(handlerKey, out oServiceEventArgs))
return true; return true;
string bestMatch = null; oServiceEventArgs = null;
return false;
lock (m_pollHandlers)
{
foreach (string pattern in m_pollHandlers.Keys)
{
if ((handlerKey == pattern)
|| (handlerKey.StartsWith(pattern) && (HANDLER_SEPARATORS.IndexOf(handlerKey[pattern.Length]) >= 0)))
{
if (String.IsNullOrEmpty(bestMatch) || pattern.Length > bestMatch.Length)
{
bestMatch = pattern;
}
}
}
if (String.IsNullOrEmpty(bestMatch))
{
oServiceEventArgs = null;
return false;
}
else
{
oServiceEventArgs = m_pollHandlers[bestMatch];
return true;
}
}
} }
private bool TryGetHTTPHandler(string handlerKey, out GenericHTTPMethod HTTPHandler) private bool TryGetHTTPHandler(string handlerKey, out GenericHTTPMethod HTTPHandler)
{ {
// m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey); // m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey);
if(m_HTTPHandlers.TryGetValue(handlerKey, out HTTPHandler))
return true;
string bestMatch = null; string bestMatch = null;
bool hasmatch = false;
lock (m_HTTPHandlers) lock (m_HTTPHandlers)
{ {
foreach (string pattern in m_HTTPHandlers.Keys) foreach (string pattern in m_HTTPHandlers.Keys)
{ {
if ((handlerKey == pattern) if (handlerKey.StartsWith(pattern))
|| (handlerKey.StartsWith(pattern) && (HANDLER_SEPARATORS.IndexOf(handlerKey[pattern.Length]) >= 0)))
{ {
if (String.IsNullOrEmpty(bestMatch) || pattern.Length > bestMatch.Length) if (!hasmatch || pattern.Length > bestMatch.Length)
{ {
bestMatch = pattern; bestMatch = pattern;
hasmatch = true;
} }
} }
} }
if (String.IsNullOrEmpty(bestMatch))
{
HTTPHandler = null;
return false;
}
else
{
HTTPHandler = m_HTTPHandlers[bestMatch];
return true;
}
} }
if (hasmatch)
{
HTTPHandler = m_HTTPHandlers[bestMatch];
return true;
}
HTTPHandler = null;
return false;
} }
private bool TryGetSimpleStreamHandler(string uripath, out ISimpleStreamHandler handler) private bool TryGetSimpleStreamHandler(string uripath, out ISimpleStreamHandler handler)
@ -1083,6 +1055,7 @@ namespace OpenSim.Framework.Servers.HttpServer
if(m_simpleStreamHandlers.TryGetValue(uripath, out handler)) if(m_simpleStreamHandlers.TryGetValue(uripath, out handler))
return true; return true;
// look only for keyword before second slash ( /keyword/someparameter/... )
handler = null; handler = null;
if(uripath.Length < 3) if(uripath.Length < 3)
return false; return false;