lvc: grab updates from tails (01371c19bd..6ae59c49e5)

Signed-off-by: Holger Levsen <holger@layer-acht.org>

1 files changed, 19 insertions, 15 deletions

diff --git a/cucumber/features/step_definitions/dhcp.rb b/cucumber/features/step_definitions/dhcp.rb
index ef4d9e15..3c834224 100644
--- a/cucumber/features/step_definitions/dhcp.rb
+++ b/cucumber/features/step_definitions/dhcp.rb
@@ -1,19 +1,23 @@
 Then /^the hostname should not have been leaked on the network$/ do
-  hostname = $vm.execute("hostname").stdout.chomp
-  packets = PacketFu::PcapFile.new.file_to_array(:filename => @sniffer.pcap_file)
-  packets.each do |p|
-    # if PacketFu::TCPPacket.can_parse?(p)
-    #   ipv4_tcp_packets << PacketFu::TCPPacket.parse(p)
-    if PacketFu::IPPacket.can_parse?(p)
-      payload = PacketFu::IPPacket.parse(p).payload
-    elsif PacketFu::IPv6Packet.can_parse?(p)
-      payload = PacketFu::IPv6Packet.parse(p).payload
-    else
-      @sniffer.save_pcap_file
-      raise "Found something in the pcap file that either is non-IP, or cannot be parsed"
-    end
-    if payload.match(hostname)
-      raise "Hostname leak detected"
+  begin
+    hostname = $vm.execute("hostname").stdout.chomp
+    packets = PacketFu::PcapFile.new.file_to_array(filename: @sniffer.pcap_file)
+    packets.each do |p|
+      # if PacketFu::TCPPacket.can_parse?(p)
+      #   ipv4_tcp_packets << PacketFu::TCPPacket.parse(p)
+      if PacketFu::IPPacket.can_parse?(p)
+        payload = PacketFu::IPPacket.parse(p).payload
+      elsif PacketFu::IPv6Packet.can_parse?(p)
+        payload = PacketFu::IPv6Packet.parse(p).payload
+      else
+        raise "Found something in the pcap file that either is non-IP, or cannot be parsed"
+      end
+      if payload.match(hostname)
+        raise "Hostname leak detected"
+      end
     end
+  rescue Exception => e
+    save_failure_artifact("Network capture", @sniffer.pcap_file)
+    raise e
   end
 end