e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Implement SCRAM-SHA-256

Browse source
This commit is contained in:
Ken-Håvard Lieng 2020-06-04 02:28:41 +02:00
parent ead3b37cf9
commit 876d9ebdd0
36 changed files with 5089 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/irc.go
View file

@ -39,6 +39,8 @@ func connectIRC(server *storage.Server, state *State, srcIP []byte) *irc.Client
Nick: server.Nick,
Username: server.Username,
Realname: server.Realname,
Account: server.Account,
Password: server.Password,
Version: fmt.Sprintf("Dispatch %s (git: %s)", version.Tag, version.Commit),
Source: "https://github.com/khlieng/dispatch",
}
@ -57,19 +59,12 @@ func connectIRC(server *storage.Server, state *State, srcIP []byte) *irc.Client
ircCfg.Username = hex.EncodeToString(srcIP)
}
if server.Account != "" && server.Password != "" {
ircCfg.SASL = &irc.SASLPlain{
Username: server.Account,
Password: server.Password,
}
}
if server.ServerPassword == "" &&
cfg.Defaults.ServerPassword != "" &&
server.Host == cfg.Defaults.Host {
ircCfg.Password = cfg.Defaults.ServerPassword
ircCfg.ServerPassword = cfg.Defaults.ServerPassword
} else {
ircCfg.Password = server.ServerPassword
ircCfg.ServerPassword = server.ServerPassword
}
i := irc.NewClient(&ircCfg)