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

Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge

avinationmerge
Melanie 2011-10-25 02:56:56 +01:00
parent b6881187d0 d9184eceab
commit a71c60ee6d
4 changed files with 57 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Server.Handlers.Authentication
Object[] args = new Object[] { config };
m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
server.AddStreamHandler(new AuthenticationServerPostHandler(m_AuthenticationService));
server.AddStreamHandler(new AuthenticationServerPostHandler(m_AuthenticationService, serverConfig));
}
}
}

65
OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
View File

@ -49,11 +49,20 @@ namespace OpenSim.Server.Handlers.Authentication
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IAuthenticationService m_AuthenticationService;
private bool m_AllowSetPassword = false;
public AuthenticationServerPostHandler(IAuthenticationService service) :
this(service, null) {}
public AuthenticationServerPostHandler(IAuthenticationService service, IConfig config) :
base("POST", "/auth")
{
m_AuthenticationService = service;
if (config != null)
{
m_AllowSetPassword = config.GetBoolean("AllowSetPassword", m_AllowSetPassword);
}
}
public override byte[] Handle(string path, Stream request,
@ -113,31 +122,45 @@ namespace OpenSim.Server.Handlers.Authentication
switch (method)
{
case "authenticate":
if (!request.ContainsKey("PASSWORD"))
case "authenticate":
if (!request.ContainsKey("PASSWORD"))
return FailureResult();
token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime);
if (token != String.Empty)
return SuccessResult(token);
return FailureResult();
token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime);
case "setpassword":
if (!m_AllowSetPassword)
return FailureResult();
if (token != String.Empty)
return SuccessResult(token);
return FailureResult();
case "verify":
if (!request.ContainsKey("TOKEN"))
if (!request.ContainsKey("PASSWORD"))
return FailureResult();
if (m_AuthenticationService.SetPassword(principalID, request["PASSWORD"].ToString()))
return SuccessResult();
else
return FailureResult();
case "verify":
if (!request.ContainsKey("TOKEN"))
return FailureResult();
if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime))
return SuccessResult();
return FailureResult();
if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime))
return SuccessResult();
return FailureResult();
case "release":
if (!request.ContainsKey("TOKEN"))
case "release":
if (!request.ContainsKey("TOKEN"))
return FailureResult();
if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString()))
return SuccessResult();
return FailureResult();
if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString()))
return SuccessResult();
return FailureResult();
}
return FailureResult();

8
bin/Robust.HG.ini.example
View File

@ -146,6 +146,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
; Realm = "useraccounts"
;; Allow the service to process HTTP setpassword calls.
;; Default is false.
; AllowSetPassword = false
[OpenIdService]
; for the server connector
AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@ -173,11 +177,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
;; Default is false
; CreateDefaultAvatarEntries = false
;; Allow the service to process HTTP create user calls.
;; Allow the service to process HTTP createuser calls.
;; Default is false.
; AllowCreateUser = false
;; Allow the service to process HTTP set account calls.
;; Allow the service to process HTTP setaccount calls.
;; Default is false.
; AllowSetAccount = false

8
bin/Robust.ini.example
View File

@ -129,6 +129,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; for the server connector
LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
;; Allow the service to process HTTP setpassword calls.
;; Default is false.
; AllowSetPassword = false
[OpenIdService]
; for the server connector
AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@ -156,11 +160,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
;; Default is false
; CreateDefaultAvatarEntries = false
;; Allow the service to process HTTP create user calls.
;; Allow the service to process HTTP createuser calls.
;; Default is false.
; AllowCreateUser = false
;; Allow the service to process HTTP set account calls.
;; Allow the service to process HTTP setaccount calls.
;; Default is false.
; AllowSetAccount = false