ClientConnection.cs

@@ -60,7 +60,7 @@ namespace OpenSimLite
 				for(;;)
 				{
 					Packet packet = null;
-					packet=this.InQueue.Dequeue();
+					packet = this.InQueue.Dequeue();
 					switch(packet.Type)
 					{
 						case PacketType.UseCircuitCode:

Globals.cs

@@ -55,7 +55,7 @@ namespace OpenSimLite
 			}
 		}
 		
-		public bool LocalRunning = true;
+		public bool LocalRunning = true; // not connected to a grid?
 		public string SimIPAddress = "127.0.0.1";
 		public int SimPort = 50000;
 		public string RegionName = "Test Sandbox\0";
@@ -65,6 +65,9 @@ namespace OpenSimLite
 		public ushort LoginServerPort = 8080;
 		public List<Logon> IncomingLogins = new List<Logon>();
 		
+		public string Password="mypassword";
+		public bool NeedPasswd=false;
+		
 		/// <summary>
 		/// 
 		/// </summary>

LoginServer.cs

@@ -56,6 +56,9 @@ namespace OpenSimLite
 		private Random RandomClass = new Random();
 		private int NumClients;
 		private string _defaultResponse;
+		
+		private string _mpasswd;
+		private bool _needPassswd=false;
 
 		// InitializeLoginProxy: initialize the login proxy
 		private void InitializeLoginProxy() {
@@ -63,19 +66,22 @@ namespace OpenSimLite
 			loginServer.Bind(new IPEndPoint(remoteAddress, _loginPort));
 			loginServer.Listen(1);
 			
+			this._needPassswd=Globals.Instance.NeedPasswd;
 			//read in default response string
 			StreamReader SR;
     		string lines;
     		SR=File.OpenText("new-login.dat");
     		
-    		lines=SR.ReadLine();
+    		//lines=SR.ReadLine();
     		
-    		while(lines != "end-mfile")
+    		while(!SR.EndOfStream)
     		{
-    			_defaultResponse += lines;
     			lines = SR.ReadLine();
+    			_defaultResponse += lines;
+    			//lines = SR.ReadLine();
     		}
     		SR.Close();
+    		this._mpasswd = Utility.EncodePassword(Globals.Instance.Password);
 		}
 		
 		public void Startup()
@@ -128,112 +134,173 @@ namespace OpenSimLite
 		}
 
 		// ProxyLogin: proxy a login request
-		private void ProxyLogin(StreamReader reader, StreamWriter writer) { lock(this) {
+		private void ProxyLogin(StreamReader reader, StreamWriter writer) 
-			string line;
+		{ 
-			int contentLength = 0;
+			lock(this)
+			{
+				string line;
+				int contentLength = 0;
+				// read HTTP header
+				do
+				{
+					// read one line of the header
+					line = reader.ReadLine();
+					
+					// check for premature EOF
+					if (line == null)
+						throw new Exception("EOF in client HTTP header");
 
-			// read HTTP header
+					// look for Content-Length
-			do 
+					Match match = (new Regex(@"Content-Length: (\d+)$")).Match(line);
-			{
+					if (match.Success)
-				// read one line of the header
+						contentLength = Convert.ToInt32(match.Groups[1].Captures[0].ToString());
-				line = reader.ReadLine();
+				} while (line != "");
-
-				// check for premature EOF
-				if (line == null)
-					throw new Exception("EOF in client HTTP header");
-
-				// look for Content-Length
-				Match match = (new Regex(@"Content-Length: (\d+)$")).Match(line);
-				if (match.Success)
-					contentLength = Convert.ToInt32(match.Groups[1].Captures[0].ToString());
-			} while (line != "");
-			
-			// read the HTTP body into a buffer
-			this._login = new Logon();
-			char[] content = new char[contentLength];
-			reader.Read(content, 0, contentLength);
-			 //System.Text.Encoding enc = System.Text.Encoding.ASCII;
-			XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(new String(content));
-			Hashtable requestData = (Hashtable)request.Params[0];
-			
-			string first;
-			string last;
-			LLUUID Agent;
-			LLUUID Session;
-			
-			//get login name
-			if(requestData.Contains("first"))
-			{
-				first = (string)requestData["first"];
-			}
-			else
-			{
-				first = "test";
-			}
-			if(requestData.Contains("last"))
-			{
-				last = (string)requestData["last"];
-			}
-			else
-			{
-				last = "User"+NumClients.ToString();
-			}
-			NumClients++;
-			
-			//create a agent and session LLUUID
-			int AgentRand = this.RandomClass.Next(1,9999);
-			Agent = new LLUUID("99998888-4000-"+AgentRand.ToString("0000")+"-8ec1-0b1d5cd6aead");
-			int SessionRand = this.RandomClass.Next(1,999);
-			Session = new LLUUID("aaaabbbb-5000-"+SessionRand.ToString("0000")+"-8664-58f53e442797");
-			
-			
-			XmlRpcResponse response =(XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse);
-			Hashtable responseData = (Hashtable)response.Value;
-			
-			responseData["sim_port"] = Globals.Instance.SimPort;
-			responseData["sim_ip"] = Globals.Instance.SimIPAddress;
-			responseData["agent_id"] = Agent.ToStringHyphenated();
-			responseData["session_id"] = Session.ToStringHyphenated();
-			ArrayList InventoryList = (ArrayList) responseData["inventory-skeleton"];
-			Hashtable Inventory1 = (Hashtable)InventoryList[0];
-			Hashtable Inventory2 = (Hashtable)InventoryList[1];
-			LLUUID BaseFolderID = LLUUID.Random();
-			LLUUID InventoryFolderID = LLUUID.Random();
-			Inventory2["name"] = "Base";
-			Inventory2["folder_id"] = BaseFolderID.ToStringHyphenated();
-			Inventory2["type_default"] =6;
-			Inventory1["folder_id"] = InventoryFolderID.ToStringHyphenated();
-			
-			ArrayList InventoryRoot = (ArrayList) responseData["inventory-root"];
-			Hashtable Inventoryroot = (Hashtable)InventoryRoot[0];
-			Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated();
-			
 				
-			//copy data to login object
+				// read the HTTP body into a buffer
-			_login.First = first;
+				this._login = new Logon();
-			_login.Last = last;
+				char[] content = new char[contentLength];
-			_login.Agent = Agent;
+				reader.Read(content, 0, contentLength);
-			_login.Session = Session;
+				
-			_login.BaseFolder = BaseFolderID;
+				XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(new String(content));
-			_login.InventoryFolder = InventoryFolderID;
+				if(request.MethodName == "login_to_simulator")
-			
+				{
-			lock(Globals.Instance.IncomingLogins)
+					Hashtable requestData = (Hashtable)request.Params[0];
-			{
+					string first;
-				Globals.Instance.IncomingLogins.Add(_login);
+					string last;
-			}
+					string passwd;
-			
+					LLUUID Agent;
-			// forward the XML-RPC response to the client
+					LLUUID Session;
-            writer.WriteLine("HTTP/1.0 200 OK");
+					
-            writer.WriteLine("Content-type: text/xml");
+					//get login name
-            writer.WriteLine();
+					if(requestData.Contains("first"))
-			
+					{
-			XmlTextWriter responseWriter = new XmlTextWriter(writer);
+						first = (string)requestData["first"];
-			XmlRpcResponseSerializer.Singleton.Serialize(responseWriter, response);
+					}
-			responseWriter.Close();
+					else
+					{
+						first = "test";
+					}
+					if(requestData.Contains("last"))
+					{
+						last = (string)requestData["last"];
+					}
+					else
+					{
+						last = "User"+NumClients.ToString();
+					}
+					if(requestData.Contains("passwd"))
+					{
+						passwd = (string)requestData["passwd"];
+					}
+					else
+					{
+						passwd = "notfound";
+					}
+					
+					if( !Authenticate(first, last, passwd))
+					{
+						// Fail miserably
+						writer.WriteLine("HTTP/1.0 403 Authentication Forbidden");
+						writer.WriteLine();
+						return;
+					}
+					NumClients++;
+					
+					//create a agent and session LLUUID
+					Agent = GetAgentId( first, last );
+					int SessionRand = this.RandomClass.Next(1,999);
+					Session = new LLUUID("aaaabbbb-0200-"+SessionRand.ToString("0000")+"-8664-58f53e442797");
+					
+					
+					XmlRpcResponse response =(XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse);
+					Hashtable responseData = (Hashtable)response.Value;
+					
+					responseData["sim_port"] = Globals.Instance.SimPort;
+					responseData["sim_ip"] = Globals.Instance.SimIPAddress;
+					responseData["agent_id"] = Agent.ToStringHyphenated();
+					responseData["session_id"] = Session.ToStringHyphenated();
+					ArrayList InventoryList = (ArrayList) responseData["inventory-skeleton"];
+					Hashtable Inventory1 = (Hashtable)InventoryList[0];
+					Hashtable Inventory2 = (Hashtable)InventoryList[1];
+					LLUUID BaseFolderID = LLUUID.Random();
+					LLUUID InventoryFolderID = LLUUID.Random();
+					Inventory2["name"] = "Base";
+					Inventory2["folder_id"] = BaseFolderID.ToStringHyphenated();
+					Inventory2["type_default"] =6;
+					Inventory1["folder_id"] = InventoryFolderID.ToStringHyphenated();
+					
+					ArrayList InventoryRoot = (ArrayList) responseData["inventory-root"];
+					Hashtable Inventoryroot = (Hashtable)InventoryRoot[0];
+					Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated();
+					
+					CustomiseLoginResponse( responseData, first, last );
+					
+					//copy data to login object
+					_login.First = first;
+					_login.Last = last;
+					_login.Agent = Agent;
+					_login.Session = Session;
+					_login.BaseFolder = BaseFolderID;
+					_login.InventoryFolder = InventoryFolderID;
+					
+					lock(Globals.Instance.IncomingLogins)
+					{
+						Globals.Instance.IncomingLogins.Add(_login);
+					}
+					
+					// forward the XML-RPC response to the client
+					writer.WriteLine("HTTP/1.0 200 OK");
+					writer.WriteLine("Content-type: text/xml");
+					writer.WriteLine();
+					
+					XmlTextWriter responseWriter = new XmlTextWriter(writer);
+					XmlRpcResponseSerializer.Singleton.Serialize(responseWriter, response);
+					responseWriter.Close();
+				}
+				else
+				{
+					writer.WriteLine("HTTP/1.0 403 Authentication Forbidden");
+					writer.WriteLine();
+				}
 			}
 		}
+		
+		protected virtual void CustomiseLoginResponse( Hashtable responseData, string first, string last )
+		{
+		}
+
+		protected virtual LLUUID GetAgentId(string firstName, string lastName)
+		{
+			LLUUID Agent;
+			int AgentRand = this.RandomClass.Next(1,9999);
+			Agent = new LLUUID("99998888-0100-"+AgentRand.ToString("0000")+"-8ec1-0b1d5cd6aead");
+			return Agent;
+		}
+
+		protected virtual bool Authenticate(string first, string last, string  passwd)
+		{
+			if(this._needPassswd)
+			{
+				//every user needs the password to login
+				string encodedpass = passwd.Remove(0,3); //remove $1$
+				if(encodedpass == this._mpasswd)
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+			else
+			{
+				//not need password to login
+				return true;
+			}
+		}
+		
 	}
-	
+
 	public class Logon
     {
     	public string First = "Test";

OpenSimLite.csproj

@@ -51,6 +51,7 @@
     <Compile Include="PhysicsManager.cs" />
     <Compile Include="InstantMessaging.cs" />
     <Compile Include="Globals.cs" />
+    <Compile Include="Utility.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

SceneGraph.cs

@@ -43,11 +43,12 @@ namespace OpenSimLite
 		public Terrain Terrain;
 		private PhysicsManager _physics;
 		private Server _server;
-		private  System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+		private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
 		private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock _avatarTemplate;
 
 		public NonBlockingQueue<UpdateCommand> Commands;
 		
+		
 		#region Thread Sync
 		//public object CommandsSync = new object();
 		private object _sendTerrainSync = new object();
@@ -315,16 +316,11 @@ namespace OpenSimLite
 		}
 	}
 	
-	public class Face
+	public struct Face
 	{
 		public int V1;
 		public int V2;
 		public int V3;
-		
-		public Face()
-		{
-			
-		}
 	}
 	
 	public class UpdateCommand

Utility.cs

@@ -0,0 +1,57 @@
+/*
+* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the <organization> nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Security.Cryptography;
+
+namespace OpenSimLite
+{
+	/// <summary>
+	/// Description of Utility.
+	/// </summary>
+	public class Utility
+	{
+		public Utility()
+		{
+		}
+		
+		public static string EncodePassword(string passwd)
+		{
+			Byte[] originalBytes;
+			Byte[] encodedBytes;
+			MD5 md5;
+			
+			md5 = new MD5CryptoServiceProvider();
+			originalBytes = ASCIIEncoding.Default.GetBytes(passwd);
+			encodedBytes = md5.ComputeHash(originalBytes);
+
+			return Regex.Replace(BitConverter.ToString(encodedBytes), "-", "").ToLower();
+		}
+	}
+}