mirror/goirc
1
0
Fork 0
mirror of https://github.com/fluffle/goirc synced 2025-05-14 19:43:20 +00:00
Code Issues Releases Wiki Activity

Add SASL authentication support

Browse source 
This hacks together support for IRCv3.1 SASL. Currently only SASL PLAIN
is supported, but it's implemented in a way that adding support for
other types should not require too many changes to the current code.
This commit is contained in:
Taavi Väänänen 2022-10-30 12:01:33 +02:00 • committed by Alex Bee
parent bbbcc9aa5b
commit e64b5d47c3
6 changed files with 234 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/connection.go
View file

@ -13,6 +13,7 @@ import (
"sync"
"time"
"github.com/emersion/go-sasl"
"github.com/fluffle/goirc/logging"
"github.com/fluffle/goirc/state"
"golang.org/x/net/proxy"
@ -51,6 +52,9 @@ type Conn struct {
// Capabilites currently enabled
currCaps *capSet
// SASL internals
saslRemainingData []byte
// CancelFunc and WaitGroup for goroutines
die context.CancelFunc
wg sync.WaitGroup
@ -101,6 +105,9 @@ type Config struct {
// A list of capabilities to request to the server during registration.
Capabilites []string
// SASL configuration to use to authenticate the connection.
Sasl sasl.Client
// Replaceable function to customise the 433 handler's new nick.
// By default an underscore "_" is appended to the current nick.
NewNick func(string) string
@ -216,16 +223,22 @@ func Client(cfg *Config) *Conn {
}
}
if cfg.Sasl != nil && !cfg.EnableCapabilityNegotiation {
logging.Warn("Enabling capability negotiation as it's required for SASL")
cfg.EnableCapabilityNegotiation = true
}
conn := &Conn{
cfg: cfg,
dialer: dialer,
intHandlers: handlerSet(),
fgHandlers: handlerSet(),
bgHandlers: handlerSet(),
stRemovers: make([]Remover, 0, len(stHandlers)),
lastsent: time.Now(),
supportedCaps: capabilitySet(),
currCaps: capabilitySet(),
cfg: cfg,
dialer: dialer,
intHandlers: handlerSet(),
fgHandlers: handlerSet(),
bgHandlers: handlerSet(),
stRemovers: make([]Remover, 0, len(stHandlers)),
lastsent: time.Now(),
supportedCaps: capabilitySet(),
currCaps: capabilitySet(),
saslRemainingData: nil,
}
conn.addIntHandlers()
return conn
@ -245,10 +258,9 @@ func (conn *Conn) Connected() bool {
// affect client behaviour. To disable flood protection temporarily,
// for example, a handler could do:
//
// conn.Config().Flood = true
// // Send many lines to the IRC server, risking "excess flood"
// conn.Config().Flood = false
//
// conn.Config().Flood = true
// // Send many lines to the IRC server, risking "excess flood"
// conn.Config().Flood = false
func (conn *Conn) Config() *Config {
return conn.cfg
}