diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index be699db97f..35cb575c2f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.Linden
{
try
{
- m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
+// m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
//m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index 440b898918..dfed761234 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -248,7 +248,7 @@ For more information, see http://openid.net/.
if (passwordValues != null && passwordValues.Length == 1)
{
if (account != null &&
- (m_authenticationService.Authenticate(account.PrincipalID, passwordValues[0], 30) != string.Empty))
+ (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty))
authRequest.IsAuthenticated = true;
else
authRequest.IsAuthenticated = false;
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index de05f28400..079bcb17ed 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -173,6 +173,12 @@ namespace OpenSim.Services.LLLoginService
// Web map
private string mapTileURL;
+ // Web Profiles
+ private string profileURL;
+
+ // OpenID
+ private string openIDURL;
+
private string searchURL;
// Error Flags
@@ -225,7 +231,7 @@ namespace OpenSim.Services.LLLoginService
public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
GridRegion destination, List invSkel, FriendInfo[] friendsList, ILibraryService libService,
string where, string startlocation, Vector3 position, Vector3 lookAt, List gestures, string message,
- GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
+ GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency)
: this()
{
FillOutInventoryData(invSkel, libService);
@@ -242,6 +248,9 @@ namespace OpenSim.Services.LLLoginService
BuddList = ConvertFriendListItem(friendsList);
StartLocation = where;
MapTileURL = mapTileURL;
+ ProfileURL = profileURL;
+ OpenIDURL = openIDURL;
+
SearchURL = searchURL;
Currency = currency;
@@ -390,6 +399,8 @@ namespace OpenSim.Services.LLLoginService
InitialOutfitHash["gender"] = "female";
initialOutfit.Add(InitialOutfitHash);
mapTileURL = String.Empty;
+ profileURL = String.Empty;
+ openIDURL = String.Empty;
searchURL = String.Empty;
currency = String.Empty;
@@ -462,6 +473,13 @@ namespace OpenSim.Services.LLLoginService
if (mapTileURL != String.Empty)
responseData["map-server-url"] = mapTileURL;
+ if (profileURL != String.Empty)
+ responseData["profile-server-url"] = profileURL;
+
+ // We need to send an openid_token back in the response too
+ if (openIDURL != String.Empty)
+ responseData["openid_url"] = openIDURL;
+
if (m_buddyList != null)
{
responseData["buddy-list"] = m_buddyList.ToArray();
@@ -567,6 +585,12 @@ namespace OpenSim.Services.LLLoginService
if (mapTileURL != String.Empty)
map["map-server-url"] = OSD.FromString(mapTileURL);
+ if (profileURL != String.Empty)
+ map["profile-server-url"] = OSD.FromString(profileURL);
+
+ if (openIDURL != String.Empty)
+ map["openid_url"] = OSD.FromString(openIDURL);
+
if (searchURL != String.Empty)
map["search"] = OSD.FromString(searchURL);
@@ -939,6 +963,18 @@ namespace OpenSim.Services.LLLoginService
set { mapTileURL = value; }
}
+ public string ProfileURL
+ {
+ get { return profileURL; }
+ set { profileURL = value; }
+ }
+
+ public string OpenIDURL
+ {
+ get { return openIDURL; }
+ set { openIDURL = value; }
+ }
+
public string SearchURL
{
get { return searchURL; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 6a9b8c6c5e..c9a11549f0 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -74,6 +74,8 @@ namespace OpenSim.Services.LLLoginService
protected string m_GatekeeperURL;
protected bool m_AllowRemoteSetLoginLevel;
protected string m_MapTileURL;
+ protected string m_ProfileURL;
+ protected string m_OpenIDURL;
protected string m_SearchURL;
protected string m_Currency;
@@ -108,6 +110,8 @@ namespace OpenSim.Services.LLLoginService
m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
+ m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
+ m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
@@ -420,7 +424,7 @@ namespace OpenSim.Services.LLLoginService
// Finally, fill out the response and return it
//
LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
- where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
+ where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency);
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
return response;
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ab5880d741..db9f08b729 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -241,6 +241,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; For V2 map
MapTileURL = "http://127.0.0.1:8002";
+ ; For WebProfiles (V3)
+ ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
+
; If you run this login server behind a proxy, set this to true
; HasProxy = false
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 90f7b5c0ac..326caeb86d 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -224,6 +224,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; For V2 map
MapTileURL = "http://127.0.0.1:8002";
+ ; For V2/3 Web Profiles
+ ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]
+
+ ; For V2/V3 webapp authentication SSO
+ OpenIDServerURL = "http://127.0.0.1/openid/openidserver/
+
; If you run this login server behind a proxy, set this to true
; HasProxy = false