Skip to content
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

Jump to bottom

Add secure hardware support for uvmboot #1390

Merged
merged 1 commit into from
May 18, 2022
Merged

Add secure hardware support for uvmboot #1390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 23 additions & 6 deletions internal/tools/uvmboot/lcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/Microsoft/hcsshim/internal/cmd"
"github.com/Microsoft/hcsshim/internal/memory"
"github.com/Microsoft/hcsshim/internal/uvm"
"github.com/Microsoft/hcsshim/pkg/securitypolicy"
"github.com/containerd/console"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
Expand All @@ -32,6 +33,7 @@ const (
scsiMountsArgName = "mount"
shareFilesArgName = "share"
securityPolicyArgName = "security-policy"
securityHardwareFlag = "security-hardware"
)

var (
Expand All @@ -50,7 +52,7 @@ var lcowCommand = cli.Command{
},
cli.StringFlag{
Name: rootFSTypeArgName,
Usage: "Either 'initrd' or 'vhd'. (default: 'vhd' if rootfs.vhd exists)",
Usage: "Either 'initrd', 'vhd' or 'none'. (default: 'vhd' if rootfs.vhd exists)",
},
cli.StringFlag{
Name: bootFilesPathArgName,
Expand Down Expand Up @@ -81,6 +83,10 @@ var lcowCommand = cli.Command{
Name: securityPolicyArgName,
Usage: "Security policy to set on the UVM. Leave empty to use an open door policy",
},
cli.BoolFlag{
Name: securityHardwareFlag,
Usage: "Use VMGS file to run on secure hardware. ('root-fs-type' must be set to 'none')",
},
cli.StringFlag{
Name: execCommandLineArgName,
Usage: "Command to execute in the UVM.",
Expand Down Expand Up @@ -180,6 +186,9 @@ func createLCOWOptions(_ context.Context, c *cli.Context, id string) (*uvm.Optio
case "vhd":
options.RootFSFile = uvm.VhdFile
options.PreferredRootFSType = uvm.PreferredRootFSTypeVHD
case "none":
options.RootFSFile = ""
options.PreferredRootFSType = uvm.PreferredRootFSTypeNA
default:
return nil, unrecognizedError(c.String(rootFSTypeArgName), rootFSTypeArgName)
}
Expand Down Expand Up @@ -224,9 +233,20 @@ func createLCOWOptions(_ context.Context, c *cli.Context, id string) (*uvm.Optio
options.DisableTimeSyncService = true
}

// default to open door security policy to allow resource modifications in
// non-snp uvmboot scenarios.
openPolicy, err := securitypolicy.NewOpenDoorPolicy().EncodeToString()
if err != nil {
return nil, fmt.Errorf("failed to encode open door policy: %s", err)
}
options.SecurityPolicy = openPolicy
if c.IsSet(securityPolicyArgName) {
options.SecurityPolicy = c.String(options.SecurityPolicy)
}
if c.IsSet(securityHardwareFlag) {
options.GuestStateFile = uvm.GuestStateFile
options.SecurityPolicyEnabled = true
options.AllowOvercommit = false
}

return options, nil
Expand All @@ -243,11 +263,8 @@ func runLCOW(ctx context.Context, options *uvm.OptionsLCOW, c *cli.Context) erro
return err
}

if c.IsSet(securityPolicyArgName) {
if err := vm.SetSecurityPolicy(ctx, options.SecurityPolicy); err != nil {
return fmt.Errorf("could not set UVM security policy: %w", err)
}
logrus.WithField("policy", options.SecurityPolicy).Debug("Set UVM security policy")
if err := vm.SetSecurityPolicy(ctx, options.SecurityPolicy); err != nil {
return fmt.Errorf("could not set UVM security policy: %w", err)
}

if err := mountSCSI(ctx, c, vm); err != nil {
Expand Down