Skip to content

Commit 9a21208

Browse files
committed
Add deduplication of policy configuration values
1 parent f2f9cb8 commit 9a21208

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

authority/admin/api/policy.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ func (par *PolicyAdminResponder) CreateAuthorityPolicy(w http.ResponseWriter, r
8888

8989
applyConditionalDefaults(newPolicy)
9090

91+
newPolicy.Deduplicate()
92+
9193
adm := linkedca.AdminFromContext(ctx)
9294

9395
var createdPolicy *linkedca.Policy
@@ -129,6 +131,8 @@ func (par *PolicyAdminResponder) UpdateAuthorityPolicy(w http.ResponseWriter, r
129131
return
130132
}
131133

134+
newPolicy.Deduplicate()
135+
132136
adm := linkedca.AdminFromContext(ctx)
133137

134138
var updatedPolicy *linkedca.Policy
@@ -207,6 +211,8 @@ func (par *PolicyAdminResponder) CreateProvisionerPolicy(w http.ResponseWriter,
207211

208212
applyConditionalDefaults(newPolicy)
209213

214+
newPolicy.Deduplicate()
215+
210216
prov.Policy = newPolicy
211217

212218
if err := par.auth.UpdateProvisioner(ctx, prov); err != nil {
@@ -241,6 +247,8 @@ func (par *PolicyAdminResponder) UpdateProvisionerPolicy(w http.ResponseWriter,
241247
return
242248
}
243249

250+
newPolicy.Deduplicate()
251+
244252
prov.Policy = newPolicy
245253
if err := par.auth.UpdateProvisioner(ctx, prov); err != nil {
246254
var pe *authority.PolicyError
@@ -311,6 +319,8 @@ func (par *PolicyAdminResponder) CreateACMEAccountPolicy(w http.ResponseWriter,
311319
return
312320
}
313321

322+
newPolicy.Deduplicate()
323+
314324
eak.Policy = newPolicy
315325

316326
acmeEAK := linkedEAKToCertificates(eak)
@@ -339,6 +349,8 @@ func (par *PolicyAdminResponder) UpdateACMEAccountPolicy(w http.ResponseWriter,
339349
return
340350
}
341351

352+
newPolicy.Deduplicate()
353+
342354
eak.Policy = newPolicy
343355
acmeEAK := linkedEAKToCertificates(eak)
344356
if err := par.acmeDB.UpdateExternalAccountKey(ctx, prov.GetId(), acmeEAK); err != nil {

0 commit comments

Comments
 (0)