Add (PLAIN) SASL support

This commit is contained in:
Wim 2016-07-21 23:47:44 +02:00
parent 5fe4b749cf
commit 79ffb76f6e
7 changed files with 47 additions and 13 deletions

View File

@ -108,6 +108,9 @@ func NewBridge(name string, config *Config, kind string) *Bridge {
func (b *Bridge) createIRC(name string) *irc.Connection { func (b *Bridge) createIRC(name string) *irc.Connection {
i := irc.IRC(b.Config.IRC.Nick, b.Config.IRC.Nick) i := irc.IRC(b.Config.IRC.Nick, b.Config.IRC.Nick)
i.UseTLS = b.Config.IRC.UseTLS i.UseTLS = b.Config.IRC.UseTLS
i.UseSASL = b.Config.IRC.UseSASL
i.SASLLogin = b.Config.IRC.NickServNick
i.SASLPassword = b.Config.IRC.NickServPassword
i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.IRC.SkipTLSVerify} i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.IRC.SkipTLSVerify}
if b.Config.IRC.Password != "" { if b.Config.IRC.Password != "" {
i.Password = b.Config.IRC.Password i.Password = b.Config.IRC.Password

View File

@ -9,6 +9,7 @@ import (
type Config struct { type Config struct {
IRC struct { IRC struct {
UseTLS bool UseTLS bool
UseSASL bool
SkipTLSVerify bool SkipTLSVerify bool
Server string Server string
Nick string Nick string

View File

@ -11,6 +11,11 @@ Server="irc.freenode.net:6667"
#OPTIONAL (default false) #OPTIONAL (default false)
UseTLS=false UseTLS=false
#Enable SASL (PLAIN) authentication. (freenode requires this from eg AWS hosts)
#It uses NickServNick and NickServPassword as login and password
#OPTIONAL (deefault false)
UseSASL=false
#Enable to not verify the certificate on your irc server. i #Enable to not verify the certificate on your irc server. i
#e.g. when using selfsigned certificates #e.g. when using selfsigned certificates
#OPTIONAL (default false) #OPTIONAL (default false)
@ -21,6 +26,7 @@ SkipTLSVerify=true
Nick="matterbot" Nick="matterbot"
#If you registered your bot with a service like Nickserv on freenode. #If you registered your bot with a service like Nickserv on freenode.
#Also being used when UseSASL=true
#OPTIONAL #OPTIONAL
NickServNick="nickserv" NickServNick="nickserv"
NickServPassword="secret" NickServPassword="secret"

View File

@ -7,7 +7,7 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
) )
var version = "0.5.0-beta1" var version = "0.5.0-beta2"
func init() { func init() {
log.SetFormatter(&log.TextFormatter{FullTimestamp: true}) log.SetFormatter(&log.TextFormatter{FullTimestamp: true})

View File

@ -439,6 +439,25 @@ func (irc *Connection) Connect(server string) error {
if len(irc.Password) > 0 { if len(irc.Password) > 0 {
irc.pwrite <- fmt.Sprintf("PASS %s\r\n", irc.Password) irc.pwrite <- fmt.Sprintf("PASS %s\r\n", irc.Password)
} }
resChan := make(chan *SASLResult)
if irc.UseSASL {
irc.setupSASLCallbacks(resChan)
irc.pwrite <- fmt.Sprintf("CAP LS\r\n")
// request SASL
irc.pwrite <- fmt.Sprintf("CAP REQ :sasl\r\n")
// if sasl request doesn't complete in 15 seconds, close chan and timeout
select {
case res := <-resChan:
if res.Failed {
close(resChan)
return res.Err
}
case <-time.After(time.Second * 15):
close(resChan)
return errors.New("SASL setup timed out. This shouldn't happen.")
}
}
irc.pwrite <- fmt.Sprintf("NICK %s\r\n", irc.nick) irc.pwrite <- fmt.Sprintf("NICK %s\r\n", irc.nick)
irc.pwrite <- fmt.Sprintf("USER %s 0.0.0.0 0.0.0.0 :%s\r\n", irc.user, irc.user) irc.pwrite <- fmt.Sprintf("USER %s 0.0.0.0 0.0.0.0 :%s\r\n", irc.user, irc.user)
return nil return nil
@ -466,6 +485,7 @@ func IRC(nick, user string) *Connection {
KeepAlive: 4 * time.Minute, KeepAlive: 4 * time.Minute,
Timeout: 1 * time.Minute, Timeout: 1 * time.Minute,
PingFreq: 15 * time.Minute, PingFreq: 15 * time.Minute,
SASLMech: "PLAIN",
QuitMessage: "", QuitMessage: "",
} }
irc.setupCallbacks() irc.setupCallbacks()

View File

@ -14,16 +14,20 @@ import (
type Connection struct { type Connection struct {
sync.WaitGroup sync.WaitGroup
Debug bool Debug bool
Error chan error Error chan error
Password string Password string
UseTLS bool UseTLS bool
TLSConfig *tls.Config UseSASL bool
Version string SASLLogin string
Timeout time.Duration SASLPassword string
PingFreq time.Duration SASLMech string
KeepAlive time.Duration TLSConfig *tls.Config
Server string Version string
Timeout time.Duration
PingFreq time.Duration
KeepAlive time.Duration
Server string
socket net.Conn socket net.Conn
pwrite chan string pwrite chan string

4
vendor/manifest vendored
View File

@ -113,8 +113,8 @@
{ {
"importpath": "github.com/thoj/go-ircevent", "importpath": "github.com/thoj/go-ircevent",
"repository": "https://github.com/thoj/go-ircevent", "repository": "https://github.com/thoj/go-ircevent",
"vcs": "", "vcs": "git",
"revision": "da78ed515c0f0833e7a92c7cc52898176198e2c1", "revision": "98c1902dd2097f38142384167e60206ba26f1585",
"branch": "master", "branch": "master",
"notests": true "notests": true
}, },