Adds optional HTTP Basic Authentication to Robust service connectors.

2026-08-11 11:57:03 +08:00 · 2014-05-23 16:19:43 -07:00
parent b7c7293c7a
commit 20f20895cf
47 changed files with 519 additions and 116 deletions
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -39,7 +39,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class AssetServicesConnector : IAssetService
+    public class AssetServicesConnector : BaseServiceConnector, IAssetService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -71,6 +71,7 @@ namespace OpenSim.Services.Connectors
        }

        public AssetServicesConnector(IConfigSource source)
+            : base(source, "AssetService")
        {
            Initialise(source);
        }
@@ -126,7 +127,7 @@ namespace OpenSim.Services.Connectors
 //                    = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>(
 //                        "GET", uri, 0, m_maxAssetRequestConcurrency);

-                asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0);
+                asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth);

                if (m_Cache != null)
                    m_Cache.Cache(asset);
@@ -156,7 +157,7 @@ namespace OpenSim.Services.Connectors

            string uri = m_ServerURI + "/assets/" + id + "/metadata";

-            AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0);
+            AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0, m_Auth);
            return asset;
        }

@@ -177,7 +178,7 @@ namespace OpenSim.Services.Connectors

            rc.RequestMethod = "GET";

-            Stream s = rc.Request();
+            Stream s = rc.Request(m_Auth);

            if (s == null)
                return null;
@@ -238,7 +239,7 @@ namespace OpenSim.Services.Connectors
                                m_AssetHandlers.Remove(id);
                            }
                            handlers.Invoke(a);
-                        }, m_maxAssetRequestConcurrency);
+                        }, m_maxAssetRequestConcurrency, m_Auth);
                    
                    success = true;
                }
@@ -268,7 +269,7 @@ namespace OpenSim.Services.Connectors
            bool[] exist = null;
            try
            {
-                exist = SynchronousRestObjectRequester.MakeRequest<string[], bool[]>("POST", uri, ids);
+                exist = SynchronousRestObjectRequester.MakeRequest<string[], bool[]>("POST", uri, ids, m_Auth);
            }
            catch (Exception)
            {
@@ -297,7 +298,7 @@ namespace OpenSim.Services.Connectors
            string newID;
            try
            {
-                newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset);
+                newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset, m_Auth);
            }
            catch (Exception e)
            {
@@ -343,7 +344,7 @@ namespace OpenSim.Services.Connectors

            string uri = m_ServerURI + "/assets/" + id;

-            if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset))
+            if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset, m_Auth))
            {
                if (m_Cache != null)
                    m_Cache.Cache(asset);
@@ -357,7 +358,7 @@ namespace OpenSim.Services.Connectors
        {
            string uri = m_ServerURI + "/assets/" + id;

-            if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0))
+            if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0, m_Auth))
            {
                if (m_Cache != null)
                    m_Cache.Expire(id);
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
@@ -32,14 +32,14 @@ using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using OpenSim.Server.Base;
 using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class AuthenticationServicesConnector : IAuthenticationService
+    public class AuthenticationServicesConnector : BaseServiceConnector, IAuthenticationService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -57,6 +57,7 @@ namespace OpenSim.Services.Connectors
        }

        public AuthenticationServicesConnector(IConfigSource source)
+            : base(source, "AuthenticationService")
        {
            Initialise(source);
        }
@@ -79,6 +80,8 @@ namespace OpenSim.Services.Connectors
                throw new Exception("Authentication connector init error");
            }
            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "AuthenticationService");
        }

        public string Authenticate(UUID principalID, string password, int lifetime)
@@ -92,7 +95,7 @@ namespace OpenSim.Services.Connectors

            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                    m_ServerURI + "/auth/plain",
-                    ServerUtils.BuildQueryString(sendData));
+                    ServerUtils.BuildQueryString(sendData), m_Auth);

            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                    reply);
@@ -105,6 +108,7 @@ namespace OpenSim.Services.Connectors

        public bool Verify(UUID principalID, string token, int lifetime)
        {
+            m_log.Error("[XXX]: Verify");
            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["LIFETIME"] = lifetime.ToString();
            sendData["PRINCIPAL"] = principalID.ToString();
@@ -114,7 +118,7 @@ namespace OpenSim.Services.Connectors

            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                    m_ServerURI + "/auth/plain",
-                    ServerUtils.BuildQueryString(sendData));
+                    ServerUtils.BuildQueryString(sendData), m_Auth);

            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                    reply);
@@ -135,7 +139,7 @@ namespace OpenSim.Services.Connectors

            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                    m_ServerURI + "/auth/plain",
-                    ServerUtils.BuildQueryString(sendData));
+                    ServerUtils.BuildQueryString(sendData), m_Auth);

            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                    reply);
--- a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
@@ -32,7 +32,7 @@ using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using IAvatarService = OpenSim.Services.Interfaces.IAvatarService;
@@ -41,7 +41,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class AvatarServicesConnector : IAvatarService
+    public class AvatarServicesConnector : BaseServiceConnector, IAvatarService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -59,6 +59,7 @@ namespace OpenSim.Services.Connectors
        }

        public AvatarServicesConnector(IConfigSource source)
+            : base(source, "AvatarService")
        {
            Initialise(source);
        }
@@ -81,6 +82,8 @@ namespace OpenSim.Services.Connectors
                throw new Exception("Avatar connector init error");
            }
            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "AvatarService");
        }


@@ -114,7 +117,7 @@ namespace OpenSim.Services.Connectors
            // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
            try
            {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply == null || (reply != null && reply == string.Empty))
                {
                    m_log.DebugFormat("[AVATAR CONNECTOR]: GetAgent received null or empty reply");
@@ -162,7 +165,7 @@ namespace OpenSim.Services.Connectors
            //m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
            try
            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -207,7 +210,7 @@ namespace OpenSim.Services.Connectors
            // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
            try
            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -250,7 +253,7 @@ namespace OpenSim.Services.Connectors
            // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
            try
            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -293,7 +296,7 @@ namespace OpenSim.Services.Connectors
            // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
            try
            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
--- a/OpenSim/Services/Connectors/BaseServiceConnector.cs
+++ b/OpenSim/Services/Connectors/BaseServiceConnector.cs
@@ -0,0 +1,33 @@
+using System;
+using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
+
+using Nini.Config;
+
+namespace OpenSim.Services.Connectors
+{
+    public class BaseServiceConnector
+    {
+        protected IServiceAuth m_Auth;
+
+        public BaseServiceConnector() { }
+
+        public BaseServiceConnector(IConfigSource config, string section)
+        {
+            Initialise(config, section);
+        }
+
+        public void Initialise(IConfigSource config, string section)
+        {
+            string authType = Util.GetConfigVarFromSections<string>(config, "AuthType", new string[] { "Network", section }, "None");
+
+            switch (authType)
+            {
+                case "BasicHttpAuthentication":
+                    m_Auth = new BasicHttpAuthentication(config, section);
+                    break;
+            }
+
+        }
+    }
+}
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Framework.Communications;
 using OpenSim.Services.Interfaces;
 using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
@@ -40,7 +41,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors.Friends
 {
-    public class FriendsServicesConnector : IFriendsService
+    public class FriendsServicesConnector : BaseServiceConnector, IFriendsService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -80,6 +81,7 @@ namespace OpenSim.Services.Connectors.Friends
                throw new Exception("Friends connector init error");
            }
            m_ServerURI = serviceURI;
+            base.Initialise(source, "FriendsService");
        }


@@ -112,7 +114,7 @@ namespace OpenSim.Services.Connectors.Friends

            try
            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -168,7 +170,7 @@ namespace OpenSim.Services.Connectors.Friends
            string uri = m_ServerURI + "/friends";
            try
            {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
@@ -223,7 +225,7 @@ namespace OpenSim.Services.Connectors.Friends
            string uri = m_ServerURI + "/friends";
            try
            {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
@@ -40,7 +41,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class GridServicesConnector : IGridService
+    public class GridServicesConnector : BaseServiceConnector, IGridService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -80,6 +81,8 @@ namespace OpenSim.Services.Connectors
                throw new Exception("Grid connector init error");
            }
            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "GridService");
        }


@@ -102,7 +105,7 @@ namespace OpenSim.Services.Connectors
            // m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
            try
            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -158,7 +161,7 @@ namespace OpenSim.Services.Connectors
            try
            {
                string reply
-                    = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                    = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);

                if (reply != string.Empty)
                {
@@ -195,7 +198,7 @@ namespace OpenSim.Services.Connectors

            try
            {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
            }
            catch (Exception e)
            {
@@ -238,7 +241,7 @@ namespace OpenSim.Services.Connectors
            string uri = m_ServerURI + "/grid";
            try
            {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
@@ -285,7 +288,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
@@ -330,7 +333,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
@@ -374,7 +377,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
@@ -428,7 +431,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);

                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
            }
@@ -479,7 +482,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);

                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
            }
@@ -530,7 +533,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);

                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
            }
@@ -583,7 +586,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);

                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
            }
@@ -634,7 +637,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);

                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
            }
@@ -685,7 +688,7 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
            }
            catch (Exception e)
            {
--- a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
@@ -40,7 +41,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class GridUserServicesConnector : IGridUserService
+    public class GridUserServicesConnector : BaseServiceConnector, IGridUserService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -80,6 +81,7 @@ namespace OpenSim.Services.Connectors
                throw new Exception("GridUser connector init error");
            }
            m_ServerURI = serviceURI;
+            base.Initialise(source, "GridUserService");
        }


@@ -162,7 +164,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -198,7 +201,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -243,7 +247,8 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply == null || (reply != null && reply == string.Empty))
                {
                    m_log.DebugFormat("[GRID USER CONNECTOR]: GetGridUserInfo received null or empty reply");
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -40,7 +40,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class XInventoryServicesConnector : IInventoryService
+    public class XInventoryServicesConnector : BaseServiceConnector, IInventoryService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -60,6 +60,7 @@ namespace OpenSim.Services.Connectors
        }

        public XInventoryServicesConnector(IConfigSource source)
+            : base(source, "InventoryService")
        {
            Initialise(source);
        }
@@ -505,7 +506,7 @@ namespace OpenSim.Services.Connectors
            lock (m_Lock)
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         m_ServerURI + "/xinventory",
-                         ServerUtils.BuildQueryString(sendData));
+                         ServerUtils.BuildQueryString(sendData), m_Auth);

            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                    reply);
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -36,6 +36,7 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
@@ -43,7 +44,7 @@ using OpenMetaverse.StructuredData;

 namespace OpenSim.Services.Connectors
 {
-    public class MapImageServicesConnector : IMapImageService
+    public class MapImageServicesConnector : BaseServiceConnector, IMapImageService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -84,6 +85,7 @@ namespace OpenSim.Services.Connectors
            }
            m_ServerURI = serviceURI;
            m_ServerURI = serviceURI.TrimEnd('/');
+            base.Initialise(source, "MapImageService");
        }

        public bool RemoveMapTile(int x, int y, out string reason)
@@ -101,7 +103,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -163,7 +166,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
@@ -40,7 +41,7 @@ using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class PresenceServicesConnector : IPresenceService
+    public class PresenceServicesConnector : BaseServiceConnector, IPresenceService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -80,6 +81,8 @@ namespace OpenSim.Services.Connectors
                throw new Exception("Presence connector init error");
            }
            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "PresenceService");
        }


@@ -104,7 +107,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString, 
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -149,7 +153,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -193,7 +198,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -238,7 +244,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -283,7 +290,8 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply == null || (reply != null && reply == string.Empty))
                {
                    m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgent received null or empty reply");
@@ -327,7 +335,8 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply == null || (reply != null && reply == string.Empty))
                {
                    m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgents received null or empty reply");
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -33,13 +33,14 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;

 namespace OpenSim.Services.Connectors
 {
-    public class UserAccountServicesConnector : IUserAccountService
+    public class UserAccountServicesConnector : BaseServiceConnector, IUserAccountService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -79,6 +80,8 @@ namespace OpenSim.Services.Connectors
                throw new Exception("User account connector init error");
            }
            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "UserAccountService");
        }

        public virtual UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
@@ -144,7 +147,8 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply == null || (reply != null && reply == string.Empty))
                {
                    m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
@@ -224,7 +228,8 @@ namespace OpenSim.Services.Connectors
            {
                reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply == null || (reply != null && reply == string.Empty))
                {
                    m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
@@ -260,7 +265,8 @@ namespace OpenSim.Services.Connectors
            {
                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                        uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                if (reply != string.Empty)
                {
                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);