Skip to content

Commit

Permalink
libpod: Ensure that generated container names are random
Browse files Browse the repository at this point in the history
Fixes #15569.

Signed-off-by: Doug Rabson <[email protected]>
  • Loading branch information
dfr committed Sep 1, 2022
1 parent 72f4c77 commit b667d73
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
8 changes: 8 additions & 0 deletions libpod/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"errors"
"fmt"
"math/rand"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -112,6 +113,13 @@ type Runtime struct {
secretsManager *secrets.SecretsManager
}

func init() {
// generateName calls namesgenerator.GetRandomName which the
// global RNG from math/rand. Seed it here to make sure we
// don't get the same name every time.
rand.Seed(time.Now().UnixNano())
}

// SetXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set.
// containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is
// use for the containers.conf configuration file.
Expand Down
28 changes: 28 additions & 0 deletions libpod/runtime_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package libpod

import (
"math/rand"
"os"
"testing"

"github.com/stretchr/testify/assert"
)

func Test_generateName(t *testing.T) {
state, path, _, err := getEmptyBoltState()
assert.NoError(t, err)
defer os.RemoveAll(path)
defer state.Close()

r := &Runtime{
state: state,
}

// Test that (*Runtime).generateName returns different names
// if called twice, even if the global RNG has the default
// seed.
n1, _ := r.generateName()
rand.Seed(1)
n2, _ := r.generateName()
assert.NotEqual(t, n1, n2)
}

0 comments on commit b667d73

Please sign in to comment.