mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
libpod: Ensure that generated container names are random
Fixes #15569. Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
@ -5,6 +5,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
@ -112,6 +113,13 @@ type Runtime struct {
|
|||||||
secretsManager *secrets.SecretsManager
|
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.
|
// 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
|
// containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is
|
||||||
// use for the containers.conf configuration file.
|
// use for the containers.conf configuration file.
|
||||||
|
28
libpod/runtime_test.go
Normal file
28
libpod/runtime_test.go
Normal 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)
|
||||||
|
}
|
Reference in New Issue
Block a user