lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-22 14:55:16 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

auth: store otp key url instead of just secret

Browse Source
This commit is contained in:
c9s 2022-04-17 00:18:48 +08:00
parent 6c7b6c6def
commit 63f525970f
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/bbgo/environment.go
View File

@ -737,9 +737,9 @@ func getAuthStoreID() string {
func (environ *Environment) setupInteraction(persistence service.PersistenceService) error { func (environ *Environment) setupInteraction(persistence service.PersistenceService) error {
var otpQRCodeImagePath = fmt.Sprintf("otp.png") var otpQRCodeImagePath = fmt.Sprintf("otp.png")
var key *otp.Key var key *otp.Key
var keySecret string var keyURL string
var authStore = environ.getAuthStore(persistence) var authStore = environ.getAuthStore(persistence)
if err := authStore.Load(&keySecret); err != nil { if err := authStore.Load(&keyURL); err != nil {
log.Warnf("telegram session not found, generating new one-time password key for new telegram session...") log.Warnf("telegram session not found, generating new one-time password key for new telegram session...")
newKey, err := setupNewOTPKey(otpQRCodeImagePath) newKey, err := setupNewOTPKey(otpQRCodeImagePath)
@ -748,22 +748,35 @@ func (environ *Environment) setupInteraction(persistence service.PersistenceServ
} }
key = newKey key = newKey
keySecret = key.Secret() keyURL = key.URL()
if err := authStore.Save(keySecret); err != nil { if err := authStore.Save(keyURL); err != nil {
return err return err
} }
printOtpAuthGuide(otpQRCodeImagePath) printOtpAuthGuide(otpQRCodeImagePath)
} else if keySecret != "" { } else if keyURL != "" {
key, err = otp.NewKeyFromURL(keySecret) key, err = otp.NewKeyFromURL(keyURL)
if err != nil { if err != nil {
log.WithError(err).Errorf("can not load otp key from url: %s, generating new otp key", keyURL)
newKey, err := setupNewOTPKey(otpQRCodeImagePath)
if err != nil {
return errors.Wrapf(err, "failed to setup totp (time-based one time password) key")
}
key = newKey
keyURL = key.URL()
if err := authStore.Save(keyURL); err != nil {
return err return err
} }
printOtpAuthGuide(otpQRCodeImagePath)
} else {
log.Infof("otp key loaded: %s", util.MaskKey(key.Secret())) log.Infof("otp key loaded: %s", util.MaskKey(key.Secret()))
printOtpAuthGuide(otpQRCodeImagePath) printOtpAuthGuide(otpQRCodeImagePath)
} }
}
authStrict := false authStrict := false
authMode := interact.AuthModeToken authMode := interact.AuthModeToken

4
pkg/interact/auth.go
View File

@ -92,7 +92,7 @@ func (it *AuthInteract) Commands(interact *Interact) {
reply.Message("Enter your one-time password") reply.Message("Enter your one-time password")
default: default:
log.Warn("unexpected auth mode: %s", it.Mode) log.Warnf("unexpected auth mode: %s", it.Mode)
} }
return nil return nil
}).NamedNext(StateAuthenticated, func(code string, reply Reply, session Session) error { }).NamedNext(StateAuthenticated, func(code string, reply Reply, session Session) error {
@ -116,7 +116,7 @@ func (it *AuthInteract) Commands(interact *Interact) {
reply.Message("Incorrect one-time pass code") reply.Message("Incorrect one-time pass code")
default: default:
log.Warn("unexpected auth mode: %s", it.Mode) log.Warnf("unexpected auth mode: %s", it.Mode)
} }
return ErrAuthenticationFailed return ErrAuthenticationFailed