* Implements IP and DNS based ban facilities to OpenSim.

* User interface is ... primitive at best right now.
* Loads bans from bans.txt and region ban DB on startup, bans.txt is in the format of one per line. The following explains how they are read;

DNS bans are in the form "somewhere.com" will block ANY matching domain (including "betasomewhere.com", "beta.somewhere.com", "somewhere.com.beta") - make sure to be reasonably specific in DNS bans.

IP address bans match on first characters, so, "127.0.0.1" will ban only that address, "127.0.1" will ban "127.0.10.0" but "127.0.1." will ban only the "127.0.1.*" network
0.6.5-rc1
Adam Frisby 2009-05-11 19:23:51 +00:00
parent d7b2beea18
commit 6dcafec22d
6 changed files with 191 additions and 1 deletions

View File

@ -1605,6 +1605,17 @@ namespace OpenSim.Client.MXP.ClientStack
return default(T);
}
public void Disconnect(string reason)
{
Kick(reason);
Close(true);
}
public void Disconnect()
{
Close(true);
}
#endregion
public void SendCreateGroupReply(UUID groupID, bool success, string message)

View File

@ -25,11 +25,20 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenMetaverse;
namespace OpenSim.Framework.Client
{
public interface IClientCore
{
bool TryGet<T>(out T iface);
T Get<T>();
// Basic Interfaces
UUID AgentId { get; }
void Disconnect(string reason);
void Disconnect();
}
}

View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Text;
namespace OpenSim.Framework.Client
{
public interface IClientIPEndpoint
{
IPAddress EndPoint { get; }
}
}

View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Handles new client connections
/// Constructor takes a single Packet and authenticates everything
/// </summary>
public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IStatsCollector
public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -10478,6 +10478,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
RegisterInterface<IClientIM>(this);
RegisterInterface<IClientChat>(this);
RegisterInterface<IClientIPEndpoint>(this);
}
public bool TryGet<T>(out T iface)
@ -10496,6 +10497,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return (T)m_clientInterfaces[typeof(T)];
}
public void Disconnect(string reason)
{
Kick(reason);
Thread.Sleep(1000);
Close(true);
}
public void Disconnect()
{
Close(true);
}
#endregion
private void RefreshGroupMembership()
@ -10587,5 +10601,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
return "";
}
#region IClientIPEndpoint Members
public IPAddress EndPoint
{
get
{
if(m_userEndPoint is IPEndPoint)
{
IPEndPoint ep = (IPEndPoint)m_userEndPoint;
return ep.Address;
}
return null;
}
}
#endregion
}
}

View File

@ -0,0 +1,81 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Agent.IPBan
{
public class IPBanModule : IRegionModule
{
#region Implementation of IRegionModule
private List<string> m_bans = new List<string>();
public void Initialise(Scene scene, IConfigSource source)
{
new SceneBanner(scene, m_bans);
lock(m_bans)
{
foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans)
{
if(!String.IsNullOrEmpty(ban.BannedHostIPMask))
m_bans.Add(ban.BannedHostIPMask);
if (!String.IsNullOrEmpty(ban.BannedHostNameMask))
m_bans.Add(ban.BannedHostNameMask);
}
}
}
public void PostInitialise()
{
if(File.Exists("bans.txt"))
{
string[] bans = File.ReadAllLines("bans.txt");
foreach (string ban in bans)
{
m_bans.Add(ban);
}
}
}
public void Close()
{
}
public string Name
{
get { return "IPBanModule"; }
}
public bool IsSharedModule
{
get { return true; }
}
#endregion
/// <summary>
/// Bans all users from the specified network from connecting.
/// DNS bans are in the form "somewhere.com" will block ANY
/// matching domain (including "betasomewhere.com", "beta.somewhere.com",
/// "somewhere.com.beta") - make sure to be reasonably specific in DNS
/// bans.
///
/// IP address bans match on first characters, so,
/// "127.0.0.1" will ban only that address,
/// "127.0.1" will ban "127.0.10.0"
/// but "127.0.1." will ban only the "127.0.1.*" network
/// </summary>
/// <param name="host">See summary for explanation of parameter</param>
public void Ban(string host)
{
m_bans.Add(host);
}
}
}

View File

@ -0,0 +1,45 @@
using System.Collections.Generic;
using System.Net;
using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Agent.IPBan
{
internal class SceneBanner
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private List<string> bans;
private SceneBase m_scene;
public SceneBanner(SceneBase scene, List<string> banList)
{
scene.EventManager.OnClientConnect += EventManager_OnClientConnect;
bans = banList;
m_scene = scene;
}
void EventManager_OnClientConnect(IClientCore client)
{
IClientIPEndpoint ipEndpoint;
if(client.TryGet(out ipEndpoint))
{
IPAddress end = ipEndpoint.EndPoint;
IPHostEntry rDNS = Dns.GetHostEntry(end);
foreach (string ban in bans)
{
if (rDNS.HostName.Contains(ban) ||
end.ToString().StartsWith(ban))
{
client.Disconnect("Banned - network \"" + ban + "\" is not allowed to connect to this server.");
m_log.Warn("[IPBAN] Disconnected '" + end + "' due to '" + ban + "' ban.");
return;
}
}
m_log.Warn("[IPBAN] User '" + end + "' not in any ban lists. Allowing connection.");
}
}
}
}