Removed legacy code and refactoring

firewall/interception/windowskext/service.go

@@ -10,78 +10,105 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-func createService(manager windows.Handle, portmasterKextPath *uint16) (windows.Handle, error) {
-	u16filename, err := syscall.UTF16FromString(driverName)
-	if err != nil {
-		return 0, fmt.Errorf("Bad service: %s", err)
-	}
-	// Check if it's already created
-	service, err := windows.OpenService(manager, &u16filename[0], windows.SERVICE_ALL_ACCESS)
-	if err == nil {
-		return service, nil
-	}
-
-	// Create the service
-	service, err = windows.CreateService(manager, &u16filename[0], &u16filename[0], windows.SERVICE_ALL_ACCESS, windows.SERVICE_KERNEL_DRIVER, windows.SERVICE_DEMAND_START, windows.SERVICE_ERROR_NORMAL, portmasterKextPath, nil, nil, nil, nil, nil)
-	if err != nil {
-		return 0, err
-	}
-
-	return service, nil
+type KextService struct {
+	handle windows.Handle
 }
 
-func driverInstall(portmasterKextPath string) (windows.Handle, error) {
-	u16kextPath, _ := syscall.UTF16FromString(portmasterKextPath)
+func createKextService(driverName string, driverPath string) (*KextService, error) {
 	// Open the service manager:
 	manager, err := windows.OpenSCManager(nil, nil, windows.SC_MANAGER_ALL_ACCESS)
 	if err != nil {
-		return 0, fmt.Errorf("Failed to open service manager: %d", err)
+		return nil, fmt.Errorf("failed to open service manager: %d", err)
 	}
 	defer windows.CloseServiceHandle(manager)
 
-	// Try to create the service. Retry if it fails.
-	var service windows.Handle
-retryLoop:
-	for i := 0; i < 3; i++ {
-		service, err = createService(manager, &u16kextPath[0])
-		if err == nil {
-			break retryLoop
-		}
+	driverNameU16, err := syscall.UTF16FromString(driverName)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert driver name to UTF16 string: %w", err)
+	}
+	// Check if it's already created
+	service, err := windows.OpenService(manager, &driverNameU16[0], windows.SERVICE_ALL_ACCESS)
+	if err == nil {
+		return &KextService{handle: service}, nil // service was already created
 	}
 
+	driverPathU16, err := syscall.UTF16FromString(driverPath)
+
+	// Create the service
+	service, err = windows.CreateService(manager, &driverNameU16[0], &driverNameU16[0], windows.SERVICE_ALL_ACCESS, windows.SERVICE_KERNEL_DRIVER, windows.SERVICE_DEMAND_START, windows.SERVICE_ERROR_NORMAL, &driverPathU16[0], nil, nil, nil, nil, nil)
 	if err != nil {
-		return 0, fmt.Errorf("Failed to create service: %s", err)
+		return nil, err
+	}
+
+	return &KextService{handle: service}, nil
+}
+
+func (s *KextService) isValid() bool {
+	return s != nil && s.handle != winInvalidHandleValue && s.handle != 0
+}
+
+func (s *KextService) start() error {
+	if !s.isValid() {
+		return fmt.Errorf("kext service not initialized")
 	}
 
 	// Start the service:
-	err = windows.StartService(service, 0, nil)
+	err := windows.StartService(s.handle, 0, nil)
 
 	if err != nil {
 		err = windows.GetLastError()
 		if err != windows.ERROR_SERVICE_ALREADY_RUNNING {
 			// Failed to start service; clean-up:
 			var status windows.SERVICE_STATUS
-			_ = windows.ControlService(service, windows.SERVICE_CONTROL_STOP, &status)
-			_ = windows.DeleteService(service)
-			_ = windows.CloseServiceHandle(service)
-			service = 0
+			_ = windows.ControlService(s.handle, windows.SERVICE_CONTROL_STOP, &status)
+			_ = windows.DeleteService(s.handle)
+			_ = windows.CloseServiceHandle(s.handle)
+			s.handle = winInvalidHandleValue
+			return err
 		}
 	}
 
-	return service, nil
+	return nil
 }
 
-func openDriver(filename string) (windows.Handle, error) {
-	u16filename, _ := syscall.UTF16FromString(filename)
-
-	handle, err := windows.CreateFile(&u16filename[0], windows.GENERIC_READ|windows.GENERIC_WRITE, 0, nil, windows.OPEN_EXISTING, windows.FILE_ATTRIBUTE_NORMAL|windows.FILE_FLAG_OVERLAPPED, 0)
-	if err != nil {
-		return 0, err
+func (s *KextService) stop() error {
+	if !s.isValid() {
+		return fmt.Errorf("kext service not initialized")
 	}
 
-	return handle, nil
+	var status windows.SERVICE_STATUS
+	err := windows.ControlService(s.handle, windows.SERVICE_CONTROL_STOP, &status)
+	if err != nil {
+		return fmt.Errorf("service failed to stop: %w", err)
+	}
+
+	if status.CurrentState != windows.SERVICE_STOP_PENDING && status.CurrentState != windows.SERVICE_STOPPED {
+		return fmt.Errorf("service unexpected status after stop: %d", status.CurrentState)
+	}
+
+	return nil
 }
 
-func closeDriver(handle windows.Handle) error {
-	return windows.CloseHandle(handle)
+func (s *KextService) delete() error {
+	if !s.isValid() {
+		return fmt.Errorf("kext service not initialized")
+	}
+
+	err := windows.DeleteService(s.handle)
+	if err != nil {
+		return fmt.Errorf("failed to delete service: %s", err)
+	}
+	return nil
+}
+
+func (s *KextService) closeHandle() error {
+	if !s.isValid() {
+		return fmt.Errorf("kext service not initialized")
+	}
+
+	err := windows.CloseServiceHandle(s.handle)
+	if err != nil {
+		return fmt.Errorf("failed to close service handle: %s", err)
+	}
+	return nil
 }