d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-14 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse Source 
1) gen_otp supports single use OTP secrets
2) improve database config check logic
3) reconnect websocket routine to engine (apart from the exchange pair syncer)
4) ImPrOvE CoNsIsTeNcY wItH LoG OuTpUt
This commit is contained in:
Adrian Gallagher
2019-08-26 12:46:53 +10:00
parent c1f9e04015
commit f6afeee800
5 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/gen_otp/otp_gen.go
View File

@@ -2,13 +2,17 @@ package main
import (
"flag"
"fmt"
"log"
"time"
"github.com/pquerna/otp/totp"
"github.com/thrasher-corp/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/core"
)
const defaultSleepTime = time.Second * 30
func containsOTP(cfg *config.Config) bool {
for x := range cfg.Exchanges {
if cfg.Exchanges[x].API.Credentials.OTPSecret != "" {
@@ -19,39 +23,66 @@ func containsOTP(cfg *config.Config) bool {
}
func main() {
var inFile string
var cfgFile, code string
var single bool
var err error
defaultCfg, err := config.GetFilePath("")
if err != nil {
log.Fatal(err)
}
flag.StringVar(&inFile, "infile", defaultCfg, "The config input file to process.")
flag.StringVar(&cfgFile, "config", defaultCfg, "The config input file to process.")
flag.BoolVar(&single, "single", false, "prompt for single use OTP code gen")
flag.Parse()
log.Println("GoCryptoTrader: OTP code generator tool.")
log.Println(core.Copyright)
// Handle single use OTP code gen
if single {
var input string
for {
log.Println("Please enter in your OTP secret:")
fmt.Scanln(&input)
if input != "" {
break
}
}
for {
code, err = totp.GenerateCode(input, time.Now())
if err != nil {
log.Fatalf("Unable to generate OTP code. Err: %s", err)
}
log.Printf("OTP code: %s\n", code)
time.Sleep(defaultSleepTime)
}
}
// Otherwise default to loading the config file and generating OTP codes from it
var cfg config.Config
err = cfg.LoadConfig(inFile)
err = cfg.LoadConfig(cfgFile)
if err != nil {
log.Fatal(err)
}
log.Println("Loaded config file.")
if !containsOTP(&cfg) {
log.Println("No exchanges with OTP code stored. Exiting.")
log.Fatal("No exchanges with OTP code stored. Exiting.")
}
for {
for x := range cfg.Exchanges {
if cfg.Exchanges[x].API.Credentials.OTPSecret != "" {
code, err := totp.GenerateCode(cfg.Exchanges[x].API.Credentials.OTPSecret, time.Now())
code, err = totp.GenerateCode(cfg.Exchanges[x].API.Credentials.OTPSecret, time.Now())
if err != nil {
log.Printf("Exchange %s: Failed to generate OTP code. Err: %s", cfg.Exchanges[x].Name, err)
log.Printf("Exchange %s: Failed to generate OTP code. Err: %s\n", cfg.Exchanges[x].Name, err)
continue
}
log.Printf("%s: %s", cfg.Exchanges[x].Name, code)
log.Printf("%s: %s\n", cfg.Exchanges[x].Name, code)
}
time.Sleep(time.Second)
}
time.Sleep(defaultSleepTime)
}
}