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

Dont send default server password to the client

Browse source
This commit is contained in:
Ken-Håvard Lieng 2016-01-27 18:08:20 +01:00
parent 1a7360a573
commit 2e8418516a
4 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/index_data.go
View file

@ -13,7 +13,7 @@ type connectDefaults struct {
Name string `json:"name"`
Address string `json:"address"`
Channels []string `json:"channels"`
Password string `json:"password"`
Password bool `json:"password"`
SSL bool `json:"ssl"`
}
@ -51,7 +51,7 @@ func getIndexData(r *http.Request, session *Session) *indexData {
Name: viper.GetString("defaults.name"),
Address: viper.GetString("defaults.address"),
Channels: viper.GetStringSlice("defaults.channels"),
Password: viper.GetString("defaults.password"),
Password: viper.GetString("defaults.password") != "",
SSL: viper.GetBool("defaults.ssl"),
},
Servers: servers,

6
server/websocket_handler.go
View file

@ -97,6 +97,12 @@ func (h *wsHandler) connect(b []byte) {
i.Password = data.Password
i.Realname = data.Realname
if data.Password == "" && viper.GetString("defaults.password") != "" {
i.Password = viper.GetString("defaults.password")
} else {
i.Password = data.Password
}
if cert := h.session.user.GetCertificate(); cert != nil {
i.TLSConfig = &tls.Config{
Certificates: []tls.Certificate{*cert},