OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WebkeyAuthenticationService is now no longer a stub! 

Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
0.7.1-dev
SignpostMarv Martin 2011-03-15 10:29:24 +00:00 committed by Justin Clark-Casey (justincc)
parent f2d2470c25
commit 482686daab
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
View File

@ -31,6 +31,9 @@ using OpenSim.Services.Interfaces;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using System.Reflection; using System.Reflection;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Services.AuthenticationService namespace OpenSim.Services.AuthenticationService
{ {
@ -43,9 +46,9 @@ namespace OpenSim.Services.AuthenticationService
public class WebkeyAuthenticationService : public class WebkeyAuthenticationService :
AuthenticationServiceBase, IAuthenticationService AuthenticationServiceBase, IAuthenticationService
{ {
// private static readonly ILog m_log = private static readonly ILog m_log =
// LogManager.GetLogger( LogManager.GetLogger(
// MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
public WebkeyAuthenticationService(IConfigSource config) : public WebkeyAuthenticationService(IConfigSource config) :
base(config) base(config)
@ -54,6 +57,33 @@ namespace OpenSim.Services.AuthenticationService
public string Authenticate(UUID principalID, string password, int lifetime) public string Authenticate(UUID principalID, string password, int lifetime)
{ {
m_log.InfoFormat("[Authenticate]: Trying a web key authenticate");
if (new UUID(password) == UUID.Zero)
{
m_log.InfoFormat("[Authenticate]: NULL_KEY is not a valid web_login_key");
}
else
{
AuthenticationData data = m_Database.Get(principalID);
if (data != null && data.Data != null)
{
if (data.Data.ContainsKey("webLoginKey"))
{
m_log.InfoFormat("[Authenticate]: Trying a web key authentication");
string key = data.Data["webLoginKey"].ToString();
m_log.DebugFormat("[WEB LOGIN AUTH]: got {0} for key in db vs {1}", key, password);
if (key == password)
{
data.Data["webLoginKey"] = UUID.Zero.ToString();
m_Database.Store(data);
return GetToken(principalID, lifetime);
}
}else{
m_log.InfoFormat("[Authenticate]: no col webLoginKey in passwd.db");
}
}
m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
}
return String.Empty; return String.Empty;
} }
} }