Region access control! Region operators can now specify things like DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.

6 files changed, 24 insertions, 6 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index da860c6..95d6264 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -14,6 +14,7 @@
     AvatarServices                      = "RemoteAvatarServicesConnector"
     NeighbourServices           = "RemoteNeighbourServicesConnector"
     AuthenticationServices      = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     PresenceServices            = "RemotePresenceServicesConnector"
     UserAccountServices         = "RemoteUserAccountServicesConnector"
     GridUserServices            = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 712481d..fa6f525 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -146,3 +146,13 @@
 
 [MapImageService]
         MapImageServerURI = "http://mygridserver.com:8003"
+
+[AuthorizationService]
+        ; If you have regions with access restrictions
+        ; specify them here using the convention
+        ; Region_<Region_Name> = <flags>
+        ; Valid flags are:
+        ; DisallowForeigners -- HG visitors not allowed
+        ; DisallowResidents -- only Admins and Managers allowed
+        ; Example:
+        ; Region_Test_1 = "DisallowForeigners"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5f0ba37..da447f1 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,6 +17,7 @@
     AvatarServices                      = "RemoteAvatarServicesConnector"
     NeighbourServices           = "RemoteNeighbourServicesConnector"
     AuthenticationServices      = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     PresenceServices            = "RemotePresenceServicesConnector"
     UserAccountServices         = "RemoteUserAccountServicesConnector"
     GridUserServices            = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6ad4ac9..d307387 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -9,6 +9,7 @@
     InventoryServices       = "LocalInventoryServicesConnector"
     NeighbourServices       = "LocalNeighbourServicesConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserAccountServices     = "LocalUserAccountServicesConnector"
@@ -47,9 +48,6 @@
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2f39218..2a7e49e 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -231,3 +231,13 @@
 [MapImageService]
         ; Set this if you want to change the default
         ; TilesStoragePath = "maptiles"
+
+[AuthorizationService]
+        ; If you have regions with access restrictions
+        ; specify them here using the convention
+        ; Region_<Region_Name> = <flags>
+        ; Valid flags are:
+        ; DisallowForeigners -- HG visitors not allowed
+        ; DisallowResidents -- only Admins and Managers allowed
+        ; Example:
+        ; Region_Test_1 = "DisallowForeigners"
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 00beb31..286d0a1 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,6 +12,7 @@
     InventoryServices           = "HGInventoryBroker"
     NeighbourServices           = "LocalNeighbourServicesConnector"
     AuthenticationServices      = "LocalAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     GridServices                        = "LocalGridServicesConnector"
     PresenceServices            = "LocalPresenceServicesConnector"
     UserAccountServices         = "LocalUserAccountServicesConnector"
@@ -68,9 +69,6 @@
         LibraryName = "OpenSim Library"
         DefaultLibrary = "./inventory/Libraries.xml"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"