diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 26 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 30 |
2 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 019bab8..2dae6b7 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Services.HypergridService | |||
62 | 62 | ||
63 | private static string m_AllowedClients = string.Empty; | 63 | private static string m_AllowedClients = string.Empty; |
64 | private static string m_DeniedClients = string.Empty; | 64 | private static string m_DeniedClients = string.Empty; |
65 | private static string m_DeniedMacs = string.Empty; | 65 | private static string m_DeniedMacs = string.Empty; |
66 | private static bool m_ForeignAgentsAllowed = true; | 66 | private static bool m_ForeignAgentsAllowed = true; |
67 | private static List<string> m_ForeignsAllowedExceptions = new List<string>(); | 67 | private static List<string> m_ForeignsAllowedExceptions = new List<string>(); |
68 | private static List<string> m_ForeignsDisallowedExceptions = new List<string>(); | 68 | private static List<string> m_ForeignsDisallowedExceptions = new List<string>(); |
@@ -138,7 +138,7 @@ namespace OpenSim.Services.HypergridService | |||
138 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 138 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
139 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 139 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
140 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 140 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
141 | m_DeniedMacs = Util.GetConfigVarFromSections<string>( | 141 | m_DeniedMacs = Util.GetConfigVarFromSections<string>( |
142 | config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); | 142 | config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); |
143 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); | 143 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); |
144 | 144 | ||
@@ -278,8 +278,8 @@ namespace OpenSim.Services.HypergridService | |||
278 | (source == null) ? "Unknown" : string.Format("{0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI)); | 278 | (source == null) ? "Unknown" : string.Format("{0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI)); |
279 | 279 | ||
280 | string curViewer = Util.GetViewerName(aCircuit); | 280 | string curViewer = Util.GetViewerName(aCircuit); |
281 | string curMac = aCircuit.Mac.ToString(); | 281 | string curMac = aCircuit.Mac.ToString(); |
282 | 282 | ||
283 | 283 | ||
284 | // | 284 | // |
285 | // Check client | 285 | // Check client |
@@ -309,17 +309,17 @@ namespace OpenSim.Services.HypergridService | |||
309 | return false; | 309 | return false; |
310 | } | 310 | } |
311 | } | 311 | } |
312 | 312 | ||
313 | if (m_DeniedMacs != string.Empty) | 313 | if (m_DeniedMacs != string.Empty) |
314 | { | 314 | { |
315 | m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); | 315 | m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); |
316 | if (m_DeniedMacs.Contains(curMac)) | 316 | if (m_DeniedMacs.Contains(curMac)) |
317 | { | 317 | { |
318 | reason = "Login failed: client with Mac " + curMac + " is denied"; | 318 | reason = "Login failed: client with Mac " + curMac + " is denied"; |
319 | m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); | 319 | m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); |
320 | return false; | 320 | return false; |
321 | } | 321 | } |
322 | } | 322 | } |
323 | 323 | ||
324 | // | 324 | // |
325 | // Authenticate the user | 325 | // Authenticate the user |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index e2cb5d0..a57c9a7 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Services.LLLoginService | |||
88 | protected string m_AvatarPicker; | 88 | protected string m_AvatarPicker; |
89 | protected string m_AllowedClients; | 89 | protected string m_AllowedClients; |
90 | protected string m_DeniedClients; | 90 | protected string m_DeniedClients; |
91 | protected string m_DeniedMacs; | 91 | protected string m_DeniedMacs; |
92 | protected string m_MessageUrl; | 92 | protected string m_MessageUrl; |
93 | protected string m_DSTZone; | 93 | protected string m_DSTZone; |
94 | protected bool m_allowDuplicatePresences = false; | 94 | protected bool m_allowDuplicatePresences = false; |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.LLLoginService | |||
135 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 135 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
136 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 136 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
137 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 137 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
138 | m_DeniedMacs = Util.GetConfigVarFromSections<string>( | 138 | m_DeniedMacs = Util.GetConfigVarFromSections<string>( |
139 | config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); | 139 | config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); |
140 | 140 | ||
141 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); | 141 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); |
@@ -293,8 +293,8 @@ namespace OpenSim.Services.LLLoginService | |||
293 | 293 | ||
294 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", | 294 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", |
295 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); | 295 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); |
296 | 296 | ||
297 | string curMac = mac.ToString(); | 297 | string curMac = mac.ToString(); |
298 | 298 | ||
299 | try | 299 | try |
300 | { | 300 | { |
@@ -328,17 +328,17 @@ namespace OpenSim.Services.LLLoginService | |||
328 | return LLFailedLoginResponse.LoginBlockedProblem; | 328 | return LLFailedLoginResponse.LoginBlockedProblem; |
329 | } | 329 | } |
330 | } | 330 | } |
331 | 331 | ||
332 | if (m_DeniedMacs != string.Empty) | 332 | if (m_DeniedMacs != string.Empty) |
333 | { | 333 | { |
334 | m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); | 334 | m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); |
335 | if (m_DeniedMacs.Contains(curMac)) | 335 | if (m_DeniedMacs.Contains(curMac)) |
336 | { | 336 | { |
337 | m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); | 337 | m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); |
338 | return LLFailedLoginResponse.LoginBlockedProblem; | 338 | return LLFailedLoginResponse.LoginBlockedProblem; |
339 | } | 339 | } |
340 | } | 340 | } |
341 | 341 | ||
342 | 342 | ||
343 | // | 343 | // |
344 | // Get the account and check that it exists | 344 | // Get the account and check that it exists |