From d6948b15c47fd067be6d7cef31caf8e49e9c9afa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 21:51:17 +0100
Subject: Make it more obvious when it happens that DLL plugin loading fails.
Improve exception output on Windows.
---
OpenSim/Region/Framework/ModuleLoader.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index 23be9c2..14ecd44 100644
--- a/OpenSim/Region/Framework/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -223,7 +223,8 @@ namespace OpenSim.Region.Framework
catch (Exception e)
{
m_log.ErrorFormat(
- "[MODULES]: Could not load types for [{0}]. Exception {1}", pluginAssembly.FullName, e);
+ "[MODULES]: Could not load types for plugin DLL {0}. Exception {1} {2}",
+ pluginAssembly.FullName, e.Message, e.StackTrace);
// justincc: Right now this is fatal to really get the user's attention
throw e;
--
cgit v1.1
From 0bd6bc8fba1ed35344218e2aa25e30a3294f2ed1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 21:59:26 +0100
Subject: create "config show" as a region console command synonym for "config
get".
This is to create greater consistency with all the other show commands.
---
OpenSim/Region/Application/OpenSim.cs | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index ec1fb04..39004d4 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -341,10 +341,15 @@ namespace OpenSim
m_console.Commands.AddCommand("region", false, "config get",
"config get [<section>] [<key>]",
- "Show a config option",
+ "Synonym for config show",
+ HandleConfig);
+
+ m_console.Commands.AddCommand("region", false, "config show",
+ "config show [<section>] [<key>]",
+ "Show config information",
"If neither section nor field are specified, then the whole current configuration is printed." + Environment.NewLine
+ "If a section is given but not a field, then all fields in that section are printed.",
- HandleConfig);
+ HandleConfig);
m_console.Commands.AddCommand("region", false, "config save",
"config save <path>",
@@ -593,7 +598,9 @@ namespace OpenSim
if (cmdparams.Length > 0)
{
- switch (cmdparams[0].ToLower())
+ string firstParam = cmdparams[0].ToLower();
+
+ switch (firstParam)
{
case "set":
if (cmdparams.Length < 4)
@@ -618,6 +625,7 @@ namespace OpenSim
break;
case "get":
+ case "show":
if (cmdparams.Length == 1)
{
foreach (IConfig config in m_config.Source.Configs)
@@ -654,8 +662,8 @@ namespace OpenSim
}
else
{
- Notice("Syntax: config get [<section>] [<key>]");
- Notice("Example: config get ScriptEngine.DotNetEngine NumberOfScriptThreads");
+ Notice("Syntax: config {0} [<section>] [<key>]", firstParam);
+ Notice("Example: config {0} ScriptEngine.DotNetEngine NumberOfScriptThreads", firstParam);
}
break;
--
cgit v1.1
From 464fa45ec90767af13bd8edcc7c67de4ec3db6a7 Mon Sep 17 00:00:00 2001
From: E. Allen Soard
Date: Fri, 8 Apr 2011 18:30:20 -0700
Subject: Implimented HTTP_VERIFY_CERT for llHttpRequest
---
.../Scripting/HttpRequest/ScriptsHttpRequests.cs | 34 ++++++++++++++++++++--
1 file changed, 31 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index d78931a..a37c781 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -29,8 +29,10 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
+using System.Net.Security;
using System.Text;
using System.Threading;
+using System.Security.Cryptography.X509Certificates;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
@@ -84,6 +86,7 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
{
+
public class HttpRequestModule : IRegionModule, IHttpRequestModule
{
private object HttpListLock = new object();
@@ -100,8 +103,23 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public HttpRequestModule()
{
+ ServicePointManager.ServerCertificateValidationCallback +=ValidateServerCertificate;
}
+ public static bool ValidateServerCertificate(
+ object sender,
+ X509Certificate certificate,
+ X509Chain chain,
+ SslPolicyErrors sslPolicyErrors)
+ {
+ HttpWebRequest Request = (HttpWebRequest)sender;
+
+ if(Request.Headers.Get("NoVerifyCert") != null)
+ {
+ return true;
+ }
+ return chain.Build(new X509Certificate2(certificate));
+ }
#region IHttpRequestModule Members
public UUID MakeHttpRequest(string url, string parameters, string body)
@@ -141,8 +159,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
break;
case (int)HttpRequestConstants.HTTP_VERIFY_CERT:
-
- // TODO implement me
+ htc.HttpVerifyCert = (int.Parse(parms[i + 1]) != 0);
break;
}
}
@@ -282,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public string HttpMethod = "GET";
public string HttpMIMEType = "text/plain;charset=utf-8";
public int HttpTimeout;
- // public bool HttpVerifyCert = true; // not implemented
+ public bool HttpVerifyCert = true; // not implemented
private Thread httpThread;
// Request info
@@ -344,6 +361,17 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
Request.Method = HttpMethod;
Request.ContentType = HttpMIMEType;
+ if(!HttpVerifyCert)
+ {
+ // Connection Group Name is probably not used so we hijack it to identify
+ // a desired security exception
+// Request.ConnectionGroupName="NoVerify";
+ Request.Headers.Add("NoVerifyCert" , "true");
+ }
+// else
+// {
+// Request.ConnectionGroupName="Verify";
+// }
if (proxyurl != null && proxyurl.Length > 0)
{
if (proxyexcepts != null && proxyexcepts.Length > 0)
--
cgit v1.1
From 3a98fb080a751d21999bb2baa769462426b5d776 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 22:29:08 +0100
Subject: minor: adjust some spacing and indentation
---
.../Scripting/HttpRequest/ScriptsHttpRequests.cs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index a37c781..23e15ef 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -86,7 +86,6 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
{
-
public class HttpRequestModule : IRegionModule, IHttpRequestModule
{
private object HttpListLock = new object();
@@ -114,10 +113,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
{
HttpWebRequest Request = (HttpWebRequest)sender;
- if(Request.Headers.Get("NoVerifyCert") != null)
+ if (Request.Headers.Get("NoVerifyCert") != null)
{
return true;
}
+
return chain.Build(new X509Certificate2(certificate));
}
#region IHttpRequestModule Members
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
* Not sure how important ordering is is here - the next first
* one completed in the list is returned, based soley on its list
* position, not the order in which the request was started or
- * finsihed. I thought about setting up a queue for this, but
+ * finished. I thought about setting up a queue for this, but
* it will need some refactoring and this works 'enough' right now
*/
@@ -254,8 +254,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
- m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
- m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
+ m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
+ m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
}
@@ -363,10 +363,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
if(!HttpVerifyCert)
{
- // Connection Group Name is probably not used so we hijack it to identify
- // a desired security exception
-// Request.ConnectionGroupName="NoVerify";
- Request.Headers.Add("NoVerifyCert" , "true");
+ // We could hijack Connection Group Name to identify
+ // a desired security exception. But at the moment we'll use a dummy header instead.
+// Request.ConnectionGroupName = "NoVerify";
+ Request.Headers.Add("NoVerifyCert", "true");
}
// else
// {
@@ -464,4 +464,4 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
}
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From e8ecb2898c55bb97d47e9b1efb7dac98d40609cd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 22:33:24 +0100
Subject: minor: remove some mono compiler warnings
---
.../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c16a985..aa28fa0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10289,12 +10289,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
UUID rq = UUID.Random();
- UUID tid = AsyncCommands.
- DataserverPlugin.RegisterRequest(m_localID,
- m_itemID, rq.ToString());
+ AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString());
- AsyncCommands.
- DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id)));
+ AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id)));
return rq.ToString();
}
@@ -10308,12 +10305,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
UUID rq = UUID.Random();
- UUID tid = AsyncCommands.
- DataserverPlugin.RegisterRequest(m_localID,
- m_itemID, rq.ToString());
+ AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString());
- AsyncCommands.
- DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id));
+ AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id));
return rq.ToString();
}
--
cgit v1.1
From 64dc7e9f141fd0f168ed90c11f932a8bdb077dc7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 22:35:07 +0100
Subject: minor: remove now inaccurate comment
---
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 23e15ef..4c8424d 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public string HttpMethod = "GET";
public string HttpMIMEType = "text/plain;charset=utf-8";
public int HttpTimeout;
- public bool HttpVerifyCert = true; // not implemented
+ public bool HttpVerifyCert = true;
private Thread httpThread;
// Request info
--
cgit v1.1
From 49d80f5711e1bc1afb6c650038619ade6d9a9e97 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 23:07:56 +0100
Subject: Include code to return more information about the
NullReferenceException seen in
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something
about it.
---
OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 8efe4e9..50b6dbe 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -39,6 +39,8 @@ namespace OpenSim.Data.MySQL
{
public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
{
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
protected Dictionary<string, FieldInfo> m_Fields =
new Dictionary<string, FieldInfo>();
@@ -217,7 +219,6 @@ namespace OpenSim.Data.MySQL
{
using (MySqlCommand cmd = new MySqlCommand())
{
-
string query = "";
List<String> names = new List<String>();
List<String> values = new List<String>();
@@ -226,6 +227,16 @@ namespace OpenSim.Data.MySQL
{
names.Add(fi.Name);
values.Add("?" + fi.Name);
+
+ // Temporarily return more information about what field is unexpectedly null for
+ // http://opensimulator.org/mantis/view.php?id=5403. This might be due to a bug in the
+ // InventoryTransferModule or we may be required to substitute a DBNull here.
+ if (fi.GetValue(row) == null)
+ throw new NullReferenceException(
+ string.Format(
+ "[MYSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
+ fi.Name, row));
+
cmd.Parameters.AddWithValue(fi.Name, fi.GetValue(row).ToString());
}
@@ -268,4 +279,4 @@ namespace OpenSim.Data.MySQL
}
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 621d5b58e1a9bc24aab384a5e9bd6eb881928505 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Apr 2011 23:56:04 +0100
Subject: minor: add a bit more method doc to IInventoryService.GetItem()
---
OpenSim/Services/Interfaces/IInventoryService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index d19faed..a8bfe47 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Services.Interfaces
/// Get an item, given by its UUID
/// </summary>
/// <param name="item"></param>
- /// <returns></returns>
+ /// <returns>null if no item was found, otherwise the found item</returns>
InventoryItemBase GetItem(InventoryItemBase item);
/// <summary>
--
cgit v1.1