OpenSimulator GForge > Projects > Cable Beach Asset Server > SVN

Diff of /trunk/AssetServer/Extensions/OpenSimInventoryFrontend.cs

-revision 49, Mon Dec 15 21:13:28 2008 UTC
+revision 70, Tue Jan 13 22:42:48 2009 UTC
 Line 34
  using System.Xml;
  using ExtensionLoader;
  using OpenMetaverse;
+ using OpenMetaverse.StructuredData;
+ using HttpServer;
  namespace AssetServer.Extensions
  {
-Line 68
+Line 70
          {
          }
-         void GetInventoryHandler(ref HttpListenerContext context)
+         bool GetInventoryHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
              UUID sessionID, agentID;
-             UUID inventoryID = DeserializeUUID(context.Request.InputStream, out agentID, out sessionID);
+             UUID ownerID = DeserializeUUID(request.Body, out agentID, out sessionID);
-             if (inventoryID != UUID.Zero)
+             if (ownerID != UUID.Zero)
              {
                  Logger.Log.Warn("GetInventory is not scalable on some inventory backends, avoid calling it wherever possible");
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
                  InventoryCollection inventory;
-                 StorageResponse response = server.InventoryProvider.TryFetchInventory(inventoryID, sessionID, out inventory);
+                 BackendResponse storageResponse = server.InventoryProvider.TryFetchInventory(owner, out inventory);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
-                 {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
-                     collectionSerializer.Serialize(context.Response.OutputStream, inventory);
-                     context.Response.OutputStream.Flush();
-                 }
-                 else if (response == StorageResponse.AuthNeeded)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                     collectionSerializer.Serialize(response.Body, inventory);
+                     response.Body.Flush();
                  }
-                 else if (response == StorageResponse.NotFound)
+                 else if (storageResponse == BackendResponse.NotFound)
                  {
                      // Return an empty inventory set to mimic OpenSim.Grid.InventoryServer.exe
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
                      inventory = new InventoryCollection();
-                     inventory.UserID = inventoryID;
+                     inventory.UserID = ownerID;
                      inventory.Folders = new Dictionary<UUID,InventoryFolder>();
                      inventory.Items = new Dictionary<UUID,InventoryItem>();
-                     collectionSerializer.Serialize(context.Response.OutputStream, inventory);
+                     collectionSerializer.Serialize(response.Body, inventory);
-                     context.Response.OutputStream.Flush();
+                     response.Body.Flush();
                  }
                  else
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+                     response.Status = HttpStatusCode.InternalServerError;
                  }
              }
              else
              {
-                 context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+                 response.Status = HttpStatusCode.BadRequest;
              }
+             return true;
          }
-         void CreateInventoryHandler(ref HttpListenerContext context)
+         bool CreateInventoryHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
-             UUID ownerID = DeserializeUUID(context.Request.InputStream);
+             UUID ownerID = DeserializeUUID(request.Body);
              if (ownerID != UUID.Zero)
              {
-                 // HACK: OpenSim doesn't supply us with any credentials when creating a new inventory.
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 // Huge gaping security hole
+                 Logger.Log.DebugFormat("Created URI {0} for inventory creation", owner);
-                 UUID sessionID = UUID.Zero;
                  InventoryFolder rootFolder = new InventoryFolder("My Inventory", ownerID, UUID.Zero, (short)AssetType.Folder);
-                 StorageResponse response = server.InventoryProvider.TryCreateInventory(rootFolder, sessionID);
+                 BackendResponse storageResponse = server.InventoryProvider.TryCreateInventory(owner, rootFolder);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
                  {
-                     CreateFolder("Animations", ownerID, rootFolder.ID, AssetType.Animation, sessionID);
+                     CreateFolder("Animations", ownerID, rootFolder.ID, AssetType.Animation);
-                     CreateFolder("Body Parts", ownerID, rootFolder.ID, AssetType.Bodypart, sessionID);
+                     CreateFolder("Body Parts", ownerID, rootFolder.ID, AssetType.Bodypart);
-                     CreateFolder("Calling Cards", ownerID, rootFolder.ID, AssetType.CallingCard, sessionID);
+                     CreateFolder("Calling Cards", ownerID, rootFolder.ID, AssetType.CallingCard);
-                     CreateFolder("Clothing", ownerID, rootFolder.ID, AssetType.Clothing, sessionID);
+                     CreateFolder("Clothing", ownerID, rootFolder.ID, AssetType.Clothing);
-                     CreateFolder("Gestures", ownerID, rootFolder.ID, AssetType.Gesture, sessionID);
+                     CreateFolder("Gestures", ownerID, rootFolder.ID, AssetType.Gesture);
-                     CreateFolder("Landmarks", ownerID, rootFolder.ID, AssetType.Landmark, sessionID);
+                     CreateFolder("Landmarks", ownerID, rootFolder.ID, AssetType.Landmark);
-                     CreateFolder("Lost and Found", ownerID, rootFolder.ID, AssetType.LostAndFoundFolder, sessionID);
+                     CreateFolder("Lost and Found", ownerID, rootFolder.ID, AssetType.LostAndFoundFolder);
-                     CreateFolder("Notecards", ownerID, rootFolder.ID, AssetType.Notecard, sessionID);
+                     CreateFolder("Notecards", ownerID, rootFolder.ID, AssetType.Notecard);
-                     CreateFolder("Objects", ownerID, rootFolder.ID, AssetType.Object, sessionID);
+                     CreateFolder("Objects", ownerID, rootFolder.ID, AssetType.Object);
-                     CreateFolder("Photo Album", ownerID, rootFolder.ID, AssetType.SnapshotFolder, sessionID);
+                     CreateFolder("Photo Album", ownerID, rootFolder.ID, AssetType.SnapshotFolder);
-                     CreateFolder("Scripts", ownerID, rootFolder.ID, AssetType.LSLText, sessionID);
+                     CreateFolder("Scripts", ownerID, rootFolder.ID, AssetType.LSLText);
-                     CreateFolder("Sounds", ownerID, rootFolder.ID, AssetType.Sound, sessionID);
+                     CreateFolder("Sounds", ownerID, rootFolder.ID, AssetType.Sound);
-                     CreateFolder("Textures", ownerID, rootFolder.ID, AssetType.Texture, sessionID);
+                     CreateFolder("Textures", ownerID, rootFolder.ID, AssetType.Texture);
-                     CreateFolder("Trash", ownerID, rootFolder.ID, AssetType.TrashFolder, sessionID);
+                     CreateFolder("Trash", ownerID, rootFolder.ID, AssetType.TrashFolder);
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeBool(response.Body, true);
-                     SerializeBool(context.Response.OutputStream, true);
+                     return true;
-                     return;
                  }
              }
-             context.Response.StatusCode = (int)HttpStatusCode.OK;
+             SerializeBool(response.Body, false);
-             SerializeBool(context.Response.OutputStream, false);
+             return true;
          }
-         void NewFolderHandler(ref HttpListenerContext context)
+         bool NewFolderHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
              UUID agentID, sessionID;
-             InventoryFolder folder = DeserializeFolder(context.Request.InputStream, out agentID, out sessionID);
+             InventoryFolder folder = DeserializeFolder(request.Body, out agentID, out sessionID);
              if (folder != null)
              {
+                 Uri owner = Utils.GetOpenSimUri(folder.Owner);
                  // Some calls that are moving or updating a folder instead of creating a new one
                  // will pass in an InventoryFolder without the name set. If this is the case we
                  // need to look up the name first
                  if (String.IsNullOrEmpty(folder.Name))
                  {
                      InventoryFolder oldFolder;
-                     if (server.InventoryProvider.TryFetchFolder(folder.Owner, folder.ID, sessionID, out oldFolder) == StorageResponse.Success)
+                     if (server.InventoryProvider.TryFetchFolder(owner, folder.ID, out oldFolder) == BackendResponse.Success)
                          folder.Name = oldFolder.Name;
                  }
-                 StorageResponse response = server.InventoryProvider.TryCreateFolder(folder, sessionID);
+                 BackendResponse storageResponse = server.InventoryProvider.TryCreateFolder(owner, folder);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeBool(response.Body, true);
-                     SerializeBool(context.Response.OutputStream, true);
+                     return true;
-                     return;
                  }
              }
-             context.Response.StatusCode = (int)HttpStatusCode.OK;
+             SerializeBool(response.Body, false);
-             SerializeBool(context.Response.OutputStream, false);
+             return true;
          }
-         void UpdateFolderHandler(ref HttpListenerContext context)
+         bool UpdateFolderHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
-             NewFolderHandler(ref context);
+             return NewFolderHandler(client, request, response);
          }
-         void MoveFolderHandler(ref HttpListenerContext context)
+         bool MoveFolderHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
-             NewFolderHandler(ref context);
+             return NewFolderHandler(client, request, response);
          }
-         void PurgeFolderHandler(ref HttpListenerContext context)
+         bool PurgeFolderHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
              UUID agentID, sessionID;
-             InventoryFolder folder = DeserializeFolder(context.Request.InputStream, out agentID, out sessionID);
+             InventoryFolder folder = DeserializeFolder(request.Body, out agentID, out sessionID);
              if (folder != null)
              {
-                 StorageResponse response = server.InventoryProvider.TryPurgeFolder(folder.Owner, folder.ID, sessionID);
+                 Uri owner = Utils.GetOpenSimUri(folder.Owner);
+                 BackendResponse storageResponse = server.InventoryProvider.TryPurgeFolder(owner, folder.ID);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeBool(response.Body, true);
-                     SerializeBool(context.Response.OutputStream, true);
+                     return true;
-                     return;
                  }
              }
-             context.Response.StatusCode = (int)HttpStatusCode.OK;
+             SerializeBool(response.Body, false);
-             SerializeBool(context.Response.OutputStream, false);
+             return true;
          }
-         void NewItemHandler(ref HttpListenerContext context)
+         bool NewItemHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
              UUID agentID, sessionID;
-             InventoryItem item = DeserializeItem(context.Request.InputStream, out agentID, out sessionID);
+             InventoryItem item = DeserializeItem(request.Body, out agentID, out sessionID);
              if (item != null)
              {
-                 StorageResponse response = server.InventoryProvider.TryCreateItem(item, sessionID);
+                 Uri owner = Utils.GetOpenSimUri(agentID);
+                 BackendResponse storageResponse = server.InventoryProvider.TryCreateItem(owner, item);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeBool(response.Body, true);
-                     SerializeBool(context.Response.OutputStream, true);
+                     return true;
-                     return;
                  }
              }
-             context.Response.StatusCode = (int)HttpStatusCode.OK;
+             SerializeBool(response.Body, false);
-             SerializeBool(context.Response.OutputStream, false);
+             return true;
          }
-         void DeleteItemHandler(ref HttpListenerContext context)
+         bool DeleteItemHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
              UUID agentID, sessionID;
-             InventoryItem item = DeserializeItem(context.Request.InputStream, out agentID, out sessionID);
+             InventoryItem item = DeserializeItem(request.Body, out agentID, out sessionID);
              if (item != null)
              {
-                 StorageResponse response = server.InventoryProvider.TryDeleteItem(item.Owner, item.ID, sessionID);
+                 Uri owner = Utils.GetOpenSimUri(item.Owner);
+                 BackendResponse storageResponse = server.InventoryProvider.TryDeleteItem(owner, item.ID);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeBool(response.Body, true);
-                     SerializeBool(context.Response.OutputStream, true);
+                     return true;
-                     return;
                  }
              }
-             context.Response.StatusCode = (int)HttpStatusCode.OK;
+             SerializeBool(response.Body, false);
-             SerializeBool(context.Response.OutputStream, false);
+             return true;
          }
-         void RootFoldersHandler(ref HttpListenerContext context)
+         bool RootFoldersHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
-             UUID ownerID = DeserializeUUID(context.Request.InputStream);
+             UUID ownerID = DeserializeUUID(request.Body);
              if (ownerID != UUID.Zero)
              {
-                 // HACK: OpenSim doesn't supply us with any credentials when fetching agent folder lists.
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 // Huge gaping security hole
-                 UUID sessionID = UUID.Zero;
                  List<InventoryFolder> skeleton;
-                 StorageResponse response = server.InventoryProvider.TryFetchFolderList(ownerID, sessionID, out skeleton);
+                 BackendResponse storageResponse = server.InventoryProvider.TryFetchFolderList(owner, out skeleton);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
-                 {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
-                     SerializeFolderList(context.Response.OutputStream, skeleton);
-                 }
-                 else if (response == StorageResponse.AuthNeeded)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                     SerializeFolderList(response.Body, skeleton);
                  }
-                 else if (response == StorageResponse.NotFound)
+                 else if (storageResponse == BackendResponse.NotFound)
                  {
                      // Return an empty set of inventory so the requester knows that
                      // an inventory needs to be created for this agent
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeFolderList(response.Body, new List<InventoryFolder>(0));
-                     SerializeFolderList(context.Response.OutputStream, new List<InventoryFolder>(0));
                  }
                  else
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+                     response.Status = HttpStatusCode.InternalServerError;
                  }
              }
              else
              {
-                 context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+                 response.Status = HttpStatusCode.BadRequest;
              }
+             return true;
          }
-         void ActiveGesturesHandler(ref HttpListenerContext context)
+         bool ActiveGesturesHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
          {
-             UUID inventoryID = DeserializeUUID(context.Request.InputStream);
+             UUID ownerID = DeserializeUUID(request.Body);
-             if (inventoryID != UUID.Zero)
+             if (ownerID != UUID.Zero)
              {
-                 // HACK: OpenSim doesn't supply us with any credentials when fetching agent folder lists.
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 // Huge gaping security hole
-                 UUID sessionID = UUID.Zero;
                  List<InventoryItem> gestures;
-                 StorageResponse response = server.InventoryProvider.TryFetchActiveGestures(inventoryID, sessionID, out gestures);
+                 BackendResponse storageResponse = server.InventoryProvider.TryFetchActiveGestures(owner, out gestures);
-                 if (response == StorageResponse.Success)
+                 if (storageResponse == BackendResponse.Success)
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeItemList(response.Body, gestures);
-                     SerializeItemList(context.Response.OutputStream, gestures);
                  }
-                 else if (response == StorageResponse.AuthNeeded)
+                 else if (storageResponse == BackendResponse.NotFound)
-                 {
-                     context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                 }
-                 else if (response == StorageResponse.NotFound)
                  {
                      // Return an empty set of gestures to match OpenSim.Grid.InventoryServer.exe behavior
-                     context.Response.StatusCode = (int)HttpStatusCode.OK;
+                     SerializeItemList(response.Body, new List<InventoryItem>(0));
-                     SerializeItemList(context.Response.OutputStream, new List<InventoryItem>(0));
                  }
                  else
                  {
-                     context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+                     response.Status = HttpStatusCode.InternalServerError;
                  }
              }
              else
              {
-                 context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+                 response.Status = HttpStatusCode.BadRequest;
              }
+             return true;
          }
-         StorageResponse CreateFolder(string name, UUID ownerID, UUID parentID, AssetType assetType, UUID sessionID)
+         BackendResponse CreateFolder(string name, UUID ownerID, UUID parentID, AssetType assetType)
          {
              InventoryFolder folder = new InventoryFolder(name, ownerID, parentID, (short)assetType);
-             return server.InventoryProvider.TryCreateFolder(folder, sessionID);
+             Uri owner = Utils.GetOpenSimUri(ownerID);
+             return server.InventoryProvider.TryCreateFolder(owner, folder);
          }
          UUID DeserializeUUID(Stream stream)
-Line 487
+Line 472
              }
              stream.Flush();
-             stream.Close();
          }
          void SerializeFolderList(Stream stream, List<InventoryFolder> folders)
-Line 516
+Line 500
              }
              stream.Flush();
-             stream.Close();
          }
          void SerializeItemList(Stream stream, List<InventoryItem> items)
-Line 559
+Line 542
              }
              stream.Flush();
-             stream.Close();
          }
          void WriteUUID(XmlWriter writer, string name, UUID id)

 Legend:



Removed from v.49
 


changed lines


 
Added in v.70
 Legend:



Removed from v.49
 


changed lines


 
Added in v.70
-Removed from v.49
+Added in v.70

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Cable Beach Asset Server

Diff of /trunk/AssetServer/Extensions/OpenSimInventoryFrontend.cs