* RestMethod now uses same pattern as XmlRpcMethod
* Made /Admin use RestMethod * HttpServer is now a mini-webapp-server yay!0.1-prestable
lbsa71
parent
761db20c5f
commit
514a323056
|
|
@ -4,10 +4,11 @@ using System.Text;
|
|||
using System.IO;
|
||||
using OpenSim.world;
|
||||
using OpenSim.UserServer;
|
||||
using OpenSim.Servers;
|
||||
|
||||
namespace OpenSim.CAPS
|
||||
{
|
||||
public class AdminWebFront : IRestHandler
|
||||
public class AdminWebFront
|
||||
{
|
||||
private string AdminPage;
|
||||
private string NewAccountForm;
|
||||
|
|
@ -24,126 +25,124 @@ namespace OpenSim.CAPS
|
|||
LoadAdminPage();
|
||||
}
|
||||
|
||||
public string HandleREST(string requestBody, string requestURL, string requestMethod)
|
||||
public void LoadMethods( BaseHttpServer server )
|
||||
{
|
||||
string responseString = "";
|
||||
try
|
||||
server.AddRestHandler("GET", "/Admin", GetAdminPage);
|
||||
server.AddRestHandler("GET", "/Admin/Welcome", GetWelcomePage);
|
||||
server.AddRestHandler("GET", "/Admin/Accounts", GetAccountsPage );
|
||||
server.AddRestHandler("GET", "/Admin/Clients", GetConnectedClientsPage );
|
||||
|
||||
server.AddRestHandler("POST", "/Admin/NewAccount", PostNewAccount );
|
||||
server.AddRestHandler("POST", "/Admin/Login", PostLogin );
|
||||
}
|
||||
|
||||
private string GetWelcomePage( string request )
|
||||
{
|
||||
string responseString;
|
||||
responseString = "Welcome to the OpenSim Admin Page";
|
||||
responseString += "<br><br><br> " + LoginForm;
|
||||
return responseString;
|
||||
}
|
||||
|
||||
private string PostLogin(string requestBody)
|
||||
{
|
||||
string responseString;
|
||||
// Console.WriteLine(requestBody);
|
||||
if (requestBody == passWord)
|
||||
{
|
||||
switch (requestURL)
|
||||
{
|
||||
case "/Admin":
|
||||
if (requestMethod == "GET")
|
||||
{
|
||||
responseString = AdminPage;
|
||||
}
|
||||
break;
|
||||
case "/Admin/Accounts":
|
||||
if (requestMethod == "GET")
|
||||
{
|
||||
responseString = "<p> Account management </p>";
|
||||
responseString += "<br> ";
|
||||
responseString += "<p> Create New Account </p>";
|
||||
responseString += NewAccountForm;
|
||||
}
|
||||
break;
|
||||
case "/Admin/Clients":
|
||||
if (requestMethod == "GET")
|
||||
{
|
||||
responseString = " <p> Listing connected Clients </p>";
|
||||
OpenSim.world.Avatar TempAv;
|
||||
foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys)
|
||||
{
|
||||
if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar")
|
||||
{
|
||||
TempAv = (OpenSim.world.Avatar)m_world.Entities[UUID];
|
||||
responseString += "<p>";
|
||||
responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
|
||||
responseString += "</p>";
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "/Admin/NewAccount":
|
||||
if (requestMethod == "POST")
|
||||
{
|
||||
string firstName = "";
|
||||
string secondName = "";
|
||||
string userPasswd = "";
|
||||
string[] comp;
|
||||
string[] passw;
|
||||
string[] line;
|
||||
string delimStr = "&";
|
||||
char[] delimiter = delimStr.ToCharArray();
|
||||
string delimStr2 = "=";
|
||||
char[] delimiter2 = delimStr2.ToCharArray();
|
||||
|
||||
//Console.WriteLine(requestBody);
|
||||
comp = requestBody.Split(delimiter);
|
||||
passw = comp[3].Split(delimiter2);
|
||||
if (passw[1] == passWord)
|
||||
{
|
||||
|
||||
line = comp[0].Split(delimiter2); //split firstname
|
||||
if (line.Length > 1)
|
||||
{
|
||||
firstName = line[1];
|
||||
}
|
||||
line = comp[1].Split(delimiter2); //split secondname
|
||||
if (line.Length > 1)
|
||||
{
|
||||
secondName = line[1];
|
||||
}
|
||||
line = comp[2].Split(delimiter2); //split user password
|
||||
if (line.Length > 1)
|
||||
{
|
||||
userPasswd = line[1];
|
||||
}
|
||||
if (this._userServer != null)
|
||||
{
|
||||
this._userServer.CreateUserAccount(firstName, secondName, userPasswd);
|
||||
}
|
||||
responseString = "<p> New Account created </p>";
|
||||
}
|
||||
else
|
||||
{
|
||||
responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
|
||||
responseString += "<br><br>" + LoginForm;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "/Admin/Login":
|
||||
if (requestMethod == "POST")
|
||||
{
|
||||
// Console.WriteLine(requestBody);
|
||||
if (requestBody == passWord)
|
||||
{
|
||||
responseString = "<p> Login Successful </p>";
|
||||
}
|
||||
else
|
||||
{
|
||||
responseString = "<p> Password Error </p>";
|
||||
responseString += "<p> Please Login with the correct password </p>";
|
||||
responseString += "<br><br> " + LoginForm;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "/Admin/Welcome":
|
||||
if (requestMethod == "GET")
|
||||
{
|
||||
responseString = "Welcome to the OpenSim Admin Page";
|
||||
responseString += "<br><br><br> " + LoginForm;
|
||||
|
||||
}
|
||||
break;
|
||||
}
|
||||
responseString = "<p> Login Successful </p>";
|
||||
}
|
||||
catch (Exception e)
|
||||
else
|
||||
{
|
||||
Console.WriteLine(e.ToString());
|
||||
responseString = "<p> Password Error </p>";
|
||||
responseString += "<p> Please Login with the correct password </p>";
|
||||
responseString += "<br><br> " + LoginForm;
|
||||
}
|
||||
return responseString;
|
||||
}
|
||||
|
||||
private string PostNewAccount(string requestBody)
|
||||
{
|
||||
string responseString;
|
||||
string firstName = "";
|
||||
string secondName = "";
|
||||
string userPasswd = "";
|
||||
string[] comp;
|
||||
string[] passw;
|
||||
string[] line;
|
||||
string delimStr = "&";
|
||||
char[] delimiter = delimStr.ToCharArray();
|
||||
string delimStr2 = "=";
|
||||
char[] delimiter2 = delimStr2.ToCharArray();
|
||||
|
||||
//Console.WriteLine(requestBody);
|
||||
comp = requestBody.Split(delimiter);
|
||||
passw = comp[3].Split(delimiter2);
|
||||
if (passw[1] == passWord)
|
||||
{
|
||||
|
||||
line = comp[0].Split(delimiter2); //split firstname
|
||||
if (line.Length > 1)
|
||||
{
|
||||
firstName = line[1];
|
||||
}
|
||||
line = comp[1].Split(delimiter2); //split secondname
|
||||
if (line.Length > 1)
|
||||
{
|
||||
secondName = line[1];
|
||||
}
|
||||
line = comp[2].Split(delimiter2); //split user password
|
||||
if (line.Length > 1)
|
||||
{
|
||||
userPasswd = line[1];
|
||||
}
|
||||
if (this._userServer != null)
|
||||
{
|
||||
this._userServer.CreateUserAccount(firstName, secondName, userPasswd);
|
||||
}
|
||||
responseString = "<p> New Account created </p>";
|
||||
}
|
||||
else
|
||||
{
|
||||
responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
|
||||
responseString += "<br><br>" + LoginForm;
|
||||
}
|
||||
return responseString;
|
||||
}
|
||||
|
||||
private string GetConnectedClientsPage( string request )
|
||||
{
|
||||
string responseString;
|
||||
responseString = " <p> Listing connected Clients </p>";
|
||||
OpenSim.world.Avatar TempAv;
|
||||
foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys)
|
||||
{
|
||||
if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar")
|
||||
{
|
||||
TempAv = (OpenSim.world.Avatar)m_world.Entities[UUID];
|
||||
responseString += "<p>";
|
||||
responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
|
||||
responseString += "</p>";
|
||||
}
|
||||
}
|
||||
return responseString;
|
||||
}
|
||||
|
||||
private string GetAccountsPage( string request )
|
||||
{
|
||||
string responseString;
|
||||
responseString = "<p> Account management </p>";
|
||||
responseString += "<br> ";
|
||||
responseString += "<p> Create New Account </p>";
|
||||
responseString += NewAccountForm;
|
||||
return responseString;
|
||||
}
|
||||
|
||||
private string GetAdminPage( string request )
|
||||
{
|
||||
return AdminPage;
|
||||
}
|
||||
|
||||
private void LoadAdminPage()
|
||||
{
|
||||
try
|
||||
|
|
|
|||
|
|
@ -199,7 +199,8 @@ namespace OpenSim
|
|||
}
|
||||
}
|
||||
|
||||
HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", LocalWorld, adminLoginServer ));
|
||||
AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, adminLoginServer);
|
||||
adminWebFront.LoadMethods( HttpServer );
|
||||
|
||||
m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
|
||||
HttpServer.Start();
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ namespace OpenSim.Servers
|
|||
{
|
||||
protected Thread m_workerThread;
|
||||
protected HttpListener m_httpListener;
|
||||
protected Dictionary<string, IRestHandler> m_restHandlers = new Dictionary<string, IRestHandler>();
|
||||
protected Dictionary<string, RestMethod> m_restHandlers = new Dictionary<string, RestMethod>();
|
||||
protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
|
||||
protected int m_port;
|
||||
|
||||
|
|
@ -23,11 +23,13 @@ namespace OpenSim.Servers
|
|||
m_port = port;
|
||||
}
|
||||
|
||||
public bool AddRestHandler(string path, IRestHandler handler)
|
||||
public bool AddRestHandler(string method, string path, RestMethod handler)
|
||||
{
|
||||
if (!this.m_restHandlers.ContainsKey(path))
|
||||
string methodKey = String.Format("{0}: {1}", method, path);
|
||||
|
||||
if (!this.m_restHandlers.ContainsKey(methodKey))
|
||||
{
|
||||
this.m_restHandlers.Add(path, handler);
|
||||
this.m_restHandlers.Add(methodKey, handler);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -69,25 +71,24 @@ namespace OpenSim.Servers
|
|||
return XmlRpcResponseSerializer.Singleton.Serialize(response);
|
||||
}
|
||||
|
||||
protected virtual string ParseREST(string requestBody, string requestURL, string requestMethod)
|
||||
protected virtual string ParseREST(string request, string path, string method)
|
||||
{
|
||||
string[] path;
|
||||
string pathDelimStr = "/";
|
||||
char[] pathDelimiter = pathDelimStr.ToCharArray();
|
||||
path = requestURL.Split(pathDelimiter);
|
||||
string response;
|
||||
RestMethod handler;
|
||||
|
||||
string responseString = "";
|
||||
string methodKey = String.Format("{0}: {1}", method, path);
|
||||
|
||||
//path[0] should be empty so we are interested in path[1]
|
||||
if (path.Length > 1)
|
||||
if (m_restHandlers.TryGetValue(methodKey, out handler))
|
||||
{
|
||||
if ((path[1] != "") && (this.m_restHandlers.ContainsKey(path[1])))
|
||||
{
|
||||
responseString = this.m_restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod);
|
||||
}
|
||||
response = handler(request);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
response = String.Empty;
|
||||
}
|
||||
|
||||
return responseString;
|
||||
return response;
|
||||
}
|
||||
|
||||
protected virtual string ParseLLSDXML(string requestBody)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,5 @@ using System.Text;
|
|||
|
||||
namespace OpenSim.CAPS
|
||||
{
|
||||
public interface IRestHandler
|
||||
{
|
||||
string HandleREST(string requestBody, string requestURL, string requestMethod);
|
||||
}
|
||||
public delegate string RestMethod( string request );
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue