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

Fix containsAllMembers

Browse source
This commit is contained in:
Mariano Cano 2019-07-29 18:16:52 -07:00
parent 18a285e847
commit 221d323b68
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
authority/provisioner/sign_ssh_options.go
View file

@ -95,6 +95,7 @@ func (o SSHOptions) match(got SSHOptions) error {
if !o.ValidBefore.IsZero() && !got.ValidBefore.IsZero() && !o.ValidBefore.Equal(&got.ValidBefore) { if !o.ValidBefore.IsZero() && !got.ValidBefore.IsZero() && !o.ValidBefore.Equal(&got.ValidBefore) {
return errors.Errorf("ssh certificate valid before does not match - got %v, want %v", got.ValidBefore, o.ValidBefore) return errors.Errorf("ssh certificate valid before does not match - got %v, want %v", got.ValidBefore, o.ValidBefore)
} }
fmt.Printf("want %+v\ngot %+v\n", o, got)
return nil return nil
} }
@ -288,7 +289,7 @@ func sshCertTypeUInt32(ct string) uint32 {
// containsAllMembers reports whether all members of subgroup are within group. // containsAllMembers reports whether all members of subgroup are within group.
func containsAllMembers(group, subgroup []string) bool { func containsAllMembers(group, subgroup []string) bool {
lg, lsg := len(group), len(subgroup) lg, lsg := len(group), len(subgroup)
if lsg > lg { if lsg > lg || (lg > 0 && lsg == 0) {
return false return false
} }
visit := make(map[string]struct{}, lg) visit := make(map[string]struct{}, lg)
@ -296,7 +297,7 @@ func containsAllMembers(group, subgroup []string) bool {
visit[group[i]] = struct{}{} visit[group[i]] = struct{}{}
} }
for i := 0; i < lsg; i++ { for i := 0; i < lsg; i++ {
if _, ok := visit[group[i]]; !ok { if _, ok := visit[subgroup[i]]; !ok {
return false return false
} }
} }