mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-13 07:29:30 +01:00
move password handling into a single file
This commit is contained in:
parent
b421971b61
commit
9aa7debbfe
@ -1,24 +1,12 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.crypto/bcrypt"
|
||||
"encoding/base64"
|
||||
"flag"
|
||||
"fmt"
|
||||
"github.com/jlatt/ergonomadic/irc"
|
||||
"log"
|
||||
"os"
|
||||
)
|
||||
|
||||
func genPasswd(passwd string) {
|
||||
crypted, err := bcrypt.GenerateFromPassword([]byte(passwd), bcrypt.MinCost)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
encoded := base64.StdEncoding.EncodeToString(crypted)
|
||||
fmt.Println(encoded)
|
||||
}
|
||||
|
||||
func main() {
|
||||
conf := flag.String("conf", "ergonomadic.json", "ergonomadic config file")
|
||||
initdb := flag.Bool("initdb", false, "initialize database")
|
||||
@ -26,7 +14,11 @@ func main() {
|
||||
flag.Parse()
|
||||
|
||||
if *passwd != "" {
|
||||
genPasswd(*passwd)
|
||||
encoded, err := irc.GenerateEncodedPassword(*passwd)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
fmt.Println(encoded)
|
||||
return
|
||||
}
|
||||
|
||||
@ -37,6 +29,7 @@ func main() {
|
||||
|
||||
if *initdb {
|
||||
irc.InitDB(config.Database())
|
||||
log.Println("database initialized: " + config.Database())
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
package irc
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.crypto/bcrypt"
|
||||
"code.google.com/p/go.text/unicode/norm"
|
||||
"errors"
|
||||
"fmt"
|
||||
@ -214,7 +213,7 @@ func (cmd *PassCommand) CheckPassword() {
|
||||
if cmd.hash == nil {
|
||||
return
|
||||
}
|
||||
cmd.err = bcrypt.CompareHashAndPassword(cmd.hash, cmd.password)
|
||||
cmd.err = ComparePassword(cmd.hash, cmd.password)
|
||||
}
|
||||
|
||||
func NewPassCommand(args []string) (editableCommand, error) {
|
||||
|
@ -1,7 +1,6 @@
|
||||
package irc
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"log"
|
||||
"os"
|
||||
@ -9,10 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func decodePassword(password string) []byte {
|
||||
if password == "" {
|
||||
return nil
|
||||
}
|
||||
bytes, err := base64.StdEncoding.DecodeString(password)
|
||||
bytes, err := DecodePassword(password)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
37
irc/password.go
Normal file
37
irc/password.go
Normal file
@ -0,0 +1,37 @@
|
||||
package irc
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.crypto/bcrypt"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
)
|
||||
|
||||
var (
|
||||
EmptyPasswordError = errors.New("empty password")
|
||||
)
|
||||
|
||||
func GenerateEncodedPassword(passwd string) (encoded string, err error) {
|
||||
if passwd == "" {
|
||||
err = EmptyPasswordError
|
||||
return
|
||||
}
|
||||
bcrypted, err := bcrypt.GenerateFromPassword([]byte(passwd), bcrypt.MinCost)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
encoded = base64.StdEncoding.EncodeToString(bcrypted)
|
||||
return
|
||||
}
|
||||
|
||||
func DecodePassword(encoded string) (decoded []byte, err error) {
|
||||
if encoded == "" {
|
||||
err = EmptyPasswordError
|
||||
return
|
||||
}
|
||||
decoded, err = base64.StdEncoding.DecodeString(encoded)
|
||||
return
|
||||
}
|
||||
|
||||
func ComparePassword(hash, password []byte) error {
|
||||
return bcrypt.CompareHashAndPassword(hash, password)
|
||||
}
|
Loading…
Reference in New Issue
Block a user