Skip to content

Commit

Permalink
adjust perms for tls fixtures at test runtime
Browse files Browse the repository at this point in the history
certstrap checks perms, can't exceed r--r--r--
  • Loading branch information
vito committed Aug 27, 2022
1 parent 783eeb5 commit 3523c00
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bass/bass.bass
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"search dns.bass\n")]
(from (buildkit:image os arch buildkit:test-config)
($ cp $cert /etc/ssl/certs/bass.crt)
($ chmod "0600" /etc/ssl/certs/bass.crt)
($ chmod "0400" /etc/ssl/certs/bass.crt)
(-> ($ buildkitd --addr "tcp://0.0.0.0:6107")
(with-mount (cache-dir "bass buildkitd") /var/lib/buildkit/)
(with-mount (mkfile ./resolv.conf resolv) /etc/resolv.conf)
Expand Down
6 changes: 3 additions & 3 deletions pkg/runtimes/buildkit.go
Original file line number Diff line number Diff line change
Expand Up @@ -664,17 +664,17 @@ func (b *builder) llb(ctx context.Context, thunk bass.Thunk, extraOpts ...llb.Ru
if thunk.TLS != nil {
crt, key, err := basstls.Generate(b.runtime.Config.CertsDir, id)
if err != nil {
return llb.ExecState{}, "", false, fmt.Errorf("init tls: %w", err)
return llb.ExecState{}, "", false, fmt.Errorf("tls: generate: %w", err)
}

crtContent, err := crt.Export()
if err != nil {
return llb.ExecState{}, "", false, fmt.Errorf("init tls: %w", err)
return llb.ExecState{}, "", false, fmt.Errorf("export crt: %w", err)
}

keyContent, err := key.ExportPrivate()
if err != nil {
return llb.ExecState{}, "", false, fmt.Errorf("init tls: %w", err)
return llb.ExecState{}, "", false, fmt.Errorf("export key: %w", err)
}

runOpt = append(runOpt,
Expand Down
4 changes: 4 additions & 0 deletions pkg/runtimes/buildkit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package runtimes_test

import (
"context"
"os"
"testing"

_ "github.com/moby/buildkit/client"
Expand All @@ -20,6 +21,9 @@ func TestBuildkitRuntime(t *testing.T) {

ctx := context.Background()

is.NoErr(os.Chmod("./testdata/tls/bass.crt", 0400))
is.NoErr(os.Chmod("./testdata/tls/bass.key", 0400))

pool, err := runtimes.NewPool(ctx, &bass.Config{
Runtimes: []bass.RuntimeConfig{
{
Expand Down

0 comments on commit 3523c00

Please sign in to comment.