default.nix

@@ -173,7 +173,6 @@ in rec {
       pkgs.yq-go
       pkgs.jq
       pkgs.dig
-      pkgs.nebula
     ]}
     export SHELL=${pkgs.bash}/bin/bash
     exec ${pkgs.bash}/bin/bash ${./tests}/entrypoint.sh "$@"

docs/admin/adding-a-host-to-the-network.md

@@ -23,13 +23,16 @@ was configured when creating the network.
 
 ## Step 3: Create a `bootstrap.json` File
 
+Access to an `admin.json` file is required for this step.
+
 To create a `bootstrap.json` file for the new host, the admin should perform the
 following command from their own host:
 
 ```
-isle hosts create \
+isle admin create-bootstrap \
     --hostname <name> \
     --ip <ip> \
+    --admin-path <path to admin.json> \
     > bootstrap.json
 ```
 
@@ -41,3 +44,21 @@ The user can now proceed with calling `isle network join`, as described in the
 [Getting Started][getting-started] document.
 
 [getting-started]: ../user/getting-started.md
+
+### Encrypted `admin.json`
+
+If `admin.json` is kept in an encrypted format on disk (it should be!) then the
+decrypted form can be piped into `create-bootstrap` over stdin. For example, if
+GPG is being used to secure `admin.json` then the following could be used to
+generate a `bootstrap.json`:
+
+```
+gpg -d <path to admin.json.gpg> | isle admin create-bootstrap \
+    --hostname <name> \
+    --ip <ip> \
+    --admin-path - \
+    > bootstrap.json
+```
+
+Note that the value of `--admin-path` is `-`, indicating that `admin.json`
+should be read from stdin.

docs/admin/creating-a-new-network.md

@@ -82,18 +82,44 @@ be chosen with care.
 * IP: The IP of your host, which will be the first host in the network. This IP
   must be within the chosen subnet range.
 
-## Step 3: Create the Network
+## Step 3: Prepare to Encrypt `admin.json`
 
-To create the network, run:
+The `admin.json` file (which will be created in the next step) is the most
+sensitive part of an isle network. If it falls into the wrong hands it can be
+used to completely compromise your network, impersonate hosts on the network,
+and will likely lead to someone stealing or deleting all of your data.
+
+Therefore it is important that the file remains encrypted when it is not being
+used, and that it is never stored to disk in its decrypted form.
+
+This guide assumes that you have GPG already set up with your own secret key,
+and that you are familiar with how it works. There is no requirement to use GPG,
+if you care to use a different method.
+
+## Step 4: Create the `admin.json` File
+
+To create the network, and the `admin.json` file in the process, run:
 
 ```
 sudo isle network create \
     --name <name> \
     --ip-net <subnet> \
     --domain <domain> \
-    --hostname <hostname>
+    --hostname <hostname> \
+    | gpg -e -r <my gpg email> \
+    > admin.json.gpg
 ```
 
+A couple of notes here:
+
+* Only one gpg recipient is specified. If you intend on including other users as
+  network administrators you can add them to the recipients list at this step,
+  so they will be able to use the `admin.json` file as well. You can also
+  manually add them as recipients later.
+
+The `isle network create` command may take up to a minute to complete. Once
+completed you should have an `admin.json.gpg` file in your current directory.
+
 At this point your host, and your network, are ready to go! To add other hosts
 to the network you can reference the [Adding a Host to the Network][add-host]
 document.

docs/roadmap.md

@@ -8,14 +8,6 @@ order they will be implemented.
 These items are listed more or less in the order they need to be completed, as
 they generally depend on the items previous to them.
 
-### Windows Support + GUI
-
-Support for Windows is a must. This requirement also includes a simple GUI,
-which would essentially act as a thin layer on top of `daemon.yml` to start
-with.
-
-Depending on difficulty level, OSX support might be added at this stage as well.
-
 ### NATS
 
 Garage is currently used to handle eventually-consistent persistent storage, but
@@ -44,6 +36,14 @@ files. The bootstrap file would be stored, encrypted, in garage, with the invite
 code being able to both identify and decrypt it. To instantiate a host, the user
 only needs to input the network domain name and the invite code.
 
+### Windows Support + GUI
+
+Support for Windows is a must. This requirement also includes a simple GUI,
+which would essentially act as a thin layer on top of `daemon.yml` to start
+with.
+
+Depending on difficulty level, OSX support might be added at this stage as well.
+
 ### FUSE Mount
 
 KBFS style. Every user should be able to mount virtual directories to their host

go/admin/admin.go

@@ -0,0 +1,43 @@
+// Package admin deals with the parsing and creation of admin.json files.
+package admin
+
+import (
+	"encoding/json"
+	"io"
+	"isle/garage"
+	"isle/nebula"
+)
+
+// CreationParams are general parameters used when creating a new network. These
+// are available to all hosts within the network via their bootstrap files.
+type CreationParams struct {
+	ID     string
+	Name   string
+	Domain string
+}
+
+// Admin is used for accessing all information contained within an admin.json.
+type Admin struct {
+	CreationParams CreationParams
+
+	Nebula struct {
+		CACredentials nebula.CACredentials
+	}
+
+	Garage struct {
+		RPCSecret                    string
+		GlobalBucketS3APICredentials garage.S3APICredentials
+	}
+}
+
+// FromReader reads an admin.json from the given io.Reader.
+func FromReader(r io.Reader) (Admin, error) {
+	var a Admin
+	err := json.NewDecoder(r).Decode(&a)
+	return a, err
+}
+
+// WriteTo writes the Admin as an admin.json to the given io.Writer.
+func (a Admin) WriteTo(into io.Writer) error {
+	return json.NewEncoder(into).Encode(a)
+}

go/bootstrap/bootstrap.go

@@ -6,8 +6,12 @@ import (
 	"crypto/sha512"
 	"encoding/json"
 	"fmt"
+	"io"
+	"isle/admin"
+	"isle/garage"
 	"isle/nebula"
 	"net/netip"
+	"os"
 	"path/filepath"
 	"sort"
 )
@@ -24,19 +28,24 @@ func AppDirPath(appDirPath string) string {
 	return filepath.Join(appDirPath, "share/bootstrap.json")
 }
 
-// CreationParams are general parameters used when creating a new network. These
-// are available to all hosts within the network via their bootstrap files.
-type CreationParams struct {
-	ID     string
-	Name   string
-	Domain string
+// Garage contains parameters needed to connect to and use the garage cluster.
+type Garage struct {
+	// TODO this should be part of some new configuration section related to
+	// secrets which may or may not be granted to this host
+	RPCSecret string
+
+	AdminToken string
+
+	// TODO this should be part of admin.CreationParams
+	GlobalBucketS3APICredentials garage.S3APICredentials
 }
 
-// Bootstrap contains all information which is needed by a host daemon to join a
-// network on boot.
+// Bootstrap is used for accessing all information contained within a
+// bootstrap.json file.
 type Bootstrap struct {
-	NetworkCreationParams CreationParams
-	CAPublicCredentials   nebula.CAPublicCredentials
+	AdminCreationParams admin.CreationParams
+	CAPublicCredentials nebula.CAPublicCredentials
+	Garage              Garage
 
 	PrivateCredentials nebula.HostPrivateCredentials
 	HostAssigned       `json:"-"`
@@ -49,7 +58,8 @@ type Bootstrap struct {
 // function assigns Hosts an empty map.
 func New(
 	caCreds nebula.CACredentials,
-	adminCreationParams CreationParams,
+	adminCreationParams admin.CreationParams,
+	garage Garage,
 	name nebula.HostName,
 	ip netip.Addr,
 ) (
@@ -73,18 +83,33 @@ func New(
 	}
 
 	return Bootstrap{
-		NetworkCreationParams: adminCreationParams,
-		CAPublicCredentials:   caCreds.Public,
-		PrivateCredentials:    hostPrivCreds,
-		HostAssigned:          assigned,
-		SignedHostAssigned:    signedAssigned,
-		Hosts:                 map[nebula.HostName]Host{},
+		AdminCreationParams: adminCreationParams,
+		CAPublicCredentials: caCreds.Public,
+		Garage:              garage,
+		PrivateCredentials:  hostPrivCreds,
+		HostAssigned:        assigned,
+		SignedHostAssigned:  signedAssigned,
+		Hosts:               map[nebula.HostName]Host{},
 	}, nil
 }
 
-// UnmarshalJSON implements the json.Unmarshaler interface. It will
-// automatically populate the HostAssigned field by unwrapping the
-// SignedHostAssigned field.
+// FromFile reads a bootstrap from a file at the given path. The HostAssigned
+// field will automatically be unwrapped.
+func FromFile(path string) (Bootstrap, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return Bootstrap{}, fmt.Errorf("opening file: %w", err)
+	}
+	defer f.Close()
+
+	var b Bootstrap
+	if err := json.NewDecoder(f).Decode(&b); err != nil {
+		return Bootstrap{}, fmt.Errorf("decoding json: %w", err)
+	}
+
+	return b, nil
+}
+
 func (b *Bootstrap) UnmarshalJSON(data []byte) error {
 	type inner Bootstrap
 
@@ -103,6 +128,11 @@ func (b *Bootstrap) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+// WriteTo writes the Bootstrap as a new bootstrap to the given io.Writer.
+func (b Bootstrap) WriteTo(into io.Writer) error {
+	return json.NewEncoder(into).Encode(b)
+}
+
 // ThisHost is a shortcut for b.Hosts[b.HostName], but will panic if the
 // HostName isn't found in the Hosts map.
 func (b Bootstrap) ThisHost() Host {

go/bootstrap/garage.go

@@ -4,6 +4,24 @@ import (
 	"isle/garage"
 )
 
+// GarageClientParams contains all the data needed to instantiate garage
+// clients.
+type GarageClientParams struct {
+	Peer                         garage.RemotePeer
+	GlobalBucketS3APICredentials garage.S3APICredentials
+	RPCSecret                    string
+}
+
+// GlobalBucketS3APIClient returns an S3 client pre-configured with access to
+// the global bucket.
+func (p GarageClientParams) GlobalBucketS3APIClient() garage.S3APIClient {
+	var (
+		addr  = p.Peer.S3APIAddr()
+		creds = p.GlobalBucketS3APICredentials
+	)
+	return garage.NewS3APIClient(addr, creds)
+}
+
 // GaragePeers returns a Peer for each known garage instance in the network.
 func (b Bootstrap) GaragePeers() []garage.RemotePeer {
 
@@ -51,3 +69,12 @@ func (b Bootstrap) ChooseGaragePeer() garage.RemotePeer {
 
 	panic("no garage instances configured")
 }
+
+// GarageClientParams returns a GarageClientParams.
+func (b Bootstrap) GarageClientParams() GarageClientParams {
+	return GarageClientParams{
+		Peer:                         b.ChooseGaragePeer(),
+		GlobalBucketS3APICredentials: b.Garage.GlobalBucketS3APICredentials,
+		RPCSecret:                    b.Garage.RPCSecret,
+	}
+}

go/bootstrap/hosts.go

@@ -3,7 +3,7 @@ package bootstrap
 import (
 	"fmt"
 	"isle/nebula"
-	"net/netip"
+	"net"
 )
 
 // NebulaHost describes the nebula configuration of a Host which is relevant for
@@ -77,17 +77,10 @@ type Host struct {
 //
 // This assumes that the Host and its data has already been verified against the
 // CA signing key.
-func (h Host) IP() netip.Addr {
+func (h Host) IP() net.IP {
 	cert := h.PublicCredentials.Cert.Unwrap()
 	if len(cert.Details.Ips) == 0 {
 		panic(fmt.Sprintf("host %q not configured with any ips: %+v", h.Name, h))
 	}
-
-	ip := cert.Details.Ips[0].IP
-	addr, ok := netip.AddrFromSlice(ip)
-	if !ok {
-		panic(fmt.Sprintf("ip %q (%#v) is not valid, somehow", ip, ip))
-	}
-
-	return addr
+	return cert.Details.Ips[0].IP
 }

go/cmd/entrypoint/admin.go

@@ -0,0 +1,199 @@
+package main
+
+import (
+	"crypto/rand"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"isle/admin"
+	"isle/bootstrap"
+	"isle/nebula"
+	"net/netip"
+	"os"
+)
+
+func randStr(l int) string {
+	b := make([]byte, l)
+	if _, err := rand.Read(b); err != nil {
+		panic(err)
+	}
+	return hex.EncodeToString(b)
+}
+
+func readAdmin(path string) (admin.Admin, error) {
+
+	if path == "-" {
+
+		adm, err := admin.FromReader(os.Stdin)
+		if err != nil {
+			return admin.Admin{}, fmt.Errorf("parsing admin.json from stdin: %w", err)
+		}
+
+		return adm, nil
+	}
+
+	f, err := os.Open(path)
+	if err != nil {
+		return admin.Admin{}, fmt.Errorf("opening file: %w", err)
+	}
+	defer f.Close()
+
+	return admin.FromReader(f)
+}
+
+var subCmdAdminCreateBootstrap = subCmd{
+	name:  "create-bootstrap",
+	descr: "Creates a new bootstrap.json file for a particular host and writes it to stdout",
+	do: func(subCmdCtx subCmdCtx) error {
+		var (
+			flags    = subCmdCtx.flagSet(false)
+			hostName nebula.HostName
+			ip       netip.Addr
+		)
+
+		hostNameF := flags.VarPF(
+			textUnmarshalerFlag{&hostName},
+			"hostname", "h",
+			"Name of the host to generate bootstrap.json for",
+		)
+
+		ipF := flags.VarPF(
+			textUnmarshalerFlag{&ip}, "ip", "i", "IP of the new host",
+		)
+
+		adminPath := flags.StringP(
+			"admin-path", "a", "",
+			`Path to admin.json file. If the given path is "-" then stdin is used.`,
+		)
+
+		if err := flags.Parse(subCmdCtx.args); err != nil {
+			return fmt.Errorf("parsing flags: %w", err)
+		}
+
+		if !hostNameF.Changed ||
+			!ipF.Changed ||
+			*adminPath == "" {
+			return errors.New("--hostname, --ip, and --admin-path are required")
+		}
+
+		adm, err := readAdmin(*adminPath)
+		if err != nil {
+			return fmt.Errorf("reading admin.json with --admin-path of %q: %w", *adminPath, err)
+		}
+
+		garageBootstrap := bootstrap.Garage{
+			RPCSecret:                    adm.Garage.RPCSecret,
+			AdminToken:                   randStr(32),
+			GlobalBucketS3APICredentials: adm.Garage.GlobalBucketS3APICredentials,
+		}
+
+		newHostBootstrap, err := bootstrap.New(
+			adm.Nebula.CACredentials,
+			adm.CreationParams,
+			garageBootstrap,
+			hostName,
+			ip,
+		)
+		if err != nil {
+			return fmt.Errorf("initializing bootstrap data: %w", err)
+		}
+
+		hostsRes, err := subCmdCtx.getHosts()
+		if err != nil {
+			return fmt.Errorf("getting hosts: %w", err)
+		}
+
+		for _, host := range hostsRes.Hosts {
+			newHostBootstrap.Hosts[host.Name] = host
+		}
+
+		return newHostBootstrap.WriteTo(os.Stdout)
+	},
+}
+
+var subCmdAdminCreateNebulaCert = subCmd{
+	name:  "create-nebula-cert",
+	descr: "Creates a signed nebula certificate file and writes it to stdout",
+	do: func(subCmdCtx subCmdCtx) error {
+		var (
+			flags    = subCmdCtx.flagSet(false)
+			hostName nebula.HostName
+			ip       netip.Addr
+		)
+
+		hostNameF := flags.VarPF(
+			textUnmarshalerFlag{&hostName},
+			"hostname", "h",
+			"Name of the host to generate a certificate for",
+		)
+
+		ipF := flags.VarPF(
+			textUnmarshalerFlag{&ip}, "ip", "i", "IP of the new host",
+		)
+
+		adminPath := flags.StringP(
+			"admin-path", "a", "",
+			`Path to admin.json file. If the given path is "-" then stdin is used.`,
+		)
+
+		pubKeyPath := flags.StringP(
+			"public-key-path", "p", "",
+			`Path to PEM file containing public key which will be embedded in the cert.`,
+		)
+
+		if err := flags.Parse(subCmdCtx.args); err != nil {
+			return fmt.Errorf("parsing flags: %w", err)
+		}
+
+		if !hostNameF.Changed ||
+			!ipF.Changed ||
+			*adminPath == "" ||
+			*pubKeyPath == "" {
+			return errors.New("--hostname, --ip, --admin-path, and --pub-key-path are required")
+		}
+
+		adm, err := readAdmin(*adminPath)
+		if err != nil {
+			return fmt.Errorf("reading admin.json with --admin-path of %q: %w", *adminPath, err)
+		}
+
+		hostPubPEM, err := os.ReadFile(*pubKeyPath)
+		if err != nil {
+			return fmt.Errorf("reading public key from %q: %w", *pubKeyPath, err)
+		}
+
+		var hostPub nebula.EncryptingPublicKey
+		if err := hostPub.UnmarshalNebulaPEM(hostPubPEM); err != nil {
+			return fmt.Errorf("unmarshaling public key as PEM: %w", err)
+		}
+
+		nebulaHostCert, err := nebula.NewHostCert(
+			adm.Nebula.CACredentials, hostPub, hostName, ip,
+		)
+		if err != nil {
+			return fmt.Errorf("creating cert: %w", err)
+		}
+
+		nebulaHostCertPEM, err := nebulaHostCert.Unwrap().MarshalToPEM()
+		if err != nil {
+			return fmt.Errorf("marshaling cert to PEM: %w", err)
+		}
+
+		if _, err := os.Stdout.Write([]byte(nebulaHostCertPEM)); err != nil {
+			return fmt.Errorf("writing to stdout: %w", err)
+		}
+
+		return nil
+	},
+}
+
+var subCmdAdmin = subCmd{
+	name:  "admin",
+	descr: "Sub-commands which only admins can run",
+	do: func(subCmdCtx subCmdCtx) error {
+		return subCmdCtx.doSubCmd(
+			subCmdAdminCreateBootstrap,
+			subCmdAdminCreateNebulaCert,
+		)
+	},
+}

go/cmd/entrypoint/garage.go

@@ -1,13 +1,12 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 	"syscall"
 
-	"isle/daemon"
+	"isle/bootstrap"
 )
 
 // minio-client keeps a configuration directory which contains various pieces of
@@ -53,7 +52,7 @@ var subCmdGarageMC = subCmd{
 			return fmt.Errorf("parsing flags: %w", err)
 		}
 
-		var clientParams daemon.GarageClientParams
+		var clientParams bootstrap.GarageClientParams
 		err := subCmdCtx.daemonRCPClient.Call(
 			subCmdCtx.ctx, &clientParams, "GetGarageClientParams", nil,
 		)
@@ -120,7 +119,7 @@ var subCmdGarageCLI = subCmd{
 	descr: "Runs the garage binary, automatically configured to point to the garage sub-process of a running isle daemon",
 	do: func(subCmdCtx subCmdCtx) error {
 
-		var clientParams daemon.GarageClientParams
+		var clientParams bootstrap.GarageClientParams
 		err := subCmdCtx.daemonRCPClient.Call(
 			subCmdCtx.ctx, &clientParams, "GetGarageClientParams", nil,
 		)
@@ -128,10 +127,6 @@ var subCmdGarageCLI = subCmd{
 			return fmt.Errorf("calling GetGarageClientParams: %w", err)
 		}
 
-		if clientParams.RPCSecret == "" {
-			return errors.New("this host does not have the garage RPC secret")
-		}
-
 		var (
 			binPath = binPath("garage")
 			args    = append([]string{"garage"}, subCmdCtx.args...)

go/cmd/entrypoint/hosts.go

@@ -1,73 +1,16 @@
 package main
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"isle/bootstrap"
 	"isle/daemon"
 	"isle/jsonutil"
 	"isle/nebula"
-	"net/netip"
 	"os"
 	"sort"
 )
 
-var subCmdHostsCreate = subCmd{
-	name:  "create",
-	descr: "Creates a new host in the network, writing its new bootstrap.json to stdout",
-	do: func(subCmdCtx subCmdCtx) error {
-		var (
-			flags    = subCmdCtx.flagSet(false)
-			hostName nebula.HostName
-			ip       netip.Addr
-		)
-
-		hostNameF := flags.VarPF(
-			textUnmarshalerFlag{&hostName},
-			"hostname", "h",
-			"Name of the host to generate bootstrap.json for",
-		)
-
-		ipF := flags.VarPF(
-			textUnmarshalerFlag{&ip}, "ip", "i", "IP of the new host",
-		)
-
-		canCreateHosts := flags.Bool(
-			"can-create-hosts",
-			false,
-			"The new host should have the ability to create hosts too",
-		)
-
-		if err := flags.Parse(subCmdCtx.args); err != nil {
-			return fmt.Errorf("parsing flags: %w", err)
-		}
-
-		if !hostNameF.Changed || !ipF.Changed {
-			return errors.New("--hostname and --ip are required")
-		}
-
-		var res daemon.CreateHostResult
-		err := subCmdCtx.daemonRCPClient.Call(
-			subCmdCtx.ctx,
-			&res,
-			"CreateHost",
-			daemon.CreateHostRequest{
-				HostName: hostName,
-				IP:       ip,
-				Opts: daemon.CreateHostOpts{
-					CanCreateHosts: *canCreateHosts,
-				},
-			},
-		)
-		if err != nil {
-			return fmt.Errorf("calling CreateHost: %w", err)
-		}
-
-		return json.NewEncoder(os.Stdout).Encode(res.JoiningBootstrap)
-	},
-}
-
 var subCmdHostsList = subCmd{
 	name:  "list",
 	descr: "Lists all hosts in the network, and their IPs",
@@ -145,7 +88,6 @@ var subCmdHosts = subCmd{
 	descr: "Sub-commands having to do with configuration of hosts in the network",
 	do: func(subCmdCtx subCmdCtx) error {
 		return subCmdCtx.doSubCmd(
-			subCmdHostsCreate,
 			subCmdHostsRemove,
 			subCmdHostsList,
 		)

go/cmd/entrypoint/main.go

@@ -61,6 +61,7 @@ func main() {
 		ctx:    ctx,
 		logger: logger,
 	}.doSubCmd(
+		subCmdAdmin,
 		subCmdDaemon,
 		subCmdGarage,
 		subCmdHosts,

go/cmd/entrypoint/nebula.go

@@ -1,79 +1,12 @@
 package main
 
 import (
-	"errors"
 	"fmt"
-	"isle/daemon"
 	"isle/jsonutil"
 	"isle/nebula"
 	"os"
 )
 
-var subCmdNebulaCreateCert = subCmd{
-	name:  "create-cert",
-	descr: "Creates a signed nebula certificate file for an existing host and writes it to stdout",
-	do: func(subCmdCtx subCmdCtx) error {
-		var (
-			flags    = subCmdCtx.flagSet(false)
-			hostName nebula.HostName
-		)
-
-		hostNameF := flags.VarPF(
-			textUnmarshalerFlag{&hostName},
-			"hostname", "h",
-			"Name of the host to generate a certificate for",
-		)
-
-		pubKeyPath := flags.StringP(
-			"public-key-path", "p", "",
-			`Path to PEM file containing public key which will be embedded in the cert.`,
-		)
-
-		if err := flags.Parse(subCmdCtx.args); err != nil {
-			return fmt.Errorf("parsing flags: %w", err)
-		}
-
-		if !hostNameF.Changed || *pubKeyPath == "" {
-			return errors.New("--hostname, --admin-path, and --pub-key-path are required")
-		}
-
-		hostPubPEM, err := os.ReadFile(*pubKeyPath)
-		if err != nil {
-			return fmt.Errorf("reading public key from %q: %w", *pubKeyPath, err)
-		}
-
-		var hostPub nebula.EncryptingPublicKey
-		if err := hostPub.UnmarshalNebulaPEM(hostPubPEM); err != nil {
-			return fmt.Errorf("unmarshaling public key as PEM: %w", err)
-		}
-
-		var res daemon.CreateNebulaCertificateResult
-		err = subCmdCtx.daemonRCPClient.Call(
-			subCmdCtx.ctx,
-			&res,
-			"CreateNebulaCertificate",
-			daemon.CreateNebulaCertificateRequest{
-				HostName:                hostName,
-				HostEncryptingPublicKey: hostPub,
-			},
-		)
-		if err != nil {
-			return fmt.Errorf("calling CreateNebulaCertificate: %w", err)
-		}
-
-		nebulaHostCertPEM, err := res.HostNebulaCertifcate.Unwrap().MarshalToPEM()
-		if err != nil {
-			return fmt.Errorf("marshaling cert to PEM: %w", err)
-		}
-
-		if _, err := os.Stdout.Write([]byte(nebulaHostCertPEM)); err != nil {
-			return fmt.Errorf("writing to stdout: %w", err)
-		}
-
-		return nil
-	},
-}
-
 var subCmdNebulaShow = subCmd{
 	name:  "show",
 	descr: "Writes nebula network information to stdout in JSON format",
@@ -97,17 +30,20 @@ var subCmdNebulaShow = subCmd{
 			return fmt.Errorf("calling GetNebulaCAPublicCredentials: %w", err)
 		}
 
-		caCert := caPublicCreds.Cert
-		caCertDetails := caCert.Unwrap().Details
+		caCert := caPublicCreds.Cert.Unwrap()
+		caCertPEM, err := caCert.MarshalToPEM()
+		if err != nil {
+			return fmt.Errorf("marshaling CA cert to PEM: %w", err)
+		}
 
-		if len(caCertDetails.Subnets) != 1 {
+		if len(caCert.Details.Subnets) != 1 {
 			return fmt.Errorf(
 				"malformed ca.crt, contains unexpected subnets %#v",
-				caCertDetails.Subnets,
+				caCert.Details.Subnets,
 			)
 		}
 
-		subnet := caCertDetails.Subnets[0]
+		subnet := caCert.Details.Subnets[0]
 
 		type outLighthouse struct {
 			PublicAddr string
@@ -115,11 +51,11 @@ var subCmdNebulaShow = subCmd{
 		}
 
 		out := struct {
-			CACert      nebula.Certificate
+			CACert      string
 			SubnetCIDR  string
 			Lighthouses []outLighthouse
 		}{
-			CACert:     caCert,
+			CACert:     string(caCertPEM),
 			SubnetCIDR: subnet.String(),
 		}
 
@@ -147,7 +83,6 @@ var subCmdNebula = subCmd{
 	descr: "Sub-commands related to the nebula VPN",
 	do: func(subCmdCtx subCmdCtx) error {
 		return subCmdCtx.doSubCmd(
-			subCmdNebulaCreateCert,
 			subCmdNebulaShow,
 		)
 	},

go/cmd/entrypoint/network.go

@@ -3,13 +3,15 @@ package main
 import (
 	"errors"
 	"fmt"
+	"isle/admin"
+	"isle/bootstrap"
 	"isle/daemon"
-	"isle/jsonutil"
+	"os"
 )
 
 var subCmdNetworkCreate = subCmd{
 	name:  "create",
-	descr: "Create's a new network, with this host being the first host in that network.",
+	descr: "Create's a new network, with this host being the first host in that network. The resulting admin.json is output to stdout.",
 	do: func(subCmdCtx subCmdCtx) error {
 		var (
 			ctx   = subCmdCtx.ctx
@@ -51,11 +53,16 @@ var subCmdNetworkCreate = subCmd{
 			return errors.New("--name, --domain, --ip-net, and --hostname are required")
 		}
 
-		err := subCmdCtx.daemonRCPClient.Call(ctx, nil, "CreateNetwork", req)
+		var adm admin.Admin
+		err := subCmdCtx.daemonRCPClient.Call(ctx, &adm, "CreateNetwork", req)
 		if err != nil {
 			return fmt.Errorf("creating network: %w", err)
 		}
 
+		if err := adm.WriteTo(os.Stdout); err != nil {
+			return fmt.Errorf("writing admin.json to stdout")
+		}
+
 		return nil
 	},
 }
@@ -81,8 +88,8 @@ var subCmdNetworkJoin = subCmd{
 			return errors.New("--bootstrap-path is required")
 		}
 
-		var newBootstrap daemon.JoiningBootstrap
-		if err := jsonutil.LoadFile(&newBootstrap, *bootstrapPath); err != nil {
+		newBootstrap, err := bootstrap.FromFile(*bootstrapPath)
+		if err != nil {
 			return fmt.Errorf(
 				"loading bootstrap from %q: %w", *bootstrapPath, err,
 			)

go/daemon/bootstrap.go

@@ -1,24 +1,14 @@
 package daemon
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
 
 	"isle/bootstrap"
 	"isle/garage/garagesrv"
-	"isle/jsonutil"
-	"isle/secrets"
 )
 
-// JoiningBootstrap wraps a normal Bootstrap to include extra data which a host
-// might need while joining a network.
-type JoiningBootstrap struct {
-	Bootstrap bootstrap.Bootstrap
-	Secrets   map[secrets.ID]json.RawMessage
-}
-
 func writeBootstrapToStateDir(
 	stateDirPath string, hostBootstrap bootstrap.Bootstrap,
 ) error {
@@ -31,11 +21,14 @@ func writeBootstrapToStateDir(
 		return fmt.Errorf("creating directory %q: %w", dirPath, err)
 	}
 
-	if err := jsonutil.WriteFile(hostBootstrap, path, 0700); err != nil {
-		return fmt.Errorf("writing bootstrap to %q: %w", path, err)
+	f, err := os.Create(path)
+	if err != nil {
+		return fmt.Errorf("creating file %q: %w", path, err)
 	}
 
-	return nil
+	defer f.Close()
+
+	return hostBootstrap.WriteTo(f)
 }
 
 func coalesceDaemonConfigAndBootstrap(

go/daemon/child_dnsmasq.go

@@ -33,7 +33,7 @@ func dnsmasqPmuxProcConfig(
 
 	confData := dnsmasq.ConfData{
 		Resolvers: daemonConfig.DNS.Resolvers,
-		Domain:    hostBootstrap.NetworkCreationParams.Domain,
+		Domain:    hostBootstrap.AdminCreationParams.Domain,
 		IP:        hostBootstrap.ThisHost().IP().String(),
 		Hosts:     hostsSlice,
 	}

go/daemon/child_garage.go

@@ -19,12 +19,11 @@ func garageAdminClientLogger(logger *mlog.Logger) *mlog.Logger {
 	return logger.WithNamespace("garageAdminClient")
 }
 
-// newGarageAdminClient will return an AdminClient for a local garage instance,
+// NewGarageAdminClient will return an AdminClient for a local garage instance,
 // or it will _panic_ if there is no local instance configured.
-func newGarageAdminClient(
+func NewGarageAdminClient(
 	logger *mlog.Logger,
 	daemonConfig Config,
-	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) *garage.AdminClient {
 
@@ -36,7 +35,7 @@ func newGarageAdminClient(
 			thisHost.IP().String(),
 			strconv.Itoa(daemonConfig.Storage.Allocations[0].AdminPort),
 		),
-		adminToken,
+		hostBootstrap.Garage.AdminToken,
 	)
 }
 
@@ -44,7 +43,6 @@ func waitForGarage(
 	ctx context.Context,
 	logger *mlog.Logger,
 	daemonConfig Config,
-	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) error {
 
@@ -66,7 +64,9 @@ func waitForGarage(
 		)
 
 		adminClient := garage.NewAdminClient(
-			adminClientLogger, adminAddr, adminToken,
+			adminClientLogger,
+			adminAddr,
+			hostBootstrap.Garage.AdminToken,
 		)
 
 		ctx := mctx.Annotate(ctx, "garageAdminAddr", adminAddr)
@@ -101,7 +101,7 @@ func bootstrapGarageHostForAlloc(
 }
 
 func garageWriteChildConfig(
-	rpcSecret, runtimeDirPath, adminToken string,
+	runtimeDirPath string,
 	hostBootstrap bootstrap.Bootstrap,
 	alloc ConfigStorageAllocation,
 ) (
@@ -129,8 +129,8 @@ func garageWriteChildConfig(
 		MetaPath: alloc.MetaPath,
 		DataPath: alloc.DataPath,
 
-		RPCSecret:  rpcSecret,
-		AdminToken: adminToken,
+		RPCSecret:  hostBootstrap.Garage.RPCSecret,
+		AdminToken: hostBootstrap.Garage.AdminToken,
 
 		LocalPeer:      peer,
 		BootstrapPeers: hostBootstrap.GaragePeers(),
@@ -144,29 +144,20 @@ func garageWriteChildConfig(
 }
 
 func garagePmuxProcConfigs(
-	ctx context.Context,
 	logger *mlog.Logger,
-	rpcSecret, runtimeDirPath, binDirPath string,
+	runtimeDirPath, binDirPath string,
 	daemonConfig Config,
-	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	[]pmuxlib.ProcessConfig, error,
 ) {
-	var (
-		pmuxProcConfigs []pmuxlib.ProcessConfig
-		allocs          = daemonConfig.Storage.Allocations
-	)
 
-	if len(allocs) > 0 && rpcSecret == "" {
-		logger.WarnString(ctx, "Not starting garage instances for storage allocations, missing garage RPC secret")
-		return nil, nil
-	}
+	var pmuxProcConfigs []pmuxlib.ProcessConfig
 
-	for _, alloc := range allocs {
+	for _, alloc := range daemonConfig.Storage.Allocations {
 
 		childConfigPath, err := garageWriteChildConfig(
-			rpcSecret, runtimeDirPath, adminToken, hostBootstrap, alloc,
+			runtimeDirPath, hostBootstrap, alloc,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("writing child config file for alloc %+v: %w", alloc, err)
@@ -185,22 +176,21 @@ func garagePmuxProcConfigs(
 	return pmuxProcConfigs, nil
 }
 
-func garageApplyLayout(
+// TODO don't expose this publicly once cluster creation is done via Daemon
+// interface.
+func GarageApplyLayout(
 	ctx context.Context,
 	logger *mlog.Logger,
 	daemonConfig Config,
-	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) error {
 
 	var (
-		adminClient = newGarageAdminClient(
-			logger, daemonConfig, adminToken, hostBootstrap,
-		)
-		thisHost = hostBootstrap.ThisHost()
-		hostName = thisHost.Name
-		allocs   = daemonConfig.Storage.Allocations
-		peers    = make([]garage.PeerLayout, len(allocs))
+		adminClient = NewGarageAdminClient(logger, daemonConfig, hostBootstrap)
+		thisHost    = hostBootstrap.ThisHost()
+		hostName    = thisHost.Name
+		allocs      = daemonConfig.Storage.Allocations
+		peers       = make([]garage.PeerLayout, len(allocs))
 	)
 
 	for i, alloc := range allocs {

go/daemon/child_nebula.go

@@ -22,7 +22,7 @@ func waitForNebula(
 	ctx context.Context, logger *mlog.Logger, hostBootstrap bootstrap.Bootstrap,
 ) error {
 	var (
-		ip       = net.IP(hostBootstrap.ThisHost().IP().AsSlice())
+		ip       = hostBootstrap.ThisHost().IP()
 		lUDPAddr = &net.UDPAddr{IP: ip, Port: 0}
 		rUDPAddr = &net.UDPAddr{IP: ip, Port: 45535}
 	)

go/daemon/child_pmux.go

@@ -9,14 +9,8 @@ import (
 )
 
 func (c *Children) newPmuxConfig(
-	ctx context.Context,
-	garageRPCSecret, binDirPath string,
-	daemonConfig Config,
-	garageAdminToken string,
-	hostBootstrap bootstrap.Bootstrap,
-) (
-	pmuxlib.Config, error,
-) {
+	binDirPath string, daemonConfig Config, hostBootstrap bootstrap.Bootstrap,
+) (pmuxlib.Config, error) {
 	nebulaPmuxProcConfig, err := nebulaPmuxProcConfig(
 		c.opts.EnvVars.RuntimeDirPath,
 		binDirPath,
@@ -40,13 +34,10 @@ func (c *Children) newPmuxConfig(
 	}
 
 	garagePmuxProcConfigs, err := garagePmuxProcConfigs(
-		ctx,
 		c.logger,
-		garageRPCSecret,
 		c.opts.EnvVars.RuntimeDirPath,
 		binDirPath,
 		daemonConfig,
-		garageAdminToken,
 		hostBootstrap,
 	)
 	if err != nil {
@@ -69,7 +60,6 @@ func (c *Children) newPmuxConfig(
 func (c *Children) postPmuxInit(
 	ctx context.Context,
 	daemonConfig Config,
-	garageAdminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) error {
 	c.logger.Info(ctx, "Waiting for nebula VPN to come online")
@@ -78,9 +68,7 @@ func (c *Children) postPmuxInit(
 	}
 
 	c.logger.Info(ctx, "Waiting for garage instances to come online")
-	err := waitForGarage(
-		ctx, c.logger, daemonConfig, garageAdminToken, hostBootstrap,
-	)
+	err := waitForGarage(ctx, c.logger, daemonConfig, hostBootstrap)
 	if err != nil {
 		return fmt.Errorf("waiting for garage to start: %w", err)
 	}

go/daemon/children.go

@@ -2,10 +2,8 @@ package daemon
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"isle/bootstrap"
-	"isle/secrets"
 
 	"code.betamike.com/micropelago/pmux/pmuxlib"
 	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
@@ -29,23 +27,15 @@ type Children struct {
 func NewChildren(
 	ctx context.Context,
 	logger *mlog.Logger,
-	binDirPath string,
-	secretsStore secrets.Store,
 	daemonConfig Config,
-	garageAdminToken string,
 	hostBootstrap bootstrap.Bootstrap,
+	binDirPath string,
 	opts *Opts,
 ) (
 	*Children, error,
 ) {
 	opts = opts.withDefaults()
 
-	logger.Info(ctx, "Loading secrets")
-	garageRPCSecret, err := getGarageRPCSecret(ctx, secretsStore)
-	if err != nil && !errors.Is(err, secrets.ErrNotFound) {
-		return nil, fmt.Errorf("loading garage RPC secret: %w", err)
-	}
-
 	pmuxCtx, pmuxCancelFn := context.WithCancel(context.Background())
 
 	c := &Children{
@@ -55,14 +45,7 @@ func NewChildren(
 		pmuxStoppedCh: make(chan struct{}),
 	}
 
-	pmuxConfig, err := c.newPmuxConfig(
-		ctx,
-		garageRPCSecret,
-		binDirPath,
-		daemonConfig,
-		garageAdminToken,
-		hostBootstrap,
-	)
+	pmuxConfig, err := c.newPmuxConfig(binDirPath, daemonConfig, hostBootstrap)
 	if err != nil {
 		return nil, fmt.Errorf("generating pmux config: %w", err)
 	}
@@ -73,9 +56,7 @@ func NewChildren(
 		c.logger.Debug(pmuxCtx, "pmux stopped")
 	}()
 
-	initErr := c.postPmuxInit(
-		ctx, daemonConfig, garageAdminToken, hostBootstrap,
-	)
+	initErr := c.postPmuxInit(ctx, daemonConfig, hostBootstrap)
 	if initErr != nil {
 		logger.Warn(ctx, "failed to initialize Children, shutting down child processes", err)
 		if err := c.Shutdown(); err != nil {

go/daemon/daemon.go

@@ -9,26 +9,17 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"isle/admin"
 	"isle/bootstrap"
-	"isle/jsonutil"
+	"isle/garage"
 	"isle/nebula"
-	"isle/secrets"
-	"net/netip"
 	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
 	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
-// CreateHostOpts are optional parameters to the CreateHost method.
-type CreateHostOpts struct {
-	// CanCreateHosts indicates that the bootstrap produced by CreateHost should
-	// give the new host the ability to create new hosts as well.
-	CanCreateHosts bool
-}
-
 // Daemon presents all functionality required for client frontends to interact
 // with isle, typically via the unix socket.
 type Daemon interface {
@@ -41,56 +32,29 @@ type Daemon interface {
 	//   become this first host's IP.
 	// - hostName: The name of this first host in the network.
 	//
-	// The daemon on which this is called will become the first host in the
-	// network, and will have full administrative privileges.
+	// An Admin instance is returned, which is necessary to perform admin
+	// actions in the future.
 	CreateNetwork(
 		ctx context.Context, name, domain string,
 		ipNet nebula.IPNet,
 		hostName nebula.HostName,
-	) error
+	) (
+		admin.Admin, error,
+	)
 
 	// JoinNetwork joins the Daemon to an existing network using the given
 	// Bootstrap.
 	//
 	// Errors:
 	// - ErrAlreadyJoined
-	JoinNetwork(context.Context, JoiningBootstrap) error
+	JoinNetwork(context.Context, bootstrap.Bootstrap) error
 
 	// GetBootstraps returns the currently active Bootstrap.
 	GetBootstrap(context.Context) (bootstrap.Bootstrap, error)
 
-	// GetGarageClientParams returns a GarageClientParams for the current
-	// network state.
-	GetGarageClientParams(context.Context) (GarageClientParams, error)
-
 	// RemoveHost removes the host of the given name from the network.
 	RemoveHost(context.Context, nebula.HostName) error
 
-	// CreateHost creates a bootstrap for a new host with the given name and IP
-	// address.
-	CreateHost(
-		ctx context.Context,
-		hostName nebula.HostName,
-		ip netip.Addr, // TODO automatically choose IP address
-		opts CreateHostOpts,
-	) (
-		JoiningBootstrap, error,
-	)
-
-	// CreateNebulaCertificate creates and signs a new nebula certficate for an
-	// existing host, given the public key for that host. This is currently
-	// mostly useful for creating certs for mobile devices.
-	//
-	// Errors:
-	// - ErrHostNotFound
-	CreateNebulaCertificate(
-		ctx context.Context,
-		hostName nebula.HostName,
-		hostPubKey nebula.EncryptingPublicKey,
-	) (
-		nebula.Certificate, error,
-	)
-
 	// Shutdown blocks until all resources held or created by the daemon,
 	// including child processes it has started, have been cleaned up.
 	//
@@ -143,9 +107,6 @@ type daemon struct {
 	envBinDirPath string
 	opts          *Opts
 
-	secretsStore     secrets.Store
-	garageAdminToken string
-
 	l             sync.RWMutex
 	state         int
 	children      *Children
@@ -180,12 +141,11 @@ func NewDaemon(
 ) {
 	var (
 		d = &daemon{
-			logger:           logger,
-			daemonConfig:     daemonConfig,
-			envBinDirPath:    envBinDirPath,
-			opts:             opts.withDefaults(),
-			garageAdminToken: randStr(32),
-			shutdownCh:       make(chan struct{}),
+			logger:        logger,
+			daemonConfig:  daemonConfig,
+			envBinDirPath: envBinDirPath,
+			opts:          opts.withDefaults(),
+			shutdownCh:    make(chan struct{}),
 		}
 		bootstrapFilePath = bootstrap.StateDirPath(d.opts.EnvVars.StateDirPath)
 	)
@@ -194,19 +154,7 @@ func NewDaemon(
 		return nil, fmt.Errorf("initializing daemon directories: %w", err)
 	}
 
-	var (
-		secretsPath = filepath.Join(d.opts.EnvVars.StateDirPath, "secrets")
-		err         error
-	)
-
-	if d.secretsStore, err = secrets.NewFSStore(secretsPath); err != nil {
-		return nil, fmt.Errorf(
-			"initializing secrets store at %q: %w", secretsPath, err,
-		)
-	}
-
-	var currBootstrap bootstrap.Bootstrap
-	err = jsonutil.LoadFile(&currBootstrap, bootstrapFilePath)
+	currBootstrap, err := bootstrap.FromFile(bootstrapFilePath)
 	if errors.Is(err, fs.ErrNotExist) {
 		// daemon has never had a network created or joined
 	} else if err != nil {
@@ -301,7 +249,7 @@ func (d *daemon) checkBootstrap(
 
 	thisHost := hostBootstrap.ThisHost()
 
-	newHosts, err := d.getGarageBootstrapHosts(ctx, d.logger, hostBootstrap)
+	newHosts, err := getGarageBootstrapHosts(ctx, d.logger, hostBootstrap)
 	if err != nil {
 		return bootstrap.Bootstrap{}, false, fmt.Errorf("getting hosts from garage: %w", err)
 	}
@@ -373,12 +321,8 @@ func (d *daemon) postInit(ctx context.Context) bool {
 			d.logger,
 			"Applying garage layout",
 			func(ctx context.Context) error {
-				return garageApplyLayout(
-					ctx,
-					d.logger,
-					d.daemonConfig,
-					d.garageAdminToken,
-					d.currBootstrap,
+				return GarageApplyLayout(
+					ctx, d.logger, d.daemonConfig, d.currBootstrap,
 				)
 			},
 		) {
@@ -391,29 +335,28 @@ func (d *daemon) postInit(ctx context.Context) bool {
 	//
 	// TODO this is pretty hacky, but there doesn't seem to be a better way to
 	// manage it at the moment.
-	_, err := getGarageS3APIGlobalBucketCredentials(ctx, d.secretsStore)
-	if errors.Is(err, secrets.ErrNotFound) {
+	if d.currBootstrap.Garage.GlobalBucketS3APICredentials == (garage.S3APICredentials{}) {
+		currBootstrap := d.currBootstrap
 		if !until(
 			ctx,
 			d.logger,
 			"Initializing garage shared global bucket",
 			func(ctx context.Context) error {
 				garageGlobalBucketCreds, err := garageInitializeGlobalBucket(
-					ctx,
-					d.logger,
-					d.daemonConfig,
-					d.garageAdminToken,
-					d.currBootstrap,
+					ctx, d.logger, d.daemonConfig, d.currBootstrap,
 				)
 				if err != nil {
 					return fmt.Errorf("initializing global bucket: %w", err)
 				}
 
-				err = setGarageS3APIGlobalBucketCredentials(
-					ctx, d.secretsStore, garageGlobalBucketCreds,
+				currBootstrap.Garage.GlobalBucketS3APICredentials = garageGlobalBucketCreds
+
+				d.logger.Info(ctx, "Writing bootstrap to state directory")
+				err = writeBootstrapToStateDir(
+					d.opts.EnvVars.StateDirPath, currBootstrap,
 				)
 				if err != nil {
-					return fmt.Errorf("storing global bucket creds: %w", err)
+					return fmt.Errorf("writing bootstrap to state dir: %w", err)
 				}
 
 				return nil
@@ -421,6 +364,10 @@ func (d *daemon) postInit(ctx context.Context) bool {
 		) {
 			return false
 		}
+
+		d.l.Lock()
+		d.currBootstrap = currBootstrap
+		d.l.Unlock()
 	}
 
 	if !until(
@@ -428,7 +375,7 @@ func (d *daemon) postInit(ctx context.Context) bool {
 		d.logger,
 		"Updating host info in garage",
 		func(ctx context.Context) error {
-			return d.putGarageBoostrapHost(ctx, d.logger, d.currBootstrap)
+			return putGarageBoostrapHost(ctx, d.logger, d.currBootstrap)
 		},
 	) {
 		return false
@@ -463,17 +410,15 @@ func (d *daemon) restartLoop(ctx context.Context, readyCh chan<- struct{}) {
 		children, err := NewChildren(
 			ctx,
 			d.logger.WithNamespace("children"),
-			d.envBinDirPath,
-			d.secretsStore,
 			d.daemonConfig,
-			d.garageAdminToken,
 			d.currBootstrap,
+			d.envBinDirPath,
 			d.opts,
 		)
 		if errors.Is(err, context.Canceled) {
 			return
 		} else if err != nil {
-			d.logger.Error(ctx, "failed to initialize child processes", err)
+			d.logger.Error(ctx, "failed to initialize daemon", err)
 			if !wait(1 * time.Second) {
 				return
 			}
@@ -522,52 +467,48 @@ func (d *daemon) restartLoop(ctx context.Context, readyCh chan<- struct{}) {
 func (d *daemon) CreateNetwork(
 	ctx context.Context,
 	name, domain string, ipNet nebula.IPNet, hostName nebula.HostName,
-) error {
+) (
+	admin.Admin, error,
+) {
 	nebulaCACreds, err := nebula.NewCACredentials(domain, ipNet)
 	if err != nil {
-		return fmt.Errorf("creating nebula CA cert: %w", err)
+		return admin.Admin{}, fmt.Errorf("creating nebula CA cert: %w", err)
 	}
 
-	var (
-		creationParams = bootstrap.CreationParams{
+	adm := admin.Admin{
+		CreationParams: admin.CreationParams{
 			ID:     randStr(32),
 			Name:   name,
 			Domain: domain,
-		}
-
-		garageRPCSecret = randStr(32)
-	)
-
-	err = setGarageRPCSecret(ctx, d.secretsStore, garageRPCSecret)
-	if err != nil {
-		return fmt.Errorf("setting garage RPC secret: %w", err)
+		},
 	}
 
-	err = setNebulaCASigningPrivateKey(ctx, d.secretsStore, nebulaCACreds.SigningPrivateKey)
-	if err != nil {
-		return fmt.Errorf("setting nebula CA signing key secret: %w", err)
+	garageBootstrap := bootstrap.Garage{
+		RPCSecret:  randStr(32),
+		AdminToken: randStr(32),
 	}
 
 	hostBootstrap, err := bootstrap.New(
 		nebulaCACreds,
-		creationParams,
+		adm.CreationParams,
+		garageBootstrap,
 		hostName,
 		ipNet.FirstAddr(),
 	)
 	if err != nil {
-		return fmt.Errorf("initializing bootstrap data: %w", err)
+		return adm, fmt.Errorf("initializing bootstrap data: %w", err)
 	}
 
 	d.l.Lock()
 
 	if d.state != daemonStateNoNetwork {
 		d.l.Unlock()
-		return ErrAlreadyJoined
+		return adm, ErrAlreadyJoined
 	}
 
 	if len(d.daemonConfig.Storage.Allocations) < 3 {
 		d.l.Unlock()
-		return ErrInvalidConfig.WithData(
+		return adm, ErrInvalidConfig.WithData(
 			"At least three storage allocations are required.",
 		)
 	}
@@ -577,20 +518,32 @@ func (d *daemon) CreateNetwork(
 	err = d.initialize(hostBootstrap, readyCh)
 	d.l.Unlock()
 	if err != nil {
-		return fmt.Errorf("initializing daemon: %w", err)
+		return adm, fmt.Errorf("initializing daemon: %w", err)
 	}
 
 	select {
 	case <-readyCh:
 	case <-ctx.Done():
-		return ctx.Err()
+		return adm, ctx.Err()
 	}
 
-	return nil
+	// As part of postInit, which is called prior to ready(), the restartLoop
+	// will check if the global bucket creds have been created yet or not, and
+	// create them if so. So once ready() is called we can get the created creds
+	// from the currBootstrap
+	d.l.RLock()
+	garageGlobalBucketCreds := d.currBootstrap.Garage.GlobalBucketS3APICredentials
+	d.l.RUnlock()
+
+	adm.Nebula.CACredentials = nebulaCACreds
+	adm.Garage.RPCSecret = hostBootstrap.Garage.RPCSecret
+	adm.Garage.GlobalBucketS3APICredentials = garageGlobalBucketCreds
+
+	return adm, nil
 }
 
 func (d *daemon) JoinNetwork(
-	ctx context.Context, newBootstrap JoiningBootstrap,
+	ctx context.Context, newBootstrap bootstrap.Bootstrap,
 ) error {
 	d.l.Lock()
 
@@ -601,13 +554,7 @@ func (d *daemon) JoinNetwork(
 
 	readyCh := make(chan struct{}, 1)
 
-	err := secrets.Import(ctx, d.secretsStore, newBootstrap.Secrets)
-	if err != nil {
-		d.l.Unlock()
-		return fmt.Errorf("importing secrets: %w", err)
-	}
-
-	err = d.initialize(newBootstrap.Bootstrap, readyCh)
+	err := d.initialize(newBootstrap, readyCh)
 	d.l.Unlock()
 	if err != nil {
 		return fmt.Errorf("initializing daemon: %w", err)
@@ -631,20 +578,6 @@ func (d *daemon) GetBootstrap(ctx context.Context) (bootstrap.Bootstrap, error)
 	})
 }
 
-func (d *daemon) GetGarageClientParams(
-	ctx context.Context,
-) (
-	GarageClientParams, error,
-) {
-	return withCurrBootstrap(d, func(
-		currBootstrap bootstrap.Bootstrap,
-	) (
-		GarageClientParams, error,
-	) {
-		return d.getGarageClientParams(ctx, currBootstrap)
-	})
-}
-
 func (d *daemon) RemoveHost(ctx context.Context, hostName nebula.HostName) error {
 	// TODO RemoveHost should publish a certificate revocation for the host
 	// being removed.
@@ -653,114 +586,12 @@ func (d *daemon) RemoveHost(ctx context.Context, hostName nebula.HostName) error
 	) (
 		struct{}, error,
 	) {
-		garageClientParams, err := d.getGarageClientParams(ctx, currBootstrap)
-		if err != nil {
-			return struct{}{}, fmt.Errorf("get garage client params: %w", err)
-		}
-
-		client := garageClientParams.GlobalBucketS3APIClient()
+		client := currBootstrap.GarageClientParams().GlobalBucketS3APIClient()
 		return struct{}{}, removeGarageBootstrapHost(ctx, client, hostName)
 	})
 	return err
 }
 
-func makeCACreds(
-	currBootstrap bootstrap.Bootstrap,
-	caSigningPrivateKey nebula.SigningPrivateKey,
-) nebula.CACredentials {
-	return nebula.CACredentials{
-		Public:            currBootstrap.CAPublicCredentials,
-		SigningPrivateKey: caSigningPrivateKey,
-	}
-}
-
-func (d *daemon) CreateHost(
-	ctx context.Context,
-	hostName nebula.HostName,
-	ip netip.Addr,
-	opts CreateHostOpts,
-) (
-	JoiningBootstrap, error,
-) {
-	return withCurrBootstrap(d, func(
-		currBootstrap bootstrap.Bootstrap,
-	) (
-		JoiningBootstrap, error,
-	) {
-		caSigningPrivateKey, err := getNebulaCASigningPrivateKey(
-			ctx, d.secretsStore,
-		)
-		if err != nil {
-			return JoiningBootstrap{}, fmt.Errorf("getting CA signing key: %w", err)
-		}
-
-		var joiningBootstrap JoiningBootstrap
-		joiningBootstrap.Bootstrap, err = bootstrap.New(
-			makeCACreds(currBootstrap, caSigningPrivateKey),
-			currBootstrap.NetworkCreationParams,
-			hostName,
-			ip,
-		)
-		if err != nil {
-			return JoiningBootstrap{}, fmt.Errorf(
-				"initializing bootstrap data: %w", err,
-			)
-		}
-
-		joiningBootstrap.Bootstrap.Hosts = currBootstrap.Hosts
-
-		secretsIDs := []secrets.ID{
-			garageRPCSecretSecretID,
-			garageS3APIGlobalBucketCredentialsSecretID,
-		}
-
-		if opts.CanCreateHosts {
-			secretsIDs = append(secretsIDs, nebulaCASigningPrivateKeySecretID)
-		}
-
-		if joiningBootstrap.Secrets, err = secrets.Export(
-			ctx, d.secretsStore, secretsIDs,
-		); err != nil {
-			return JoiningBootstrap{}, fmt.Errorf("exporting secrets: %w", err)
-		}
-
-		// TODO persist new bootstrap to garage. Requires making the daemon
-		// config change watching logic smarter, so only dnsmasq gets restarted.
-
-		return joiningBootstrap, nil
-	})
-}
-
-func (d *daemon) CreateNebulaCertificate(
-	ctx context.Context,
-	hostName nebula.HostName,
-	hostPubKey nebula.EncryptingPublicKey,
-) (
-	nebula.Certificate, error,
-) {
-	return withCurrBootstrap(d, func(
-		currBootstrap bootstrap.Bootstrap,
-	) (
-		nebula.Certificate, error,
-	) {
-		host, ok := currBootstrap.Hosts[hostName]
-		if !ok {
-			return nebula.Certificate{}, ErrHostNotFound
-		}
-
-		caSigningPrivateKey, err := getNebulaCASigningPrivateKey(
-			ctx, d.secretsStore,
-		)
-		if err != nil {
-			return nebula.Certificate{}, fmt.Errorf("getting CA signing key: %w", err)
-		}
-
-		caCreds := makeCACreds(currBootstrap, caSigningPrivateKey)
-
-		return nebula.NewHostCert(caCreds, hostPubKey, hostName, host.IP())
-	})
-}
-
 func (d *daemon) Shutdown() error {
 	d.l.Lock()
 	defer d.l.Unlock()

go/daemon/env.go

@@ -22,6 +22,34 @@ type EnvVars struct {
 
 func (e EnvVars) init() error {
 	var errs []error
+	mkDir := func(path string) error {
+		{
+			parentPath := filepath.Dir(path)
+			parentInfo, err := os.Stat(parentPath)
+			if err != nil {
+				return fmt.Errorf("checking parent path %q: %w", parentPath, err)
+			} else if !parentInfo.IsDir() {
+				return fmt.Errorf("%q is not a directory", parentPath)
+			}
+		}
+
+		info, err := os.Stat(path)
+		if errors.Is(err, fs.ErrNotExist) {
+			// fine
+		} else if err != nil {
+			return fmt.Errorf("checking path: %w", err)
+		} else if !info.IsDir() {
+			return fmt.Errorf("path is not a directory")
+		} else {
+			return nil
+		}
+
+		if err := os.Mkdir(path, 0700); err != nil {
+			return fmt.Errorf("creating directory: %w", err)
+		}
+		return nil
+	}
+
 	if err := mkDir(e.RuntimeDirPath); err != nil {
 		errs = append(errs, fmt.Errorf(
 			"creating runtime directory %q: %w",

go/daemon/errors.go

@@ -24,8 +24,4 @@ var (
 	//
 	// The Data field will be a string containing further details.
 	ErrInvalidConfig = jsonrpc2.NewError(5, "Invalid daemon config")
-
-	// ErrHostNotFound is returned when performing an operation which expected a
-	// host to exist in the network, but that host wasn't found.
-	ErrHostNotFound = jsonrpc2.NewError(6, "Host not found")
 )

go/daemon/garage_client_params.go

@@ -1,52 +0,0 @@
-package daemon
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"isle/bootstrap"
-	"isle/garage"
-	"isle/secrets"
-)
-
-// GarageClientParams contains all the data needed to instantiate garage
-// clients.
-type GarageClientParams struct {
-	Peer                         garage.RemotePeer
-	GlobalBucketS3APICredentials garage.S3APICredentials
-
-	// RPCSecret may be empty, if the secret is not available on the host.
-	RPCSecret string
-}
-
-func (d *daemon) getGarageClientParams(
-	ctx context.Context, currBootstrap bootstrap.Bootstrap,
-) (
-	GarageClientParams, error,
-) {
-	creds, err := getGarageS3APIGlobalBucketCredentials(ctx, d.secretsStore)
-	if err != nil {
-		return GarageClientParams{}, fmt.Errorf("getting garage global bucket creds: %w", err)
-	}
-
-	rpcSecret, err := getGarageRPCSecret(ctx, d.secretsStore)
-	if err != nil && !errors.Is(err, secrets.ErrNotFound) {
-		return GarageClientParams{}, fmt.Errorf("getting garage rpc secret: %w", err)
-	}
-
-	return GarageClientParams{
-		Peer:                         currBootstrap.ChooseGaragePeer(),
-		GlobalBucketS3APICredentials: creds,
-		RPCSecret:                    rpcSecret,
-	}, nil
-}
-
-// GlobalBucketS3APIClient returns an S3 client pre-configured with access to
-// the global bucket.
-func (p GarageClientParams) GlobalBucketS3APIClient() garage.S3APIClient {
-	var (
-		addr  = p.Peer.S3APIAddr()
-		creds = p.GlobalBucketS3APICredentials
-	)
-	return garage.NewS3APIClient(addr, creds)
-}

go/daemon/global_bucket.go

@@ -24,13 +24,12 @@ func garageInitializeGlobalBucket(
 	ctx context.Context,
 	logger *mlog.Logger,
 	daemonConfig Config,
-	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	garage.S3APICredentials, error,
 ) {
-	adminClient := newGarageAdminClient(
-		logger, daemonConfig, adminToken, hostBootstrap,
+	adminClient := NewGarageAdminClient(
+		logger, daemonConfig, hostBootstrap,
 	)
 
 	creds, err := adminClient.CreateS3APICredentials(
@@ -63,28 +62,24 @@ func garageInitializeGlobalBucket(
 // putGarageBoostrapHost places the <hostname>.json.signed file for this host
 // into garage so that other hosts are able to see relevant configuration for
 // it.
-func (d *daemon) putGarageBoostrapHost(
+func putGarageBoostrapHost(
 	ctx context.Context, logger *mlog.Logger, currBootstrap bootstrap.Bootstrap,
 ) error {
-	garageClientParams, err := d.getGarageClientParams(ctx, currBootstrap)
-	if err != nil {
-		return fmt.Errorf("getting garage client params: %w", err)
-	}
-
 	var (
-		host   = currBootstrap.ThisHost()
-		client = garageClientParams.GlobalBucketS3APIClient()
+		b      = currBootstrap
+		host   = b.ThisHost()
+		client = b.GarageClientParams().GlobalBucketS3APIClient()
 	)
 
 	configured, err := nebula.Sign(
-		host.HostConfigured, currBootstrap.PrivateCredentials.SigningPrivateKey,
+		host.HostConfigured, b.PrivateCredentials.SigningPrivateKey,
 	)
 	if err != nil {
 		return fmt.Errorf("signing host configured data: %w", err)
 	}
 
 	hostB, err := json.Marshal(bootstrap.AuthenticatedHost{
-		Assigned:   currBootstrap.SignedHostAssigned,
+		Assigned:   b.SignedHostAssigned,
 		Configured: configured,
 	})
 	if err != nil {
@@ -112,18 +107,14 @@ func (d *daemon) putGarageBoostrapHost(
 	return nil
 }
 
-func (d *daemon) getGarageBootstrapHosts(
+func getGarageBootstrapHosts(
 	ctx context.Context, logger *mlog.Logger, currBootstrap bootstrap.Bootstrap,
 ) (
 	map[nebula.HostName]bootstrap.Host, error,
 ) {
-	garageClientParams, err := d.getGarageClientParams(ctx, currBootstrap)
-	if err != nil {
-		return nil, fmt.Errorf("getting garage client params: %w", err)
-	}
-
 	var (
-		client = garageClientParams.GlobalBucketS3APIClient()
+		b      = currBootstrap
+		client = b.GarageClientParams().GlobalBucketS3APIClient()
 		hosts  = map[nebula.HostName]bootstrap.Host{}
 
 		objInfoCh = client.ListObjects(
@@ -161,7 +152,7 @@ func (d *daemon) getGarageBootstrapHosts(
 			continue
 		}
 
-		host, err := authedHost.Unwrap(currBootstrap.CAPublicCredentials)
+		host, err := authedHost.Unwrap(b.CAPublicCredentials)
 		if err != nil {
 			logger.Warn(ctx, "Host could not be authenticated", err)
 		}

go/daemon/jigs.go

@@ -4,11 +4,6 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
-	"errors"
-	"fmt"
-	"io/fs"
-	"os"
-	"path/filepath"
 	"time"
 
 	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
@@ -43,34 +38,3 @@ func randStr(l int) string {
 	}
 	return hex.EncodeToString(b)
 }
-
-// mkDir is like os.Mkdir but it returns better error messages. If the directory
-// already exists then nil is returned.
-func mkDir(path string) error {
-	{
-		parentPath := filepath.Dir(path)
-		parentInfo, err := os.Stat(parentPath)
-		if err != nil {
-			return fmt.Errorf("checking fs node of parent %q: %w", parentPath, err)
-		} else if !parentInfo.IsDir() {
-			return fmt.Errorf("%q is not a directory", parentPath)
-		}
-	}
-
-	info, err := os.Stat(path)
-	if errors.Is(err, fs.ErrNotExist) {
-		// fine
-	} else if err != nil {
-		return fmt.Errorf("checking fs node: %w", err)
-	} else if !info.IsDir() {
-		return fmt.Errorf("exists but is not a directory")
-	} else {
-		return nil
-	}
-
-	if err := os.Mkdir(path, 0700); err != nil {
-		return fmt.Errorf("creating directory: %w", err)
-	}
-
-	return nil
-}

go/daemon/rpc.go

@@ -4,9 +4,9 @@ import (
 	"cmp"
 	"context"
 	"fmt"
+	"isle/admin"
 	"isle/bootstrap"
 	"isle/nebula"
-	"net/netip"
 	"slices"
 
 	"golang.org/x/exp/maps"
@@ -46,16 +46,16 @@ type CreateNetworkRequest struct {
 func (r *RPC) CreateNetwork(
 	ctx context.Context, req CreateNetworkRequest,
 ) (
-	struct{}, error,
+	admin.Admin, error,
 ) {
-	return struct{}{}, r.daemon.CreateNetwork(
+	return r.daemon.CreateNetwork(
 		ctx, req.Name, req.Domain, req.IPNet, req.HostName,
 	)
 }
 
 // JoinNetwork passes through to the Daemon method of the same name.
 func (r *RPC) JoinNetwork(
-	ctx context.Context, req JoiningBootstrap,
+	ctx context.Context, req bootstrap.Bootstrap,
 ) (
 	struct{}, error,
 ) {
@@ -86,14 +86,21 @@ func (r *RPC) GetHosts(
 	return GetHostsResult{hosts}, nil
 }
 
-// GetGarageClientParams passes the call through to the Daemon method of the
-// same name.
+// GetGarageClientParams returns a GarageClientParams which can be used to
+// interact with garage.
 func (r *RPC) GetGarageClientParams(
 	ctx context.Context, req struct{},
 ) (
-	GarageClientParams, error,
+	bootstrap.GarageClientParams, error,
 ) {
-	return r.daemon.GetGarageClientParams(ctx)
+	b, err := r.daemon.GetBootstrap(ctx)
+	if err != nil {
+		return bootstrap.GarageClientParams{}, fmt.Errorf(
+			"retrieving bootstrap: %w", err,
+		)
+	}
+
+	return b.GarageClientParams(), nil
 }
 
 // GetNebulaCAPublicCredentials returns the CAPublicCredentials for the network.
@@ -112,7 +119,7 @@ func (r *RPC) GetNebulaCAPublicCredentials(
 	return b.CAPublicCredentials, nil
 }
 
-// RemoveHostRequest contains the arguments to the RemoveHost RPC method.
+// RemoveHostRequest contains the arguments to the RemoveHost method.
 //
 // All fields are required.
 type RemoveHostRequest struct {
@@ -123,69 +130,3 @@ type RemoveHostRequest struct {
 func (r *RPC) RemoveHost(ctx context.Context, req RemoveHostRequest) (struct{}, error) {
 	return struct{}{}, r.daemon.RemoveHost(ctx, req.HostName)
 }
-
-// CreateHostRequest contains the arguments to the
-// CreateHost RPC method.
-//
-// All fields are required.
-type CreateHostRequest struct {
-	HostName nebula.HostName
-	IP       netip.Addr
-	Opts     CreateHostOpts
-}
-
-// CreateHostResult wraps the results from the CreateHost RPC method.
-type CreateHostResult struct {
-	JoiningBootstrap JoiningBootstrap
-}
-
-// CreateHost passes the call through to the Daemon method of the
-// same name.
-func (r *RPC) CreateHost(
-	ctx context.Context, req CreateHostRequest,
-) (
-	CreateHostResult, error,
-) {
-	joiningBootstrap, err := r.daemon.CreateHost(
-		ctx, req.HostName, req.IP, req.Opts,
-	)
-	if err != nil {
-		return CreateHostResult{}, err
-	}
-
-	return CreateHostResult{JoiningBootstrap: joiningBootstrap}, nil
-}
-
-// CreateNebulaCertificateRequest contains the arguments to the
-// CreateNebulaCertificate RPC method.
-//
-// All fields are required.
-type CreateNebulaCertificateRequest struct {
-	HostName                nebula.HostName
-	HostEncryptingPublicKey nebula.EncryptingPublicKey
-}
-
-// CreateNebulaCertificateResult wraps the results from the
-// CreateNebulaCertificate RPC method.
-type CreateNebulaCertificateResult struct {
-	HostNebulaCertifcate nebula.Certificate
-}
-
-// CreateNebulaCertificate passes the call through to the Daemon method of the
-// same name.
-func (r *RPC) CreateNebulaCertificate(
-	ctx context.Context, req CreateNebulaCertificateRequest,
-) (
-	CreateNebulaCertificateResult, error,
-) {
-	cert, err := r.daemon.CreateNebulaCertificate(
-		ctx, req.HostName, req.HostEncryptingPublicKey,
-	)
-	if err != nil {
-		return CreateNebulaCertificateResult{}, err
-	}
-
-	return CreateNebulaCertificateResult{
-		HostNebulaCertifcate: cert,
-	}, nil
-}

go/daemon/secrets.go

@@ -1,52 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"isle/garage"
-	"isle/nebula"
-	"isle/secrets"
-)
-
-const (
-	secretsNSNebula = "nebula"
-	secretsNSGarage = "garage"
-)
-
-////////////////////////////////////////////////////////////////////////////////
-// Nebula-related secrets
-
-var (
-	nebulaCASigningPrivateKeySecretID = secrets.NewID(secretsNSNebula, "ca-signing-private-key")
-)
-
-var getNebulaCASigningPrivateKey, setNebulaCASigningPrivateKey = secrets.GetSetFunctions[nebula.SigningPrivateKey](
-	nebulaCASigningPrivateKeySecretID,
-)
-
-////////////////////////////////////////////////////////////////////////////////
-// Garage-related secrets
-
-func garageS3APIBucketCredentialsSecretID(credsName string) secrets.ID {
-	return secrets.NewID(
-		secretsNSGarage, fmt.Sprintf("s3-api-bucket-credentials-%s", credsName),
-	)
-}
-
-var (
-	garageRPCSecretSecretID                    = secrets.NewID(secretsNSGarage, "rpc-secret")
-	garageS3APIGlobalBucketCredentialsSecretID = garageS3APIBucketCredentialsSecretID(
-		garage.GlobalBucketS3APICredentialsName,
-	)
-)
-
-// Get/Set functions for garage-related secrets.
-var (
-	getGarageRPCSecret, setGarageRPCSecret = secrets.GetSetFunctions[string](
-		garageRPCSecretSecretID,
-	)
-
-	getGarageS3APIGlobalBucketCredentials,
-	setGarageS3APIGlobalBucketCredentials = secrets.GetSetFunctions[garage.S3APICredentials](
-		garageS3APIGlobalBucketCredentialsSecretID,
-	)
-)

go/garage/garage.go

@@ -11,8 +11,6 @@ const (
 	// accessible to all hosts in the network.
 	GlobalBucket = "global-shared"
 
-	// GlobalBucketS3APICredentialsName is the main alias of the shared API key
-	// used to write to the global bucket.
 	GlobalBucketS3APICredentialsName = "global-shared-key"
 
 	// ReplicationFactor indicates the replication factor set on the garage

go/nebula/encrypting_key.go

@@ -46,7 +46,7 @@ func (pk *EncryptingPublicKey) UnmarshalText(b []byte) error {
 // UnmarshalNebulaPEM unmarshals the EncryptingPublicKey as a nebula host public
 // key PEM.
 func (pk *EncryptingPublicKey) UnmarshalNebulaPEM(b []byte) error {
-	b, _, err := cert.UnmarshalX25519PublicKey(b)
+	b, _, err := cert.UnmarshalEd25519PublicKey(b)
 	if err != nil {
 		return fmt.Errorf("unmarshaling: %w", err)
 	}

go/secrets/secrets.go

@@ -1,13 +0,0 @@
-// Package secrets manages the storage and distributions of secret values that
-// hosts need to perform various actions.
-package secrets
-
-import "fmt"
-
-// ID is a unique identifier for a Secret.
-type ID string
-
-// NewID returns a new ID within the given namespace.
-func NewID(namespace, id string) ID {
-	return ID(fmt.Sprintf("%s-%s", namespace, id))
-}

go/secrets/store.go

@@ -1,105 +0,0 @@
-package secrets
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// ErrNotFound is returned when an ID could not be found.
-var ErrNotFound = errors.New("not found")
-
-// Store is used to persist and retrieve secrets. If a Store serializes a
-// payload it will do so using JSON.
-type Store interface {
-	// Set stores the secret payload of the given ID.
-	Set(context.Context, ID, any) error
-
-	// Get retrieves the secret of the given ID, setting it into the given
-	// pointer value, or returns ErrNotFound.
-	Get(context.Context, any, ID) error
-}
-
-// GetSetFunctions returns a Get/Set function pair for the given ID and payload
-// type.
-func GetSetFunctions[T any](
-	id ID,
-) (
-	func(context.Context, Store) (T, error), // Get
-	func(context.Context, Store, T) error, // Set
-) {
-	var (
-		get = func(ctx context.Context, store Store) (T, error) {
-			var v T
-			err := store.Get(ctx, &v, id)
-			return v, err
-		}
-		set = func(ctx context.Context, store Store, v T) error {
-			return store.Set(ctx, id, v)
-		}
-	)
-	return get, set
-}
-
-// MultiSet will call Set on the given Store for every key-value pair in the
-// given map.
-func MultiSet(ctx context.Context, s Store, m map[ID]any) error {
-	var errs []error
-	for id, payload := range m {
-		if err := s.Set(ctx, id, payload); err != nil {
-			errs = append(errs, fmt.Errorf("setting payload for %q: %w", id, err))
-		}
-	}
-	return errors.Join(errs...)
-}
-
-// MultiGet will call Get on the given Store for every key-value pair in the
-// given map. Each value in the map must be a pointer receiver.
-func MultiGet(ctx context.Context, s Store, m map[ID]any) error {
-	var errs []error
-	for id, into := range m {
-		if err := s.Get(ctx, into, id); err != nil {
-			errs = append(errs, fmt.Errorf("getting payload for %q: %w", id, err))
-		}
-	}
-	return errors.Join(errs...)
-}
-
-// Export returns a map of ID to raw payload for each ID given. An error is
-// returned for _each_ ID which could not be exported, wrapped using
-// `errors.Join`, alongside whatever keys could be exported.
-func Export(
-	ctx context.Context, s Store, ids []ID,
-) (
-	map[ID]json.RawMessage, error,
-) {
-	var (
-		m    = map[ID]json.RawMessage{}
-		errs []error
-	)
-
-	for _, id := range ids {
-		var into json.RawMessage
-		if err := s.Get(ctx, &into, id); err != nil {
-			errs = append(errs, fmt.Errorf("exporting %q: %w", id, err))
-			continue
-		}
-		m[id] = into
-	}
-
-	return m, errors.Join(errs...)
-}
-
-// Import sets all given ID/payload pairs into the Store.
-func Import(
-	ctx context.Context, s Store, m map[ID]json.RawMessage,
-) error {
-	var errs []error
-	for id, payload := range m {
-		if err := s.Set(ctx, id, payload); err != nil {
-			errs = append(errs, fmt.Errorf("importing %q: %w", id, err))
-		}
-	}
-	return errors.Join(errs...)
-}

go/secrets/store_fs.go

@@ -1,83 +0,0 @@
-package secrets
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/fs"
-	"os"
-	"path/filepath"
-)
-
-type fsStore struct {
-	dirPath string
-}
-
-type fsStorePayload[Body any] struct {
-	Version int
-	Body    Body
-}
-
-// NewFSStore returns a Store which will store secrets to the given directory.
-func NewFSStore(dirPath string) (Store, error) {
-	err := os.Mkdir(dirPath, 0700)
-	if err != nil && !errors.Is(err, fs.ErrExist) {
-		return nil, fmt.Errorf("making directory: %w", err)
-	}
-	return &fsStore{dirPath}, nil
-}
-
-func (s *fsStore) path(id ID) string {
-	return filepath.Join(s.dirPath, string(id))
-}
-
-func (s *fsStore) Set(_ context.Context, id ID, payload any) error {
-	path := s.path(id)
-
-	f, err := os.Create(path)
-	if err != nil {
-		return fmt.Errorf("creating file %q: %w", path, err)
-	}
-	defer f.Close()
-
-	if err := json.NewEncoder(f).Encode(fsStorePayload[any]{
-		Version: 1,
-		Body:    payload,
-	}); err != nil {
-		return fmt.Errorf("writing JSON encoded payload to %q: %w", path, err)
-	}
-
-	return nil
-}
-
-func (s *fsStore) Get(_ context.Context, into any, id ID) error {
-	path := s.path(id)
-
-	f, err := os.Open(path)
-	if errors.Is(err, fs.ErrNotExist) {
-		return ErrNotFound
-	} else if err != nil {
-		return fmt.Errorf("creating file %q: %w", path, err)
-	}
-	defer f.Close()
-
-	var fullPayload fsStorePayload[json.RawMessage]
-	if err := json.NewDecoder(f).Decode(&fullPayload); err != nil {
-		return fmt.Errorf("decoding JSON payload from %q: %w", path, err)
-	}
-
-	if fullPayload.Version != 1 {
-		return fmt.Errorf(
-			"unexpected JSON payload version %d", fullPayload.Version,
-		)
-	}
-
-	if err := json.Unmarshal(fullPayload.Body, into); err != nil {
-		return fmt.Errorf(
-			"decoding JSON payload body from %q into %T: %w", path, into, err,
-		)
-	}
-
-	return nil
-}

go/secrets/store_fs_test.go

@@ -1,42 +0,0 @@
-package secrets
-
-import (
-	"context"
-	"errors"
-	"testing"
-)
-
-func Test_fsStore(t *testing.T) {
-	type payload struct {
-		Foo int
-	}
-
-	var (
-		ctx = context.Background()
-		dir = t.TempDir()
-		id  = NewID("testing", "a")
-	)
-
-	store, err := NewFSStore(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var got payload
-	if err := store.Get(ctx, &got, id); !errors.Is(err, ErrNotFound) {
-		t.Fatalf("expected %v, got: %v", ErrNotFound, err)
-	}
-
-	want := payload{Foo: 5}
-	if err := store.Set(ctx, id, want); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := store.Get(ctx, &got, id); err != nil {
-		t.Fatal(err)
-	}
-
-	if want != got {
-		t.Fatalf("wanted %+v, got: %+v", want, got)
-	}
-}

tests/cases/admin/01-create-network.sh

@@ -0,0 +1,16 @@
+# shellcheck source=../../utils/with-1-data-1-empty-node-network.sh
+source "$UTILS"/with-1-data-1-empty-node-network.sh
+
+[ "$(cat a/meta/isle/rpc_port)" = "3900" ]
+[ "$(cat b/meta/isle/rpc_port)" = "3910" ]
+[ "$(cat c/meta/isle/rpc_port)" = "3920" ]
+
+[ "$(jq -r <admin.json '.CreationParams.ID')" != "" ]
+[ "$(jq -r <admin.json '.CreationParams.Name')" = "testing" ]
+[ "$(jq -r <admin.json '.CreationParams.Domain')" = "shared.test" ]
+
+bootstrap_file="$XDG_STATE_HOME/isle/bootstrap.json"
+
+[ "$(jq -rc <"$bootstrap_file" '.AdminCreationParams')" = "$(jq -rc <admin.json '.CreationParams')" ]
+[ "$(jq -rc <"$bootstrap_file" '.CAPublicCredentials')" = "$(jq -rc <admin.json '.Nebula.CACredentials.Public')" ]
+[ "$(jq -r <"$bootstrap_file" '.SignedHostAssigned.Body.Name')" = "primus" ]

tests/cases/admin/02-create-bootstrap.sh

@@ -0,0 +1,14 @@
+# shellcheck source=../../utils/with-1-data-1-empty-node-network.sh
+source "$UTILS"/with-1-data-1-empty-node-network.sh
+
+adminBS="$XDG_STATE_HOME"/isle/bootstrap.json
+bs="$secondus_bootstrap" # set in with-1-data-1-empty-node-network.sh
+
+[ "$(jq -r <"$bs" '.AdminCreationParams')" = "$(jq -r <admin.json '.CreationParams')" ]
+[ "$(jq -r <"$bs" '.SignedHostAssigned.Body.Name')" = "secondus" ]
+
+[ "$(jq -r <"$bs" '.Hosts.primus.PublicCredentials')" \
+= "$(jq -r <"$adminBS" '.SignedHostAssigned.Body.PublicCredentials')" ]
+
+[ "$(jq <"$bs" '.Hosts.primus.Garage.Instances|length')" = "3" ]
+

tests/cases/hosts/01-create.sh

@@ -1,17 +0,0 @@
-# shellcheck source=../../utils/with-1-data-1-empty-node-network.sh
-source "$UTILS"/with-1-data-1-empty-node-network.sh
-
-adminBS="$XDG_STATE_HOME"/isle/bootstrap.json
-bs="$secondus_bootstrap" # set in with-1-data-1-empty-node-network.sh
-
-[ "$(jq -r <"$bs" '.Bootstrap.NetworkCreationParams.Domain')" = "shared.test" ]
-[ "$(jq -r <"$bs" '.Bootstrap.NetworkCreationParams.Name')" = "testing" ]
-[ "$(jq -r <"$bs" '.Bootstrap.SignedHostAssigned.Body.Name')" = "secondus" ]
-
-[ "$(jq -r <"$bs" '.Bootstrap.Hosts.primus.PublicCredentials')" \
-= "$(jq -r <"$adminBS" '.SignedHostAssigned.Body.PublicCredentials')" ]
-
-[ "$(jq <"$bs" '.Bootstrap.Hosts.primus.Garage.Instances|length')" = "3" ]
-
-[ "$(jq <"$bs" '.Secrets["garage-rpc-secret"]')" != "null" ]
-

tests/cases/nebula/00-show.sh

@@ -1,12 +0,0 @@
-# shellcheck source=../../utils/with-1-data-1-empty-node-network.sh
-source "$UTILS"/with-1-data-1-empty-node-network.sh
-
-info="$(isle nebula show)"
-
-[ "$(echo "$info" | jq -r '.CACert')" \
-= "$(jq -r <"$BOOTSTRAP_FILE" '.CAPublicCredentials.Cert')" ]
-
-[ "$(echo "$info" | jq -r '.SubnetCIDR')" = "10.6.9.0/24" ]
-[ "$(echo "$info" | jq -r '.Lighthouses|length')" = "1" ]
-[ "$(echo "$info" | jq -r '.Lighthouses[0].PublicAddr')" = "127.0.0.1:60000" ]
-[ "$(echo "$info" | jq -r '.Lighthouses[0].IP')" = "10.6.9.1" ]

tests/cases/nebula/01-create-cert.sh

@@ -1,17 +0,0 @@
-# shellcheck source=../../utils/with-1-data-1-empty-node-network.sh
-source "$UTILS"/with-1-data-1-empty-node-network.sh
-
-nebula-cert keygen -out-key /dev/null -out-pub pubkey
-cat pubkey
-
-(
-    isle nebula create-cert \
-        --hostname non-esiste \
-        --public-key-path pubkey \
-        2>&1 || true \
-) | grep '\[6\] Host not found'
-
-isle nebula create-cert \
-    --hostname primus \
-    --public-key-path pubkey \
-    | grep -- '-----BEGIN NEBULA CERTIFICATE-----'

tests/cases/network/00-create.sh

@@ -1,12 +0,0 @@
-# shellcheck source=../../utils/with-1-data-1-empty-node-network.sh
-source "$UTILS"/with-1-data-1-empty-node-network.sh
-
-[ "$(cat a/meta/isle/rpc_port)" = "3900" ]
-[ "$(cat b/meta/isle/rpc_port)" = "3910" ]
-[ "$(cat c/meta/isle/rpc_port)" = "3920" ]
-
-[ "$(jq -r <"$BOOTSTRAP_FILE" '.NetworkCreationParams.ID')" != "" ]
-[ "$(jq -r <"$BOOTSTRAP_FILE" '.NetworkCreationParams.Name')" = "testing" ]
-[ "$(jq -r <"$BOOTSTRAP_FILE" '.NetworkCreationParams.Domain')" = "shared.test" ]
-
-[ "$(jq -r <"$BOOTSTRAP_FILE" '.SignedHostAssigned.Body.Name')" = "primus" ]

tests/utils/shared-daemon-env.sh

@@ -13,6 +13,5 @@ export TMPDIR="$TMPDIR"
 export XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR"
 export XDG_STATE_HOME="$XDG_STATE_HOME"
 export ISLE_DAEMON_HTTP_SOCKET_PATH="$ROOT_TMPDIR/$base-daemon.sock"
-BOOTSTRAP_FILE="$XDG_STATE_HOME/isle/bootstrap.json"
 cd "$TMPDIR"
 EOF

tests/utils/with-1-data-1-empty-node-network.sh

@@ -63,10 +63,12 @@ EOF
         --domain      shared.test \
         --hostname    primus \
         --ip-net      "$ipNet" \
-        --name        "testing"
+        --name        "testing" \
+        > admin.json
 
     echo "Creating secondus bootstrap"
-    isle hosts create \
+    isle admin create-bootstrap \
+        --admin-path admin.json \
         --hostname secondus \
         --ip "$secondus_ip" \
         > "$secondus_bootstrap"