mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Fix some comments

Browse source
This commit is contained in:
Herman Slatman 2022-10-21 11:11:42 +02:00
parent 70da534893
commit 49718f1bbb
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
authority/authority.go
View file

@ -94,7 +94,7 @@ type Authority struct {
// If true, do not initialize the authority // If true, do not initialize the authority
skipInit bool skipInit bool
// If true, does not output initialization logs // If true, do not output initialization logs
quietInit bool quietInit bool
} }
@ -603,9 +603,13 @@ func (a *Authority) init() error {
return admin.WrapErrorISE(err, "error loading provisioners to initialize authority") return admin.WrapErrorISE(err, "error loading provisioners to initialize authority")
} }
if len(provs) == 0 && !strings.EqualFold(a.config.AuthorityConfig.DeploymentType, "linked") { if len(provs) == 0 && !strings.EqualFold(a.config.AuthorityConfig.DeploymentType, "linked") {
// Migration will currently only be kicked off once, because either one or more provisioners
// are migrated or a default JWK provisioner will be created in the DB. It won't run for
// linked or hosted deployments. Not for linked, because that case is explicitly checked
// for above. Not for hosted, because there'll be at least an existing OIDC provisioner.
var firstJWKProvisioner *linkedca.Provisioner var firstJWKProvisioner *linkedca.Provisioner
if len(a.config.AuthorityConfig.Provisioners) > 0 { if len(a.config.AuthorityConfig.Provisioners) > 0 {
// Existing provisioners detected; try migrating them to DB storage // Existing provisioners detected; try migrating them to DB storage.
a.initLogf("Starting migration of provisioners") a.initLogf("Starting migration of provisioners")
for _, p := range a.config.AuthorityConfig.Provisioners { for _, p := range a.config.AuthorityConfig.Provisioners {
lp, err := ProvisionerToLinkedca(p) lp, err := ProvisionerToLinkedca(p)
@ -621,14 +625,12 @@ func (a *Authority) init() error {
// Mark the first JWK provisioner, so that it can be used for administration purposes // Mark the first JWK provisioner, so that it can be used for administration purposes
if firstJWKProvisioner == nil && lp.Type == linkedca.Provisioner_JWK { if firstJWKProvisioner == nil && lp.Type == linkedca.Provisioner_JWK {
firstJWKProvisioner = lp firstJWKProvisioner = lp
a.initLogf("Migrated JWK provisioner %q with admin permissions", p.GetName()) // TODO(hs): change the wording? a.initLogf("Migrated JWK provisioner %q with admin permissions", p.GetName())
} else { } else {
a.initLogf("Migrated %s provisioner %q", p.GetType(), p.GetName()) a.initLogf("Migrated %s provisioner %q", p.GetType(), p.GetName())
} }
} }
// TODO(hs): test if this works with LinkedCA too. Also could be useful
// for printing out where the configuration is read from in case of LinkedCA.
c := a.config c := a.config
if c.WasLoadedFromFile() { if c.WasLoadedFromFile() {
// TODO(hs): check if prerequisites for writing files look OK (user/group, permission bits, etc) as // TODO(hs): check if prerequisites for writing files look OK (user/group, permission bits, etc) as
@ -659,7 +661,7 @@ func (a *Authority) init() error {
if err != nil { if err != nil {
return admin.WrapErrorISE(err, "error creating first provisioner") return admin.WrapErrorISE(err, "error creating first provisioner")
} }
a.initLogf("Created JWK provisioner %q with admin permissions", firstJWKProvisioner.GetName()) // TODO(hs): change the wording? a.initLogf("Created JWK provisioner %q with admin permissions", firstJWKProvisioner.GetName())
} }
// Create first super admin, belonging to the first JWK provisioner // Create first super admin, belonging to the first JWK provisioner

2
pki/pki.go
View file

@ -900,7 +900,7 @@ func (p *PKI) GenerateConfig(opt ...ConfigOption) (*authconfig.Config, error) {
// TODO(hs): the logic for creating the provisioners and the super admin // TODO(hs): the logic for creating the provisioners and the super admin
// is similar to what's done when automatically migrating the provisioners. // is similar to what's done when automatically migrating the provisioners.
// This is related to the existing comment above. Refactor this to exist in // This is related to the existing comment above. Refactor this to exist in
// a single place and ensure it happensonly once. // a single place and ensure it happens only once.
_db, err := db.New(cfg.DB) _db, err := db.New(cfg.DB)
if err != nil { if err != nil {
return nil, err return nil, err