aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2009-09-03 21:03:04 +0100
committerMelanie2009-09-03 21:03:04 +0100
commit328fd104e183d6c08148d9752ad7f61608244f5d (patch)
treed5e6d5cb705cb8b5dd50c02c09eec0126a1ce9b0 /OpenSim/Services
parenteliminate unnecessary storage of mesh objects which are no longer necessary a... (diff)
downloadopensim-SC_OLD-328fd104e183d6c08148d9752ad7f61608244f5d.zip
opensim-SC_OLD-328fd104e183d6c08148d9752ad7f61608244f5d.tar.gz
opensim-SC_OLD-328fd104e183d6c08148d9752ad7f61608244f5d.tar.bz2
opensim-SC_OLD-328fd104e183d6c08148d9752ad7f61608244f5d.tar.xz
Remove the distinction between password and login key in the authentication
service. This will be done in the login service instead, it's out of scope for an authenticator
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs (renamed from OpenSim/Services/AuthenticationService/AuthenticationService.cs)16
-rw-r--r--OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs76
-rw-r--r--OpenSim/Services/Interfaces/IAuthenticationService.cs7
3 files changed, 81 insertions, 18 deletions
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 803d90c..d20edb3 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -36,29 +36,19 @@ namespace OpenSim.Services.AuthenticationService
36 // or any other components that need 36 // or any other components that need
37 // verifiable identification. 37 // verifiable identification.
38 // 38 //
39 public class AuthenticationService 39 public class PasswordAuthenticationService
40 { 40 {
41 public byte[] GetPublicKey() 41 public byte[] GetPublicKey()
42 { 42 {
43 return new byte[0]; 43 return new byte[0];
44 } 44 }
45 45
46 public string AuthenticatePassword(UUID principalID, string password) 46 public string Authenticate(UUID principalID, string password)
47 { 47 {
48 return String.Empty; 48 return String.Empty;
49 } 49 }
50 50
51 public byte[] AuthenticatePasswordEncrypted(byte[] cyphertext, byte[] key) 51 public byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key)
52 {
53 return new byte[0];
54 }
55
56 public string AuthenticateWebkey(UUID principalID, string webkey)
57 {
58 return String.Empty;
59 }
60
61 public byte[] AuthenticateWebkeyEncrypted(byte[] cyphertext, byte[] key)
62 { 52 {
63 return new byte[0]; 53 return new byte[0];
64 } 54 }
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
new file mode 100644
index 0000000..478d259
--- /dev/null
+++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
@@ -0,0 +1,76 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenMetaverse;
30
31namespace OpenSim.Services.AuthenticationService
32{
33 // Generic Authentication service used for identifying
34 // and authenticating principals.
35 // Principals may be clients acting on users' behalf,
36 // or any other components that need
37 // verifiable identification.
38 //
39 public class WebkeyAuthenticationService
40 {
41 public byte[] GetPublicKey()
42 {
43 return new byte[0];
44 }
45
46 public string Authenticate(UUID principalID, string password)
47 {
48 return String.Empty;
49 }
50
51 public byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key)
52 {
53 return new byte[0];
54 }
55
56 public bool Verify(UUID principalID, string token)
57 {
58 return false;
59 }
60
61 public bool VerifyEncrypted(byte[] cyphertext, byte[] key)
62 {
63 return false;
64 }
65
66 public bool Release(UUID principalID, string token)
67 {
68 return false;
69 }
70
71 public bool ReleaseEncrypted(byte[] cyphertext, byte[] key)
72 {
73 return false;
74 }
75 }
76}
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs
index d473cf8..f042c93 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -70,11 +70,8 @@ namespace OpenSim.Services.Interfaces
70 // the public key of the peer, which the connector must have 70 // the public key of the peer, which the connector must have
71 // obtained using a remote GetPublicKey call. 71 // obtained using a remote GetPublicKey call.
72 // 72 //
73 string AuthenticatePassword(UUID principalID, string password); 73 string Authenticate(UUID principalID, string password);
74 byte[] AuthenticatePasswordEncrypted(byte[] cyphertext, byte[] key); 74 byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key);
75
76 string AuthenticateWebkey(UUID principalID, string webkey);
77 byte[] AuthenticateWebkeyEncrypted(byte[] cyphertext, byte[] key);
78 75
79 ////////////////////////////////////////////////////// 76 //////////////////////////////////////////////////////
80 // Verification 77 // Verification