External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

do bcrypt in the client main routine

Browse source
This commit is contained in:
Jeremy Latt 2014-02-23 22:21:39 -08:00
parent 2229645a39
commit be089e7f5f
6 changed files with 179 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

30
irc/config.go
View file

@ -1,10 +1,24 @@
package irc
import (
"encoding/base64"
"encoding/json"
"log"
"os"
"path/filepath"
)
func decodePassword(password string) []byte {
if password == "" {
return nil
}
bytes, err := base64.StdEncoding.DecodeString(password)
if err != nil {
log.Fatal(err)
}
return bytes
}
type Config struct {
Debug map[string]bool
Listeners []ListenerConfig
@ -14,11 +28,19 @@ type Config struct {
Password string
}
func (conf *Config) PasswordBytes() []byte {
return decodePassword(conf.Password)
}
type OperatorConfig struct {
Name string
Password string
}
func (conf *OperatorConfig) PasswordBytes() []byte {
return decodePassword(conf.Password)
}
type ListenerConfig struct {
Net string
Address string
@ -30,10 +52,10 @@ func (config *ListenerConfig) IsTLS() bool {
return (config.Key != "") && (config.Certificate != "")
}
func LoadConfig() (config *Config, err error) {
func LoadConfig(filename string) (config *Config, err error) {
config = &Config{}
file, err := os.Open("ergonomadic.json")
file, err := os.Open(filename)
if err != nil {
return
}
@ -44,6 +66,10 @@ func LoadConfig() (config *Config, err error) {
if err != nil {
return
}
dir := filepath.Dir(filename)
config.MOTD = filepath.Join(dir, config.MOTD)
for _, lconf := range config.Listeners {
if lconf.Net == "" {
lconf.Net = "tcp"