jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added DropCapabilities() and DropBoundingSet() API to libcontainer. 

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
This commit is contained in:
Vishnu Kannan 2014-06-23 18:30:25 +00:00
parent 4c55db7d58
commit ece2d83558
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
namespaces/init.go
View File

@ -195,7 +195,7 @@ func FinalizeNamespace(container *libcontainer.Container) error {
} }
// drop capabilities in bounding set before changing user // drop capabilities in bounding set before changing user
if err := capabilities.DropBoundingSet(&container.Capabilities); err != nil { if err := capabilities.DropBoundingSet(container.Capabilities); err != nil {
return fmt.Errorf("drop bounding set %s", err) return fmt.Errorf("drop bounding set %s", err)
} }
@ -213,7 +213,7 @@ func FinalizeNamespace(container *libcontainer.Container) error {
} }
// drop all other capabilities // drop all other capabilities
if err := capabilities.DropCapabilities(&container.Capabilities); err != nil { if err := capabilities.DropCapabilities(container.Capabilities); err != nil {
return fmt.Errorf("drop capabilities %s", err) return fmt.Errorf("drop capabilities %s", err)
} }

8
security/capabilities/capabilities.go
View File

@ -10,7 +10,7 @@ const allCapabilityTypes = capability.CAPS | capability.BOUNDS
// DropBoundingSet drops the capability bounding set to those specified in the // DropBoundingSet drops the capability bounding set to those specified in the
// container configuration. // container configuration.
func DropBoundingSet(capabilities *[]string) error { func DropBoundingSet(capabilities []string) error {
c, err := capability.NewPid(os.Getpid()) c, err := capability.NewPid(os.Getpid())
if err != nil { if err != nil {
return err return err
@ -28,7 +28,7 @@ func DropBoundingSet(capabilities *[]string) error {
} }
// DropCapabilities drops all capabilities for the current process expect those specified in the container configuration. // DropCapabilities drops all capabilities for the current process expect those specified in the container configuration.
func DropCapabilities(capList *[]string) error { func DropCapabilities(capList []string) error {
c, err := capability.NewPid(os.Getpid()) c, err := capability.NewPid(os.Getpid())
if err != nil { if err != nil {
return err return err
@ -45,9 +45,9 @@ func DropCapabilities(capList *[]string) error {
} }
// getEnabledCapabilities returns the capabilities that should not be dropped by the container. // getEnabledCapabilities returns the capabilities that should not be dropped by the container.
func getEnabledCapabilities(capList *[]string) []capability.Cap { func getEnabledCapabilities(capList []string) []capability.Cap {
keep := []capability.Cap{} keep := []capability.Cap{}
for _, capability := range *capList { for _, capability := range capList {
if c := GetCapability(capability); c != nil { if c := GetCapability(capability); c != nil {
keep = append(keep, c.Value) keep = append(keep, c.Value)
} }

4
security/capabilities/types_test.go
View File

@ -10,10 +10,10 @@ func TestCapabilitiesContains(t *testing.T) {
GetCapability("SETPCAP"), GetCapability("SETPCAP"),
} }
if caps.Contains("SYS_ADMIN") { if caps.contains("SYS_ADMIN") {
t.Fatal("capabilities should not contain SYS_ADMIN") t.Fatal("capabilities should not contain SYS_ADMIN")
} }
if !caps.Contains("MKNOD") { if !caps.contains("MKNOD") {
t.Fatal("capabilities should contain MKNOD but does not") t.Fatal("capabilities should contain MKNOD but does not")
} }
} }

8
utils.go
View File

@ -39,3 +39,11 @@ func GetInternalNetworkSpec(net *Network) *network.Network {
func GetAllCapabilities() []string { func GetAllCapabilities() []string {
return capabilities.GetAllCapabilities() return capabilities.GetAllCapabilities()
} }
func DropBoundingSet(container *Container) error {
return capabilities.DropBoundingSet(container.Capabilities)
}
func DropCapabilities(container *Container) error {
return capabilities.DropCapabilities(container.Capabilities)
}