standalone
MW 2007-02-08 21:18:24 +00:00
parent aab0dd0530
commit b8822e4340
8 changed files with 238 additions and 115 deletions

View File

@ -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 string SimIPAddress = "127.0.0.1";
public int SimPort = 50000; public int SimPort = 50000;
public string RegionName = "Test Sandbox\0"; public string RegionName = "Test Sandbox\0";
@ -65,6 +65,9 @@ namespace OpenSimLite
public ushort LoginServerPort = 8080; public ushort LoginServerPort = 8080;
public List<Logon> IncomingLogins = new List<Logon>(); public List<Logon> IncomingLogins = new List<Logon>();
public string Password="mypassword";
public bool NeedPasswd=false;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

View File

@ -57,25 +57,31 @@ namespace OpenSimLite
private int NumClients; private int NumClients;
private string _defaultResponse; private string _defaultResponse;
private string _mpasswd;
private bool _needPassswd=false;
// InitializeLoginProxy: initialize the login proxy // InitializeLoginProxy: initialize the login proxy
private void InitializeLoginProxy() { private void InitializeLoginProxy() {
loginServer = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); loginServer = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
loginServer.Bind(new IPEndPoint(remoteAddress, _loginPort)); loginServer.Bind(new IPEndPoint(remoteAddress, _loginPort));
loginServer.Listen(1); loginServer.Listen(1);
this._needPassswd=Globals.Instance.NeedPasswd;
//read in default response string //read in default response string
StreamReader SR; StreamReader SR;
string lines; string lines;
SR=File.OpenText("new-login.dat"); SR=File.OpenText("new-login.dat");
lines=SR.ReadLine(); //lines=SR.ReadLine();
while(lines != "end-mfile") while(!SR.EndOfStream)
{ {
_defaultResponse += lines;
lines = SR.ReadLine(); lines = SR.ReadLine();
_defaultResponse += lines;
//lines = SR.ReadLine();
} }
SR.Close(); SR.Close();
this._mpasswd = Utility.EncodePassword(Globals.Instance.Password);
} }
public void Startup() public void Startup()
@ -128,10 +134,12 @@ namespace OpenSimLite
} }
// ProxyLogin: proxy a login request // ProxyLogin: proxy a login request
private void ProxyLogin(StreamReader reader, StreamWriter writer) { lock(this) { private void ProxyLogin(StreamReader reader, StreamWriter writer)
{
lock(this)
{
string line; string line;
int contentLength = 0; int contentLength = 0;
// read HTTP header // read HTTP header
do do
{ {
@ -152,12 +160,14 @@ namespace OpenSimLite
this._login = new Logon(); this._login = new Logon();
char[] content = new char[contentLength]; char[] content = new char[contentLength];
reader.Read(content, 0, 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];
XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(new String(content));
if(request.MethodName == "login_to_simulator")
{
Hashtable requestData = (Hashtable)request.Params[0];
string first; string first;
string last; string last;
string passwd;
LLUUID Agent; LLUUID Agent;
LLUUID Session; LLUUID Session;
@ -178,13 +188,28 @@ namespace OpenSimLite
{ {
last = "User"+NumClients.ToString(); 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++; NumClients++;
//create a agent and session LLUUID //create a agent and session LLUUID
int AgentRand = this.RandomClass.Next(1,9999); Agent = GetAgentId( first, last );
Agent = new LLUUID("99998888-4000-"+AgentRand.ToString("0000")+"-8ec1-0b1d5cd6aead");
int SessionRand = this.RandomClass.Next(1,999); int SessionRand = this.RandomClass.Next(1,999);
Session = new LLUUID("aaaabbbb-5000-"+SessionRand.ToString("0000")+"-8664-58f53e442797"); Session = new LLUUID("aaaabbbb-0200-"+SessionRand.ToString("0000")+"-8664-58f53e442797");
XmlRpcResponse response =(XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse); XmlRpcResponse response =(XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse);
@ -208,6 +233,7 @@ namespace OpenSimLite
Hashtable Inventoryroot = (Hashtable)InventoryRoot[0]; Hashtable Inventoryroot = (Hashtable)InventoryRoot[0];
Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated(); Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated();
CustomiseLoginResponse( responseData, first, last );
//copy data to login object //copy data to login object
_login.First = first; _login.First = first;
@ -231,8 +257,49 @@ namespace OpenSimLite
XmlRpcResponseSerializer.Singleton.Serialize(responseWriter, response); XmlRpcResponseSerializer.Singleton.Serialize(responseWriter, response);
responseWriter.Close(); 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 class Logon
{ {

View File

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

View File

@ -48,6 +48,7 @@ namespace OpenSimLite
public NonBlockingQueue<UpdateCommand> Commands; public NonBlockingQueue<UpdateCommand> Commands;
#region Thread Sync #region Thread Sync
//public object CommandsSync = new object(); //public object CommandsSync = new object();
private object _sendTerrainSync = new object(); private object _sendTerrainSync = new object();
@ -315,16 +316,11 @@ namespace OpenSimLite
} }
} }
public class Face public struct Face
{ {
public int V1; public int V1;
public int V2; public int V2;
public int V3; public int V3;
public Face()
{
}
} }
public class UpdateCommand public class UpdateCommand

57
Utility.cs Normal file
View File

@ -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();
}
}
}

Binary file not shown.

File diff suppressed because one or more lines are too long