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.

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

[v10] Add Machine ID enterprise license enforcement #13981

Merged
merged 5 commits into from
Jun 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions lib/auth/bot.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
apievents "github.com/gravitational/teleport/api/types/events"
"github.com/gravitational/teleport/lib/defaults"
"github.com/gravitational/teleport/lib/events"
"github.com/gravitational/teleport/lib/modules"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/utils"
)
Expand Down Expand Up @@ -112,6 +113,11 @@ func createBotUser(ctx context.Context, s *Server, botName string, resourceName

// createBot creates a new certificate renewal bot from a bot request.
func (s *Server) createBot(ctx context.Context, req *proto.CreateBotRequest) (*proto.CreateBotResponse, error) {
if !modules.GetModules().Features().MachineID {
return nil, trace.AccessDenied(
"this Teleport cluster is not licensed for Machine ID, please contact the cluster administrator")
}

if req.Name == "" {
return nil, trace.BadParameter("bot name must not be empty")
}
Expand Down Expand Up @@ -453,6 +459,11 @@ func (s *Server) validateGenerationLabel(ctx context.Context, user types.User, c
func (s *Server) generateInitialBotCerts(ctx context.Context, username string, pubKey []byte, expires time.Time, renewable bool) (*proto.Certs, error) {
var err error

if !modules.GetModules().Features().MachineID {
return nil, trace.AccessDenied(
"this Teleport cluster is not licensed for Machine ID, please contact the cluster administrator")
}

// Extract the user and role set for whom the certificate will be generated.
// This should be safe since this is typically done against a local user.
//
Expand Down
99 changes: 99 additions & 0 deletions lib/auth/bot_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
Copyright 2022 Gravitational, 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 auth

import (
"context"
"testing"
"time"

"github.com/gravitational/teleport/api/client/proto"
"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/lib/auth/native"
"github.com/gravitational/teleport/lib/modules"
"github.com/gravitational/teleport/lib/tlsca"
"github.com/gravitational/teleport/lib/utils"
"github.com/gravitational/trace"
"github.com/stretchr/testify/require"
"golang.org/x/crypto/ssh"
)

func TestBotCreateFeatureDisabled(t *testing.T) {
modules.SetTestModules(t, &modules.TestModules{
TestFeatures: modules.Features{
MachineID: false,
},
})

srv := newTestTLSServer(t)
_, err := CreateRole(context.Background(), srv.Auth(), "example", types.RoleSpecV5{})
require.NoError(t, err)

// Attempt to create a bot. This should fail immediately.
_, err = srv.Auth().createBot(context.Background(), &proto.CreateBotRequest{
Name: "test",
Roles: []string{"example"},
})
require.True(t, trace.IsAccessDenied(err))
require.Contains(t, err.Error(), "not licensed")
}

func TestBotOnboardFeatureDisabled(t *testing.T) {
modules.SetTestModules(t, &modules.TestModules{
TestFeatures: modules.Features{
MachineID: false,
},
})

srv := newTestTLSServer(t)

botName := "test"
botResourceName := BotResourceName(botName)

_, err := createBotRole(context.Background(), srv.Auth(), "test", "bot-test", []string{})
require.NoError(t, err)

_, err = createBotUser(context.Background(), srv.Auth(), botName, botResourceName)
require.NoError(t, err)

later := srv.Clock().Now().Add(4 * time.Hour)
goodToken := newBotToken(t, "good-token", botName, types.RoleBot, later)

err = srv.Auth().UpsertToken(context.Background(), goodToken)
require.NoError(t, err)

privateKey, publicKey, err := native.GenerateKeyPair()
require.NoError(t, err)
sshPrivateKey, err := ssh.ParseRawPrivateKey(privateKey)
require.NoError(t, err)
tlsPublicKey, err := tlsca.MarshalPublicKeyFromPrivateKeyPEM(sshPrivateKey)
require.NoError(t, err)

// Attempt to register a bot. This should fail even if a token was manually
// created.
_, err = Register(RegisterParams{
Token: goodToken.GetName(),
ID: IdentityID{
Role: types.RoleBot,
},
Servers: []utils.NetAddr{*utils.MustParseAddr(srv.Addr().String())},
PublicTLSKey: tlsPublicKey,
PublicSSHKey: publicKey,
})
require.Error(t, err)
require.Contains(t, err.Error(), "not licensed")
}
1 change: 1 addition & 0 deletions lib/modules/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ func (p *defaultModules) Features() Features {
DB: true,
App: true,
Desktop: true,
MachineID: true,
ModeratedSessions: false, // moderated sessions is supported in enterprise only
}
}
Expand Down