Skip to content

fix panic with empty definitions in parent file #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 9, 2025
Merged

fix panic with empty definitions in parent file #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65341e1
fix panic with empty definitions in parent file
clstokes Jun 9, 2025
09c12d8
rename tests
clstokes Jun 9, 2025
e080d4e
test empty child object/array
clstokes Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,13 @@ func addParentPathComments(parentDoc *ParsedDocument) error {
default:
pathComment(parentSection, parentDoc.Path)
case *jwcc.Array:
pathComment(parentSection.Value.(*jwcc.Array).Values[0], parentDoc.Path)
if len(parentSection.Value.(*jwcc.Array).Values) != 0 {
pathComment(parentSection.Value.(*jwcc.Array).Values[0], parentDoc.Path)
}
case *jwcc.Object:
pathComment(parentSection.Value.(*jwcc.Object).Members[0], parentDoc.Path)
if len(parentSection.Value.(*jwcc.Object).Members) != 0 {
pathComment(parentSection.Value.(*jwcc.Object).Members[0], parentDoc.Path)
}
}
}
return nil
Expand Down
142 changes: 140 additions & 2 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@ func TestHandleArray(t *testing.T) {
handlerFn("acls", parentDoc.Path, parentDoc.Object, "CHILD", childSection)

mergedValues := parentDoc.Object.Find("acls").Value.(*jwcc.Array).Values

if len(mergedValues) != 2 {
t.Fatalf("section [%v] should be [1], not [%v]", "acls", len(mergedValues))
}
Expand Down Expand Up @@ -471,7 +470,6 @@ func TestHandleObject(t *testing.T) {
handlerFn("groups", parentDoc.Path, parentDoc.Object, "CHILD", childSection)

mergedValues := parentDoc.Object.Find("groups").Value.(*jwcc.Object).Members

if len(mergedValues) != 3 {
t.Fatalf("section [%v] should be [1], not [%v]", "groups", len(mergedValues))
}
Expand Down Expand Up @@ -520,6 +518,146 @@ func TestHandleAutoApprovers(t *testing.T) {
}
}

func TestEmptyParentObject(t *testing.T) {
parent, err := jwcc.Parse(strings.NewReader(`{"hosts":{}}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}
parentDoc := &ParsedDocument{
Object: parent.Value.(*jwcc.Object),
Path: "parent",
}

child, err := jwcc.Parse(strings.NewReader(`{
"hosts": {
"host1": "100.99.98.97",
}
}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

childDoc := &ParsedDocument{
Object: child.Value.(*jwcc.Object),
Path: "child",
}

err = mergeDocs(preDefinedAclSections, parentDoc, []*ParsedDocument{childDoc})
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

mergedValues := parentDoc.Object.Find("hosts").Value.(*jwcc.Object).Members
if len(mergedValues) != 1 {
t.Fatalf("section [%v] should be [1], not [%v]", "hosts", len(mergedValues))
}
}

func TestEmptyParentArray(t *testing.T) {
parent, err := jwcc.Parse(strings.NewReader(`{"acls":[]}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}
parentDoc := &ParsedDocument{
Object: parent.Value.(*jwcc.Object),
Path: "parent",
}

child, err := jwcc.Parse(strings.NewReader(`{
"acls": [
{"action": "accept", "src": ["finance1"], "dst": ["tag:demo-infra:22"]},
]
}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

childDoc := &ParsedDocument{
Object: child.Value.(*jwcc.Object),
Path: "child",
}

err = mergeDocs(preDefinedAclSections, parentDoc, []*ParsedDocument{childDoc})
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

mergedValues := parentDoc.Object.Find("acls").Value.(*jwcc.Array).Values
if len(mergedValues) != 1 {
t.Fatalf("section [%v] should be [1], not [%v]", "acls", len(mergedValues))
}
}

func TestEmptyChildObject(t *testing.T) {
parent, err := jwcc.Parse(strings.NewReader(`{
"hosts": {
"host1": "100.99.98.97",
}
}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}
parentDoc := &ParsedDocument{
Object: parent.Value.(*jwcc.Object),
Path: "parent",
}

child, err := jwcc.Parse(strings.NewReader(`{"hosts":{}}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

childDoc := &ParsedDocument{
Object: child.Value.(*jwcc.Object),
Path: "child",
}

err = mergeDocs(preDefinedAclSections, parentDoc, []*ParsedDocument{childDoc})
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

mergedValues := parentDoc.Object.Find("hosts").Value.(*jwcc.Object).Members
if len(mergedValues) != 1 {
t.Fatalf("section [%v] should be [1], not [%v]", "hosts", len(mergedValues))
}
}

func TestEmptyChildArray(t *testing.T) {
parent, err := jwcc.Parse(strings.NewReader(`{
"acls": [
{"action": "accept", "src": ["finance1"], "dst": ["tag:demo-infra:22"]},
]
}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}
parentDoc := &ParsedDocument{
Object: parent.Value.(*jwcc.Object),
Path: "parent",
}

child, err := jwcc.Parse(strings.NewReader(`{"acls":[]}`))
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

childDoc := &ParsedDocument{
Object: child.Value.(*jwcc.Object),
Path: "child",
}

err = mergeDocs(preDefinedAclSections, parentDoc, []*ParsedDocument{childDoc})
if err != nil {
t.Fatalf("expected no error, got [%v]", err)
}

mergedValues := parentDoc.Object.Find("acls").Value.(*jwcc.Array).Values
if len(mergedValues) != 1 {
t.Fatalf("section [%v] should be [1], not [%v]", "acls", len(mergedValues))
}
}

func TestSort(t *testing.T) {
parent, err := jwcc.Parse(strings.NewReader(ACL_PARENT))
if err != nil {
Expand Down