Merge branch 'wire-acme-extensions' into herman/remove-rusty-cli

acme/challenge.go

@@ -383,6 +383,7 @@ func wireOIDC01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSO
 		Handle    string `json:"name"`
 		Issuer    string `json:"iss,omitempty"`
 		GivenName string `json:"given_name,omitempty"`
+		KeyAuth   string `json:"keyauth"` // TODO(hs): use this property instead of the one in the payload after https://github.com/wireapp/rusty-jwt-tools/tree/fix/keyauth is done
 	}
 	err = idToken.Claims(&claims)
 	if err != nil {

authority/provisioner/dpop_options.go

@@ -43,12 +43,12 @@ func (o *DPOPOptions) GetTarget(deviceID string) (string, error) {
 		return "", errors.New("misconfigured target template configuration")
 	}
 	targetTemplate := o.GetDPOPTarget()
-	tmpl, err := template.New("DeviceID").Parse(targetTemplate)
+	tmpl, err := template.New("DeviceId").Parse(targetTemplate)
 	if err != nil {
 		return "", fmt.Errorf("failed parsing dpop template: %w", err)
 	}
 	buf := new(bytes.Buffer)
-	if err = tmpl.Execute(buf, struct{ DeviceID string }{DeviceID: deviceID}); err != nil {
+	if err = tmpl.Execute(buf, struct{ DeviceId string }{DeviceId: deviceID}); err != nil { //nolint:revive,stylecheck // TODO(hs): this requires changes in configuration
 		return "", fmt.Errorf("failed executing dpop template: %w", err)
 	}
 	return buf.String(), nil

authority/provisioner/oidc_options.go

@@ -56,12 +56,12 @@ func (o *OIDCOptions) GetTarget(deviceID string) (string, error) {
 		return "", errors.New("misconfigured target template configuration")
 	}
 	targetTemplate := o.Provider.IssuerURL
-	tmpl, err := template.New("DeviceID").Parse(targetTemplate)
+	tmpl, err := template.New("DeviceId").Parse(targetTemplate)
 	if err != nil {
 		return "", fmt.Errorf("failed parsing oidc template: %w", err)
 	}
 	buf := new(bytes.Buffer)
-	if err = tmpl.Execute(buf, struct{ DeviceID string }{DeviceID: deviceID}); err != nil {
+	if err = tmpl.Execute(buf, struct{ DeviceId string }{DeviceId: deviceID}); err != nil { //nolint:revive,stylecheck // TODO(hs): this requires changes in configuration
 		return "", fmt.Errorf("failed executing oidc template: %w", err)
 	}
 	return buf.String(), nil