Merge branch 'master' of ssh://MyConnection/var/git/opensim

2 files changed, 10 insertions, 61 deletions

diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs
index b448a14..9225773 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -39,39 +39,12 @@ namespace OpenSim.Services.Interfaces
     public interface IAuthenticationService
     {
         //////////////////////////////////////////////////////
-        // PKI Zone!
-        //
-        // HG2 authentication works by using a cryptographic
-        // exchange.
-        // This method must provide a public key, the other
-        // crypto methods must understand hoow to deal with
-        // messages encrypted to it.
-        //
-        // If the public key is of zero length, you will
-        // get NO encryption and NO security.
-        //
-        // For non-HG installations, this is not relevant
-        //
-        // Implementors who are not using PKI can treat the
-        // cyphertext as a string and provide a zero-length
-        // key. Encryptionless implementations will not
-        // interoperate with implementations using encryption.
-        // If one side uses encryption, both must do so.
-        //
-        byte[] GetPublicKey();
-
-        //////////////////////////////////////////////////////
         // Authentication
         //
         // These methods will return a token, which can be used to access
         // various services.
         //
-        // The encrypted versions take the received cyphertext and
-        // the public key of the peer, which the connector must have
-        // obtained using a remote GetPublicKey call.
-        //
         string Authenticate(UUID principalID, string password, int lifetime);
-        byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key);
 
         //////////////////////////////////////////////////////
         // Verification
@@ -81,12 +54,7 @@ namespace OpenSim.Services.Interfaces
         // Tokens expire after 30 minutes and can be refreshed by
         // re-verifying.
         //
-        // If encrypted authentication was used, encrypted verification
-        // must be used to refresh. Unencrypted verification is still
-        // performed, but doesn't refresh token lifetime.
-        //
         bool Verify(UUID principalID, string token, int lifetime);
-        bool VerifyEncrypted(byte[] cyphertext, byte[] key);
 
         //////////////////////////////////////////////////////
         // Teardown
@@ -95,11 +63,7 @@ namespace OpenSim.Services.Interfaces
         // invalidates it and it can not subsequently be used
         // or refreshed.
         //
-        // Tokens created by encrypted authentication must
-        // be returned by encrypted release calls;
-        //
         bool Release(UUID principalID, string token);
-        bool ReleaseEncrypted(byte[] cyphertext, byte[] key);
 
         //////////////////////////////////////////////////////
         // Grid
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 35254a1..92bd8ef 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -30,13 +30,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Interfaces
 {
-    public class UserAccountData
+    public class UserAccount
     {
-        public UserAccountData()
+        public UserAccount()
         {
         }
 
-        public UserAccountData(UUID userID, UUID homeRegionID, float homePositionX,
+        public UserAccount(UUID userID, UUID homeRegionID, float homePositionX,
                 float homePositionY, float homePositionZ, float homeLookAtX,
                 float homeLookAtY, float homeLookAtZ)
         {
@@ -78,41 +78,26 @@ namespace OpenSim.Services.Interfaces
 
     };
 
-    public class UserAccountDataMessage
+    public interface IUserAccountService
     {
-        public UserAccountData Data;
-
-        // Set to the region's ID and secret when updating home location
-        //
-        public UUID RegionID;
-        public UUID RegionSecret;
-
-        // Set to the auth info of the user requesting creation/update
-        //
-        public UUID PrincipalID;
-        public UUID SessionID;
-    };
-
-    public interface IUserAccountDataService
-    {
-        UserAccountData GetUserAccountData(UUID scopeID, UUID userID);
-        UserAccountData GetUserAccountData(UUID scopeID, string FirstName, string LastName);
+        UserAccount GetUserAccount(UUID scopeID, UUID userID);
+        UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
         // Returns the list of avatars that matches both the search
         // criterion and the scope ID passed
         //
-        List<UserAccountData> GetUserAccountData(UUID scopeID, string query);
+        List<UserAccount> GetUserAccount(UUID scopeID, string query);
 
 
         // This will set only the home region portion of the data!
         // Can't be used to set god level, flags, type or change the name!
         //
-        bool SetHomePosition(UserAccountData data, UUID RegionID, UUID RegionSecret);
+        bool SetHomePosition(UserAccount data, UUID RegionID, UUID RegionSecret);
 
         // Update all updatable fields
         //
-        bool SetUserAccountData(UserAccountData data, UUID PrincipalID, UUID SessionID);
+        bool SetUserAccount(UserAccount data, UUID PrincipalID, string token);
         
         // Creates a user data record
-        bool CreateUserAccountData(UserAccountData data, UUID PrincipalID, UUID SessionID);
+        bool CreateUserAccount(UserAccount data, UUID PrincipalID, string token);
     }
 }