aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2008-05-27 18:40:49 +0000
committerSean Dague2008-05-27 18:40:49 +0000
commite436120d60c2777ceb8cab97a3ce44cbef657a33 (patch)
tree1ed1da894dde6c976ed569e5582ce409cfa10374 /OpenSim/Region
parentThank you kindly, Melanie for a patch that adds: (diff)
downloadopensim-SC_OLD-e436120d60c2777ceb8cab97a3ce44cbef657a33.zip
opensim-SC_OLD-e436120d60c2777ceb8cab97a3ce44cbef657a33.tar.gz
opensim-SC_OLD-e436120d60c2777ceb8cab97a3ce44cbef657a33.tar.bz2
opensim-SC_OLD-e436120d60c2777ceb8cab97a3ce44cbef657a33.tar.xz
comment out the x.y security check in the script engine because it's so aggressive
it blocks string = "http://osgrid.org", amoung other things.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 765eb5d..919d368 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -114,9 +114,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
114 114
115 // checks for alpha.alpha way of referring to objects in C# 115 // checks for alpha.alpha way of referring to objects in C#
116 // ignores alpha.x alpha.y, alpha.z for refering to vector components 116 // ignores alpha.x alpha.y, alpha.z for refering to vector components
117 Match SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 117 Match SecurityM;
118 if (SecurityM.Success) 118
119 throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'"); 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);
121 // if (SecurityM.Success)
122 // throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'");
120 123
121 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);
122 if (SecurityM.Success) 125 if (SecurityM.Success)