Changed GetUserInfo so that the exposure of user account details is ruled by a configuration variable. It's on by default.

bullet-2.82
Diva Canto 2014-07-06 16:02:04 -07:00
parent 108978be1e
commit ba233008cd
3 changed files with 30 additions and 5 deletions

View File

@ -75,6 +75,7 @@ namespace OpenSim.Services.HypergridService
protected static string m_GridName; protected static string m_GridName;
protected static int m_LevelOutsideContacts; protected static int m_LevelOutsideContacts;
protected static bool m_ShowDetails;
protected static bool m_BypassClientVerification; protected static bool m_BypassClientVerification;
@ -128,6 +129,7 @@ namespace OpenSim.Services.HypergridService
m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args); m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args);
m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0); m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0);
m_ShowDetails = serverConfig.GetBoolean("ShowUserDetailsInHGProfile", true);
LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed"); LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed");
LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
@ -571,12 +573,22 @@ namespace OpenSim.Services.HypergridService
if (account != null) if (account != null)
{ {
info.Add("user_flags", (object)account.UserFlags); info.Add("user_firstname", account.FirstName);
info.Add("user_created", (object)account.Created); info.Add("user_lastname", account.LastName);
info.Add("user_title", (object)account.UserTitle);
info.Add("user_firstname", (object)account.FirstName);
info.Add("user_lastname", (object)account.LastName);
info.Add("result", "success"); info.Add("result", "success");
if (m_ShowDetails)
{
info.Add("user_flags", account.UserFlags);
info.Add("user_created", account.Created);
info.Add("user_title", account.UserTitle);
}
else
{
info.Add("user_flags", 0);
info.Add("user_created", 0);
info.Add("user_title", string.Empty);
}
} }
return info; return info;

View File

@ -571,6 +571,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
;; Leave blank or commented for no exceptions. ;; Leave blank or commented for no exceptions.
; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
;; This variable controls what is exposed to profiles of local users
;; as seen from outside of this grid. Leave it uncommented for exposing
;; UserTitle, UserFlags and the creation date. Uncomment and change to False
;; to block this info from being exposed.
; ShowUserDetailsInHGProfile = True
; * The interface that local users get when they are in other grids. ; * The interface that local users get when they are in other grids.
; * This restricts the inventory operations while in other grids. ; * This restricts the inventory operations while in other grids.

View File

@ -337,6 +337,13 @@
;; Leave blank or commented for no exceptions. ;; Leave blank or commented for no exceptions.
; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
;; This variable controls what is exposed to profiles of local users
;; as seen from outside of this grid. Leave it uncommented for exposing
;; UserTitle, UserFlags and the creation date. Uncomment and change to False
;; to block this info from being exposed.
; ShowUserDetailsInHGProfile = True
[HGInventoryService] [HGInventoryService]
;; If you have this set under [Hypergrid], no need to set it here, leave it commented ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
; HomeURI = "http://127.0.0.1:9000" ; HomeURI = "http://127.0.0.1:9000"