change sign ident

ethanndickson · ethanndickson · commit af5acc90687d · 2024-11-15T05:30:51.000Z
diff --git a/scripts/build_go.sh b/scripts/build_go.sh
@@ -39,6 +39,7 @@ arch="${GOARCH:-amd64}"
 slim="${CODER_SLIM_BUILD:-0}"
 sign_darwin="${CODER_SIGN_DARWIN:-0}"
 sign_windows="${CODER_SIGN_WINDOWS:-0}"
+bin_ident="com.coder.cli"
 output_path=""
 agpl="${CODER_BUILD_AGPL:-0}"
 boringcrypto=${CODER_BUILD_BORINGCRYPTO:-0}
@@ -185,6 +186,7 @@ if [[ "$dylib" == 1 ]]; then
 	cmd_path="./vpn/dylib/lib.go"
 	build_args+=("-buildmode=c-shared")
 	sdk="$(xcrun --sdk macosx --show-sdk-path)"
+	bin_ident="com.coder.desktop"
 fi
 
 goexp=""
@@ -199,7 +201,7 @@ GOEXPERIMENT="$goexp" CGO_ENABLED="$cgo" GOOS="$os" GOARCH="$arch" GOARM="$arm_v
 	"$cmd_path" 1>&2
 
 if [[ "$sign_darwin" == 1 ]] && [[ "$os" == "darwin" ]]; then
-	execrelative ./sign_darwin.sh "$output_path" 1>&2
+	execrelative ./sign_darwin.sh "$output_path" "$bin_ident" 1>&2
 fi
 
 if [[ "$sign_windows" == 1 ]] && [[ "$os" == "windows" ]]; then
diff --git a/scripts/sign_darwin.sh b/scripts/sign_darwin.sh
@@ -3,7 +3,7 @@
 # This script signs the provided darwin binary with an Apple Developer
 # certificate.
 #
-# Usage: ./sign_darwin.sh path/to/binary
+# Usage: ./sign_darwin.sh path/to/binary binary_identifier
 #
 # On success, the input file will be signed using the Apple Developer
 # certificate.
@@ -25,15 +25,23 @@ set -euo pipefail
 # shellcheck source=scripts/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
 
+if [[ "$#" -lt 2 ]]; then
+    echo "Usage: $0 path/to/binary binary_identifier"
+    exit 1
+fi
+
+BINARY_PATH="$1"
+BINARY_IDENTIFIER="$2"
+
 # Check dependencies
 dependencies rcodesign
 requiredenvs AC_CERTIFICATE_FILE AC_CERTIFICATE_PASSWORD_FILE
 
 # -v is quite verbose, the default output is pretty good on it's own.
 rcodesign sign \
-	--binary-identifier "com.coder.cli" \
-	--p12-file "$AC_CERTIFICATE_FILE" \
-	--p12-password-file "$AC_CERTIFICATE_PASSWORD_FILE" \
-	--code-signature-flags runtime \
-	"$@" \
-	1>&2
+    --binary-identifier "$BINARY_IDENTIFIER" \
+    --p12-file "$AC_CERTIFICATE_FILE" \
+    --p12-password-file "$AC_CERTIFICATE_PASSWORD_FILE" \
+    --code-signature-flags runtime \
+    "$BINARY_PATH" \
+    1>&2
diff --git a/vpn/dylib/lib.go b/vpn/dylib/lib.go
@@ -15,27 +15,24 @@ import (
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
+
 	"github.com/coder/coder/v2/vpn"
 )
 
 // OpenTunnel creates a new VPN tunnel by `dup`ing the provided 'PIPE'
 // file descriptors for reading, writing, and logging.
 //
 //export OpenTunnel
-func OpenTunnel(cReadFD, cWriteFD, cLogFD int32) int32 {
+func OpenTunnel(cReadFD, cWriteFD int32) int32 {
 	ctx := context.Background()
 
 	conn, err := newFdConn(cReadFD, cWriteFD)
 	if err != nil {
 		return -1
 	}
 
-	logger, err := newFdLogger(cLogFD)
-	if err != nil {
-		return -1
-	}
-
-	_, err = vpn.NewTunnel(ctx, logger, conn)
+	// Logs will be sent over the protocol
+	_, err = vpn.NewTunnel(ctx, slog.Make(sloghuman.Sink(io.Discard)), conn)
 	if err != nil {
 		return -1
 	}
@@ -93,17 +90,4 @@ func newFdConn(cReadFD, cWriteFD int32) (io.ReadWriteCloser, error) {
 	}, nil
 }
 
-func newFdLogger(cLogFD int32) (slog.Logger, error) {
-	logFD, err := unix.Dup(int(cLogFD))
-	if err != nil {
-		return slog.Logger{}, xerrors.New("failed to dup logFD")
-	}
-	logFile := os.NewFile(uintptr(logFD), "PIPE")
-	if logFile == nil {
-		unix.Close(logFD)
-		return slog.Logger{}, xerrors.New("failed to create log file")
-	}
-	return slog.Make(sloghuman.Sink(logFile)).Leveled(slog.LevelDebug), nil
-}
-
 func main() {}
