diff options
author | Melanie | 2010-05-16 15:01:56 +0100 |
---|---|---|
committer | Melanie | 2010-05-16 15:01:56 +0100 |
commit | b94cace5471c6a4269a5c2cd0969e4a106cfbdc2 (patch) | |
tree | a79d6123f0926ddf438cad2964d460ac6b58ccd5 /OpenSim/Region | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connectio... (diff) | |
download | opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.zip opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.tar.gz opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.tar.bz2 opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
7 files changed, 201 insertions, 28 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 7721cdf..b860cf6 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim | |||
105 | 105 | ||
106 | // Check if the system is compatible with OpenSimulator. | 106 | // Check if the system is compatible with OpenSimulator. |
107 | // Ensures that the minimum system requirements are met | 107 | // Ensures that the minimum system requirements are met |
108 | m_log.Info("Performing compatibility checks... "); | 108 | m_log.Info("Performing compatibility checks... \n"); |
109 | string supported = String.Empty; | 109 | string supported = String.Empty; |
110 | if (Util.IsEnvironmentSupported(ref supported)) | 110 | if (Util.IsEnvironmentSupported(ref supported)) |
111 | { | 111 | { |
@@ -120,6 +120,113 @@ namespace OpenSim | |||
120 | Culture.SetCurrentCulture(); | 120 | Culture.SetCurrentCulture(); |
121 | 121 | ||
122 | 122 | ||
123 | // Validate that the user has the most basic configuration done | ||
124 | // If not, offer to do the most basic configuration for them warning them along the way of the importance of | ||
125 | // reading these files. | ||
126 | /* | ||
127 | m_log.Info("Checking for reguired configuration...\n"); | ||
128 | |||
129 | bool OpenSim_Ini = (File.Exists(Path.Combine(Util.configDir(), "OpenSim.ini"))) | ||
130 | || (File.Exists(Path.Combine(Util.configDir(), "opensim.ini"))) | ||
131 | || (File.Exists(Path.Combine(Util.configDir(), "openSim.ini"))) | ||
132 | || (File.Exists(Path.Combine(Util.configDir(), "Opensim.ini"))); | ||
133 | |||
134 | bool StanaloneCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini")); | ||
135 | bool StanaloneCommon_lowercased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "standalonecommon.ini")); | ||
136 | bool GridCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "GridCommon.ini")); | ||
137 | bool GridCommon_lowerCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "gridcommon.ini")); | ||
138 | |||
139 | if ((OpenSim_Ini) | ||
140 | && ( | ||
141 | (StanaloneCommon_ProperCased | ||
142 | || StanaloneCommon_lowercased | ||
143 | || GridCommon_ProperCased | ||
144 | || GridCommon_lowerCased | ||
145 | ))) | ||
146 | { | ||
147 | m_log.Info("Required Configuration Files Found\n"); | ||
148 | } | ||
149 | else | ||
150 | { | ||
151 | MainConsole.Instance = new LocalConsole("Region"); | ||
152 | string resp = MainConsole.Instance.CmdPrompt( | ||
153 | "\n\n*************Required Configuration files not found.*************\n\n OpenSimulator will not run without these files.\n\nRemember, these file names are Case Sensitive in Linux and Proper Cased.\n1. ./OpenSim.ini\nand\n2. ./config-include/StandaloneCommon.ini \nor\n3. ./config-include/GridCommon.ini\n\nAlso, you will want to examine these files in great detail because only the basic system will load by default. OpenSimulator can do a LOT more if you spend a little time going through these files.\n\n" + ": " + "Do you want to copy the most basic Defaults from standalone?", | ||
154 | "yes"); | ||
155 | if (resp == "yes") | ||
156 | { | ||
157 | |||
158 | if (!(OpenSim_Ini)) | ||
159 | { | ||
160 | try | ||
161 | { | ||
162 | File.Copy(Path.Combine(Util.configDir(), "OpenSim.ini.example"), | ||
163 | Path.Combine(Util.configDir(), "OpenSim.ini")); | ||
164 | } catch (UnauthorizedAccessException) | ||
165 | { | ||
166 | MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, Make sure OpenSim has have the required permissions\n"); | ||
167 | } catch (ArgumentException) | ||
168 | { | ||
169 | MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, The current directory is invalid.\n"); | ||
170 | } catch (System.IO.PathTooLongException) | ||
171 | { | ||
172 | MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, the Path to these files is too long.\n"); | ||
173 | } catch (System.IO.DirectoryNotFoundException) | ||
174 | { | ||
175 | MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, the current directory is reporting as not found.\n"); | ||
176 | } catch (System.IO.FileNotFoundException) | ||
177 | { | ||
178 | MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, the example is not found, please make sure that the example files exist.\n"); | ||
179 | } catch (System.IO.IOException) | ||
180 | { | ||
181 | // Destination file exists already or a hard drive failure... .. so we can just drop this one | ||
182 | //MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, the example is not found, please make sure that the example files exist.\n"); | ||
183 | } catch (System.NotSupportedException) | ||
184 | { | ||
185 | MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, The current directory is invalid.\n"); | ||
186 | } | ||
187 | |||
188 | } | ||
189 | if (!(StanaloneCommon_ProperCased || StanaloneCommon_lowercased)) | ||
190 | { | ||
191 | try | ||
192 | { | ||
193 | File.Copy(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini.example"), | ||
194 | Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini")); | ||
195 | } | ||
196 | catch (UnauthorizedAccessException) | ||
197 | { | ||
198 | MainConsole.Instance.Output("Unable to Copy StandaloneCommon.ini.example to StandaloneCommon.ini, Make sure OpenSim has the required permissions\n"); | ||
199 | } | ||
200 | catch (ArgumentException) | ||
201 | { | ||
202 | MainConsole.Instance.Output("Unable to Copy StandaloneCommon.ini.example to StandaloneCommon.ini, The current directory is invalid.\n"); | ||
203 | } | ||
204 | catch (System.IO.PathTooLongException) | ||
205 | { | ||
206 | MainConsole.Instance.Output("Unable to Copy StandaloneCommon.ini.example to StandaloneCommon.ini, the Path to these files is too long.\n"); | ||
207 | } | ||
208 | catch (System.IO.DirectoryNotFoundException) | ||
209 | { | ||
210 | MainConsole.Instance.Output("Unable to Copy StandaloneCommon.ini.example to StandaloneCommon.ini, the current directory is reporting as not found.\n"); | ||
211 | } | ||
212 | catch (System.IO.FileNotFoundException) | ||
213 | { | ||
214 | MainConsole.Instance.Output("Unable to Copy StandaloneCommon.ini.example to StandaloneCommon.ini, the example is not found, please make sure that the example files exist.\n"); | ||
215 | } | ||
216 | catch (System.IO.IOException) | ||
217 | { | ||
218 | // Destination file exists already or a hard drive failure... .. so we can just drop this one | ||
219 | //MainConsole.Instance.Output("Unable to Copy OpenSim.ini.example to OpenSim.ini, the example is not found, please make sure that the example files exist.\n"); | ||
220 | } | ||
221 | catch (System.NotSupportedException) | ||
222 | { | ||
223 | MainConsole.Instance.Output("Unable to Copy StandaloneCommon.ini.example to StandaloneCommon.ini, The current directory is invalid.\n"); | ||
224 | } | ||
225 | } | ||
226 | } | ||
227 | MainConsole.Instance = null; | ||
228 | } | ||
229 | */ | ||
123 | configSource.Alias.AddAlias("On", true); | 230 | configSource.Alias.AddAlias("On", true); |
124 | configSource.Alias.AddAlias("Off", false); | 231 | configSource.Alias.AddAlias("Off", false); |
125 | configSource.Alias.AddAlias("True", true); | 232 | configSource.Alias.AddAlias("True", true); |
@@ -145,6 +252,8 @@ namespace OpenSim | |||
145 | // load Crash directory config | 252 | // load Crash directory config |
146 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); | 253 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); |
147 | 254 | ||
255 | |||
256 | |||
148 | if (background) | 257 | if (background) |
149 | { | 258 | { |
150 | m_sim = new OpenSimBackground(configSource); | 259 | m_sim = new OpenSimBackground(configSource); |
@@ -152,8 +261,14 @@ namespace OpenSim | |||
152 | } | 261 | } |
153 | else | 262 | else |
154 | { | 263 | { |
264 | |||
265 | |||
266 | |||
267 | |||
155 | m_sim = new OpenSim(configSource); | 268 | m_sim = new OpenSim(configSource); |
156 | 269 | ||
270 | |||
271 | |||
157 | m_sim.Startup(); | 272 | m_sim.Startup(); |
158 | 273 | ||
159 | while (true) | 274 | while (true) |
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 2a1355b..a6f5d97 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
107 | } | 107 | } |
108 | 108 | ||
109 | Caps caps | 109 | Caps caps |
110 | = new Caps( | 110 | = new Caps(m_scene, |
111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
112 | MainServer.Instance.Port, | 112 | MainServer.Instance.Port, |
113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); | 113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index acc3a78..9c8cbc6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -286,6 +286,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
286 | fromName = avatar.Name; | 286 | fromName = avatar.Name; |
287 | sourceType = ChatSourceType.Agent; | 287 | sourceType = ChatSourceType.Agent; |
288 | } | 288 | } |
289 | else if (c.SenderUUID != UUID.Zero) | ||
290 | { | ||
291 | fromID = c.SenderUUID; | ||
292 | } | ||
289 | 293 | ||
290 | // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); | 294 | // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); |
291 | if (c.Scene != null) | 295 | if (c.Scene != null) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 9df6074..a895d6e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -143,10 +143,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
143 | } | 143 | } |
144 | 144 | ||
145 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) | 145 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) |
146 | { | 146 | { |
147 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | ||
148 | try | 147 | try |
149 | { | 148 | { |
149 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | ||
150 | |||
150 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) | 151 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) |
151 | { | 152 | { |
152 | avatar.Invulnerable = false; | 153 | avatar.Invulnerable = false; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e920ff5..5973847 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2657,34 +2657,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
2657 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); | 2657 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); |
2658 | 2658 | ||
2659 | // Do the verification here | 2659 | // Do the verification here |
2660 | System.Net.EndPoint ep = client.GetClientEP(); | 2660 | System.Net.IPEndPoint ep = (System.Net.IPEndPoint)client.GetClientEP(); |
2661 | if (aCircuit != null) | 2661 | if (aCircuit != null) |
2662 | { | 2662 | { |
2663 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0) | 2663 | if (!VerifyClient(aCircuit, ep, out vialogin)) |
2664 | { | 2664 | { |
2665 | m_log.DebugFormat("[Scene]: Incoming client {0} {1} in region {2} via Login", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); | 2665 | // uh-oh, this is fishy |
2666 | vialogin = true; | 2666 | m_log.WarnFormat("[Scene]: Agent {0} with session {1} connecting with unidentified end point {2}. Refusing service.", |
2667 | IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>(); | 2667 | client.AgentId, client.SessionId, ep.ToString()); |
2668 | if (userVerification != null && ep != null) | 2668 | try |
2669 | { | 2669 | { |
2670 | if (!userVerification.VerifyClient(aCircuit, ep.ToString())) | 2670 | client.Close(); |
2671 | { | 2671 | } |
2672 | // uh-oh, this is fishy | 2672 | catch (Exception e) |
2673 | m_log.WarnFormat("[Scene]: Agent {0} with session {1} connecting with unidentified end point {2}. Refusing service.", | 2673 | { |
2674 | client.AgentId, client.SessionId, ep.ToString()); | 2674 | m_log.DebugFormat("[Scene]: Exception while closing aborted client: {0}", e.StackTrace); |
2675 | try | ||
2676 | { | ||
2677 | client.Close(); | ||
2678 | } | ||
2679 | catch (Exception e) | ||
2680 | { | ||
2681 | m_log.DebugFormat("[Scene]: Exception while closing aborted client: {0}", e.StackTrace); | ||
2682 | } | ||
2683 | return; | ||
2684 | } | ||
2685 | else | ||
2686 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} returned true", aCircuit.firstname, aCircuit.lastname); | ||
2687 | } | 2675 | } |
2676 | return; | ||
2688 | } | 2677 | } |
2689 | } | 2678 | } |
2690 | 2679 | ||
@@ -2710,7 +2699,65 @@ namespace OpenSim.Region.Framework.Scenes | |||
2710 | EventManager.TriggerOnClientLogin(client); | 2699 | EventManager.TriggerOnClientLogin(client); |
2711 | } | 2700 | } |
2712 | 2701 | ||
2713 | 2702 | private bool VerifyClient(AgentCircuitData aCircuit, System.Net.IPEndPoint ep, out bool vialogin) | |
2703 | { | ||
2704 | vialogin = false; | ||
2705 | |||
2706 | // Do the verification here | ||
2707 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0) | ||
2708 | { | ||
2709 | m_log.DebugFormat("[Scene]: Incoming client {0} {1} in region {2} via Login", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); | ||
2710 | vialogin = true; | ||
2711 | IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>(); | ||
2712 | if (userVerification != null && ep != null) | ||
2713 | { | ||
2714 | if (!userVerification.VerifyClient(aCircuit, ep.Address.ToString())) | ||
2715 | { | ||
2716 | // uh-oh, this is fishy | ||
2717 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned false", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); | ||
2718 | return false; | ||
2719 | } | ||
2720 | else | ||
2721 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned true", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); | ||
2722 | } | ||
2723 | } | ||
2724 | |||
2725 | return true; | ||
2726 | } | ||
2727 | |||
2728 | // Called by Caps, on the first HTTP contact from the client | ||
2729 | public override bool CheckClient(UUID agentID, System.Net.IPEndPoint ep) | ||
2730 | { | ||
2731 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(agentID); | ||
2732 | if (aCircuit != null) | ||
2733 | { | ||
2734 | bool vialogin = false; | ||
2735 | if (!VerifyClient(aCircuit, ep, out vialogin)) | ||
2736 | { | ||
2737 | // if it doesn't pass, we remove the agentcircuitdata altogether | ||
2738 | // and the scene presence and the client, if they exist | ||
2739 | try | ||
2740 | { | ||
2741 | ScenePresence sp = GetScenePresence(agentID); | ||
2742 | if (sp != null) | ||
2743 | sp.ControllingClient.Close(); | ||
2744 | |||
2745 | // BANG! SLASH! | ||
2746 | m_authenticateHandler.RemoveCircuit(agentID); | ||
2747 | |||
2748 | return false; | ||
2749 | } | ||
2750 | catch (Exception e) | ||
2751 | { | ||
2752 | m_log.DebugFormat("[Scene]: Exception while closing aborted client: {0}", e.StackTrace); | ||
2753 | } | ||
2754 | } | ||
2755 | else | ||
2756 | return true; | ||
2757 | } | ||
2758 | |||
2759 | return false; | ||
2760 | } | ||
2714 | 2761 | ||
2715 | /// <summary> | 2762 | /// <summary> |
2716 | /// Register for events from the client | 2763 | /// Register for events from the client |
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 3218dad..bfc19b7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -536,5 +536,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
536 | get { return false; } | 536 | get { return false; } |
537 | } | 537 | } |
538 | 538 | ||
539 | public abstract bool CheckClient(UUID agentID, System.Net.IPEndPoint ep); | ||
539 | } | 540 | } |
540 | } | 541 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs index dd9f8f6..42587c1 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs | |||
@@ -70,6 +70,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
70 | { | 70 | { |
71 | throw new NotImplementedException(); | 71 | throw new NotImplementedException(); |
72 | } | 72 | } |
73 | |||
74 | public override bool CheckClient(UUID agentID, System.Net.IPEndPoint ep) | ||
75 | { | ||
76 | throw new NotImplementedException(); | ||
77 | } | ||
73 | } | 78 | } |
74 | 79 | ||
75 | [Test] | 80 | [Test] |