Merge branch 'main' into add-custom-routes

Author: RahulThennarasu

Protobuf.Makefile

@@ -1,12 +1,26 @@
+# Copyright © 2025 Apple Inc. and the Containerization project authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOCAL_DIR := $(ROOT_DIR)/.local
-LOCALBIN := $(LOCAL_DIR)/bin
+LOCAL_BIN_DIR := $(LOCAL_DIR)/bin
 
-## Versions
-PROTOC_VERSION=26.1
+# Versions
+PROTOC_VERSION := 26.1
 
-# protoc binary installation
-PROTOC_ZIP = protoc-$(PROTOC_VERSION)-osx-universal_binary.zip
-PROTOC = $(LOCALBIN)/protoc@$(PROTOC_VERSION)/protoc
+# Protoc binary installation
+PROTOC_ZIP := protoc-$(PROTOC_VERSION)-osx-universal_binary.zip
+PROTOC := $(LOCAL_BIN_DIR)/protoc@$(PROTOC_VERSION)/protoc
 $(PROTOC):
 	@echo Downloading protocol buffers...
 	@mkdir -p $(LOCAL_DIR)
@@ -16,14 +30,13 @@ $(PROTOC):
 	@unzip -o $(PROTOC_ZIP) 'include/*' -d $(dir $@)
 	@rm -f $(PROTOC_ZIP)
 
-protoc_gen_grpc_swift:
-	swift build --product protoc-gen-grpc-swift
-
+.PHONY: protoc-gen-swift
 protoc-gen-swift:
-	swift build --product protoc-gen-swift
+	@$(SWIFT) build --product protoc-gen-swift
+	@$(SWIFT) build --product protoc-gen-grpc-swift
 
 .PHONY: protos
-protos: $(PROTOC) protoc_gen_grpc_swift protoc-gen-swift
+protos: $(PROTOC) protoc-gen-swift
 	@echo Generating protocol buffers source code...
 	@$(PROTOC) Sources/Containerization/SandboxContext/SandboxContext.proto \
 		--plugin=protoc-gen-grpc-swift=$(BUILD_BIN_DIR)/protoc-gen-grpc-swift \
@@ -35,3 +48,8 @@ protos: $(PROTOC) protoc_gen_grpc_swift protoc-gen-swift
 		--swift_opt=Visibility=Public \
 		-I.
 	@"$(MAKE)" update-licenses
+
+.PHONY: clean-proto-tools
+clean-proto-tools:
+	@echo Cleaning proto tools...
+	@rm -rf $(LOCAL_DIR)/bin/protoc*

Sources/Integration/ContainerTests.swift

@@ -930,6 +930,73 @@ extension IntegrationSuite {
         }
     }
 
+    func testUnixSocketIntoGuest() async throws {
+        let id = "test-unixsocket-into-guest"
+
+        let bs = try await bootstrap(id)
+
+        let hostSocketPath = try createHostUnixSocket()
+
+        let buffer = BufferWriter()
+        let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
+            config.process.arguments = ["sleep", "100"]
+            config.sockets = [
+                UnixSocketConfiguration(
+                    source: URL(filePath: hostSocketPath),
+                    destination: URL(filePath: "/tmp/test.sock"),
+                    direction: .into
+                )
+            ]
+            config.bootlog = bs.bootlog
+        }
+
+        do {
+            try await container.create()
+            try await container.start()
+
+            // Execute ls -l to check the socket exists and is indeed a socket
+            let lsExec = try await container.exec("ls-socket") { config in
+                config.arguments = ["ls", "-l", "/tmp/test.sock"]
+                config.stdout = buffer
+            }
+
+            try await lsExec.start()
+            let status = try await lsExec.wait()
+            try await lsExec.delete()
+
+            guard status.exitCode == 0 else {
+                throw IntegrationError.assert(msg: "ls command failed with status \(status)")
+            }
+
+            guard let output = String(data: buffer.data, encoding: .utf8) else {
+                throw IntegrationError.assert(msg: "failed to convert ls output to UTF8")
+            }
+
+            // Socket files in ls -l output start with 's'
+            guard output.hasPrefix("s") else {
+                throw IntegrationError.assert(
+                    msg: "expected socket file (starting with 's'), got: \(output)")
+            }
+
+            try await container.kill(SIGKILL)
+            try await container.wait()
+            try await container.stop()
+        } catch {
+            try? await container.stop()
+            throw error
+        }
+    }
+
+    private func createHostUnixSocket() throws -> String {
+        let dir = FileManager.default.uniqueTemporaryDirectory(create: true)
+        let socketPath = dir.appendingPathComponent("test.sock").path
+
+        let socket = try Socket(type: UnixType(path: socketPath))
+        try socket.listen()
+
+        return socketPath
+    }
+
     private func createMountDirectory() throws -> URL {
         let dir = FileManager.default.uniqueTemporaryDirectory(create: true)
         try "hello".write(to: dir.appendingPathComponent("hi.txt"), atomically: true, encoding: .utf8)

Sources/Integration/Suite.swift

@@ -293,6 +293,7 @@ struct IntegrationSuite: AsyncParsableCommand {
             Test("container statistics", testContainerStatistics),
             Test("container cgroup limits", testCgroupLimits),
             Test("container no serial console", testNoSerialConsole),
+            Test("unix socket into guest", testUnixSocketIntoGuest),
 
             // Pods
             Test("pod single container", testPodSingleContainer),

licenserc.toml

@@ -4,6 +4,7 @@ headerPath = "scripts/license-header.txt"
 
 includes = [
     "Makefile",
+    "*.Makefile",
     "*.swift",
     "*.h",
     "*.cpp",