Kichiyaki
/
gootp
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 7 Projects Releases Wiki Activity

refactor: don't export the generateOTP fn, extract a few constants, update command usages (#13)

This commit is contained in:
Dawid Wysokiński 2022-05-20 06:54:58 +02:00 committed by GitHub
parent 90682c1ea8
commit 174e667b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/otp.go
View File

@ -9,7 +9,17 @@ import (
"github.com/pquerna/otp/totp"
)
func GenerateOTP(entry Entry, t time.Time) (string, int64, error) {
const (
typeTOTP = "TOTP"
algorithmSHA1 = "SHA1"
algorithmSHA256 = "SHA256"
algorithmSHA512 = "SHA512"
algorithmMD5 = "MD5"
digitsSix = 6
digitsEight = 8
)
func generateOTP(entry Entry, t time.Time) (string, int64, error) {
algorithm, err := parseAlgorithm(entry.Algorithm)
if err != nil {
return "", 0, fmt.Errorf("parseAlgorithm: %w", err)
@ -21,7 +31,7 @@ func GenerateOTP(entry Entry, t time.Time) (string, int64, error) {
}
switch strings.ToUpper(entry.Type) {
case "TOTP":
case typeTOTP:
code, err := totp.GenerateCodeCustom(entry.Secret, t, totp.ValidateOpts{
Algorithm: algorithm,
Period: uint(entry.Period),
@ -39,13 +49,13 @@ func GenerateOTP(entry Entry, t time.Time) (string, int64, error) {
func parseAlgorithm(algorithm string) (otp.Algorithm, error) {
switch strings.ToUpper(algorithm) {
case "SHA1":
case algorithmSHA1:
return otp.AlgorithmSHA1, nil
case "SHA256":
case algorithmSHA256:
return otp.AlgorithmSHA256, nil
case "SHA512":
case algorithmSHA512:
return otp.AlgorithmSHA512, nil
case "MD5":
case algorithmMD5:
return otp.AlgorithmMD5, nil
default:
return 0, fmt.Errorf("unsupported algorithm: %s", algorithm)
@ -54,9 +64,9 @@ func parseAlgorithm(algorithm string) (otp.Algorithm, error) {
func parseDigits(digits uint8) (otp.Digits, error) {
switch digits {
case 6:
case digitsSix:
return otp.DigitsSix, nil
case 8:
case digitsEight:
return otp.DigitsEight, nil
default:
return 0, fmt.Errorf("unsupported digits: %d", digits)

2
internal/ui.go
View File

@ -104,7 +104,7 @@ func buildItemTitle(issuer, label string) string {
}
func buildItemDescription(e Entry, t time.Time) string {
otp, remaining, err := GenerateOTP(e, t)
otp, remaining, err := generateOTP(e, t)
if err != nil {
return err.Error()
}

3
main.go
View File

@ -34,6 +34,7 @@ func newApp() (*cli.App, error) {
return &cli.App{
Name: "gootp",
Usage: "2FA App compatible with andOTP backup file format",
Version: Version,
Action: func(c *cli.Context) error {
var err error
@ -86,7 +87,7 @@ func newApp() (*cli.App, error) {
func newDecryptCommand() *cli.Command {
return &cli.Command{
Name: "decrypt",
Usage: "decrypt backup file generated by andotp",
Usage: "Decrypts backup file generated by andotp",
Action: func(c *cli.Context) error {
var err error
password := []byte(c.String("password"))