vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-01 18:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cleanup for new kext

Browse source
This commit is contained in:
Vladimir Stoilov 2024-04-18 10:09:06 +03:00
parent e082d047de
commit 10d1584d20
No known key found for this signature in database
GPG key ID: 2F190B67A43A81AF
2 changed files with 1 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
firewall/interception/windowskext2/service.go
View file

@ -9,146 +9,4 @@ import (
func createKextService(driverName string, driverPath string) (*kext_interface.KextService, error) {
return kext_interface.CreateKextService(driverName, driverPath)
}
// func deleteService(manager windows.Handle, service *KextService, driverName []uint16) error {
// // Stop and wait before deleting
// _ = service.stop(true)
// // Try to delete even if stop failed
// err := service.delete()
// if err != nil {
// return fmt.Errorf("failed to delete old service: %s", err)
// }
// // Wait until we can no longer open the old service.
// // Not very efficient but NotifyServiceStatusChange cannot be used with driver service.
// start := time.Now()
// timeLimit := time.Duration(30 * time.Second)
// for {
// handle, err := windows.OpenService(manager, &driverName[0], windows.SERVICE_ALL_ACCESS)
// if err != nil {
// break
// }
// _ = windows.CloseServiceHandle(handle)
// if time.Since(start) > timeLimit {
// return fmt.Errorf("time limit reached")
// }
// time.Sleep(100 * time.Millisecond)
// }
// return nil
// }
// func (s *KextService) isValid() bool {
// return s != nil && s.handle != winInvalidHandleValue && s.handle != 0
// }
// func (s *KextService) isRunning() (bool, error) {
// if !s.isValid() {
// return false, fmt.Errorf("kext service not initialized")
// }
// var status windows.SERVICE_STATUS
// err := windows.QueryServiceStatus(s.handle, &status)
// if err != nil {
// return false, err
// }
// return status.CurrentState == windows.SERVICE_RUNNING, nil
// }
// func waitForServiceStatus(handle windows.Handle, neededStatus uint32, timeLimit time.Duration) (bool, error) {
// var status windows.SERVICE_STATUS
// status.CurrentState = windows.SERVICE_NO_CHANGE
// start := time.Now()
// for status.CurrentState == neededStatus {
// err := windows.QueryServiceStatus(handle, &status)
// if err != nil {
// return false, fmt.Errorf("failed while waiting for service to start: %w", err)
// }
// if time.Since(start) > timeLimit {
// return false, fmt.Errorf("time limit reached")
// }
// // Sleep for 1/10 of the wait hint, recommended time from microsoft
// time.Sleep(time.Duration((status.WaitHint / 10)) * time.Millisecond)
// }
// return true, nil
// }
// func (s *KextService) start(wait bool) error {
// if !s.isValid() {
// return fmt.Errorf("kext service not initialized")
// }
// // Start the service:
// 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(s.handle, windows.SERVICE_CONTROL_STOP, &status)
// _ = windows.DeleteService(s.handle)
// _ = windows.CloseServiceHandle(s.handle)
// s.handle = winInvalidHandleValue
// return err
// }
// }
// // Wait for service to start
// if wait {
// success, err := waitForServiceStatus(s.handle, windows.SERVICE_RUNNING, time.Duration(10*time.Second))
// if err != nil || !success {
// return fmt.Errorf("service did not start: %w", err)
// }
// }
// return nil
// }
// func (s *KextService) stop(wait bool) error {
// if !s.isValid() {
// return fmt.Errorf("kext service not initialized")
// }
// // Stop the service
// 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)
// }
// // Wait for service to stop
// if wait {
// success, err := waitForServiceStatus(s.handle, windows.SERVICE_STOPPED, time.Duration(10*time.Second))
// if err != nil || !success {
// return fmt.Errorf("service did not stop: %w", err)
// }
// }
// return nil
// }
// 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)
// }
// // Service wont be deleted until all handles are closed.
// err = windows.CloseServiceHandle(s.handle)
// if err != nil {
// return fmt.Errorf("failed to close service handle: %s", err)
// }
// s.handle = winInvalidHandleValue
// return nil
// }
}

2
go.mod
View file

@ -7,8 +7,6 @@ toolchain go1.21.2
// TODO: Remove when https://github.com/tc-hib/winres/pull/4 is merged or changes are otherwise integrated.
replace github.com/tc-hib/winres => github.com/dhaavi/winres v0.2.2
replace github.com/vlabo/portmaster_windows_rust_kext/kext_interface => /home/vladimir/Dev/Safing/portmaster_windows_rust_kext/kext_interface
require (
github.com/Xuanwo/go-locale v1.1.0
github.com/agext/levenshtein v1.2.3