From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.
---
.../AuthenticationServerPostHandler.cs | 28 +++++++++++-----------
.../Authentication/OpenIdServerConnector.cs | 2 +-
.../Handlers/Authentication/OpenIdServerHandler.cs | 11 +++++----
3 files changed, 22 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Server/Handlers/Authentication')
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index 6ee98b3..4f03cf4 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -82,11 +82,11 @@ namespace OpenSim.Server.Handlers.Authentication
switch (p[0])
{
case "plain":
- StreamReader sr = new StreamReader(request);
- string body = sr.ReadToEnd();
- sr.Close();
-
+ string body;
+ using(StreamReader sr = new StreamReader(request))
+ body = sr.ReadToEnd();
return DoPlainMethods(body);
+
case "crypt":
byte[] buffer = new byte[request.Length];
long length = request.Length;
@@ -132,41 +132,41 @@ namespace OpenSim.Server.Handlers.Authentication
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();
-
+
case "setpassword":
if (!m_AllowSetPassword)
return FailureResult();
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();
-
+
case "release":
if (!request.ContainsKey("TOKEN"))
return FailureResult();
-
+
if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString()))
return SuccessResult();
-
+
return FailureResult();
case "getauthinfo":
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs
index 6464399..ac8ff52 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Authentication
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
-
+
private IAuthenticationService m_AuthenticationService;
private IUserAccountService m_UserAccountService;
private string m_ConfigName = "OpenIdService";
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index b201dc7..254b82f 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -178,14 +178,14 @@ namespace OpenSim.Server.Handlers.Authentication
";
///