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

Implement * end wildcard for whitelist urls

prebuild-update
Justin Clark-Casey (justincc) 2010-07-15 21:14:55 +01:00
parent dce7307aa2
commit 0edabffb7d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
View File

@ -460,6 +460,10 @@ namespace OpenSim.Region.CoreModules.Media.Moap
{ {
string wlUrl = rawWlUrl; string wlUrl = rawWlUrl;
// Deal with a line-ending wildcard
if (wlUrl.EndsWith("*"))
wlUrl = wlUrl.Remove(wlUrl.Length - 1);
if (!wlUrl.StartsWith("http://")) if (!wlUrl.StartsWith("http://"))
wlUrl = "http://" + wlUrl; wlUrl = "http://" + wlUrl;
@ -467,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
if (url.StartsWith(wlUrl)) if (url.StartsWith(wlUrl))
{ {
m_log.DebugFormat("[MOAP]: Whitelist url {0} matches requested url {1}", wlUrl, url); m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", wlUrl, url);
return true; return true;
} }
} }