libpod: Ensure that generated container names are random

Fixes #15569.

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-08-31 18:02:38 +01:00
parent 72f4c77139
commit b667d7340c
2 changed files with 36 additions and 0 deletions

View File

@ -5,6 +5,7 @@ import (
"context"
"errors"
"fmt"
"math/rand"
"os"
"path/filepath"
"strings"
@ -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.

28
libpod/runtime_test.go Normal file
View File

@ -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)
}