OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Making the web_login_key code work, even if the LL Viewer doesn't support it. Other clients can launch the LL Viewer with something like this, for example: 

Process.Start("C:\\Program Files\\SecondLife\\SecondLife.exe", 
"-loginuri " + loginuri + "?web_login_key=" + web_login_key + " -login " + firstName + " " + lastName + " -multiple");
This requires a prior step for actually getting the key, which can be done like this:
http://localhost:9000/?method=login&firstname=barak&lastname=obama&password=123&show_login_form=FALSE
0.6.4-rc1
diva 2009-03-08 23:17:49 +00:00
parent 4f23718102
commit 6f4051c932
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Framework/Communications/LoginService.cs
View File

@ -116,6 +116,8 @@ namespace OpenSim.Framework.Communications
XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0];
SniffLoginKey((Uri)request.Params[2], requestData);
bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") &&
(requestData.Contains("passwd") || requestData.Contains("web_login_key")));
@ -303,7 +305,7 @@ namespace OpenSim.Framework.Communications
string passwd = (string) requestData["passwd"];
GoodLogin = AuthenticateUser(userProfile, passwd);
}
else if (requestData.Contains("web_login_key"))
if (!GoodLogin && (requestData.Contains("web_login_key")))
{
try
{
@ -576,7 +578,7 @@ namespace OpenSim.Framework.Communications
{
UUID webloginkey = UUID.Random();
m_userManager.StoreWebLoginKey(user.ID, webloginkey);
statuscode = 301;
//statuscode = 301;
string redirectURL = "about:blank?redirect-http-hack=" +
HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
@ -584,8 +586,9 @@ namespace OpenSim.Framework.Communications
"&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
//m_log.Info("[WEB]: R:" + redirectURL);
returnactions["int_response_code"] = statuscode;
returnactions["str_redirect_location"] = redirectURL;
returnactions["str_response_string"] = "<HTML><BODY>GoodLogin</BODY></HTML>";
//returnactions["str_redirect_location"] = redirectURL;
//returnactions["str_response_string"] = "<HTML><BODY>GoodLogin</BODY></HTML>";
returnactions["str_response_string"] = webloginkey.ToString();
}
else
{
@ -854,5 +857,17 @@ namespace OpenSim.Framework.Communications
RootFolderID = rootID;
}
}
protected void SniffLoginKey(Uri uri, Hashtable requestData)
{
string uri_str = uri.ToString();
string[] parts = uri_str.Split(new char[] { '=' });
if (parts.Length > 1)
{
string web_login_key = parts[1];
requestData.Add("web_login_key", web_login_key);
m_log.InfoFormat("[LOGIN]: Login with web_login_key {0}", web_login_key);
}
}
}
}