From 8c797d0f76782fce796c7fc052aebcc4b531c889 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Fri, 4 Nov 2016 12:42:58 +1000 Subject: [PATCH] Initial DLINE changes --- CHANGELOG.md | 1 + irc/commands.go | 10 ++++ irc/dline.go | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ irc/help.go | 38 ++++++++++-- irc/server.go | 34 +++++++++-- 5 files changed, 224 insertions(+), 10 deletions(-) create mode 100644 irc/dline.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d30f098..0eec877a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ New release of Oragono! ### Security ### Added +* Added ability to `DLINE` IP addresses ad networks, to allow for fast blocking. ### Changed diff --git a/irc/commands.go b/irc/commands.go index 7ee7b63b..723bd668 100644 --- a/irc/commands.go +++ b/irc/commands.go @@ -76,6 +76,11 @@ var Commands = map[string]Command{ handler: debugHandler, minParams: 1, }, + "DLINE": { + handler: dlineHandler, + minParams: 1, + oper: true, + }, "HELP": { handler: helpHandler, minParams: 0, @@ -200,6 +205,11 @@ var Commands = map[string]Command{ handler: topicHandler, minParams: 1, }, + "UNDLINE": { + handler: undlineHandler, + minParams: 1, + oper: true, + }, "USER": { handler: userHandler, usablePreReg: true, diff --git a/irc/dline.go b/irc/dline.go new file mode 100644 index 00000000..92ebbd59 --- /dev/null +++ b/irc/dline.go @@ -0,0 +1,151 @@ +// Copyright (c) 2016- Daniel Oaks +// released under the MIT license + +package irc + +import "net" +import "time" + +// IPRestrictTime contains the expiration info about the given IP. +type IPRestrictTime struct { + // Expires is when this block expires. + Expires time.Time + // Length is how long this block lasts for. + Length time.Duration +} + +// IsExpired returns true if the time has expired. +func (iptime *IPRestrictTime) IsExpired() bool { + return iptime.Expires.Before(time.Now()) +} + +// IPBanInfo holds info about an IP/net ban. +type IPBanInfo struct { + // Reason is the ban reason. + Reason string + // OperReason is an oper ban reason. + OperReason string + // Time holds details about the duration, if it exists. + Time *IPRestrictTime +} + +// dLineAddr contains the address itself and expiration time for a given network. +type dLineAddr struct { + // Address is the address that is blocked. + Address net.IP + // Info contains information on the ban. + Info IPBanInfo +} + +// dLineNet contains the net itself and expiration time for a given network. +type dLineNet struct { + // Network is the network that is blocked. + Network net.IPNet + // Info contains information on the ban. + Info IPBanInfo +} + +// DLineManager manages and dlines. +type DLineManager struct { + // addresses that are dlined + addresses map[string]*dLineAddr + // networks that are dlined + networks map[string]*dLineNet +} + +// NewDLineManager returns a new DLineManager. +func NewDLineManager() *DLineManager { + dm := DLineManager{ + addresses: make(map[string]*dLineAddr), + networks: make(map[string]*dLineNet), + } + return &dm +} + +// AddNetwork adds a network to the blocked list. +func (dm *DLineManager) AddNetwork(network net.IPNet, length *IPRestrictTime) { + netString := network.String() + dln := dLineNet{ + Network: network, + Info: IPBanInfo{ + Time: length, + Reason: "", + OperReason: "", + }, + } + dm.networks[netString] = &dln +} + +// RemoveNetwork removes a network from the blocked list. +func (dm *DLineManager) RemoveNetwork(network net.IPNet) { + netString := network.String() + delete(dm.networks, netString) +} + +// AddIP adds an IP address to the blocked list. +func (dm *DLineManager) AddIP(addr net.IP, length *IPRestrictTime) { + addrString := addr.String() + dla := dLineAddr{ + Address: addr, + Info: IPBanInfo{ + Time: length, + Reason: "", + OperReason: "", + }, + } + dm.addresses[addrString] = &dla +} + +// RemoveIP removes an IP from the blocked list. +func (dm *DLineManager) RemoveIP(addr net.IP) { + addrString := addr.String() + delete(dm.addresses, addrString) +} + +// CheckIP returns whether or not an IP address was banned, and how long it is banned for. +func (dm *DLineManager) CheckIP(addr net.IP) (isBanned bool, info *IPBanInfo) { + // check IP addr + addrString := addr.String() + + addrInfo := dm.addresses[addrString] + if addrInfo != nil { + if addrInfo.Info.Time != nil { + if addrInfo.Info.Time.IsExpired() { + // ban on IP has expired, remove it from our blocked list + dm.RemoveIP(addr) + } else { + return true, &addrInfo.Info + } + } else { + return true, nil + } + } + + // check networks + var netsToRemove []net.IPNet + + for _, netInfo := range dm.networks { + if !netInfo.Network.Contains(addr) { + continue + } + + if netInfo.Info.Time != nil { + if netInfo.Info.Time.IsExpired() { + // ban on network has expired, remove it from our blocked list + netsToRemove = append(netsToRemove, netInfo.Network) + } else { + return true, &addrInfo.Info + } + } else { + return true, nil + } + } + + // remove expired networks + for _, expiredNet := range netsToRemove { + dm.RemoveNetwork(expiredNet) + } + + // no matches! + return false, nil +} diff --git a/irc/help.go b/irc/help.go index d96b5405..371195fc 100644 --- a/irc/help.go +++ b/irc/help.go @@ -36,7 +36,8 @@ Oragono supports the following channel modes: +i | Invite-only mode, only invited clients can join the channel. +m | Moderated mode, only privileged clients can talk on the channel. - +n | No-outside-messages mode, only users that are on the channel can send the channel messages. + +n | No-outside-messages mode, only users that are on the channel can send + | messages to it. +t | Only channel opers can modify the topic. +s | Secret mode, channel won't show up in /LIST or whois replies. @@ -95,6 +96,26 @@ Prints debug information about the IRCd.