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

refactor: simplify current whitelist url checking by using System.Uri

prebuild-update
Justin Clark-Casey (justincc) 2010-07-15 21:40:44 +01:00
parent 610a2626a5
commit 2ec6e3b440
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,11 +451,13 @@ namespace OpenSim.Region.CoreModules.Media.Moap
/// <summary> /// <summary>
/// Check the given url against the given whitelist. /// Check the given url against the given whitelist.
/// </summary> /// </summary>
/// <param name="url"></param> /// <param name="rawUrl"></param>
/// <param name="whitelist"></param> /// <param name="whitelist"></param>
/// <returns>true if the url matches an entry on the whitelist, false otherwise</returns> /// <returns>true if the url matches an entry on the whitelist, false otherwise</returns>
protected bool CheckUrlAgainstWhitelist(string url, string[] whitelist) protected bool CheckUrlAgainstWhitelist(string rawUrl, string[] whitelist)
{ {
Uri url = new Uri(rawUrl);
foreach (string rawWlUrl in whitelist) foreach (string rawWlUrl in whitelist)
{ {
string wlUrl = rawWlUrl; string wlUrl = rawWlUrl;
@ -464,14 +466,13 @@ namespace OpenSim.Region.CoreModules.Media.Moap
if (wlUrl.EndsWith("*")) if (wlUrl.EndsWith("*"))
wlUrl = wlUrl.Remove(wlUrl.Length - 1); wlUrl = wlUrl.Remove(wlUrl.Length - 1);
if (!wlUrl.StartsWith("http://"))
wlUrl = "http://" + wlUrl;
m_log.DebugFormat("[MOAP]: Checking whitelist URL {0}", wlUrl); m_log.DebugFormat("[MOAP]: Checking whitelist URL {0}", wlUrl);
if (url.StartsWith(wlUrl)) string urlToMatch = url.Authority + url.AbsolutePath;
if (urlToMatch.StartsWith(wlUrl))
{ {
m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", wlUrl, url); m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", wlUrl, urlToMatch);
return true; return true;
} }
} }