diff options
Diffstat (limited to '')
5 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index e42f9a0..f66b4e2 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Services.AuthenticationService | |||
41 | // Generic Authentication service used for identifying | 41 | // Generic Authentication service used for identifying |
42 | // and authenticating principals. | 42 | // and authenticating principals. |
43 | // Principals may be clients acting on users' behalf, | 43 | // Principals may be clients acting on users' behalf, |
44 | // or any other components that need | 44 | // or any other components that need |
45 | // verifiable identification. | 45 | // verifiable identification. |
46 | // | 46 | // |
47 | public class AuthenticationServiceBase : ServiceBase | 47 | public class AuthenticationServiceBase : ServiceBase |
@@ -49,7 +49,7 @@ namespace OpenSim.Services.AuthenticationService | |||
49 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
50 | LogManager.GetLogger( | 50 | LogManager.GetLogger( |
51 | MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | protected IAuthenticationData m_Database; | 53 | protected IAuthenticationData m_Database; |
54 | protected IUserAccountService m_UserAccountService = null; | 54 | protected IUserAccountService m_UserAccountService = null; |
55 | 55 | ||
@@ -178,7 +178,7 @@ namespace OpenSim.Services.AuthenticationService | |||
178 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); | 178 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); |
179 | return true; | 179 | return true; |
180 | } | 180 | } |
181 | 181 | ||
182 | protected string GetToken(UUID principalID, int lifetime) | 182 | protected string GetToken(UUID principalID, int lifetime) |
183 | { | 183 | { |
184 | UUID token = UUID.Random(); | 184 | UUID token = UUID.Random(); |
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index a9359f3..0204699 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Services.AuthenticationService | |||
41 | // Generic Authentication service used for identifying | 41 | // Generic Authentication service used for identifying |
42 | // and authenticating principals. | 42 | // and authenticating principals. |
43 | // Principals may be clients acting on users' behalf, | 43 | // Principals may be clients acting on users' behalf, |
44 | // or any other components that need | 44 | // or any other components that need |
45 | // verifiable identification. | 45 | // verifiable identification. |
46 | // | 46 | // |
47 | public class PasswordAuthenticationService : | 47 | public class PasswordAuthenticationService : |
@@ -50,7 +50,7 @@ namespace OpenSim.Services.AuthenticationService | |||
50 | private static readonly ILog m_log = | 50 | private static readonly ILog m_log = |
51 | LogManager.GetLogger( | 51 | LogManager.GetLogger( |
52 | MethodBase.GetCurrentMethod().DeclaringType); | 52 | MethodBase.GetCurrentMethod().DeclaringType); |
53 | 53 | ||
54 | public PasswordAuthenticationService(IConfigSource config, IUserAccountService userService) : | 54 | public PasswordAuthenticationService(IConfigSource config, IUserAccountService userService) : |
55 | base(config, userService) | 55 | base(config, userService) |
56 | { | 56 | { |
diff --git a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs index ef4e234..c946b04 100644 --- a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.AuthenticationService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.AuthenticationService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs index 1510168..0bd5b1f 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Services.AuthenticationService | |||
40 | // Generic Authentication service used for identifying | 40 | // Generic Authentication service used for identifying |
41 | // and authenticating principals. | 41 | // and authenticating principals. |
42 | // Principals may be clients acting on users' behalf, | 42 | // Principals may be clients acting on users' behalf, |
43 | // or any other components that need | 43 | // or any other components that need |
44 | // verifiable identification. | 44 | // verifiable identification. |
45 | // | 45 | // |
46 | public class WebkeyAuthenticationService : | 46 | public class WebkeyAuthenticationService : |
@@ -49,7 +49,7 @@ namespace OpenSim.Services.AuthenticationService | |||
49 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
50 | LogManager.GetLogger( | 50 | LogManager.GetLogger( |
51 | MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) : | 53 | public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) : |
54 | base(config, userService) | 54 | base(config, userService) |
55 | { | 55 | { |
@@ -79,7 +79,7 @@ namespace OpenSim.Services.AuthenticationService | |||
79 | { | 79 | { |
80 | if (data.Data.ContainsKey("webLoginKey")) | 80 | if (data.Data.ContainsKey("webLoginKey")) |
81 | { | 81 | { |
82 | string key = data.Data["webLoginKey"].ToString(); | 82 | string key = data.Data["webLoginKey"].ToString(); |
83 | if (key == password) | 83 | if (key == password) |
84 | { | 84 | { |
85 | data.Data["webLoginKey"] = UUID.Zero.ToString(); | 85 | data.Data["webLoginKey"] = UUID.Zero.ToString(); |
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs index bbc8470..4203c7b 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs | |||
@@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService | |||
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private Dictionary<string, IAuthenticationService> m_svcChecks | 46 | private Dictionary<string, IAuthenticationService> m_svcChecks |
47 | = new Dictionary<string, IAuthenticationService>(); | 47 | = new Dictionary<string, IAuthenticationService>(); |
48 | 48 | ||
49 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) | 49 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) |
50 | : base(config) | 50 | : base(config) |
51 | { | 51 | { |
@@ -86,7 +86,7 @@ namespace OpenSim.Services.AuthenticationService | |||
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | 89 | ||
90 | 90 | ||
91 | if (result == string.Empty) | 91 | if (result == string.Empty) |
92 | { | 92 | { |
@@ -97,8 +97,8 @@ namespace OpenSim.Services.AuthenticationService | |||
97 | { | 97 | { |
98 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); | 98 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); |
99 | } | 99 | } |
100 | 100 | ||
101 | 101 | ||
102 | return result; | 102 | return result; |
103 | } | 103 | } |
104 | } | 104 | } |