added AuthorizationRequest and AuthorizationResponse objects for passing Authorization messages over http. Added handling code for these in the AuthorizationServerConnector and AuthorizationServicesConnector

5 files changed, 172 insertions, 46 deletions

diff --git a/OpenSim/Framework/AuthorizationRequest.cs b/OpenSim/Framework/AuthorizationRequest.cs
new file mode 100644
index 0000000..864d87d
--- /dev/null
+++ b/OpenSim/Framework/AuthorizationRequest.cs
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OpenSim.Framework
+{
+    public class AuthorizationRequest
+    {
+        private string m_ID;
+        private string m_firstname;
+        private string m_surname;
+        private string m_email;
+        private string m_regionName;
+        private string m_regionID;
+
+        public AuthorizationRequest()
+        {
+        }
+
+        public AuthorizationRequest(string ID,string FirstName, string SurName, string Email, string RegionName, string RegionID)
+        {
+            m_ID = ID;
+            m_firstname = FirstName;
+            m_surname = SurName;
+            m_email = Email;
+            m_regionName = RegionName;
+            m_regionID = RegionID;
+        }
+        
+        public string ID
+        {
+            get { return m_ID; }
+            set { m_ID = value; }
+        }
+        
+        public string FirstName
+        {
+            get { return m_firstname; }
+            set { m_firstname = value; }
+        }
+        
+        public string SurName
+        {
+            get { return m_surname; }
+            set { m_surname = value; }
+        }
+        
+        public string Email
+        {
+            get { return m_email; }
+            set { m_email = value; }
+        }
+        
+        public string RegionName
+        {
+            get { return m_regionName; }
+            set { m_regionName = value; }
+        }
+        
+        public string RegionID
+        {
+            get { return m_regionID; }
+            set { m_regionID = value; }
+        }
+        
+        
+        
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/AuthorizationResponse.cs b/OpenSim/Framework/AuthorizationResponse.cs
new file mode 100644
index 0000000..5a03dfe
--- /dev/null
+++ b/OpenSim/Framework/AuthorizationResponse.cs
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OpenSim.Framework
+{
+    public class AuthorizationResponse
+    {
+        private bool m_isAuthorized;
+        private string m_message;
+
+        public AuthorizationResponse()
+        {
+        }
+
+        public AuthorizationResponse(bool isAuthorized,string message)
+        {
+            m_isAuthorized = isAuthorized;
+            m_message = message;
+            
+        }
+        
+        public bool IsAuthorized
+        {
+            get { return m_isAuthorized; }
+            set { m_isAuthorized = value; }
+        }
+        
+        public string Message
+        {
+            get { return m_message; }
+            set { m_message = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
index 725cf78..0d9f239 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Authorization
             m_AuthorizationService =
                     ServerUtils.LoadPlugin<IAuthorizationService>(authorizationService, args);
 
-            server.AddStreamHandler(new AuthorizationServerGetHandler(m_AuthorizationService));
+            server.AddStreamHandler(new AuthorizationServerPostHandler(m_AuthorizationService));
         }
     }
 }
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerGetHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
index 9e4c00e..407a18a 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
@@ -28,8 +28,8 @@
 using Nini.Config;
 using log4net;
 using System;
-using System.IO;
 using System.Reflection;
+using System.IO;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -42,54 +42,29 @@ using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Server.Handlers.Authorization
 {
-    public class AuthorizationServerGetHandler : BaseStreamHandler
+    public class AuthorizationServerPostHandler : BaseStreamHandler
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private IAuthorizationService m_AuthorizationService;
 
-        public AuthorizationServerGetHandler(IAuthorizationService service) :
-                base("GET", "/authorization")
+        public AuthorizationServerPostHandler(IAuthorizationService service) :
+                base("POST", "/authorization")
         {
+            m_AuthorizationService = service;
         }
 
         public override byte[] Handle(string path, Stream request,
                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-            // always return success for now, this is just stub functionality
-            return SuccessResult();
-        }
-        
-        private byte[] SuccessResult()
-        {
-            XmlDocument doc = new XmlDocument();
-
-            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
-                    "", "");
-
-            doc.AppendChild(xmlnode);
+            XmlSerializer xs = new XmlSerializer(typeof (AuthorizationRequest));
+            AuthorizationRequest Authorization = (AuthorizationRequest) xs.Deserialize(request);
 
-            XmlElement rootElement = doc.CreateElement("", "Authorization",
-                    "");
-
-            doc.AppendChild(rootElement);
-
-            XmlElement result = doc.CreateElement("", "Result", "");
-            result.AppendChild(doc.CreateTextNode("success"));
-
-            rootElement.AppendChild(result);
-
-            return DocToBytes(doc);
-        }
-        
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
+            AuthorizationResponse result = new AuthorizationResponse(true,Authorization.FirstName + " " + Authorization.SurName + " has been authorized");
 
-            return ms.GetBuffer();
+            xs = new XmlSerializer(typeof(AuthorizationResponse));
+            return ServerUtils.SerializeResult(xs, result);
+            
         }
     }
 }
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index 151d96a..d65afc6 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -90,26 +90,27 @@ namespace OpenSim.Services.Connectors
 
         public bool isAuthorizedForRegion(UserProfileData user, RegionInfo region)
         {
-            // this should be a remote call to the authorization server specified in the AuthorizationServerURI
-            m_log.Info("[AUTHORIZATION CONNECTOR]: isAuthorizedForRegion is not yet implemented. Returning true, the user is authorized ");
+            // do a remote call to the authorization server specified in the AuthorizationServerURI
+            m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: isAuthorizedForRegion checking {0} {1} at remote server {2}",user.FirstName,user.SurName, m_ServerURI);
             
-            string uri = m_ServerURI + "?uuid="+user.ID + "&firstname="+user.FirstName+"&lastname="+user.SurName+"&region="+region.RegionName+"&regionid="+region.RegionID+"&email="+user.Email;
+            string uri = m_ServerURI;
             
-            string result = string.Empty;
+            AuthorizationRequest req = new AuthorizationRequest(user.ID.ToString(),user.FirstName,user.SurName,user.Email,region.RegionName,region.RegionID.ToString());
             
+            AuthorizationResponse response;
             try
             {
-                result = SynchronousRestObjectRequester.
-                        MakeRequest<UserProfileData, string>("POST", uri, user);
+                response = SynchronousRestObjectRequester.MakeRequest<AuthorizationRequest, AuthorizationResponse>("POST", uri, req);
             }
             catch (Exception e)
             {
                 m_log.WarnFormat("[AUTHORIZATION CONNECTOR]: Unable to send authorize {0} {1} for region {2} error thrown during comms with remote server. Reason: {3}", user.FirstName,user.SurName,region.RegionName, e.Message);
+                m_log.WarnFormat("Inner Exception is {0}",e.InnerException);
                 return m_ResponseOnFailure;
             }
             
-            m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}",result);
-            if(result.Contains("success"))
+            m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}",response.Message);
+            if(response.IsAuthorized)
                 return true;
             else 
                 return false;