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

2 files changed, 13 insertions, 38 deletions

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);
+            
         }
     }
 }