1 files changed, 98 insertions, 99 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
index 6afda79..3b6e99e 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
@@ -57,8 +57,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
            m_server = server;
            // Request for / or /?...
-            //server.HttpServer.AddHandler("get", null, @"(^/$)|(^/\?.*)", BrowseRequestHandler);
+            //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server));
-            m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server));
            m_log.Info("[ASSET] Browser Frontend loaded.");
        }
@@ -89,102 +88,102 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
        #endregion IPlugin implementation
-        public class BrowseRequestHandler : IStreamedRequestHandler
+        //public class BrowseRequestHandler : IStreamedRequestHandler
-        {
+        //{
-            AssetInventoryServer m_server;
+        //    AssetInventoryServer m_server;
-            string m_contentType;
+        //    string m_contentType;
-            string m_httpMethod;
+        //    string m_httpMethod;
-            string m_path;
+        //    string m_path;
-            public BrowseRequestHandler(AssetInventoryServer server)
+        //    public BrowseRequestHandler(AssetInventoryServer server)
-            {
+        //    {
-                m_server = server;
+        //        m_server = server;
-                m_contentType = null;
+        //        m_contentType = null;
-                m_httpMethod = "GET";
+        //        m_httpMethod = "GET";
-                m_path = @"(^/$)|(^/\?.*)";
+        //        m_path = @"(^/$)|(^/\?.*)";
-            }
+        //    }
-            #region IStreamedRequestHandler implementation
+        //    #region IStreamedRequestHandler implementation
-            public string ContentType
+        //    public string ContentType
-            {
+        //    {
-                get { return m_contentType; }
+        //        get { return m_contentType; }
-            }
+        //    }
-            public string HttpMethod
+        //    public string HttpMethod
-            {
+        //    {
-                get { return m_httpMethod; }
+        //        get { return m_httpMethod; }
-            }
+        //    }
-            public string Path
+        //    public string Path
-            {
+        //    {
-                get { return m_path; }
+        //        get { return m_path; }
-            }
+        //    }
-            public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        //    public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-            {
+        //    {
-                const int ASSETS_PER_PAGE = 25;
+        //        const int ASSETS_PER_PAGE = 25;
-                const string HEADER = "<html><head><title>Asset Server</title></head><body>";
+        //        const string HEADER = "<html><head><title>Asset Server</title></head><body>";
-                const string TABLE_HEADER =
+        //        const string TABLE_HEADER =
-                    "<table><tr><th>Name</th><th>Description</th><th>Type</th><th>ID</th><th>Temporary</th><th>SHA-1</th></tr>";
+        //            "<table><tr><th>Name</th><th>Description</th><th>Type</th><th>ID</th><th>Temporary</th><th>SHA-1</th></tr>";
-                const string TABLE_FOOTER = "</table>";
+        //        const string TABLE_FOOTER = "</table>";
-                const string FOOTER = "</body></html>";
+        //        const string FOOTER = "</body></html>";
-                UUID authToken = Utils.GetAuthToken(httpRequest);
+        //        UUID authToken = Utils.GetAuthToken(httpRequest);
-                StringBuilder html = new StringBuilder();
+        //        StringBuilder html = new StringBuilder();
-                int start = 0;
+        //        int start = 0;
-                uint page = 0;
+        //        uint page = 0;
-                if (!String.IsNullOrEmpty(httpRequest.Url.Query))
+        //        if (!String.IsNullOrEmpty(httpRequest.Url.Query))
-                {
+        //        {
-                    NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+        //            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
-                    if (!String.IsNullOrEmpty(query["page"]) && UInt32.TryParse(query["page"], out page))
+        //            if (!String.IsNullOrEmpty(query["page"]) && UInt32.TryParse(query["page"], out page))
-                        start = (int)page * ASSETS_PER_PAGE;
+        //                start = (int)page * ASSETS_PER_PAGE;
-                }
+        //        }
-                html.AppendLine(HEADER);
+        //        html.AppendLine(HEADER);
-                html.AppendLine("<p>");
+        //        html.AppendLine("<p>");
-                if (page > 0)
+        //        if (page > 0)
-                    html.AppendFormat("<a href=\"{0}?page={1}\">&lt; Previous Page</a> | ", httpRequest.RawUrl, page - 1);
+        //            html.AppendFormat("<a href=\"{0}?page={1}\">&lt; Previous Page</a> | ", httpRequest.RawUrl, page - 1);
-                html.AppendFormat("<a href=\"{0}?page={1}\">Next Page &gt;</a>", httpRequest.RawUrl, page + 1);
+        //        html.AppendFormat("<a href=\"{0}?page={1}\">Next Page &gt;</a>", httpRequest.RawUrl, page + 1);
-                html.AppendLine("</p>");
+        //        html.AppendLine("</p>");
-                html.AppendLine(TABLE_HEADER);
+        //        html.AppendLine(TABLE_HEADER);
-                m_server.StorageProvider.ForEach(
+        //        m_server.StorageProvider.ForEach(
-                    delegate(Metadata data)
+        //            delegate(Metadata data)
-                    {
+        //            {
-                        if (m_server.AuthorizationProvider.IsMetadataAuthorized(authToken, data.ID))
+        //                if (m_server.AuthorizationProvider.IsMetadataAuthorized(authToken, data.ID))
-                        {
+        //                {
-                            html.AppendLine(String.Format(
+        //                    html.AppendLine(String.Format(
-                                "<tr><td>{0}</td><td>{1}</td><td>{2}</td><td>{3}</td><td>{4}</td><td>{5}</td></tr>",
+        //                        "<tr><td>{0}</td><td>{1}</td><td>{2}</td><td>{3}</td><td>{4}</td><td>{5}</td></tr>",
-                                data.Name, data.Description, data.ContentType, data.ID, data.Temporary,
+        //                        data.Name, data.Description, data.ContentType, data.ID, data.Temporary,
-                                BitConverter.ToString(data.SHA1).Replace("-", String.Empty)));
+        //                        BitConverter.ToString(data.SHA1).Replace("-", String.Empty)));
-                        }
+        //                }
-                        else
+        //                else
-                        {
+        //                {
-                            html.AppendLine(String.Format(
+        //                    html.AppendLine(String.Format(
-                                "<tr><td>[Protected Asset]</td><td>&nbsp;</td><td>&nbsp;</td><td>{0}</td><td>{1}</td><td>&nbsp;</td></tr>",
+        //                        "<tr><td>[Protected Asset]</td><td>&nbsp;</td><td>&nbsp;</td><td>{0}</td><td>{1}</td><td>&nbsp;</td></tr>",
-                                data.ID, data.Temporary));
+        //                        data.ID, data.Temporary));
-                        }
+        //                }
-                    }, start, ASSETS_PER_PAGE
+        //            }, start, ASSETS_PER_PAGE
-                );
+        //        );
-                html.AppendLine(TABLE_FOOTER);
+        //        html.AppendLine(TABLE_FOOTER);
-                html.AppendLine(FOOTER);
+        //        html.AppendLine(FOOTER);
-                byte[] responseData = System.Text.Encoding.UTF8.GetBytes(html.ToString());
+        //        byte[] responseData = System.Text.Encoding.UTF8.GetBytes(html.ToString());
-                httpResponse.StatusCode = (int) HttpStatusCode.OK;
+        //        httpResponse.StatusCode = (int) HttpStatusCode.OK;
-                httpResponse.Body.Write(responseData, 0, responseData.Length);
+        //        httpResponse.Body.Write(responseData, 0, responseData.Length);
-                httpResponse.Body.Flush();
+        //        httpResponse.Body.Flush();
-                return responseData;
+        //        return responseData;
-            }
+        //    }
-            #endregion IStreamedRequestHandler implementation
+        //    #endregion IStreamedRequestHandler implementation
-        }
+        //}
    }
 }

diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs index 6afda79..3b6e99e 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
@@ -57,8 +57,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
57	m_server = server;	57	m_server = server;
58		58
59	// Request for / or /?...	59	// Request for / or /?...
60	//server.HttpServer.AddHandler("get", null, @"(^/$)\|(^/\?.*)", BrowseRequestHandler);	60	//m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server));
61	m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server));
62		61
63	m_log.Info("[ASSET] Browser Frontend loaded.");	62	m_log.Info("[ASSET] Browser Frontend loaded.");
64	}	63	}
@@ -89,102 +88,102 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
89		88
90	#endregion IPlugin implementation	89	#endregion IPlugin implementation
91		90
92	public class BrowseRequestHandler : IStreamedRequestHandler	91	//public class BrowseRequestHandler : IStreamedRequestHandler
93	{	92	//{
94	AssetInventoryServer m_server;	93	// AssetInventoryServer m_server;
95	string m_contentType;	94	// string m_contentType;
96	string m_httpMethod;	95	// string m_httpMethod;
97	string m_path;	96	// string m_path;
98		97
99	public BrowseRequestHandler(AssetInventoryServer server)	98	// public BrowseRequestHandler(AssetInventoryServer server)
100	{	99	// {
101	m_server = server;	100	// m_server = server;
102	m_contentType = null;	101	// m_contentType = null;
103	m_httpMethod = "GET";	102	// m_httpMethod = "GET";
104	m_path = @"(^/$)\|(^/\?.*)";	103	// m_path = @"(^/$)\|(^/\?.*)";
105	}	104	// }
106		105
107	#region IStreamedRequestHandler implementation	106	// #region IStreamedRequestHandler implementation
108		107
109	public string ContentType	108	// public string ContentType
110	{	109	// {
111	get { return m_contentType; }	110	// get { return m_contentType; }
112	}	111	// }
113		112
114	public string HttpMethod	113	// public string HttpMethod
115	{	114	// {
116	get { return m_httpMethod; }	115	// get { return m_httpMethod; }
117	}	116	// }
118		117
119	public string Path	118	// public string Path
120	{	119	// {
121	get { return m_path; }	120	// get { return m_path; }
122	}	121	// }
123		122
124	public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)	123	// public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
125	{	124	// {
126	const int ASSETS_PER_PAGE = 25;	125	// const int ASSETS_PER_PAGE = 25;
127	const string HEADER = "<html><head><title>Asset Server</title></head><body>";	126	// const string HEADER = "<html><head><title>Asset Server</title></head><body>";
128	const string TABLE_HEADER =	127	// const string TABLE_HEADER =
129	"<table><tr><th>Name</th><th>Description</th><th>Type</th><th>ID</th><th>Temporary</th><th>SHA-1</th></tr>";	128	// "<table><tr><th>Name</th><th>Description</th><th>Type</th><th>ID</th><th>Temporary</th><th>SHA-1</th></tr>";
130	const string TABLE_FOOTER = "</table>";	129	// const string TABLE_FOOTER = "</table>";
131	const string FOOTER = "</body></html>";	130	// const string FOOTER = "</body></html>";
132		131
133	UUID authToken = Utils.GetAuthToken(httpRequest);	132	// UUID authToken = Utils.GetAuthToken(httpRequest);
134		133
135	StringBuilder html = new StringBuilder();	134	// StringBuilder html = new StringBuilder();
136	int start = 0;	135	// int start = 0;
137	uint page = 0;	136	// uint page = 0;
138		137
139	if (!String.IsNullOrEmpty(httpRequest.Url.Query))	138	// if (!String.IsNullOrEmpty(httpRequest.Url.Query))
140	{	139	// {
141	NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);	140	// NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
142	if (!String.IsNullOrEmpty(query["page"]) && UInt32.TryParse(query["page"], out page))	141	// if (!String.IsNullOrEmpty(query["page"]) && UInt32.TryParse(query["page"], out page))
143	start = (int)page * ASSETS_PER_PAGE;	142	// start = (int)page * ASSETS_PER_PAGE;
144	}	143	// }
145		144
146	html.AppendLine(HEADER);	145	// html.AppendLine(HEADER);
147		146
148	html.AppendLine("<p>");	147	// html.AppendLine("<p>");
149	if (page > 0)	148	// if (page > 0)
150	html.AppendFormat("<a href=\"{0}?page={1}\">< Previous Page</a> \| ", httpRequest.RawUrl, page - 1);	149	// html.AppendFormat("<a href=\"{0}?page={1}\">< Previous Page</a> \| ", httpRequest.RawUrl, page - 1);
151	html.AppendFormat("<a href=\"{0}?page={1}\">Next Page ></a>", httpRequest.RawUrl, page + 1);	150	// html.AppendFormat("<a href=\"{0}?page={1}\">Next Page ></a>", httpRequest.RawUrl, page + 1);
152	html.AppendLine("</p>");	151	// html.AppendLine("</p>");
153		152
154	html.AppendLine(TABLE_HEADER);	153	// html.AppendLine(TABLE_HEADER);
155		154
156	m_server.StorageProvider.ForEach(	155	// m_server.StorageProvider.ForEach(
157	delegate(Metadata data)	156	// delegate(Metadata data)
158	{	157	// {
159	if (m_server.AuthorizationProvider.IsMetadataAuthorized(authToken, data.ID))	158	// if (m_server.AuthorizationProvider.IsMetadataAuthorized(authToken, data.ID))
160	{	159	// {
161	html.AppendLine(String.Format(	160	// html.AppendLine(String.Format(
162	"<tr><td>{0}</td><td>{1}</td><td>{2}</td><td>{3}</td><td>{4}</td><td>{5}</td></tr>",	161	// "<tr><td>{0}</td><td>{1}</td><td>{2}</td><td>{3}</td><td>{4}</td><td>{5}</td></tr>",
163	data.Name, data.Description, data.ContentType, data.ID, data.Temporary,	162	// data.Name, data.Description, data.ContentType, data.ID, data.Temporary,
164	BitConverter.ToString(data.SHA1).Replace("-", String.Empty)));	163	// BitConverter.ToString(data.SHA1).Replace("-", String.Empty)));
165	}	164	// }
166	else	165	// else
167	{	166	// {
168	html.AppendLine(String.Format(	167	// html.AppendLine(String.Format(
169	"<tr><td>[Protected Asset]</td><td> </td><td> </td><td>{0}</td><td>{1}</td><td> </td></tr>",	168	// "<tr><td>[Protected Asset]</td><td> </td><td> </td><td>{0}</td><td>{1}</td><td> </td></tr>",
170	data.ID, data.Temporary));	169	// data.ID, data.Temporary));
171	}	170	// }
172	}, start, ASSETS_PER_PAGE	171	// }, start, ASSETS_PER_PAGE
173	);	172	// );
174		173
175	html.AppendLine(TABLE_FOOTER);	174	// html.AppendLine(TABLE_FOOTER);
176		175
177	html.AppendLine(FOOTER);	176	// html.AppendLine(FOOTER);
178		177
179	byte[] responseData = System.Text.Encoding.UTF8.GetBytes(html.ToString());	178	// byte[] responseData = System.Text.Encoding.UTF8.GetBytes(html.ToString());
180		179
181	httpResponse.StatusCode = (int) HttpStatusCode.OK;	180	// httpResponse.StatusCode = (int) HttpStatusCode.OK;
182	httpResponse.Body.Write(responseData, 0, responseData.Length);	181	// httpResponse.Body.Write(responseData, 0, responseData.Length);
183	httpResponse.Body.Flush();	182	// httpResponse.Body.Flush();
184	return responseData;	183	// return responseData;
185	}	184	// }
186		185
187	#endregion IStreamedRequestHandler implementation	186	// #endregion IStreamedRequestHandler implementation
188	}	187	//}
189	}	188	}
190	}	189	}