From 35d053b46f70c4f0e97903596a41cbb3cfa37646 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Fri, 16 May 2025 20:11:20 -0400 Subject: [PATCH] Drop github.com/fortis/go-steam-totp (functionality now convered by github.com/pquerna/otp) --- core/copy.go | 6 +++--- go.mod | 3 +-- go.sum | 6 ++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/core/copy.go b/core/copy.go index 2e78f18..36c4f48 100644 --- a/core/copy.go +++ b/core/copy.go @@ -6,7 +6,7 @@ import ( "strings" "time" - steamtotp "github.com/fortis/go-steam-totp" + "github.com/pquerna/otp" "github.com/pquerna/otp/totp" "github.com/rwinkhart/go-boilerplate/back" "github.com/rwinkhart/libmutton/crypt" @@ -73,13 +73,13 @@ func GenTOTP(secret string, time time.Time, forSteam bool) string { var err error if forSteam { - totpToken, err = steamtotp.GenerateAuthCode(secret, time) + totpToken, err = totp.GenerateCodeCustom(secret, time, totp.ValidateOpts{Period: 30, Digits: 5, Encoder: otp.EncoderSteam}) } else { totpToken, err = totp.GenerateCode(secret, time) } if err != nil { - back.PrintError("Error generating TOTP code", back.ErrorOther, true) + back.PrintError("Error generating TOTP code: "+err.Error(), back.ErrorOther, true) } return totpToken diff --git a/go.mod b/go.mod index 12a6698..54cc3e2 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,8 @@ module github.com/rwinkhart/libmutton go 1.24.3 require ( - github.com/fortis/go-steam-totp v0.0.0-20171114202746-18e928674727 github.com/pkg/sftp v1.13.9 - github.com/pquerna/otp v1.4.1-0.20231130234153-3357de7c0481 + github.com/pquerna/otp v1.5.0 github.com/rwinkhart/go-boilerplate v0.0.0-20250509173525-20670ec7bb9c github.com/rwinkhart/rcw v0.1.2 golang.design/x/clipboard v0.7.0 // only for Android builds diff --git a/go.sum b/go.sum index 9b48b37..ca823ff 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,6 @@ github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fortis/go-steam-totp v0.0.0-20171114202746-18e928674727 h1:1RkPJqfzrncAuh9xgoslr9OplZskm+VRA9lkucHPQZ4= -github.com/fortis/go-steam-totp v0.0.0-20171114202746-18e928674727/go.mod h1:wRAWHbTlpt0C4kwnKoa42L2Phrv6uIq+c50P2uKpb7I= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -13,8 +11,8 @@ github.com/pkg/sftp v1.13.9 h1:4NGkvGudBL7GteO3m6qnaQ4pC0Kvf0onSVc9gR3EWBw= github.com/pkg/sftp v1.13.9/go.mod h1:OBN7bVXdstkFFN/gdnHPUb5TE8eb8G1Rp9wCItqjkkA= 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/pquerna/otp v1.4.1-0.20231130234153-3357de7c0481 h1:FkxbO331O7mS5EJkP+MCi0o2gswh/Aezs+//NmefrR8= -github.com/pquerna/otp v1.4.1-0.20231130234153-3357de7c0481/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= +github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs= +github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/rwinkhart/go-boilerplate v0.0.0-20250509173525-20670ec7bb9c h1:RIMnYf1MwsvmAr9E0/cpn7rTh8BWdfsQ2r31ITKJp2A= github.com/rwinkhart/go-boilerplate v0.0.0-20250509173525-20670ec7bb9c/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= github.com/rwinkhart/go-winio-easy-pipe-handles v0.0.0-20250407031321-96994a0e8410 h1:NhHwFM3Pgm6zRUfFKvi0p5ndjfFbVWsRwmmhyFlG4PE=