aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-09-04 08:10:05 +0100
committerMelanie2009-09-04 08:10:05 +0100
commit67f803c919324f49e21279faa43c9578b625529e (patch)
tree4924c2931e34c2a19645ed7d918da17b54e791f6 /OpenSim
parentFully implement unencrypted auth token operations (diff)
downloadopensim-SC-67f803c919324f49e21279faa43c9578b625529e.zip
opensim-SC-67f803c919324f49e21279faa43c9578b625529e.tar.gz
opensim-SC-67f803c919324f49e21279faa43c9578b625529e.tar.bz2
opensim-SC-67f803c919324f49e21279faa43c9578b625529e.tar.xz
Add the new AuthStore to migrations. Update OpenSim.Server.ini
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLAuthenticationData.cs3
-rw-r--r--OpenSim/Data/MySQL/Resources/001_AuthStore.sql21
-rw-r--r--OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs2
3 files changed, 25 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index 1ee64ce..afd59bd 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -45,6 +45,9 @@ namespace OpenSim.Data.MySQL
45 : base(connectionString) 45 : base(connectionString)
46 { 46 {
47 m_Realm = realm; 47 m_Realm = realm;
48
49 Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore");
50 m.Update();
48 } 51 }
49 52
50 public AuthenticationData Get(UUID principalID) 53 public AuthenticationData Get(UUID principalID)
diff --git a/OpenSim/Data/MySQL/Resources/001_AuthStore.sql b/OpenSim/Data/MySQL/Resources/001_AuthStore.sql
new file mode 100644
index 0000000..c7e16fb
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_AuthStore.sql
@@ -0,0 +1,21 @@
1begin;
2
3CREATE TABLE `auth` (
4 `UUID` char(36) NOT NULL,
5 `passwordHash` char(32) NOT NULL default '',
6 `passwordSalt` char(32) NOT NULL default '',
7 `webLoginKey` varchar(255) NOT NULL default '',
8 PRIMARY KEY (`UUID`)
9) ENGINE=InnoDB;
10
11CREATE TABLE `tokens` (
12 `UUID` char(36) NOT NULL,
13 `token` varchar(255) NOT NULL,
14 `validity` datetime NOT NULL,
15 UNIQUE KEY `uuid_token` (`UUID`,`token`),
16 KEY `UUID` (`UUID`),
17 KEY `token` (`token`),
18 KEY `validity` (`validity`)
19) ENGINE=InnoDB;
20
21commit;
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index 5056db3..2ed177c 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Services.AuthenticationService
53 { 53 {
54 string dllName = String.Empty; 54 string dllName = String.Empty;
55 string connString = String.Empty; 55 string connString = String.Empty;
56 string realm = String.Empty; 56 string realm = "auth";
57 57
58 // 58 //
59 // Try reading the [AuthenticationService] section first, if it exists 59 // Try reading the [AuthenticationService] section first, if it exists