-
Notifications
You must be signed in to change notification settings - Fork 247
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1456 from marmijo/systemd_storage_conflict
config/types: prevent files/links/dirs from conflicting with systemd units or dropins
- Loading branch information
Showing
12 changed files
with
1,492 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,260 @@ | ||
| // Copyright 2020 Red Hat, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package types | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| "github.com/coreos/ignition/v2/config/shared/errors" | ||
| "github.com/coreos/ignition/v2/config/util" | ||
|
|
||
| "github.com/coreos/vcontext/path" | ||
| "github.com/coreos/vcontext/report" | ||
| ) | ||
|
|
||
| func TestConfigValidation(t *testing.T) { | ||
| tests := []struct { | ||
| in Config | ||
| out error | ||
| at path.ContextPath | ||
| }{ | ||
| // test 0: file conflicts with systemd dropin file, error | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Files: []File{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service.d/bar.conf"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| Units: []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Dropins: []Dropin{ | ||
| { | ||
| Name: "bar.conf", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Bar"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| out: errors.ErrPathConflictsSystemd, | ||
| at: path.New("json", "storage", "files", 0, "path"), | ||
| }, | ||
| // test 1: file conflicts with systemd unit, error | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Files: []File{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| Units: []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Bar"), | ||
| Enabled: util.BoolToPtr(true), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| out: errors.ErrPathConflictsSystemd, | ||
| at: path.New("json", "storage", "files", 0, "path"), | ||
| }, | ||
| // test 2: directory conflicts with systemd dropin file, error | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Directories: []Directory{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service.d/bar.conf"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Dropins: []Dropin{ | ||
| { | ||
| Name: "bar.conf", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Bar"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| out: errors.ErrPathConflictsSystemd, | ||
| at: path.New("json", "storage", "directories", 0, "path"), | ||
| }, | ||
| // test 3: directory conflicts with systemd unit, error | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Directories: []Directory{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Contents: util.StrToPtr("[foo]\nQux=Baz"), | ||
| Enabled: util.BoolToPtr(true), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| out: errors.ErrPathConflictsSystemd, | ||
| at: path.New("json", "storage", "directories", 0, "path"), | ||
| }, | ||
| // test 4: link conflicts with systemd dropin file, error | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Links: []Link{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service.d/bar.conf"}, | ||
| LinkEmbedded1: LinkEmbedded1{Target: "/qux.conf"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Dropins: []Dropin{ | ||
| { | ||
| Name: "bar.conf", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Bar"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| out: errors.ErrPathConflictsSystemd, | ||
| at: path.New("json", "storage", "links", 0, "path"), | ||
| }, | ||
| // test 5: link conflicts with systemd unit, error | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Links: []Link{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service"}, | ||
| LinkEmbedded1: LinkEmbedded1{Target: "/qux.conf"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Contents: util.StrToPtr("[foo]\nQux=Baz"), | ||
| Enabled: util.BoolToPtr(true), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| out: errors.ErrPathConflictsSystemd, | ||
| at: path.New("json", "storage", "links", 0, "path"), | ||
| }, | ||
| // test 6: non-conflicting scenarios | ||
| { | ||
| in: Config{ | ||
| Storage: Storage{ | ||
| Files: []File{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/bar.service.d/baz.conf"}, | ||
| }, | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/bar.service"}, | ||
| }, | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/foo.service.d/qux.conf"}, | ||
| }, | ||
| }, | ||
| Links: []Link{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/qux.service"}, | ||
| LinkEmbedded1: LinkEmbedded1{Target: "/qux.conf"}, | ||
| }, | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/quux.service.d/foo.conf"}, | ||
| LinkEmbedded1: LinkEmbedded1{Target: "/foo.conf"}, | ||
| }, | ||
| }, | ||
| Directories: []Directory{ | ||
| { | ||
| Node: Node{Path: "/etc/systemd/system/quux.service.d"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: Systemd{ | ||
| Units: []Unit{ | ||
| { | ||
| Name: "foo.service", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Baz"), | ||
| Enabled: util.BoolToPtr(true), | ||
| }, | ||
| { | ||
| Name: "bar.service", | ||
| Dropins: []Dropin{ | ||
| { | ||
| Name: "baz.conf", | ||
| }, | ||
| }, | ||
| Enabled: util.BoolToPtr(true), | ||
| }, | ||
| { | ||
| Name: "qux.service", | ||
| Dropins: []Dropin{ | ||
| { | ||
| Name: "bar.conf", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Baz"), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "quux.service", | ||
| Contents: util.StrToPtr("[Foo]\nQux=Baz"), | ||
| Enabled: util.BoolToPtr(true), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| for i, test := range tests { | ||
| r := test.in.Validate(path.New("json")) | ||
| expected := report.Report{} | ||
| expected.AddOnError(test.at, test.out) | ||
| if !reflect.DeepEqual(expected, r) { | ||
| t.Errorf("#%d: bad error: expected : %v, got %v", i, expected, r) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.