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

Add the new AuthStore to migrations. Update OpenSim.Server.ini

remotes/origin/0.6.7-post-fixes
Melanie 2009-09-04 08:10:05 +01:00
parent ac40c7a74c
commit 67f803c919
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/MySQL/MySQLAuthenticationData.cs
View File

@ -45,6 +45,9 @@ namespace OpenSim.Data.MySQL
: base(connectionString) : base(connectionString)
{ {
m_Realm = realm; m_Realm = realm;
Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore");
m.Update();
} }
public AuthenticationData Get(UUID principalID) public AuthenticationData Get(UUID principalID)

21
OpenSim/Data/MySQL/Resources/001_AuthStore.sql Normal file
View File

@ -0,0 +1,21 @@
begin;
CREATE TABLE `auth` (
`UUID` char(36) NOT NULL,
`passwordHash` char(32) NOT NULL default '',
`passwordSalt` char(32) NOT NULL default '',
`webLoginKey` varchar(255) NOT NULL default '',
PRIMARY KEY (`UUID`)
) ENGINE=InnoDB;
CREATE TABLE `tokens` (
`UUID` char(36) NOT NULL,
`token` varchar(255) NOT NULL,
`validity` datetime NOT NULL,
UNIQUE KEY `uuid_token` (`UUID`,`token`),
KEY `UUID` (`UUID`),
KEY `token` (`token`),
KEY `validity` (`validity`)
) ENGINE=InnoDB;
commit;

2
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Services.AuthenticationService
{ {
string dllName = String.Empty; string dllName = String.Empty;
string connString = String.Empty; string connString = String.Empty;
string realm = String.Empty; string realm = "auth";
// //
// Try reading the [AuthenticationService] section first, if it exists // Try reading the [AuthenticationService] section first, if it exists

15
bin/OpenSim.Server.ini.example
View File

@ -5,6 +5,9 @@
; * These are the IN connectors the server uses, the in connectors ; * These are the IN connectors the server uses, the in connectors
; * read this config file and load the needed OUT and database connectors ; * read this config file and load the needed OUT and database connectors
; * ; *
; * Add "OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" to
; * enable the experimental authentication service
; *
[Startup] [Startup]
ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector" ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
@ -45,3 +48,15 @@ ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=gr
; * This is the configuration for the freeswitch server in grid mode ; * This is the configuration for the freeswitch server in grid mode
[FreeswitchService] [FreeswitchService]
LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
; * This is the new style authentication service. Currently, only MySQL
; * is implemented. "Realm" is the table that is used for user lookup.
; * By setting it to "users", you can use the old style users table
; * as an authentication source.
; *
[AuthenticationService]
AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
StorageProvider = "OpenSim.Data.MySQL.dll"
ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
; Realm = "auth"