fdb6304e32
Split the relativeTime function into relativeTime and relativeTimeFromString. Refactored the installer. Made a lot of progress with PgSQL and MSSQL support, mostly MSSQL. Made a lot of progress on the automated testing suite. Added eqcss to the file extension list. ..depressed.. Fixed various bugs here and there. gen_mysql.go is now properly excluded when the pgsql or mssql build tag is passed. The BBCode plugin is now always initialised prior to it's test. We've begun transitioning towards deserializing database times directly into time.Times rather than doing it every time on the spot. Added more dev flags. The tests now make use of a test database rather than the production database.
41 lines
1.0 KiB
Go
41 lines
1.0 KiB
Go
package install
|
|
|
|
import "encoding/base64"
|
|
import "crypto/rand"
|
|
import "golang.org/x/crypto/bcrypt"
|
|
|
|
const saltLength int = 32
|
|
|
|
// Generate a cryptographically secure set of random bytes..
|
|
func GenerateSafeString(length int) (string, error) {
|
|
rb := make([]byte, length)
|
|
_, err := rand.Read(rb)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return base64.URLEncoding.EncodeToString(rb), nil
|
|
}
|
|
|
|
// Generate a bcrypt hash from a password and a salt
|
|
func BcryptGeneratePassword(password string) (hashedPassword string, salt string, err error) {
|
|
salt, err = GenerateSafeString(saltLength)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
|
|
password = password + salt
|
|
hashedPassword, err = bcryptGeneratePasswordNoSalt(password)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
return hashedPassword, salt, nil
|
|
}
|
|
|
|
func bcryptGeneratePasswordNoSalt(password string) (hash string, err error) {
|
|
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return string(hashedPassword), nil
|
|
}
|