chore: modify dockerfile to build with stbernard

.github/workflows/edge-publish.yml

@@ -69,4 +69,3 @@ jobs:
             checkout_hash=$GITHUB_SHA
           provenance: false
           push: true
-

dockerfiles/bloodhound.Dockerfile

@@ -26,48 +26,27 @@ ARG AZUREHOUND_VERSION=v2.1.9
 FROM --platform=$BUILDPLATFORM docker.io/library/node:20-alpine AS deps
 ARG version=v999.999.999
 ARG checkout_hash=""
-ENV PYTHONUNBUFFERED=1
-ENV VERSION=${version}
+ENV SB_LOG_LEVEL=debug
+ENV SB_VERSION=${version}
 ENV CHECKOUT_HASH=${checkout_hash}
 WORKDIR /bloodhound
 
-RUN apk add --update --no-cache python3 git go
-RUN find /usr/lib -name EXTERNALLY-MANAGED -delete
-RUN python3 -m ensurepip
-RUN pip3 install --no-cache --upgrade pip setuptools
+RUN apk add --update --no-cache git go
 
 COPY . /bloodhound
+RUN go run github.com/specterops/bloodhound/packages/go/stbernard deps
 
 ########
-# Build UI
+# Build
 ################
-FROM deps AS ui-builder
-
-WORKDIR /bloodhound/packages/javascript/bh-shared-ui
-RUN yarn install
-RUN yarn build
-
-WORKDIR /bloodhound/packages/javascript/js-client-library
-RUN yarn install
-RUN yarn build
-
-WORKDIR /bloodhound
-RUN python3 packages/python/beagle/main.py build bh-ui -v
-
-########
-# Build API
-################
-FROM deps AS api-builder
+FROM deps AS builder
 ARG TARGETOS
 ARG TARGETARCH
-ENV GOOS=${TARGETOS}
-ENV GOARCH=${TARGETARCH}
 ENV CGO_ENABLED=0
+ENV SB_VERSION=${version}
 WORKDIR /bloodhound
 
-COPY --from=ui-builder /bloodhound/dist /bloodhound/dist
-
-RUN python3 packages/python/beagle/main.py build bh -v -d
+RUN go run github.com/specterops/bloodhound/packages/go/stbernard build --os ${TARGETOS} --arch ${TARGETARCH}
 
 ########
 # Package other assets
@@ -118,7 +97,7 @@ ARG SHARPHOUND_VERSION
 ARG AZUREHOUND_VERSION
 
 COPY dockerfiles/configs/bloodhound.config.json /bloodhound.config.json
-COPY --from=api-builder /bloodhound/dist/bhapi /bloodhound
+COPY --from=builder /bloodhound/dist/bhapi /bloodhound
 COPY --from=hound-builder /opt/bloodhound /etc/bloodhound /var/log /
 COPY --from=hound-builder /tmp/sharphound/sharphound-$SHARPHOUND_VERSION.zip /etc/bloodhound/collectors/sharphound/
 COPY --from=hound-builder /tmp/sharphound/sharphound-$SHARPHOUND_VERSION.zip.sha256 /etc/bloodhound/collectors/sharphound/

packages/go/stbernard/command/builder/builder.go

@@ -59,6 +59,8 @@ func (s *command) Name() string {
 // Parse command flags
 func (s *command) Parse(cmdIndex int) error {
 	cmd := flag.NewFlagSet(Name, flag.ExitOnError)
+	targetOs := cmd.String("os", "", "Specify the OS to build for. This will override anything in GOOS.")
+	targetArch := cmd.String("arch", "", "Specify the architecture to build for. This will override anything in GOARCH.")
 
 	cmd.Usage = func() {
 		w := flag.CommandLine.Output()
@@ -71,6 +73,13 @@ func (s *command) Parse(cmdIndex int) error {
 		return fmt.Errorf("parsing %s command: %w", Name, err)
 	}
 
+	if *targetOs != "" {
+		s.env.Override("GOOS", *targetOs)
+	}
+	if *targetArch != "" {
+		s.env.Override("GOARCH", *targetArch)
+	}
+
 	return nil
 }
 

packages/go/stbernard/command/command.go

@@ -72,15 +72,14 @@ type usageFunc func()
 //
 // It does not support flags of its own, each subcommand is responsible for parsing
 // their flags.
-func ParseCLI() (CommandRunner, error) {
+func ParseCLI(env environment.Environment) (CommandRunner, error) {
 	var (
 		verboseEnabled *bool
 		debugEnabled   *bool
 		cmdStartIdx    int
 		currentCmd     command
 		helpRequested  bool
 
-		env      = environment.NewEnvironment()
 		commands = []command{
 			envdump.Create(env),
 			deps.Create(env),

packages/go/stbernard/environment/environment.go

@@ -19,6 +19,13 @@ package environment
 import (
 	"os"
 	"strings"
+
+	"github.com/specterops/bloodhound/log"
+)
+
+const (
+	LogLevelVarName = "SB_LOG_LEVEL"
+	VersionVarName  = "SB_VERSION"
 )
 
 // Environment is a string map representation of env vars
@@ -46,6 +53,12 @@ func (s Environment) SetIfEmpty(key string, value string) {
 	}
 }
 
+// Overrides an environment variable with a new value
+func (s Environment) Override(key string, value string) {
+	log.Infof("Overriding environment variable %s with %s", key, value)
+	s[key] = value
+}
+
 // Slice converts the Environment to a slice of strings in the form `KEY=VALUE` to send to external libraries
 func (s Environment) Slice() []string {
 	var envSlice = make([]string, 0, len(s))

packages/go/stbernard/main.go

@@ -20,15 +20,15 @@ package main
 
 import (
 	"errors"
-	"os"
 
 	"github.com/specterops/bloodhound/log"
 	"github.com/specterops/bloodhound/packages/go/stbernard/command"
+	"github.com/specterops/bloodhound/packages/go/stbernard/environment"
 )
 
 func main() {
-	const LogLevelVarName = "SB_LOG_LEVEL"
-	var rawLvl = os.Getenv(LogLevelVarName)
+	env := environment.NewEnvironment()
+	var rawLvl = env[environment.LogLevelVarName]
 
 	log.ConfigureDefaults()
 
@@ -37,12 +37,12 @@ func main() {
 	}
 
 	if lvl, err := log.ParseLevel(rawLvl); err != nil {
-		log.Errorf("Could not parse log level from %s: %v", LogLevelVarName, err)
+		log.Errorf("Could not parse log level from %s: %v", environment.LogLevelVarName, err)
 	} else {
 		log.SetGlobalLevel(lvl)
 	}
 
-	if cmd, err := command.ParseCLI(); errors.Is(err, command.ErrNoCmd) {
+	if cmd, err := command.ParseCLI(env); errors.Is(err, command.ErrNoCmd) {
 		log.Fatalf("No valid command specified")
 	} else if errors.Is(err, command.ErrHelpRequested) {
 		// No need to exit 1 if help was requested

packages/go/stbernard/workspace/golang/build.go

@@ -33,15 +33,21 @@ import (
 // BuildMainPackages builds all main packages for a list of module paths
 func BuildMainPackages(workRoot string, modPaths []string, env environment.Environment) error {
 	var (
+		err      error
 		errs     []error
 		wg       sync.WaitGroup
 		mu       sync.Mutex
+		version  semver.Version
 		buildDir = filepath.Join(workRoot, "dist") + string(filepath.Separator)
 	)
 
-	version, err := git.ParseLatestVersionFromTags(workRoot, env)
-	if err != nil {
-		return fmt.Errorf("parse latest version from git tags: %w", err)
+	if version, err = git.ParseLatestVersionFromTags(workRoot, env); err != nil {
+		log.Warnf("Failed to parse version from git tags, falling back to environment variable: %v", err)
+		parsedVersion, err := semver.NewVersion(env[environment.VersionVarName])
+		if err != nil {
+			return fmt.Errorf("error parsing version from environment variable: %w", err)
+		}
+		version = *parsedVersion
 	}
 
 	log.Infof("Building for version %s", version.Original())