aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-27 19:07:57 +0000
committerTeravus Ovares2008-05-27 19:07:57 +0000
commit1487699045876ef052e0764dc3163c1d746fe7f8 (patch)
treed8e3a3854b968b0cc8941b307195ed049b1a5d5f /OpenSim
parentcomment out the x.y security check in the script engine because it's so aggre... (diff)
downloadopensim-SC-1487699045876ef052e0764dc3163c1d746fe7f8.zip
opensim-SC-1487699045876ef052e0764dc3163c1d746fe7f8.tar.gz
opensim-SC-1487699045876ef052e0764dc3163c1d746fe7f8.tar.bz2
opensim-SC-1487699045876ef052e0764dc3163c1d746fe7f8.tar.xz
* Revert last commit as it opens sim owners up to all sorts of nasty scripts.
* If the regex that we're using isn't good enough, we really need to make it better.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 919d368..d132f8c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -117,9 +117,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
117 Match SecurityM; 117 Match SecurityM;
118 118
119 // BROKEN: this check is very wrong. It block's any url in strings. 119 // BROKEN: this check is very wrong. It block's any url in strings.
120 // = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 120 SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
121 // if (SecurityM.Success) 121 if (SecurityM.Success)
122 // throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'"); 122 throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'");
123 123
124 SecurityM = Regex.Match(checkscript, @"typeof\s", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 124 SecurityM = Regex.Match(checkscript, @"typeof\s", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
125 if (SecurityM.Success) 125 if (SecurityM.Success)