jandd/cacert-gosignerclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Update cacert-gosigner dependency

Browse source 
- update dependency
- adapt to refactoring in messages package
This commit is contained in:
Jan Dittberner 2022-12-01 11:37:14 +01:00
parent 792675c8c5
commit 23174c9c7d
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -3,7 +3,7 @@ module git.cacert.org/cacert-gosignerclient
go 1.19 go 1.19
require ( require (
git.cacert.org/cacert-gosigner v0.0.0-20221130191226-de7e716a8274 git.cacert.org/cacert-gosigner v0.0.0-20221201103407-51afebf2c12f
github.com/balacode/go-delta v0.1.0 github.com/balacode/go-delta v0.1.0
github.com/shamaton/msgpackgen v0.3.0 github.com/shamaton/msgpackgen v0.3.0
github.com/sirupsen/logrus v1.9.0 github.com/sirupsen/logrus v1.9.0

2
go.sum
View file

@ -1,5 +1,7 @@
git.cacert.org/cacert-gosigner v0.0.0-20221130191226-de7e716a8274 h1:lGaIVUyXCtmDZ3ZhCYE44rpbvDF/JMDA/zrPgCZKMvc= git.cacert.org/cacert-gosigner v0.0.0-20221130191226-de7e716a8274 h1:lGaIVUyXCtmDZ3ZhCYE44rpbvDF/JMDA/zrPgCZKMvc=
git.cacert.org/cacert-gosigner v0.0.0-20221130191226-de7e716a8274/go.mod h1:mb8oBdxQ26GI3xT4b8B7hXYWGED9vvjPGxehmbicyc4= git.cacert.org/cacert-gosigner v0.0.0-20221130191226-de7e716a8274/go.mod h1:mb8oBdxQ26GI3xT4b8B7hXYWGED9vvjPGxehmbicyc4=
git.cacert.org/cacert-gosigner v0.0.0-20221201103407-51afebf2c12f h1:OLe/r/dK4WtQXjLCP3Naq/MUkkVkClvw2JIzLxNR2sI=
git.cacert.org/cacert-gosigner v0.0.0-20221201103407-51afebf2c12f/go.mod h1:mb8oBdxQ26GI3xT4b8B7hXYWGED9vvjPGxehmbicyc4=
github.com/balacode/go-delta v0.1.0 h1:pwz4CMn06P2bIaIfAx3GSabMPwJp/Ww4if+7SgPYa3I= github.com/balacode/go-delta v0.1.0 h1:pwz4CMn06P2bIaIfAx3GSabMPwJp/Ww4if+7SgPYa3I=
github.com/balacode/go-delta v0.1.0/go.mod h1:wLNrwTI3lHbPBvnLzqbHmA7HVVlm1u22XLvhbeA6t3o= github.com/balacode/go-delta v0.1.0/go.mod h1:wLNrwTI3lHbPBvnLzqbHmA7HVVlm1u22XLvhbeA6t3o=
github.com/balacode/zr v1.0.0 h1:MCupkEoXvrnCljc4KddiDOhR04ZLUAACgtKuo3o+9vc= github.com/balacode/zr v1.0.0 h1:MCupkEoXvrnCljc4KddiDOhR04ZLUAACgtKuo3o+9vc=

14
internal/client/client.go
View file

@ -168,11 +168,6 @@ func (c *Client) commandLoop(ctx context.Context) {
} }
case <-fetchCRLTimer.C: case <-fetchCRLTimer.C:
for _, crlInfo := range c.buildCRLInfo() { for _, crlInfo := range c.buildCRLInfo() {
announce, err := messages.BuildCommandAnnounce(messages.CmdFetchCRL)
if err != nil {
c.logger.WithError(err).Error("could not build fetch CRL command announce")
}
var lastKnown []byte var lastKnown []byte
if crlInfo.LastKnown != nil { if crlInfo.LastKnown != nil {
@ -180,7 +175,7 @@ func (c *Client) commandLoop(ctx context.Context) {
} }
c.commands <- &protocol.Command{ c.commands <- &protocol.Command{
Announce: announce, Announce: messages.BuildCommandAnnounce(messages.CmdFetchCRL),
Command: &messages.FetchCRLCommand{ Command: &messages.FetchCRLCommand{
IssuerID: crlInfo.Name, IssuerID: crlInfo.Name,
LastKnownID: lastKnown, LastKnownID: lastKnown,
@ -190,13 +185,8 @@ func (c *Client) commandLoop(ctx context.Context) {
fetchCRLTimer.Reset(c.config.FetchCRLInterval) fetchCRLTimer.Reset(c.config.FetchCRLInterval)
case <-healthTimer.C: case <-healthTimer.C:
announce, err := messages.BuildCommandAnnounce(messages.CmdHealth)
if err != nil {
c.logger.WithError(err).Error("could not build health command announce")
}
c.commands <- &protocol.Command{ c.commands <- &protocol.Command{
Announce: announce, Announce: messages.BuildCommandAnnounce(messages.CmdHealth),
Command: &messages.HealthCommand{}, Command: &messages.HealthCommand{},
} }

2
internal/handler/handler.go
View file

@ -164,7 +164,7 @@ func (s *SignerClientHandler) handleHealthResponse(r *messages.HealthResponse) {
signerInfo.UsableProfiles = make(map[string][]client.Profile) signerInfo.UsableProfiles = make(map[string][]client.Profile)
for certName, value := range item.MoreInfo { for certName, value := range item.MoreInfo {
certInfo, err := item.ParseCertificateInfo(value) certInfo, err := messages.ParseCertificateInfo(value)
if err != nil { if err != nil {
s.logger.WithError(err).Error("could not parse certificate information") s.logger.WithError(err).Error("could not parse certificate information")