change totp secret length; fixes
This commit is contained in:
Ilya Sosnovsky
parent
5cabdcb686
commit
bc7f26f14d
4 changed files with 22 additions and 19 deletions
3
go.mod
3
go.mod
|
|
@ -5,9 +5,10 @@ go 1.14
|
|||
require (
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
|
||||
github.com/alecthomas/units v0.0.0-20201120081800-1786d5ef83d4 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3
|
||||
github.com/mattn/go-sqlite3 v1.14.16
|
||||
github.com/sirupsen/logrus v1.9.0
|
||||
github.com/stretchr/testify v1.7.0 // indirect
|
||||
golang.org/x/crypto v0.2.0
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6
|
||||
)
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -11,8 +11,6 @@ github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwp
|
|||
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
||||
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
|
|
@ -33,9 +31,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
|
|||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
|
||||
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
version = "1.0.7"
|
||||
version = "1.0.8"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
@ -112,7 +112,10 @@ func main() {
|
|||
kingpin.Fatalf(authErr.Error())
|
||||
} else if authSuccessful {
|
||||
fmt.Println("Authorization successful")
|
||||
} else {
|
||||
fmt.Println("Authorization failed")
|
||||
}
|
||||
|
||||
} else {
|
||||
fmt.Println("Please provide only one type of auth flag")
|
||||
os.Exit(1)
|
||||
|
|
@ -131,6 +134,8 @@ func main() {
|
|||
kingpin.Fatalf(appErr.Error())
|
||||
} else if appConfigured {
|
||||
fmt.Println("App configured")
|
||||
} else {
|
||||
fmt.Println("App not configured yet")
|
||||
}
|
||||
case getSecretCommand.FullCommand():
|
||||
wrap(openvpnUser.GetUserOtpSecret(*getSecretCommandUserFlag))
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import (
|
|||
"encoding/base32"
|
||||
"fmt"
|
||||
"github.com/dgryski/dgoogauth"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
"os"
|
||||
"strings"
|
||||
|
|
@ -18,7 +17,7 @@ func (oUser *OpenvpnUser) InitDb() {
|
|||
checkErr(err)
|
||||
_, err = oUser.Database.Exec("CREATE TABLE IF NOT EXISTS migrations(id integer not null primary key autoincrement, name string)")
|
||||
checkErr(err)
|
||||
log.Infof("Database initialized at %v", oUser.Database.Driver())
|
||||
fmt.Println("Database initialized")
|
||||
}
|
||||
|
||||
func (oUser *OpenvpnUser) CreateUser(username, password string) (string, error) {
|
||||
|
|
@ -150,7 +149,6 @@ func (oUser *OpenvpnUser) listUsers(all bool) []User {
|
|||
u := User{}
|
||||
err = rows.Scan(&u.id, &u.name, &u.password, &u.revoked, &u.deleted, &u.appConfigured)
|
||||
if err != nil {
|
||||
//log.Error(err)
|
||||
continue
|
||||
}
|
||||
users = append(users, u)
|
||||
|
|
@ -169,7 +167,7 @@ func (oUser *OpenvpnUser) PrintUsers(all bool) {
|
|||
}
|
||||
_ = w.Flush()
|
||||
} else {
|
||||
log.Print("No users created yet")
|
||||
fmt.Println("No users created yet")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -186,10 +184,9 @@ func (oUser *OpenvpnUser) ChangeUserPassword(username, password string) (string,
|
|||
func (oUser *OpenvpnUser) RegisterOtpSecret(username, secret string) (string, error) {
|
||||
if oUser.userIsActive(username) {
|
||||
if secret == "generate" {
|
||||
randomStr := RandStr(6, "alphanum")
|
||||
randomStr := RandStr(20, "num")
|
||||
|
||||
secret = base32.StdEncoding.EncodeToString([]byte(randomStr))
|
||||
log.Debug("new generated secret for user %s: %s", username, secret)
|
||||
}
|
||||
|
||||
_, err := oUser.Database.Exec("UPDATE users SET secret = $1 WHERE username = $2", secret, username)
|
||||
|
|
@ -258,7 +255,11 @@ func (oUser *OpenvpnUser) GetUserOtpSecret(username string) (string, error) {
|
|||
func (oUser *OpenvpnUser) IsSecondFactorEnabled(username string) (bool, error) {
|
||||
if oUser.userIsActive(username) {
|
||||
u := User{}
|
||||
_ = oUser.Database.QueryRow("SELECT username, appConfigured FROM users WHERE username = $1", username).Scan(&u.name, &u.appConfigured)
|
||||
err := oUser.Database.QueryRow("SELECT username, app_configured FROM users WHERE username = $1", username).Scan(&u.name, &u.appConfigured)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
if u.name == username {
|
||||
return u.appConfigured, nil
|
||||
}
|
||||
|
|
@ -290,10 +291,10 @@ func (oUser *OpenvpnUser) AuthUser(username, password, totp string) (bool, error
|
|||
|
||||
trimmedToken := strings.TrimSpace(totp)
|
||||
|
||||
ok, err := otpConfig.Authenticate(trimmedToken)
|
||||
ok, authErr := otpConfig.Authenticate(trimmedToken)
|
||||
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
if authErr != nil {
|
||||
fmt.Println(authErr)
|
||||
}
|
||||
if ok {
|
||||
return true, nil
|
||||
|
|
@ -329,17 +330,17 @@ func (oUser *OpenvpnUser) MigrateDb() {
|
|||
if err == sql.ErrNoRows {
|
||||
continue
|
||||
}
|
||||
log.Fatal(err)
|
||||
fmt.Println(err)
|
||||
}
|
||||
if c == 0 {
|
||||
log.Info("Migrating database with new migration %s\n", migration.name)
|
||||
fmt.Printf("Migrating database with new migration %s\n", migration.name)
|
||||
_, err = oUser.Database.Exec(migration.sql)
|
||||
checkErr(err)
|
||||
_, err = oUser.Database.Exec("INSERT INTO migrations(name) VALUES ($1)", migration.name)
|
||||
checkErr(err)
|
||||
}
|
||||
}
|
||||
log.Info("Migrations are up to date")
|
||||
fmt.Println("Migrations are up to date")
|
||||
}
|
||||
|
||||
func checkErr(err error) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue