steven/hyp
1
1
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

Compare commits

base: steven:1e195c3768d43e1a2ee7f3bda7ca3ebd937a5404
Branches Tags
steven:main
steven:0.0.2
steven:0.0.1
steven:0.0.3
...
compare: steven:af0c9559876c44624a840d36625b4c0af5f31177
Branches Tags
steven:main
steven:0.0.2
steven:0.0.1
steven:0.0.3

3 Commits
1e195c3768 ... af0c955987

Author SHA1 Message Date
Steven Polley
af0c955987 upgrade golang.org/x/exp package
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-04-20 13:28:25 -06:00
Steven Polley
caf5bd5af6 Fix incorrect string formatting directive 2024-04-20 13:27:18 -06:00
Steven Polley
a52f3f0d43 fix incorrect logic in rotateSequence 
This was introduced in the previous few commits when adding support for multiple secrets in knockd.  The logic to push and pop entries from the knockSequences slice needed to be adjusted to cound for the number of secrets that are loaded by hypd.
 2024-04-20 13:27:00 -06:00
5 changed files with 8 additions and 11 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ hyp.secret
hypd/hypd hypd/hypd
hyp/hyp hyp/hyp
hypd/hypdconfig.json hypd/hypdconfig.json
hypd/secrets/

2
go.mod
View File

@ -10,6 +10,6 @@ require (
require ( require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/sys v0.19.0 // indirect golang.org/x/sys v0.19.0 // indirect
) )

8
go.sum
View File

@ -18,12 +18,8 @@ github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc=
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

2
hyp/cmd/knock.go
View File

@ -54,7 +54,7 @@ Example usage:
decodedSecret, err := base32.StdEncoding.DecodeString(string(secretBytes)) decodedSecret, err := base32.StdEncoding.DecodeString(string(secretBytes))
if err != nil { if err != nil {
log.Fatalf("failed to base32 decode secret '%s': %w", secretFilePath, err) log.Fatalf("failed to base32 decode secret '%s': %v", secretFilePath, err)
} }
ports, err := otphyp.GeneratePorts(decodedSecret, time.Now()) ports, err := otphyp.GeneratePorts(decodedSecret, time.Now())

4
hypd/server/packet.go
View File

@ -175,7 +175,7 @@ func rotateSequence() {
for { for {
// Generate new knock sequences with time skew support // Generate new knock sequences with time skew support
t := time.Now().Add(time.Second * -30) t := time.Now().Add(time.Second * -30)
for i := len(knockSequences); i < 3; i++ { for i := len(knockSequences) / len(sharedSecrets); i < 3; i++ {
for _, secret := range sharedSecrets { for _, secret := range sharedSecrets {
portSequence, err := otphyp.GeneratePorts(secret, t.Add((time.Second * 30 * time.Duration(i)))) portSequence, err := otphyp.GeneratePorts(secret, t.Add((time.Second * 30 * time.Duration(i))))
if err != nil { if err != nil {
@ -190,7 +190,7 @@ func rotateSequence() {
time.Sleep(time.Until(time.Now().Truncate(time.Second * 30).Add(time.Second * 30))) time.Sleep(time.Until(time.Now().Truncate(time.Second * 30).Add(time.Second * 30)))
// pop first value, next iteration pushes new value // pop first value, next iteration pushes new value
knockSequences = knockSequences[1:] knockSequences = knockSequences[len(sharedSecrets):]
} }
} }