Archives/smallstep-certificates
2
0
Fork 0
mirror of https://github.com/smallstep/certificates.git synced 2024-10-31 03:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused error from challenge validation controller creator

Browse Source
This commit is contained in:
Herman Slatman 2023-05-02 00:52:11 +02:00
parent 4f7a4f63f7
commit c73f157ea4
No known key found for this signature in database
GPG Key ID: F4D8A44EA0A75A4F
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
authority/provisioner/scep.go
View File

@ -96,7 +96,7 @@ type challengeValidationController struct {
// newChallengeValidationController creates a new challengeValidationController
// that performs challenge validation through webhooks.
func newChallengeValidationController(client *http.Client, webhooks []*Webhook) (*challengeValidationController, error) {
func newChallengeValidationController(client *http.Client, webhooks []*Webhook) *challengeValidationController {
scepHooks := []*Webhook{}
for _, wh := range webhooks {
if wh.Kind != linkedca.Webhook_SCEPCHALLENGE.String() {
@ -110,7 +110,7 @@ func newChallengeValidationController(client *http.Client, webhooks []*Webhook)
return &challengeValidationController{
client: client,
webhooks: scepHooks,
}, nil
}
}
var (
@ -177,12 +177,10 @@ func (s *SCEP) Init(config Config) (err error) {
return errors.New("only encryption algorithm identifiers from 0 to 4 are valid")
}
if s.challengeValidationController, err = newChallengeValidationController(
s.challengeValidationController = newChallengeValidationController(
config.WebhookClient,
s.GetOptions().GetWebhooks(),
); err != nil {
return fmt.Errorf("failed creating challenge validation controller: %w", err)
}
)
// TODO: add other, SCEP specific, options?

5
authority/provisioner/scep_test.go
View File

@ -134,15 +134,14 @@ func Test_challengeValidationController_Validate(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c, err := newChallengeValidationController(tt.fields.client, tt.fields.webhooks)
require.NoError(t, err)
c := newChallengeValidationController(tt.fields.client, tt.fields.webhooks)
if tt.server != nil {
defer tt.server.Close()
}
ctx := context.Background()
err = c.Validate(ctx, tt.args.challenge, tt.args.transactionID)
err := c.Validate(ctx, tt.args.challenge, tt.args.transactionID)
if tt.expErr != nil {
assert.EqualError(t, err, tt.expErr.Error())