Skip to content

[v14] Add insecure drop mode (#35175) #35403

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
atburke merged 1 commit into from
Dec 6, 2023
Merged

[v14] Add insecure drop mode (#35175) #35403

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions api/proto/teleport/legacy/types/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2532,6 +2532,9 @@ enum CreateHostUserMode {
HOST_USER_MODE_DROP = 2;
// HOST_USER_MODE_KEEP enables host user creation and leaves users behind at session end.
HOST_USER_MODE_KEEP = 3;
// HOST_USER_MODE_INSECURE enables host user creation without a home directory and deletes
// users at session end.
HOST_USER_MODE_INSECURE_DROP = 4;
}

// CreateDatabaseUserMode determines whether database user creation should be
Expand Down
11 changes: 8 additions & 3 deletions api/types/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,9 +1814,10 @@ var LabelMatcherKinds = []string{
}

const (
createHostUserModeOffString = "off"
createHostUserModeDropString = "drop"
createHostUserModeKeepString = "keep"
createHostUserModeOffString = "off"
createHostUserModeDropString = "drop"
createHostUserModeKeepString = "keep"
createHostUserModeInsecureDropString = "insecure-drop"
)

func (h CreateHostUserMode) encode() (string, error) {
Expand All @@ -1829,6 +1830,8 @@ func (h CreateHostUserMode) encode() (string, error) {
return createHostUserModeDropString, nil
case CreateHostUserMode_HOST_USER_MODE_KEEP:
return createHostUserModeKeepString, nil
case CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP:
return createHostUserModeInsecureDropString, nil
}
return "", trace.BadParameter("invalid host user mode %v", h)
}
Expand Down Expand Up @@ -1866,6 +1869,8 @@ func (h *CreateHostUserMode) decode(val any) error {
*h = CreateHostUserMode_HOST_USER_MODE_DROP
case createHostUserModeKeepString:
*h = CreateHostUserMode_HOST_USER_MODE_KEEP
case createHostUserModeInsecureDropString:
*h = CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP
default:
return trace.BadParameter("invalid host user mode %v", val)
}
Expand Down
4 changes: 4 additions & 0 deletions api/types/role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ func TestMarshallCreateHostUserModeJSON(t *testing.T) {
{input: CreateHostUserMode_HOST_USER_MODE_UNSPECIFIED, expected: ""},
{input: CreateHostUserMode_HOST_USER_MODE_DROP, expected: "drop"},
{input: CreateHostUserMode_HOST_USER_MODE_KEEP, expected: "keep"},
{input: CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP, expected: "insecure-drop"},
} {
got, err := json.Marshal(&tc.input)
require.NoError(t, err)
Expand All @@ -390,6 +391,7 @@ func TestMarshallCreateHostUserModeYAML(t *testing.T) {
{input: CreateHostUserMode_HOST_USER_MODE_UNSPECIFIED, expected: "\"\""},
{input: CreateHostUserMode_HOST_USER_MODE_DROP, expected: "drop"},
{input: CreateHostUserMode_HOST_USER_MODE_KEEP, expected: "keep"},
{input: CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP, expected: "insecure-drop"},
} {
got, err := yaml.Marshal(&tc.input)
require.NoError(t, err)
Expand All @@ -408,6 +410,7 @@ func TestUnmarshallCreateHostUserModeJSON(t *testing.T) {
{expected: CreateHostUserMode_HOST_USER_MODE_KEEP, input: "\"keep\""},
{expected: CreateHostUserMode_HOST_USER_MODE_KEEP, input: 3},
{expected: CreateHostUserMode_HOST_USER_MODE_OFF, input: 1},
{expected: CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP, input: 4},
} {
var got CreateHostUserMode
err := json.Unmarshal([]byte(fmt.Sprintf("%v", tc.input)), &got)
Expand All @@ -426,6 +429,7 @@ func TestUnmarshallCreateHostUserModeYAML(t *testing.T) {
{expected: CreateHostUserMode_HOST_USER_MODE_UNSPECIFIED, input: "\"\""},
{expected: CreateHostUserMode_HOST_USER_MODE_DROP, input: "drop"},
{expected: CreateHostUserMode_HOST_USER_MODE_KEEP, input: "keep"},
{expected: CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP, input: "insecure-drop"},
} {
var got CreateHostUserMode
err := yaml.Unmarshal([]byte(tc.input), &got)
Expand Down
3,020 changes: 1,513 additions & 1,507 deletions api/types/types.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions integration/hostuser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,29 @@ func TestRootHostUsers(t *testing.T) {
u, err := user.Lookup(testuser)
require.NoError(t, err)
requireUserInGroups(t, u, testGroups)
require.NotEmpty(t, u.HomeDir)
require.DirExists(t, u.HomeDir)

require.NoError(t, closer.Close())
_, err = user.Lookup(testuser)
require.Equal(t, err, user.UnknownUserError(testuser))
require.NoDirExists(t, u.HomeDir)
})

t.Run("test create temporary user without home dir", func(t *testing.T) {
users := srv.NewHostUsers(context.Background(), presence, "host_uuid")

testGroups := []string{"group1", "group2"}
closer, err := users.CreateUser(testuser, &services.HostUsersInfo{Groups: testGroups, Mode: types.CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP})
require.NoError(t, err)

testGroups = append(testGroups, types.TeleportServiceGroup)
t.Cleanup(cleanupUsersAndGroups([]string{testuser}, testGroups))

u, err := user.Lookup(testuser)
require.NoError(t, err)
requireUserInGroups(t, u, testGroups)
require.NoDirExists(t, u.HomeDir)

require.NoError(t, closer.Close())
_, err = user.Lookup(testuser)
Expand Down
3 changes: 3 additions & 0 deletions integrations/operator/crdgen/testdata/protofiles/teleport/legacy/types/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2451,6 +2451,9 @@ enum CreateHostUserMode {
HOST_USER_MODE_DROP = 2;
// HOST_USER_MODE_KEEP enables host user creation and leaves users behind at session end.
HOST_USER_MODE_KEEP = 3;
// HOST_USER_MODE_INSECURE enables host user creation without a home directory and deletes
// users at session end.
HOST_USER_MODE_INSECURE_DROP = 4;
}

// RoleOptions is a set of role options
Expand Down
3 changes: 2 additions & 1 deletion lib/services/access_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,8 @@ func (a *accessChecker) HostUsers(s types.Server) (*HostUsersInfo, error) {
mode = createHostUserMode
}
// prefer to use HostUserModeKeep over Drop if mode has already been set.
if mode == types.CreateHostUserMode_HOST_USER_MODE_DROP && createHostUserMode == types.CreateHostUserMode_HOST_USER_MODE_KEEP {
if (mode == types.CreateHostUserMode_HOST_USER_MODE_DROP || mode == types.CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP) &&
createHostUserMode == types.CreateHostUserMode_HOST_USER_MODE_KEEP {
mode = types.CreateHostUserMode_HOST_USER_MODE_KEEP
}

Expand Down
9 changes: 5 additions & 4 deletions lib/srv/usermgmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func (u *HostUserManagement) CreateUser(name string, ui *services.HostUsersInfo)

groups := make([]string, len(ui.Groups))
copy(groups, ui.Groups)
if ui.Mode == types.CreateHostUserMode_HOST_USER_MODE_DROP {
if ui.Mode == types.CreateHostUserMode_HOST_USER_MODE_DROP || ui.Mode == types.CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP {
groups = append(groups, types.TeleportServiceGroup)
}
var errs []error
Expand Down Expand Up @@ -305,9 +305,10 @@ func (u *HostUserManagement) CreateUser(name string, ui *services.HostUsersInfo)
return trace.Wrap(err)
}

err = u.backend.CreateHomeDirectory(name, user.Uid, user.Gid)
if err != nil {
return trace.Wrap(err)
if ui.Mode != types.CreateHostUserMode_HOST_USER_MODE_INSECURE_DROP {
if err := u.backend.CreateHomeDirectory(name, user.Uid, user.Gid); err != nil {
return trace.Wrap(err)
}
}

return nil
Expand Down