Cleanup and go fmt

analyze/analyzer.go

@@ -2,16 +2,15 @@ package analyze
 
 import (
 	"fmt"
-	"log"
-
-	"github.com/google/gopacket"
 	"github.com/maride/pancap/output"
 	"github.com/maride/pancap/protocol"
+	"github.com/google/gopacket"
+	"log"
 )
 
 var (
 	// Store total amount and amount of visited packets
-	totalPackets     int
+	totalPackets int
 	processedPackets int
 )
 
@@ -40,9 +39,6 @@ func Analyze(source *gopacket.PacketSource) error {
 			}
 		}
 
-		// Register communication for graph
-		output.AddPkgToGraph(packet)
-
 		// Raise statistics
 		totalPackets += 1
 		if processed {
@@ -72,3 +68,4 @@ func handleErr(err error) {
 		log.Printf("Encountered error while examining packets, continuing anyway. Error: %s", err.Error())
 	}
 }
+

common/common.go

@@ -23,10 +23,10 @@ func GenerateTree(strarr []string) string {
 	// iterate over each element
 	for iter, elem := range strarr {
 		// check if we got the last element
-		if iter < len(strarr)-1 {
+		if iter < len(strarr) - 1 {
 			tmpstr = fmt.Sprintf("%s├ %s\n", tmpstr, elem)
 		} else {
-			tmpstr = fmt.Sprintf("%s╰ %s\n", tmpstr, elem)
+			tmpstr = fmt.Sprintf( "%s╰ %s\n", tmpstr, elem)
 		}
 	}
 

file.go

@@ -3,30 +3,29 @@ package main
 import (
 	"flag"
 	"fmt"
-
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 	"github.com/google/gopacket/pcap"
 )
 
 var (
-	filenameFlag string
+	filenameFlag *string
 )
 
 // Registers the flag --file
 func registerFileFlags() {
-	flag.StringVar(&filenameFlag, "file", "", "PCAP file to base analysis on")
+	filenameFlag = flag.String("file", "", "PCAP file to base analysis on")
 }
 
 // Opens the PCAP, returns its packets and the link type or an error
 func openPCAP() (*gopacket.PacketSource, layers.LinkType, error) {
 	// Check if we even got a file.
-	if filenameFlag == "" {
+	if *filenameFlag == "" {
 		return nil, 0, fmt.Errorf("missing file to analyze. Please specifiy it with --file")
 	}
 
 	// Open specified file
-	handle, openErr := pcap.OpenOffline(filenameFlag)
+	handle, openErr := pcap.OpenOffline(*filenameFlag)
 	if openErr != nil {
 		// There were some problems opening the file
 		return nil, 0, openErr

main.go

@@ -3,12 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/maride/pancap/analyze"
+	"github.com/maride/pancap/output"
 	"log"
 	"math/rand"
 	"time"
-
-	"github.com/maride/pancap/analyze"
-	"github.com/maride/pancap/output"
 )
 
 func main() {
@@ -37,9 +36,6 @@ func main() {
 	// Extract found and requested files
 	output.StoreFiles()
 
-	// Create communication graph
-	output.CreateGraph()
-
 	// Show user analysis
 	analyze.PrintSummary()
 

output/file.go

@@ -6,10 +6,10 @@ import (
 )
 
 type File struct {
-	name    string
+	name string
 	content []byte
-	origin  string
-	hash    string
+	origin string
+	hash string
 }
 
 // Creates a new file object and calculates the hash of the given content

output/filemanager.go

@@ -46,12 +46,12 @@ func StoreFiles() {
 	var filesToExtract []File
 
 	// Check different flag scenarios
-	if targetAllFiles {
+	if *targetAllFiles {
 		// We should extract all files.
 		filesToExtract = registeredFiles
 	} else {
 		// We should extract only a given set of files
-		fileList := strings.Split(targetFiles, ",")
+		fileList := strings.Split(*targetFiles, ",")
 		for _, f := range fileList {
 			// Iterate over desired files
 			found := false
@@ -80,7 +80,7 @@ func StoreFiles() {
 
 // Writes the given file object to disk, along with a stats file placed next to it.
 func writeOut(f File) {
-	targetName := fmt.Sprintf("%s%c%s", targetOutput, os.PathSeparator, f.hash)
+	targetName := fmt.Sprintf("%s%c%s", *targetOutput, os.PathSeparator, f.hash)
 	targetDescName := fmt.Sprintf("%s.info", targetName)
 	targetDescription := fmt.Sprintf("Filename: %s\nHash: %s\nOrigin: %s\nSize: %d", f.name, f.hash, f.origin, len(f.content))
 

output/flag.go

@@ -3,19 +3,19 @@ package output
 import "flag"
 
 var (
-	fullOutput       bool
-	printEmptyBlocks bool
-	targetFiles      string
-	targetAllFiles   bool
-	targetOutput     string
-	graphOutput      string
+	fullOutput *bool
+	printEmptyBlocks *bool
+	targetFiles *string
+	targetAllFiles *bool
+	targetOutput *string
 )
 
 func RegisterFlags() {
-	flag.BoolVar(&fullOutput, "full-output", false, "Show full output instead of limiting submodule output")
-	flag.BoolVar(&printEmptyBlocks, "print-empty-blocks", false, "Prints blocks (submodule output) even if the submodule doesn't have any content to print.")
-	flag.StringVar(&targetFiles, "extract-these", "", "Comma-separated list of files to extract.")
-	flag.BoolVar(&targetAllFiles, "extract-all", false, "Extract all files found.")
-	flag.StringVar(&targetOutput, "extract-to", "./extracted", "Directory to store extracted files in.")
-	flag.StringVar(&graphOutput, "create-graph", "", "Create a Graphviz graph out of collected communication")
+	fullOutput = flag.Bool("full-output", false, "Show full output instead of limiting submodule output")
+	printEmptyBlocks = flag.Bool("print-empty-blocks", false, "Prints blocks (submodule output) even if the submodule doesn't have any content to print.")
+	targetFiles = flag.String("extract-these", "", "Comma-separated list of files to extract.")
+	targetAllFiles = flag.Bool("extract-all", false, "Extract all files found.")
+	targetOutput = flag.String("extract-to", "./extracted", "Directory to store extracted files in.")
 }
+
+

output/graph.go

@@ -1,103 +0,0 @@
-package output
-
-import (
-	"crypto/sha256"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/google/gopacket"
-)
-
-var graphPkgs []GraphPkg
-
-// AddPkgToGraph adds the given packet as communication to the graph
-func AddPkgToGraph(pkg gopacket.Packet) {
-	// Only proceed if pkg contains a network layer
-	if pkg.NetworkLayer() == nil {
-		return
-	}
-
-	src := pkg.NetworkLayer().NetworkFlow().Src().String()
-	dst := pkg.NetworkLayer().NetworkFlow().Dst().String()
-
-	// Search for the given communication pair
-	for _, p := range graphPkgs {
-		if p.from == src && p.to == dst {
-			// Communication pair found, add protocol and finish
-			p.AddProtocol("nil")
-			return
-		}
-	}
-
-	// Communcation pair was not in graphPkgs, add to it
-	graphPkgs = append(graphPkgs, GraphPkg{
-		from:     src,
-		to:       dst,
-		protocol: []string{""},
-	})
-}
-
-// CreateGraph writes out a Graphviz digraph
-func CreateGraph() {
-	if graphOutput == "" {
-		// No graph requested
-		return
-	}
-
-	// Start with the Graphviz-specific header
-	dot := fmt.Sprintf("# Compile with `neato -Tpng %s > %s.png`\n", graphOutput, graphOutput)
-	dot += "digraph pancap {\n\toverlap = false;\n"
-
-	// First, gather all nodes as-is and write them out
-	dot += nodedef(graphPkgs)
-
-	// Iterate over communication
-	for _, p := range graphPkgs {
-		dot += fmt.Sprintf("\tn%s->n%s\n", hash(p.from), hash(p.to))
-	}
-
-	// Close
-	dot += "}\n"
-
-	// Write out
-	ioutil.WriteFile(graphOutput, []byte(dot), 0644)
-}
-
-// Creates a list of distinct nodes, Graphviz-compatible
-func nodedef(pkgs []GraphPkg) string {
-	output := ""
-	nodes := []string{}
-	for _, p := range graphPkgs {
-		// Check if src and dst are already present in nodes array
-		srcFound := false
-		dstFound := false
-		for _, n := range nodes {
-			if p.from == n {
-				srcFound = true
-			}
-			if p.to == n {
-				dstFound = true
-			}
-		}
-		if !srcFound {
-			// src not yet present, add to node list
-			nodes = append(nodes, p.from)
-		}
-		if !dstFound {
-			// dst not yet present, add to node list
-			nodes = append(nodes, p.to)
-		}
-	}
-
-	// Output Graphviz-compatible node definition
-	for _, n := range nodes {
-		// As the Graphviz charset for nodes is rather small, rely on hashes
-		output += fmt.Sprintf("\tn%s[label=\"%s\"]\n", hash(n), n)
-	}
-
-	return output
-}
-
-func hash(s string) string {
-	return fmt.Sprintf("%x", sha256.Sum256([]byte(s)))[:6]
-}

output/graphpkg.go

@@ -1,19 +0,0 @@
-package output
-
-// GraphPkg resembles a directed communication from one address to another
-// It wraps up required information to draw a graph of the communication, including spoken protocols.
-type GraphPkg struct {
-	from     string
-	to       string
-	protocol []string
-}
-
-// AddProtocol adds the given protocol to the list of protocols if not already present
-func (p *GraphPkg) AddProtocol(protocol string) {
-	for _, p := range p.protocol {
-		if p == protocol {
-			return
-		}
-	}
-	p.protocol = append(p.protocol, protocol)
-}

output/output.go

@@ -23,10 +23,4 @@ func Finalize() {
 		// User avoided the files
 		printer.Println("Files found in stream. Add --extract-all or --extract-these <list> to extract them.")
 	}
-
-	// Check if something graph-worthy was collected
-	if graphOutput == "" && len(graphPkgs) > 0 {
-		// User didn't want a graph
-		printer.Println("To summarize the communcation flow with a Graphviz graph, specify --create-graph <out.dot>.")
-	}
 }

output/printer.go

@@ -2,18 +2,17 @@ package output
 
 import (
 	"fmt"
-	"strings"
-
 	"github.com/fatih/color"
+	"strings"
 )
 
 const (
 	MaxContentLines = 50
-	SnipMark        = "----- cut at 50 entries -----"
+	SnipMark = "----- cut at 50 entries -----"
 )
 
 var (
-	DidSnip            bool
+	DidSnip bool
 	DidAvoidEmptyBlock bool
 )
 
@@ -22,7 +21,7 @@ var (
 // If the content is longer than MaxContentLines, content is cut.
 func PrintBlock(headline string, content string) {
 	// Avoid printing empty blocks - at least if user didn't specify it otherwise
-	if len(content) == 0 && !printEmptyBlocks {
+	if len(content) == 0 && !*printEmptyBlocks {
 		// No content and we are not forced to print empty blocks, return
 		DidAvoidEmptyBlock = true
 		return
@@ -39,7 +38,7 @@ func PrintBlock(headline string, content string) {
 	}
 
 	// Cut to MaxContentLines if required
-	if !(fullOutput) {
+	if !(*fullOutput) {
 		// User states that they don't want to see the whole output - cut content.
 		content = cutContent(content)
 	}

protocol/arp/arp.go

@@ -2,24 +2,24 @@ package arp
 
 import (
 	"fmt"
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
 	"github.com/maride/pancap/common"
 	"github.com/maride/pancap/output"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 	"log"
 	"net"
 )
 
 var (
-	arpStatsList   []arpStats
-	devices        []arpDevice
+	arpStatsList []arpStats
+	devices []arpDevice
 	linkLocalBlock = net.IPNet{
 		IP:   net.IPv4(169, 254, 0, 0),
 		Mask: net.IPv4Mask(255, 255, 0, 0),
 	}
 )
 
-type Protocol struct{}
+type Protocol struct {}
 
 // Checks if the given packet is an ARP packet we can process
 func (p *Protocol) CanAnalyze(packet gopacket.Packet) bool {
@@ -118,7 +118,7 @@ func (p *Protocol) getStatOrCreate(macaddr string) *arpStats {
 
 	// None found yet, we need to create a new one
 	arpStatsList = append(arpStatsList, arpStats{
-		macaddr: macaddr,
+		macaddr:  macaddr,
 	})
 
 	// And return it

protocol/arp/arpDevice.go

@@ -2,5 +2,5 @@ package arp
 
 type arpDevice struct {
 	macaddr string
-	ipaddr  string
+	ipaddr string
 }

protocol/arp/arpStats.go

@@ -1,9 +1,9 @@
 package arp
 
 type arpStats struct {
-	macaddr      string
-	asked        int
-	answered     int
-	askedList    []string
+	macaddr string
+	asked int
+	answered int
+	askedList []string
 	answeredList []string
 }

protocol/dhcpv4/dhcp.go

@@ -1,16 +1,16 @@
 package dhcpv4
 
 import (
+	"github.com/maride/pancap/output"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/maride/pancap/output"
 )
 
 type Protocol struct {
-	hostnames    []hostname
+	hostnames []hostname
 	networkSetup map[layers.DHCPOpt][]byte
-	requestMAC   []string
-	responses    []dhcpResponse
+	requestMAC []string
+	responses []dhcpResponse
 }
 
 // Checks if the given packet is a DHCP packet we can process

protocol/dhcpv4/dhcpResponse.go

@@ -1,8 +1,9 @@
 package dhcpv4
 
 type dhcpResponse struct {
-	destMACAddr   string
-	newIPAddr     string
+	destMACAddr string
+	newIPAddr string
 	serverMACAddr string
-	askedFor      bool
+	askedFor bool
 }
+

protocol/dhcpv4/hostname.go

@@ -1,8 +1,8 @@
 package dhcpv4
 
 type hostname struct {
-	hostname       string
+	hostname string
 	requestedByMAC string
-	granted        bool
+	granted bool
 	deniedHostname string
 }

protocol/dhcpv4/hostnames.go

@@ -2,8 +2,8 @@ package dhcpv4
 
 import (
 	"fmt"
-	"github.com/google/gopacket/layers"
 	"github.com/maride/pancap/common"
+	"github.com/google/gopacket/layers"
 	"log"
 )
 

protocol/dhcpv4/network.go

@@ -12,13 +12,13 @@ import (
 
 var (
 	watchedOpts = []layers.DHCPOpt{
-		layers.DHCPOptSubnetMask,    // Option 1
-		layers.DHCPOptRouter,        // Option 3
-		layers.DHCPOptDNS,           // Option 6
+		layers.DHCPOptSubnetMask, // Option 1
+		layers.DHCPOptRouter, // Option 3
+		layers.DHCPOptDNS, // Option 6
 		layers.DHCPOptBroadcastAddr, // Option 28
-		layers.DHCPOptNTPServers,    // Option 42
-		layers.DHCPOptLeaseTime,     // Option 51
-		layers.DHCPOptT1,            // Option 58
+		layers.DHCPOptNTPServers, // Option 42
+		layers.DHCPOptLeaseTime, // Option 51
+		layers.DHCPOptT1, // Option 58
 	}
 )
 
@@ -126,7 +126,7 @@ func formatDate(rawDate []byte) (string, bool) {
 	intDate := binary.LittleEndian.Uint32(rawDate)
 	seconds := intDate % 60
 	minutes := intDate / 60 % 60
-	hours := intDate / 60 / 60 % 60
+	hours   := intDate / 60 / 60 % 60
 	formattedDate := ""
 
 	// Check which words we need to pick

protocol/dhcpv4/request.go

@@ -2,8 +2,8 @@ package dhcpv4
 
 import (
 	"fmt"
-	"github.com/google/gopacket/layers"
 	"github.com/maride/pancap/common"
+	"github.com/google/gopacket/layers"
 )
 
 // Processes the DHCP request packet handed over

protocol/dhcpv4/response.go

@@ -2,8 +2,8 @@ package dhcpv4
 
 import (
 	"fmt"
-	"github.com/google/gopacket/layers"
 	"github.com/maride/pancap/common"
+	"github.com/google/gopacket/layers"
 	"log"
 )
 

protocol/dns/answer.go

@@ -2,20 +2,20 @@ package dns
 
 import (
 	"fmt"
-	"github.com/google/gopacket/layers"
 	"github.com/maride/pancap/common"
+	"github.com/google/gopacket/layers"
 	"golang.org/x/net/publicsuffix"
 	"log"
 )
 
 var (
-	numAnswers           int
-	answerDomains        []string
-	answerBaseDomains    []string
+	numAnswers int
+	answerDomains []string
+	answerBaseDomains []string
 	answerPrivateDomains []string
-	answerType           = make(map[layers.DNSType]int)
-	answerPublicIPv4     []string
-	answerPrivateIPv4    []string
+	answerType = make(map[layers.DNSType]int)
+	answerPublicIPv4 []string
+	answerPrivateIPv4 []string
 )
 
 // Called on every DNS packet to process response(s)

protocol/dns/common.go

@@ -8,7 +8,7 @@ import (
 
 var (
 	privateBlocks = []net.IPNet{
-		{net.IPv4(10, 0, 0, 0), net.IPv4Mask(255, 0, 0, 0)},      // 10.0.0.0/8
+		{net.IPv4(10, 0, 0, 0), net.IPv4Mask(255, 0, 0, 0)}, 	  // 10.0.0.0/8
 		{net.IPv4(172, 16, 0, 0), net.IPv4Mask(255, 240, 0, 0)},  // 172.16.0.0/12
 		{net.IPv4(192, 168, 0, 0), net.IPv4Mask(255, 255, 0, 0)}, // 192.168.0.0/24
 		{net.IPv4(100, 64, 0, 0), net.IPv4Mask(255, 192, 0, 0)},  // 100.64.0.0/10
@@ -58,7 +58,7 @@ func (p *Protocol) generateDNSTypeSummary(typearr map[layers.DNSType]int) string
 		if iter == 0 {
 			// We don't need to append yet
 			answerstr = elem
-		} else if iter == len(answerarr)-1 {
+		} else if iter == len(answerarr) - 1 {
 			// Last element, use "and" instead of a comma
 			answerstr = fmt.Sprintf("%s and %s", answerstr, elem)
 		} else {

protocol/dns/dns.go

@@ -1,12 +1,12 @@
 package dns
 
 import (
+	"github.com/maride/pancap/output"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/maride/pancap/output"
 )
 
-type Protocol struct{}
+type Protocol struct {}
 
 func (p *Protocol) CanAnalyze(packet gopacket.Packet) bool {
 	return packet.Layer(layers.LayerTypeDNS) != nil

protocol/dns/question.go

@@ -2,18 +2,18 @@ package dns
 
 import (
 	"fmt"
-	"github.com/google/gopacket/layers"
 	"github.com/maride/pancap/common"
+	"github.com/google/gopacket/layers"
 	"golang.org/x/net/publicsuffix"
 	"log"
 )
 
 var (
-	numQuestions           int
-	questionDomains        []string
-	questionBaseDomains    []string
+	numQuestions int
+	questionDomains []string
+	questionBaseDomains []string
 	questionPrivateDomains []string
-	questionType           = make(map[layers.DNSType]int)
+	questionType = make(map[layers.DNSType]int)
 )
 
 // Called on every DNS packet to process questions

protocol/http/http.go

@@ -1,20 +1,20 @@
 package http
 
 import (
+	"github.com/maride/pancap/common"
+	"github.com/maride/pancap/output"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 	"github.com/google/gopacket/tcpassembly"
-	"github.com/maride/pancap/common"
-	"github.com/maride/pancap/output"
 )
 
 type Protocol struct {
-	initialized       bool
-	requestFactory    *httpRequestFactory
-	responseFactory   *httpResponseFactory
-	requestPool       *tcpassembly.StreamPool
-	responsePool      *tcpassembly.StreamPool
-	requestAssembler  *tcpassembly.Assembler
+	initialized bool
+	requestFactory *httpRequestFactory
+	responseFactory *httpResponseFactory
+	requestPool *tcpassembly.StreamPool
+	responsePool *tcpassembly.StreamPool
+	requestAssembler *tcpassembly.Assembler
 	responseAssembler *tcpassembly.Assembler
 }
 

protocol/http/httpResponseFactory.go

@@ -3,17 +3,17 @@ package http
 import (
 	"bufio"
 	"fmt"
+	"github.com/maride/pancap/output"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/tcpassembly"
 	"github.com/google/gopacket/tcpassembly/tcpreader"
-	"github.com/maride/pancap/output"
 	"io"
 	"io/ioutil"
 	"net/http"
 )
 
 var (
-	responseSummaryLines []string
+	responseSummaryLines   []string
 )
 
 type httpResponseFactory struct{}