Skip to content

Commit 5e9bce5

Browse files
hslatmanhslatman
committed
Unexport GetPolicy()
1 parent f0272dc commit 5e9bce5

File tree

12 files changed

+23
-23
lines changed

12 files changed

+23
-23
lines changed

‎authority/provisioner/acme.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ type ACMEIdentifier struct {
107107
// certificate for an ACME Order Identifier.
108108
func (p *ACME) AuthorizeOrderIdentifier(ctx context.Context, identifier ACMEIdentifier) error {
109109

110-
x509Policy := p.ctl.GetPolicy().GetX509()
110+
x509Policy := p.ctl.getPolicy().getX509()
111111

112112
// identifier is allowed if no policy is configured
113113
if x509Policy == nil {
@@ -141,7 +141,7 @@ func (p *ACME) AuthorizeSign(ctx context.Context, token string) ([]SignOption, e
141141
// validators
142142
defaultPublicKeyValidator{},
143143
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
144-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
144+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
145145
}
146146

147147
return opts, nil

‎authority/provisioner/aws.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ func (p *AWS) AuthorizeSign(ctx context.Context, token string) ([]SignOption, er
478478
defaultPublicKeyValidator{},
479479
commonNameValidator(payload.Claims.Subject),
480480
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
481-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
481+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
482482
), nil
483483
}
484484

@@ -758,6 +758,6 @@ func (p *AWS) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOption,
758758
// Require all the fields in the SSH certificate
759759
&sshCertDefaultValidator{},
760760
// Ensure that all principal names are allowed
761-
newSSHNamePolicyValidator(p.ctl.GetPolicy().GetSSHHost(), nil),
761+
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), nil),
762762
), nil
763763
}

‎authority/provisioner/azure.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func (p *Azure) AuthorizeSign(ctx context.Context, token string) ([]SignOption,
362362
// validators
363363
defaultPublicKeyValidator{},
364364
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
365-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
365+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
366366
), nil
367367
}
368368

@@ -429,7 +429,7 @@ func (p *Azure) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOptio
429429
// Require all the fields in the SSH certificate
430430
&sshCertDefaultValidator{},
431431
// Ensure that all principal names are allowed
432-
newSSHNamePolicyValidator(p.ctl.GetPolicy().GetSSHHost(), nil),
432+
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), nil),
433433
), nil
434434
}
435435

‎authority/provisioner/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func SanitizeSSHUserPrincipal(email string) string {
199199
}, strings.ToLower(email))
200200
}
201201

202-
func (c *Controller) GetPolicy() *policyEngine {
202+
func (c *Controller) getPolicy() *policyEngine {
203203
if c == nil {
204204
return nil
205205
}

‎authority/provisioner/gcp.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func (p *GCP) AuthorizeSign(ctx context.Context, token string) ([]SignOption, er
272272
// validators
273273
defaultPublicKeyValidator{},
274274
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
275-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
275+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
276276
), nil
277277
}
278278

@@ -436,6 +436,6 @@ func (p *GCP) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOption,
436436
// Require all the fields in the SSH certificate
437437
&sshCertDefaultValidator{},
438438
// Ensure that all principal names are allowed
439-
newSSHNamePolicyValidator(p.ctl.GetPolicy().GetSSHHost(), nil),
439+
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), nil),
440440
), nil
441441
}

‎authority/provisioner/jwk.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (p *JWK) AuthorizeSign(ctx context.Context, token string) ([]SignOption, er
183183
defaultPublicKeyValidator{},
184184
defaultSANsValidator(claims.SANs),
185185
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
186-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
186+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
187187
}, nil
188188
}
189189

@@ -266,7 +266,7 @@ func (p *JWK) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOption,
266266
// Require and validate all the default fields in the SSH certificate.
267267
&sshCertDefaultValidator{},
268268
// Ensure that all principal names are allowed
269-
newSSHNamePolicyValidator(p.ctl.GetPolicy().GetSSHHost(), p.ctl.GetPolicy().GetSSHUser()),
269+
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), p.ctl.getPolicy().getSSHUser()),
270270
), nil
271271
}
272272

‎authority/provisioner/k8sSA.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ func (p *K8sSA) AuthorizeSign(ctx context.Context, token string) ([]SignOption,
242242
// validators
243243
defaultPublicKeyValidator{},
244244
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
245-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
245+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
246246
}, nil
247247
}
248248

@@ -286,7 +286,7 @@ func (p *K8sSA) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOptio
286286
// Require and validate all the default fields in the SSH certificate.
287287
&sshCertDefaultValidator{},
288288
// Ensure that all principal names are allowed
289-
newSSHNamePolicyValidator(p.ctl.GetPolicy().GetSSHHost(), p.ctl.GetPolicy().GetSSHUser()),
289+
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), p.ctl.getPolicy().getSSHUser()),
290290
), nil
291291
}
292292

‎authority/provisioner/nebula.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (p *Nebula) AuthorizeSign(ctx context.Context, token string) ([]SignOption,
163163
},
164164
defaultPublicKeyValidator{},
165165
newValidityValidator(p.ctl.Claimer.MinTLSCertDuration(), p.ctl.Claimer.MaxTLSCertDuration()),
166-
newX509NamePolicyValidator(p.ctl.GetPolicy().GetX509()),
166+
newX509NamePolicyValidator(p.ctl.getPolicy().getX509()),
167167
}, nil
168168
}
169169

@@ -260,7 +260,7 @@ func (p *Nebula) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOpti
260260
// Require all the fields in the SSH certificate
261261
&sshCertDefaultValidator{},
262262
// Ensure that all principal names are allowed
263-
newSSHNamePolicyValidator(p.ctl.GetPolicy().GetSSHHost(), nil),
263+
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), nil),
264264
), nil
265265
}
266266

‎authority/provisioner/oidc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func (o *OIDC) AuthorizeSign(ctx context.Context, token string) ([]SignOption, e
355355
// validators
356356
defaultPublicKeyValidator{},
357357
newValidityValidator(o.ctl.Claimer.MinTLSCertDuration(), o.ctl.Claimer.MaxTLSCertDuration()),
358-
newX509NamePolicyValidator(o.ctl.GetPolicy().GetX509()),
358+
newX509NamePolicyValidator(o.ctl.getPolicy().getX509()),
359359
}, nil
360360
}
361361

@@ -443,7 +443,7 @@ func (o *OIDC) AuthorizeSSHSign(ctx context.Context, token string) ([]SignOption
443443
// Require all the fields in the SSH certificate
444444
&sshCertDefaultValidator{},
445445
// Ensure that all principal names are allowed
446-
newSSHNamePolicyValidator(o.ctl.GetPolicy().GetSSHHost(), o.ctl.GetPolicy().GetSSHUser()),
446+
newSSHNamePolicyValidator(o.ctl.getPolicy().getSSHHost(), o.ctl.getPolicy().getSSHUser()),
447447
), nil
448448
}
449449

‎authority/provisioner/policy.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ func newPolicyEngine(options *Options) (*policyEngine, error) {
4343
}, nil
4444
}
4545

46-
func (p *policyEngine) GetX509() policy.X509Policy {
46+
func (p *policyEngine) getX509() policy.X509Policy {
4747
if p == nil {
4848
return nil
4949
}
5050
return p.x509Policy
5151
}
5252

53-
func (p *policyEngine) GetSSHHost() policy.HostPolicy {
53+
func (p *policyEngine) getSSHHost() policy.HostPolicy {
5454
if p == nil {
5555
return nil
5656
}
5757
return p.sshHostPolicy
5858
}
5959

60-
func (p *policyEngine) GetSSHUser() policy.UserPolicy {
60+
func (p *policyEngine) getSSHUser() policy.UserPolicy {
6161
if p == nil {
6262
return nil
6363
}

0 commit comments

Comments
 (0)