pkg/runner/output.go (1)

226-259: Consider extracting service field logic to reduce duplication.

The service field copying and clearing logic (lines 226-259) is duplicated in WriteCsvOutputWithMac (lines 303-336). Consider extracting this into a helper method to improve maintainability.

🔎 Example refactor with helper methods

Add these helper methods to the file:

// copyServiceToResult copies service fields from port.Service to Result
func copyServiceToResult(result *Result, service *port.Service) {
	result.DeviceType = service.DeviceType
	result.ExtraInfo = service.ExtraInfo
	result.HighVersion = service.HighVersion
	result.Hostname = service.Hostname
	result.LowVersion = service.LowVersion
	result.Method = service.Method
	result.Name = service.Name
	result.OSType = service.OSType
	result.Product = service.Product
	result.Proto = service.Proto
	result.RPCNum = service.RPCNum
	result.ServiceFP = service.ServiceFP
	result.Tunnel = service.Tunnel
	result.Version = service.Version
	result.Confidence = service.Confidence
}

// clearServiceFields clears all service-related fields in Result
func clearServiceFields(result *Result) {
	result.DeviceType = ""
	result.ExtraInfo = ""
	result.HighVersion = ""
	result.Hostname = ""
	result.LowVersion = ""
	result.Method = ""
	result.Name = ""
	result.OSType = ""
	result.Product = ""
	result.Proto = ""
	result.RPCNum = ""
	result.ServiceFP = ""
	result.Tunnel = ""
	result.Version = ""
	result.Confidence = 0
}

Then replace the duplicated logic:

 		// copy the service fields
 		if p.Service != nil {
-			result.DeviceType = p.Service.DeviceType
-			result.ExtraInfo = p.Service.ExtraInfo
-			result.HighVersion = p.Service.HighVersion
-			result.Hostname = p.Service.Hostname
-			result.LowVersion = p.Service.LowVersion
-			result.Method = p.Service.Method
-			result.Name = p.Service.Name
-			result.OSType = p.Service.OSType
-			result.Product = p.Service.Product
-			result.Proto = p.Service.Proto
-			result.RPCNum = p.Service.RPCNum
-			result.ServiceFP = p.Service.ServiceFP
-			result.Tunnel = p.Service.Tunnel
-			result.Version = p.Service.Version
-			result.Confidence = p.Service.Confidence
+			copyServiceToResult(result, p.Service)
 		} else {
-			// Clear service fields if no service information exists
-			result.DeviceType = ""
-			result.ExtraInfo = ""
-			result.HighVersion = ""
-			result.Hostname = ""
-			result.LowVersion = ""
-			result.Method = ""
-			result.Name = ""
-			result.OSType = ""
-			result.Product = ""
-			result.Proto = ""
-			result.RPCNum = ""
-			result.ServiceFP = ""
-			result.Tunnel = ""
-			result.Version = ""
-			result.Confidence = 0
+			clearServiceFields(result)
 		}

Apply the same pattern to WriteCsvOutputWithMac.

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

pkg/runner/output.go (1)

304-329: LGTM! Helper function correctly addresses the service leak bug.

The implementation correctly handles both cases:

• When service is not nil, all 15 service fields are copied to the result
• When service is nil, copying from an empty port.Service{} clears all fields using zero values

This centralized approach eliminates the code duplication flagged in the previous review and ensures consistent behavior across JSON and CSV output paths.

💡 Optional: Minor simplification

The local variable s could be eliminated by directly handling both branches, though the current approach is perfectly clear:

func copyServiceFields(result *Result, service *port.Service) {
	if service == nil {
		service = &port.Service{}
	}
	
	result.DeviceType = service.DeviceType
	result.ExtraInfo = service.ExtraInfo
	// ... rest of fields
}

However, modifying the parameter might be considered less idiomatic, so the current implementation is fine.

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

pkg/runner/output.go (1)

302-326: LGTM! The helper correctly handles both copying and clearing service fields.

The function properly addresses the service info leak by ensuring all service fields are set to zero values when service is nil. All 15 fields from port.Service are accounted for, and the implementation is straightforward.

💡 Optional: Minor simplification

The intermediate variable s could be eliminated for slightly more concise code:

 func copyServiceFields(result *Result, service *port.Service) {
-	var s *port.Service
-	if service != nil {
-		s = service
-	} else {
-		s = &port.Service{}
+	if service == nil {
+		service = &port.Service{}
 	}
 
-	result.DeviceType = s.DeviceType
-	result.ExtraInfo = s.ExtraInfo
+	result.DeviceType = service.DeviceType
+	result.ExtraInfo = service.ExtraInfo
 	// ... (apply to all remaining fields)

The current implementation is perfectly correct, so this is purely a style preference.

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro