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.

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

composer: seed the random number generator #1136

Merged
merged 1 commit into from
Dec 15, 2020
Merged

composer: seed the random number generator #1136

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
10 changes: 8 additions & 2 deletions internal/cloudapi/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
package cloudapi

import (
"crypto/rand"
"encoding/json"
"fmt"
"math/rand"
"math"
"math/big"
"net/http"

"github.com/go-chi/chi"
Expand Down Expand Up @@ -83,7 +85,11 @@ func (server *Server) Compose(w http.ResponseWriter, r *http.Request) {
var targets []*target.Target

// use the same seed for all images so we get the same IDs
manifestSeed := rand.Int63()
bigSeed, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt64))
if err != nil {
panic("cannot generate a manifest seed: " + err.Error())
}
manifestSeed := bigSeed.Int64()

for i, ir := range request.ImageRequests {
arch, err := distribution.GetArch(ir.Architecture)
Expand Down
10 changes: 8 additions & 2 deletions internal/kojiapi/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
package kojiapi

import (
"crypto/rand"
"encoding/json"
"fmt"
"log"
"math/rand"
"math"
"math/big"
"net/http"
"strings"
"time"
Expand Down Expand Up @@ -89,7 +91,11 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
kojiDirectory := "osbuild-composer-koji-" + uuid.New().String()

// use the same seed for all images so we get the same IDs
manifestSeed := rand.Int63()
bigSeed, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt64))
if err != nil {
panic("cannot generate a manifest seed: " + err.Error())
}
manifestSeed := bigSeed.Int64()

for i, ir := range request.ImageRequests {
arch, err := d.GetArch(ir.Architecture)
Expand Down
13 changes: 11 additions & 2 deletions internal/weldr/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ package weldr
import (
"archive/tar"
"bytes"
"crypto/rand"
"encoding/json"
errors_package "errors"
"fmt"
"io"
"log"
"math/rand"
"math"
"math/big"
"net"
"net/http"
"net/url"
Expand Down Expand Up @@ -1837,6 +1839,13 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
}

size := imageType.Size(cr.Size)

bigSeed, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt64))
if err != nil {
panic("cannot generate a manifest seed: " + err.Error())
}
seed := bigSeed.Int64()

manifest, err := imageType.Manifest(bp.Customizations,
distro.ImageOptions{
Size: size,
Expand All @@ -1848,7 +1857,7 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
api.allRepositories(),
packages,
buildPackages,
rand.Int63())
seed)
if err != nil {
errors := responseError{
ID: "ManifestCreationFailed",
Expand Down