particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete unused internal/pathpolicy package

Browse source 
This copy of the package in osbuild-composer is no longer used by any
code. Instead, the copy which is in the `osbuild/images` repository (and
module) is the implementation used by distro definitions.

Delete this code to reduce potential confusion and code duplication.

Also delete code in `internal/blueprint` package, which uses the
pathpolicy package. This code is no longer used, but instead the version
from `osbuild/images` is being used.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-10-18 16:53:14 +02:00 • committed by Simon de Vlieger
parent 3d7b01b18d
commit d57f2e5bb5
8 changed files with 0 additions and 565 deletions
Download patch file Download diff file Expand all files Collapse all files

120
internal/blueprint/fsnode_customizations_test.go
View file

@ -8,7 +8,6 @@ import (
"github.com/BurntSushi/toml"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/fsnode"
"github.com/osbuild/osbuild-composer/internal/pathpolicy"
"github.com/stretchr/testify/assert"
)
@ -1133,122 +1132,3 @@ func TestValidateDirFileCustomizations(t *testing.T) {
})
}
}
func TestCheckFileCustomizationsPolicy(t *testing.T) {
policy := map[string]pathpolicy.PathPolicy{
"/": {Deny: true},
"/etc": {},
"/etc/fstab": {Deny: true},
"/etc/os-release": {Deny: true},
"/etc/hostname": {Deny: true},
"/etc/shadow": {Deny: true},
"/etc/passwd": {Deny: true},
"/etc/group": {Deny: true},
}
pathPolicy := pathpolicy.NewPathPolicies(policy)
testCases := []struct {
Name string
Files []FileCustomization
Error bool
}{
{
Name: "disallowed-file",
Files: []FileCustomization{
{
Path: "/etc/shadow",
},
},
Error: true,
},
{
Name: "disallowed-file-2",
Files: []FileCustomization{
{
Path: "/home/user/.ssh/authorized_keys",
},
},
Error: true,
},
{
Name: "disallowed-file-3",
Files: []FileCustomization{
{
Path: "/file",
},
},
Error: true,
},
{
Name: "allowed-file-named",
Files: []FileCustomization{
{
Path: "/etc/named.conf",
},
},
},
}
for _, tc := range testCases {
t.Run(tc.Name, func(t *testing.T) {
err := CheckFileCustomizationsPolicy(tc.Files, pathPolicy)
if tc.Error {
assert.Error(t, err)
} else {
assert.NoError(t, err)
}
})
}
}
func TestCheckDirectoryCustomizationsPolicy(t *testing.T) {
policy := map[string]pathpolicy.PathPolicy{
"/": {Deny: true},
"/etc": {},
}
pathPolicy := pathpolicy.NewPathPolicies(policy)
testCases := []struct {
Name string
Directories []DirectoryCustomization
Error bool
}{
{
Name: "disallowed-directory",
Directories: []DirectoryCustomization{
{
Path: "/dir",
},
},
Error: true,
},
{
Name: "disallowed-directory-2",
Directories: []DirectoryCustomization{
{
Path: "/var/log/fancy-dir",
},
},
Error: true,
},
{
Name: "allowed-directory",
Directories: []DirectoryCustomization{
{
Path: "/etc/systemd/system/sshd.service.d",
},
},
},
}
for _, tc := range testCases {
t.Run(tc.Name, func(t *testing.T) {
err := CheckDirectoryCustomizationsPolicy(tc.Directories, pathPolicy)
if tc.Error {
assert.Error(t, err)
} else {
assert.NoError(t, err)
}
})
}
}