sneak/go-ircevent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #115 from irccloud/sasl_fix

Browse Source 
Fix issue with SASL auth on some servers
This commit is contained in:
Thomas Jager 2019-03-01 11:50:49 +01:00 committed by GitHub
commit 4a9f9901cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
irc_sasl.go
View File

@ -12,15 +12,25 @@ type SASLResult struct {
Err error Err error
} }
// Check if a space-separated list of arguments contains a value.
func listContains(list string, value string) bool {
for _, arg_name := range strings.Split(strings.TrimSpace(list), " ") {
if arg_name == value {
return true
}
}
return false
}
func (irc *Connection) setupSASLCallbacks(result chan<- *SASLResult) { func (irc *Connection) setupSASLCallbacks(result chan<- *SASLResult) {
irc.AddCallback("CAP", func(e *Event) { irc.AddCallback("CAP", func(e *Event) {
if len(e.Arguments) == 3 { if len(e.Arguments) == 3 {
if e.Arguments[1] == "LS" { if e.Arguments[1] == "LS" {
if !strings.Contains(e.Arguments[2], "sasl") { if !listContains(e.Arguments[2], "sasl") {
result <- &SASLResult{true, errors.New("no SASL capability " + e.Arguments[2])} result <- &SASLResult{true, errors.New("no SASL capability " + e.Arguments[2])}
} }
} }
if e.Arguments[1] == "ACK" && e.Arguments[2] == "sasl" { if e.Arguments[1] == "ACK" && listContains(e.Arguments[2], "sasl") {
if irc.SASLMech != "PLAIN" { if irc.SASLMech != "PLAIN" {
result <- &SASLResult{true, errors.New("only PLAIN is supported")} result <- &SASLResult{true, errors.New("only PLAIN is supported")}
} }