First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
Diva Canto
parent
96f387ce49
commit
b29ae72460
|
|
@ -37,6 +37,7 @@ using OpenMetaverse;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Communications;
|
using OpenSim.Framework.Communications;
|
||||||
using OpenSim.Framework.Communications.Services;
|
using OpenSim.Framework.Communications.Services;
|
||||||
|
using LoginResponse = OpenSim.Framework.Communications.Services.LoginResponse;
|
||||||
using OpenSim.Framework.Communications.Cache;
|
using OpenSim.Framework.Communications.Cache;
|
||||||
using OpenSim.Framework.Capabilities;
|
using OpenSim.Framework.Capabilities;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ using OpenSim.Data;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Communications;
|
using OpenSim.Framework.Communications;
|
||||||
using OpenSim.Framework.Communications.Services;
|
using OpenSim.Framework.Communications.Services;
|
||||||
|
using LoginResponse = OpenSim.Framework.Communications.Services.LoginResponse;
|
||||||
using OpenSim.Framework.Communications.Cache;
|
using OpenSim.Framework.Communications.Cache;
|
||||||
using OpenSim.Framework.Capabilities;
|
using OpenSim.Framework.Capabilities;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace OpenSim.Services.Interfaces
|
||||||
|
{
|
||||||
|
public abstract class LoginResponse
|
||||||
|
{
|
||||||
|
public abstract Hashtable ToHashtable();
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract class FailedLoginResponse : LoginResponse
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface ILoginService
|
||||||
|
{
|
||||||
|
LoginResponse Login(string firstName, string lastName, string passwd, string startLocation);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,740 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using log4net;
|
||||||
|
using OpenMetaverse;
|
||||||
|
using OpenMetaverse.StructuredData;
|
||||||
|
|
||||||
|
namespace OpenSim.Services.LLLoginService
|
||||||
|
{
|
||||||
|
public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse
|
||||||
|
{
|
||||||
|
string m_key;
|
||||||
|
string m_value;
|
||||||
|
string m_login;
|
||||||
|
|
||||||
|
public static LLFailedLoginResponse UserProblem;
|
||||||
|
public static LLFailedLoginResponse GridProblem;
|
||||||
|
public static LLFailedLoginResponse InventoryProblem;
|
||||||
|
public static LLFailedLoginResponse DeadRegionProblem;
|
||||||
|
public static LLFailedLoginResponse LoginBlockedProblem;
|
||||||
|
public static LLFailedLoginResponse AlreadyLoggedInProblem;
|
||||||
|
public static LLFailedLoginResponse InternalError;
|
||||||
|
|
||||||
|
static LLFailedLoginResponse()
|
||||||
|
{
|
||||||
|
UserProblem = new LLFailedLoginResponse("key",
|
||||||
|
"Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
|
||||||
|
"false");
|
||||||
|
GridProblem = new LLFailedLoginResponse("key",
|
||||||
|
"Error connecting to grid. Could not percieve credentials from login XML.",
|
||||||
|
"false");
|
||||||
|
InventoryProblem = new LLFailedLoginResponse("key",
|
||||||
|
"The inventory service is not responding. Please notify your login region operator.",
|
||||||
|
"false");
|
||||||
|
DeadRegionProblem = new LLFailedLoginResponse("key",
|
||||||
|
"The region you are attempting to log into is not responding. Please select another region and try again.",
|
||||||
|
"false");
|
||||||
|
LoginBlockedProblem = new LLFailedLoginResponse("presence",
|
||||||
|
"Logins are currently restricted. Please try again later.",
|
||||||
|
"false");
|
||||||
|
AlreadyLoggedInProblem = new LLFailedLoginResponse("presence",
|
||||||
|
"You appear to be already logged in. " +
|
||||||
|
"If this is not the case please wait for your session to timeout. " +
|
||||||
|
"If this takes longer than a few minutes please contact the grid owner. " +
|
||||||
|
"Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.",
|
||||||
|
"false");
|
||||||
|
InternalError = new LLFailedLoginResponse("Internal Error", "Error generating Login Response", "false");
|
||||||
|
}
|
||||||
|
|
||||||
|
public LLFailedLoginResponse(string key, string value, string login)
|
||||||
|
{
|
||||||
|
m_key = key;
|
||||||
|
m_value = value;
|
||||||
|
m_login = login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Hashtable ToHashtable()
|
||||||
|
{
|
||||||
|
Hashtable loginError = new Hashtable();
|
||||||
|
loginError["reason"] = m_key;
|
||||||
|
loginError["message"] = m_value;
|
||||||
|
loginError["login"] = m_login;
|
||||||
|
return loginError;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OSD ToOSDMap()
|
||||||
|
{
|
||||||
|
OSDMap map = new OSDMap();
|
||||||
|
|
||||||
|
map["reason"] = OSD.FromString(m_key);
|
||||||
|
map["message"] = OSD.FromString(m_value);
|
||||||
|
map["login"] = OSD.FromString(m_login);
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A class to handle LL login response.
|
||||||
|
/// </summary>
|
||||||
|
public class LLLoginResponse : OpenSim.Services.Interfaces.LoginResponse
|
||||||
|
{
|
||||||
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
private static Hashtable globalTexturesHash;
|
||||||
|
// Global Textures
|
||||||
|
private static string sunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
|
||||||
|
private static string cloudTexture = "dc4b9f0b-d008-45c6-96a4-01dd947ac621";
|
||||||
|
private static string moonTexture = "ec4b9f0b-d008-45c6-96a4-01dd947ac621";
|
||||||
|
|
||||||
|
private Hashtable loginFlagsHash;
|
||||||
|
private Hashtable uiConfigHash;
|
||||||
|
|
||||||
|
private ArrayList loginFlags;
|
||||||
|
private ArrayList globalTextures;
|
||||||
|
private ArrayList eventCategories;
|
||||||
|
private ArrayList uiConfig;
|
||||||
|
private ArrayList classifiedCategories;
|
||||||
|
private ArrayList inventoryRoot;
|
||||||
|
private ArrayList initialOutfit;
|
||||||
|
private ArrayList agentInventory;
|
||||||
|
private ArrayList inventoryLibraryOwner;
|
||||||
|
private ArrayList inventoryLibRoot;
|
||||||
|
private ArrayList inventoryLibrary;
|
||||||
|
private ArrayList activeGestures;
|
||||||
|
|
||||||
|
private UserInfo userProfile;
|
||||||
|
|
||||||
|
private UUID agentID;
|
||||||
|
private UUID sessionID;
|
||||||
|
private UUID secureSessionID;
|
||||||
|
|
||||||
|
// Login Flags
|
||||||
|
private string dst;
|
||||||
|
private string stipendSinceLogin;
|
||||||
|
private string gendered;
|
||||||
|
private string everLoggedIn;
|
||||||
|
private string login;
|
||||||
|
private uint simPort;
|
||||||
|
private uint simHttpPort;
|
||||||
|
private string simAddress;
|
||||||
|
private string agentAccess;
|
||||||
|
private string agentAccessMax;
|
||||||
|
private Int32 circuitCode;
|
||||||
|
private uint regionX;
|
||||||
|
private uint regionY;
|
||||||
|
|
||||||
|
// Login
|
||||||
|
private string firstname;
|
||||||
|
private string lastname;
|
||||||
|
|
||||||
|
// Error Flags
|
||||||
|
private string errorReason;
|
||||||
|
private string errorMessage;
|
||||||
|
|
||||||
|
private string welcomeMessage;
|
||||||
|
private string startLocation;
|
||||||
|
private string allowFirstLife;
|
||||||
|
private string home;
|
||||||
|
private string seedCapability;
|
||||||
|
private string lookAt;
|
||||||
|
|
||||||
|
private BuddyList m_buddyList = null;
|
||||||
|
|
||||||
|
static LLLoginResponse()
|
||||||
|
{
|
||||||
|
// This is being set, but it's not used
|
||||||
|
// not sure why.
|
||||||
|
globalTexturesHash = new Hashtable();
|
||||||
|
globalTexturesHash["sun_texture_id"] = sunTexture;
|
||||||
|
globalTexturesHash["cloud_texture_id"] = cloudTexture;
|
||||||
|
globalTexturesHash["moon_texture_id"] = moonTexture;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LLLoginResponse()
|
||||||
|
{
|
||||||
|
loginFlags = new ArrayList();
|
||||||
|
globalTextures = new ArrayList();
|
||||||
|
eventCategories = new ArrayList();
|
||||||
|
uiConfig = new ArrayList();
|
||||||
|
classifiedCategories = new ArrayList();
|
||||||
|
|
||||||
|
uiConfigHash = new Hashtable();
|
||||||
|
|
||||||
|
// defaultXmlRpcResponse = new XmlRpcResponse();
|
||||||
|
userProfile = new UserInfo();
|
||||||
|
inventoryRoot = new ArrayList();
|
||||||
|
initialOutfit = new ArrayList();
|
||||||
|
agentInventory = new ArrayList();
|
||||||
|
inventoryLibrary = new ArrayList();
|
||||||
|
inventoryLibraryOwner = new ArrayList();
|
||||||
|
activeGestures = new ArrayList();
|
||||||
|
|
||||||
|
SetDefaultValues();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetDefaultValues()
|
||||||
|
{
|
||||||
|
DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
|
||||||
|
StipendSinceLogin = "N";
|
||||||
|
Gendered = "Y";
|
||||||
|
EverLoggedIn = "Y";
|
||||||
|
login = "false";
|
||||||
|
firstname = "Test";
|
||||||
|
lastname = "User";
|
||||||
|
agentAccess = "M";
|
||||||
|
agentAccessMax = "A";
|
||||||
|
startLocation = "last";
|
||||||
|
allowFirstLife = "Y";
|
||||||
|
|
||||||
|
ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock.";
|
||||||
|
ErrorReason = "key";
|
||||||
|
welcomeMessage = "Welcome to OpenSim!";
|
||||||
|
seedCapability = String.Empty;
|
||||||
|
home = "{'region_handle':[r" + (1000*Constants.RegionSize).ToString() + ",r" + (1000*Constants.RegionSize).ToString() + "], 'position':[r" +
|
||||||
|
userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
|
||||||
|
userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
|
||||||
|
userProfile.homelookat.Y.ToString() + ",r" + userProfile.homelookat.Z.ToString() + "]}";
|
||||||
|
lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
|
||||||
|
RegionX = (uint) 255232;
|
||||||
|
RegionY = (uint) 254976;
|
||||||
|
|
||||||
|
// Classifieds;
|
||||||
|
AddClassifiedCategory((Int32) 1, "Shopping");
|
||||||
|
AddClassifiedCategory((Int32) 2, "Land Rental");
|
||||||
|
AddClassifiedCategory((Int32) 3, "Property Rental");
|
||||||
|
AddClassifiedCategory((Int32) 4, "Special Attraction");
|
||||||
|
AddClassifiedCategory((Int32) 5, "New Products");
|
||||||
|
AddClassifiedCategory((Int32) 6, "Employment");
|
||||||
|
AddClassifiedCategory((Int32) 7, "Wanted");
|
||||||
|
AddClassifiedCategory((Int32) 8, "Service");
|
||||||
|
AddClassifiedCategory((Int32) 9, "Personal");
|
||||||
|
|
||||||
|
SessionID = UUID.Random();
|
||||||
|
SecureSessionID = UUID.Random();
|
||||||
|
AgentID = UUID.Random();
|
||||||
|
|
||||||
|
Hashtable InitialOutfitHash = new Hashtable();
|
||||||
|
InitialOutfitHash["folder_name"] = "Nightclub Female";
|
||||||
|
InitialOutfitHash["gender"] = "female";
|
||||||
|
initialOutfit.Add(InitialOutfitHash);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public override Hashtable ToHashtable()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable responseData = new Hashtable();
|
||||||
|
|
||||||
|
loginFlagsHash = new Hashtable();
|
||||||
|
loginFlagsHash["daylight_savings"] = DST;
|
||||||
|
loginFlagsHash["stipend_since_login"] = StipendSinceLogin;
|
||||||
|
loginFlagsHash["gendered"] = Gendered;
|
||||||
|
loginFlagsHash["ever_logged_in"] = EverLoggedIn;
|
||||||
|
loginFlags.Add(loginFlagsHash);
|
||||||
|
|
||||||
|
responseData["first_name"] = Firstname;
|
||||||
|
responseData["last_name"] = Lastname;
|
||||||
|
responseData["agent_access"] = agentAccess;
|
||||||
|
responseData["agent_access_max"] = agentAccessMax;
|
||||||
|
|
||||||
|
globalTextures.Add(globalTexturesHash);
|
||||||
|
// this.eventCategories.Add(this.eventCategoriesHash);
|
||||||
|
|
||||||
|
AddToUIConfig("allow_first_life", allowFirstLife);
|
||||||
|
uiConfig.Add(uiConfigHash);
|
||||||
|
|
||||||
|
responseData["sim_port"] = (Int32) SimPort;
|
||||||
|
responseData["sim_ip"] = SimAddress;
|
||||||
|
responseData["http_port"] = (Int32)SimHttpPort;
|
||||||
|
|
||||||
|
responseData["agent_id"] = AgentID.ToString();
|
||||||
|
responseData["session_id"] = SessionID.ToString();
|
||||||
|
responseData["secure_session_id"] = SecureSessionID.ToString();
|
||||||
|
responseData["circuit_code"] = CircuitCode;
|
||||||
|
responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
|
||||||
|
responseData["login-flags"] = loginFlags;
|
||||||
|
responseData["global-textures"] = globalTextures;
|
||||||
|
responseData["seed_capability"] = seedCapability;
|
||||||
|
|
||||||
|
responseData["event_categories"] = eventCategories;
|
||||||
|
responseData["event_notifications"] = new ArrayList(); // todo
|
||||||
|
responseData["classified_categories"] = classifiedCategories;
|
||||||
|
responseData["ui-config"] = uiConfig;
|
||||||
|
|
||||||
|
if (agentInventory != null)
|
||||||
|
{
|
||||||
|
responseData["inventory-skeleton"] = agentInventory;
|
||||||
|
responseData["inventory-root"] = inventoryRoot;
|
||||||
|
}
|
||||||
|
responseData["inventory-skel-lib"] = inventoryLibrary;
|
||||||
|
responseData["inventory-lib-root"] = inventoryLibRoot;
|
||||||
|
responseData["gestures"] = activeGestures;
|
||||||
|
responseData["inventory-lib-owner"] = inventoryLibraryOwner;
|
||||||
|
responseData["initial-outfit"] = initialOutfit;
|
||||||
|
responseData["start_location"] = startLocation;
|
||||||
|
responseData["seed_capability"] = seedCapability;
|
||||||
|
responseData["home"] = home;
|
||||||
|
responseData["look_at"] = lookAt;
|
||||||
|
responseData["message"] = welcomeMessage;
|
||||||
|
responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize);
|
||||||
|
responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize);
|
||||||
|
|
||||||
|
if (m_buddyList != null)
|
||||||
|
{
|
||||||
|
responseData["buddy-list"] = m_buddyList.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
responseData["login"] = "true";
|
||||||
|
|
||||||
|
return responseData;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[CLIENT]: LoginResponse: Error creating Hashtable Response: " + e.Message);
|
||||||
|
|
||||||
|
return LLFailedLoginResponse.InternalError.ToHashtable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public OSD ToLLSDResponse()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
OSDMap map = new OSDMap();
|
||||||
|
|
||||||
|
map["first_name"] = OSD.FromString(Firstname);
|
||||||
|
map["last_name"] = OSD.FromString(Lastname);
|
||||||
|
map["agent_access"] = OSD.FromString(agentAccess);
|
||||||
|
map["agent_access_max"] = OSD.FromString(agentAccessMax);
|
||||||
|
|
||||||
|
map["sim_port"] = OSD.FromInteger(SimPort);
|
||||||
|
map["sim_ip"] = OSD.FromString(SimAddress);
|
||||||
|
|
||||||
|
map["agent_id"] = OSD.FromUUID(AgentID);
|
||||||
|
map["session_id"] = OSD.FromUUID(SessionID);
|
||||||
|
map["secure_session_id"] = OSD.FromUUID(SecureSessionID);
|
||||||
|
map["circuit_code"] = OSD.FromInteger(CircuitCode);
|
||||||
|
map["seconds_since_epoch"] = OSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
|
||||||
|
|
||||||
|
#region Login Flags
|
||||||
|
|
||||||
|
OSDMap loginFlagsLLSD = new OSDMap();
|
||||||
|
loginFlagsLLSD["daylight_savings"] = OSD.FromString(DST);
|
||||||
|
loginFlagsLLSD["stipend_since_login"] = OSD.FromString(StipendSinceLogin);
|
||||||
|
loginFlagsLLSD["gendered"] = OSD.FromString(Gendered);
|
||||||
|
loginFlagsLLSD["ever_logged_in"] = OSD.FromString(EverLoggedIn);
|
||||||
|
map["login-flags"] = WrapOSDMap(loginFlagsLLSD);
|
||||||
|
|
||||||
|
#endregion Login Flags
|
||||||
|
|
||||||
|
#region Global Textures
|
||||||
|
|
||||||
|
OSDMap globalTexturesLLSD = new OSDMap();
|
||||||
|
globalTexturesLLSD["sun_texture_id"] = OSD.FromString(SunTexture);
|
||||||
|
globalTexturesLLSD["cloud_texture_id"] = OSD.FromString(CloudTexture);
|
||||||
|
globalTexturesLLSD["moon_texture_id"] = OSD.FromString(MoonTexture);
|
||||||
|
|
||||||
|
map["global-textures"] = WrapOSDMap(globalTexturesLLSD);
|
||||||
|
|
||||||
|
#endregion Global Textures
|
||||||
|
|
||||||
|
map["seed_capability"] = OSD.FromString(seedCapability);
|
||||||
|
|
||||||
|
map["event_categories"] = ArrayListToOSDArray(eventCategories);
|
||||||
|
//map["event_notifications"] = new OSDArray(); // todo
|
||||||
|
map["classified_categories"] = ArrayListToOSDArray(classifiedCategories);
|
||||||
|
|
||||||
|
#region UI Config
|
||||||
|
|
||||||
|
OSDMap uiConfigLLSD = new OSDMap();
|
||||||
|
uiConfigLLSD["allow_first_life"] = OSD.FromString(allowFirstLife);
|
||||||
|
map["ui-config"] = WrapOSDMap(uiConfigLLSD);
|
||||||
|
|
||||||
|
#endregion UI Config
|
||||||
|
|
||||||
|
#region Inventory
|
||||||
|
|
||||||
|
map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory);
|
||||||
|
|
||||||
|
map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary);
|
||||||
|
map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ;
|
||||||
|
map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot);
|
||||||
|
map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner);
|
||||||
|
|
||||||
|
#endregion Inventory
|
||||||
|
|
||||||
|
map["gestures"] = ArrayListToOSDArray(activeGestures);
|
||||||
|
|
||||||
|
map["initial-outfit"] = ArrayListToOSDArray(initialOutfit);
|
||||||
|
map["start_location"] = OSD.FromString(startLocation);
|
||||||
|
|
||||||
|
map["seed_capability"] = OSD.FromString(seedCapability);
|
||||||
|
map["home"] = OSD.FromString(home);
|
||||||
|
map["look_at"] = OSD.FromString(lookAt);
|
||||||
|
map["message"] = OSD.FromString(welcomeMessage);
|
||||||
|
map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize);
|
||||||
|
map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize);
|
||||||
|
|
||||||
|
if (m_buddyList != null)
|
||||||
|
{
|
||||||
|
map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
map["login"] = OSD.FromString("true");
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[CLIENT]: LoginResponse: Error creating LLSD Response: " + e.Message);
|
||||||
|
|
||||||
|
return LLFailedLoginResponse.InternalError.ToOSDMap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public OSDArray ArrayListToOSDArray(ArrayList arrlst)
|
||||||
|
{
|
||||||
|
OSDArray llsdBack = new OSDArray();
|
||||||
|
foreach (Hashtable ht in arrlst)
|
||||||
|
{
|
||||||
|
OSDMap mp = new OSDMap();
|
||||||
|
foreach (DictionaryEntry deHt in ht)
|
||||||
|
{
|
||||||
|
mp.Add((string)deHt.Key, OSDString.FromObject(deHt.Value));
|
||||||
|
}
|
||||||
|
llsdBack.Add(mp);
|
||||||
|
}
|
||||||
|
return llsdBack;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static OSDArray WrapOSDMap(OSDMap wrapMe)
|
||||||
|
{
|
||||||
|
OSDArray array = new OSDArray();
|
||||||
|
array.Add(wrapMe);
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetEventCategories(string category, string value)
|
||||||
|
{
|
||||||
|
// this.eventCategoriesHash[category] = value;
|
||||||
|
//TODO
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddToUIConfig(string itemName, string item)
|
||||||
|
{
|
||||||
|
uiConfigHash[itemName] = item;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddClassifiedCategory(Int32 ID, string categoryName)
|
||||||
|
{
|
||||||
|
Hashtable hash = new Hashtable();
|
||||||
|
hash["category_name"] = categoryName;
|
||||||
|
hash["category_id"] = ID;
|
||||||
|
classifiedCategories.Add(hash);
|
||||||
|
// this.classifiedCategoriesHash.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Properties
|
||||||
|
|
||||||
|
public string Login
|
||||||
|
{
|
||||||
|
get { return login; }
|
||||||
|
set { login = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string DST
|
||||||
|
{
|
||||||
|
get { return dst; }
|
||||||
|
set { dst = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string StipendSinceLogin
|
||||||
|
{
|
||||||
|
get { return stipendSinceLogin; }
|
||||||
|
set { stipendSinceLogin = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Gendered
|
||||||
|
{
|
||||||
|
get { return gendered; }
|
||||||
|
set { gendered = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string EverLoggedIn
|
||||||
|
{
|
||||||
|
get { return everLoggedIn; }
|
||||||
|
set { everLoggedIn = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public uint SimPort
|
||||||
|
{
|
||||||
|
get { return simPort; }
|
||||||
|
set { simPort = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public uint SimHttpPort
|
||||||
|
{
|
||||||
|
get { return simHttpPort; }
|
||||||
|
set { simHttpPort = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string SimAddress
|
||||||
|
{
|
||||||
|
get { return simAddress; }
|
||||||
|
set { simAddress = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public UUID AgentID
|
||||||
|
{
|
||||||
|
get { return agentID; }
|
||||||
|
set { agentID = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public UUID SessionID
|
||||||
|
{
|
||||||
|
get { return sessionID; }
|
||||||
|
set { sessionID = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public UUID SecureSessionID
|
||||||
|
{
|
||||||
|
get { return secureSessionID; }
|
||||||
|
set { secureSessionID = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public Int32 CircuitCode
|
||||||
|
{
|
||||||
|
get { return circuitCode; }
|
||||||
|
set { circuitCode = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public uint RegionX
|
||||||
|
{
|
||||||
|
get { return regionX; }
|
||||||
|
set { regionX = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public uint RegionY
|
||||||
|
{
|
||||||
|
get { return regionY; }
|
||||||
|
set { regionY = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string SunTexture
|
||||||
|
{
|
||||||
|
get { return sunTexture; }
|
||||||
|
set { sunTexture = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string CloudTexture
|
||||||
|
{
|
||||||
|
get { return cloudTexture; }
|
||||||
|
set { cloudTexture = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string MoonTexture
|
||||||
|
{
|
||||||
|
get { return moonTexture; }
|
||||||
|
set { moonTexture = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Firstname
|
||||||
|
{
|
||||||
|
get { return firstname; }
|
||||||
|
set { firstname = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Lastname
|
||||||
|
{
|
||||||
|
get { return lastname; }
|
||||||
|
set { lastname = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string AgentAccess
|
||||||
|
{
|
||||||
|
get { return agentAccess; }
|
||||||
|
set { agentAccess = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string AgentAccessMax
|
||||||
|
{
|
||||||
|
get { return agentAccessMax; }
|
||||||
|
set { agentAccessMax = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string StartLocation
|
||||||
|
{
|
||||||
|
get { return startLocation; }
|
||||||
|
set { startLocation = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string LookAt
|
||||||
|
{
|
||||||
|
get { return lookAt; }
|
||||||
|
set { lookAt = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string SeedCapability
|
||||||
|
{
|
||||||
|
get { return seedCapability; }
|
||||||
|
set { seedCapability = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ErrorReason
|
||||||
|
{
|
||||||
|
get { return errorReason; }
|
||||||
|
set { errorReason = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ErrorMessage
|
||||||
|
{
|
||||||
|
get { return errorMessage; }
|
||||||
|
set { errorMessage = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList InventoryRoot
|
||||||
|
{
|
||||||
|
get { return inventoryRoot; }
|
||||||
|
set { inventoryRoot = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList InventorySkeleton
|
||||||
|
{
|
||||||
|
get { return agentInventory; }
|
||||||
|
set { agentInventory = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList InventoryLibrary
|
||||||
|
{
|
||||||
|
get { return inventoryLibrary; }
|
||||||
|
set { inventoryLibrary = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList InventoryLibraryOwner
|
||||||
|
{
|
||||||
|
get { return inventoryLibraryOwner; }
|
||||||
|
set { inventoryLibraryOwner = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList InventoryLibRoot
|
||||||
|
{
|
||||||
|
get { return inventoryLibRoot; }
|
||||||
|
set { inventoryLibRoot = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList ActiveGestures
|
||||||
|
{
|
||||||
|
get { return activeGestures; }
|
||||||
|
set { activeGestures = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Home
|
||||||
|
{
|
||||||
|
get { return home; }
|
||||||
|
set { home = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Message
|
||||||
|
{
|
||||||
|
get { return welcomeMessage; }
|
||||||
|
set { welcomeMessage = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public BuddyList BuddList
|
||||||
|
{
|
||||||
|
get { return m_buddyList; }
|
||||||
|
set { m_buddyList = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
public class UserInfo
|
||||||
|
{
|
||||||
|
public string firstname;
|
||||||
|
public string lastname;
|
||||||
|
public ulong homeregionhandle;
|
||||||
|
public Vector3 homepos;
|
||||||
|
public Vector3 homelookat;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BuddyList
|
||||||
|
{
|
||||||
|
public List<BuddyInfo> Buddies = new List<BuddyInfo>();
|
||||||
|
|
||||||
|
public void AddNewBuddy(BuddyInfo buddy)
|
||||||
|
{
|
||||||
|
if (!Buddies.Contains(buddy))
|
||||||
|
{
|
||||||
|
Buddies.Add(buddy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList ToArray()
|
||||||
|
{
|
||||||
|
ArrayList buddyArray = new ArrayList();
|
||||||
|
foreach (BuddyInfo buddy in Buddies)
|
||||||
|
{
|
||||||
|
buddyArray.Add(buddy.ToHashTable());
|
||||||
|
}
|
||||||
|
return buddyArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BuddyInfo
|
||||||
|
{
|
||||||
|
public int BuddyRightsHave = 1;
|
||||||
|
public int BuddyRightsGiven = 1;
|
||||||
|
public UUID BuddyID;
|
||||||
|
|
||||||
|
public BuddyInfo(string buddyID)
|
||||||
|
{
|
||||||
|
BuddyID = new UUID(buddyID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BuddyInfo(UUID buddyID)
|
||||||
|
{
|
||||||
|
BuddyID = buddyID;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Hashtable ToHashTable()
|
||||||
|
{
|
||||||
|
Hashtable hTable = new Hashtable();
|
||||||
|
hTable["buddy_rights_has"] = BuddyRightsHave;
|
||||||
|
hTable["buddy_rights_given"] = BuddyRightsGiven;
|
||||||
|
hTable["buddy_id"] = BuddyID.ToString();
|
||||||
|
return hTable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,74 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
using log4net;
|
||||||
|
using Nini.Config;
|
||||||
|
using OpenMetaverse;
|
||||||
|
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Server.Base;
|
||||||
|
using OpenSim.Services.Interfaces;
|
||||||
|
|
||||||
|
namespace OpenSim.Services.LLLoginService
|
||||||
|
{
|
||||||
|
public class LLLoginService : ILoginService
|
||||||
|
{
|
||||||
|
private IUserAccountService m_UserAccountService;
|
||||||
|
private IAuthenticationService m_AuthenticationService;
|
||||||
|
private IInventoryService m_InventoryService;
|
||||||
|
private IGridService m_GridService;
|
||||||
|
private IPresenceService m_PresenceService;
|
||||||
|
|
||||||
|
public LLLoginService(IConfigSource config)
|
||||||
|
{
|
||||||
|
IConfig serverConfig = config.Configs["LoginService"];
|
||||||
|
if (serverConfig == null)
|
||||||
|
throw new Exception(String.Format("No section LoginService in config file"));
|
||||||
|
|
||||||
|
string accountService = serverConfig.GetString("UserAccountService", String.Empty);
|
||||||
|
string authService = serverConfig.GetString("AuthenticationService", String.Empty);
|
||||||
|
string invService = serverConfig.GetString("InventoryService", String.Empty);
|
||||||
|
string gridService = serverConfig.GetString("GridService", String.Empty);
|
||||||
|
string presenceService = serverConfig.GetString("PresenceService", String.Empty);
|
||||||
|
|
||||||
|
// These 3 are required; the other 2 aren't
|
||||||
|
if (accountService == string.Empty || authService == string.Empty ||
|
||||||
|
invService == string.Empty)
|
||||||
|
throw new Exception("LoginService is missing service specifications");
|
||||||
|
|
||||||
|
Object[] args = new Object[] { config };
|
||||||
|
m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
|
||||||
|
m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args);
|
||||||
|
m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
|
||||||
|
if (gridService != string.Empty)
|
||||||
|
m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
|
||||||
|
if (presenceService != string.Empty)
|
||||||
|
m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation)
|
||||||
|
{
|
||||||
|
// Get the account and check that it exists
|
||||||
|
UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, firstName, lastName);
|
||||||
|
if (account == null)
|
||||||
|
return LLFailedLoginResponse.UserProblem;
|
||||||
|
|
||||||
|
// Authenticate this user
|
||||||
|
string token = m_AuthenticationService.Authenticate(account.PrincipalID, passwd, 30);
|
||||||
|
UUID session = UUID.Zero;
|
||||||
|
if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out session)))
|
||||||
|
return LLFailedLoginResponse.UserProblem;
|
||||||
|
|
||||||
|
// Get the user's inventory
|
||||||
|
List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID);
|
||||||
|
if ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0))
|
||||||
|
return LLFailedLoginResponse.InventoryProblem;
|
||||||
|
|
||||||
|
// lots of things missing... need to do the simulation service
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -60,3 +60,11 @@
|
||||||
|
|
||||||
[UserAccountService]
|
[UserAccountService]
|
||||||
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
||||||
|
|
||||||
|
[LoginService]
|
||||||
|
LocalServiceModule = "OpenSim.Services.LLoginService.dll:LLLoginService"
|
||||||
|
UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
||||||
|
AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
|
||||||
|
InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
|
||||||
|
PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
|
||||||
|
|
||||||
|
|
|
||||||
31
prebuild.xml
31
prebuild.xml
|
|
@ -1476,6 +1476,37 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
<Project frameworkVersion="v3_5" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
|
||||||
|
<Configuration name="Debug">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration name="Release">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
|
||||||
|
<ReferencePath>../../../bin/</ReferencePath>
|
||||||
|
<Reference name="System"/>
|
||||||
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
||||||
|
<Reference name="OpenSim.Services.Interfaces"/>
|
||||||
|
<Reference name="OpenSim.Services.Base"/>
|
||||||
|
<Reference name="OpenSim.Server.Base"/>
|
||||||
|
<Reference name="OpenMetaverseTypes.dll"/>
|
||||||
|
<Reference name="OpenMetaverse.dll"/>
|
||||||
|
<Reference name="OpenMetaverse.StructuredData.dll"/>
|
||||||
|
<Reference name="Nini.dll" />
|
||||||
|
<Reference name="log4net.dll"/>
|
||||||
|
|
||||||
|
<Files>
|
||||||
|
<Match pattern="*.cs" recurse="true"/>
|
||||||
|
</Files>
|
||||||
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
|
<Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue