Gumper: 1

Slack: 0

Author: evandeters

networking/bubba/main.go

@@ -53,5 +53,7 @@ func main() {
 		log.Fatalln(err)
 	}
 
+    go handleMsg()
+
     log.Fatalln(router.Run(":80"))
 }

networking/bubba/middleware.go

@@ -62,8 +62,6 @@ func handleWebSocket(conn *websocket.Conn) {
         }
 
         agentChan <- jsonData
-        sendToAgents(msg)
-
     }
 }
 
@@ -124,13 +122,7 @@ func handleMsg() {
                 log.Println(err)
                 return
             }
-            ip := msg["IP"].(string)
-            for client := range agentClients {
-                clientIP := strings.Split(client.NetConn().RemoteAddr().String(), ":")[0]
-                if ip == clientIP {
-                    client.WriteMessage(websocket.TextMessage, jsonData)
-                }
-            }
+            sendToAgents(jsonData)
         case msg := <-connChan:
             if msg["OpCode"].(float64) == 5 {
                 AddConnection(msg)

networking/bubba/templates/pages/agents.html

@@ -8,6 +8,7 @@
             <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="ModifyList(11)">Remove from Whitelist</button>
             <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="ModifyList(1)">Add to Blacklist</button>
             <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="ModifyList(2)">Remove from Blacklist</button>
+            <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="ModifyMin(5)">Set Min Connection Count</button>
             <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="SendCmd(13)">Enable Blacklist Mode</button>
             <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="SendCmd(14)">Enable Whitelist Mode</button>
             <button type="button" class="btn btn-primary mx-1 mb-1" style="padding: 0.5em 1em; height: 10vh; font-size: 1.75vh" onclick="SendCmd(15)">Clear Whitelist</button>
@@ -79,6 +80,19 @@
         }));
     }
 
+    function ModifyMin() {
+        var min = document.getElementById("cidr").value;
+        if (min === "") {
+            alert("Please enter a CIDR");
+            return;
+        }
+        min = parseInt(min);
+        socket.send(JSON.stringify({
+            "OpCode": 5,
+            "Count": min
+        }));
+    }
+
     function SendCmd(opcode) {
         socket.send(JSON.stringify({
             "OpCode": opcode,

networking/gumpa/main.go

@@ -25,21 +25,26 @@ import (
 )
 
 var (
+    ifaces []pcap.Interface
+
     blacklist []*net.IPNet
     blacklistMode = true
     whitelist []*net.IPNet
     whitelistMode = false
 
     SERVER_IP *string
     hostname, _ = os.Hostname()
+    hostHash string
 
     serverChan = make(chan []byte)
 
     connMap = make(map[string]int)
-    minConnCount = 3
+    minConnCount = 1
 
     rwLock sync.RWMutex
     mu sync.Mutex
+
+    quit = make(chan bool)
 )
 
 func main() {
@@ -68,37 +73,17 @@ func main() {
 
     log.Println("Starting up...")
 
-    ifaces, err := pcap.FindAllDevs()
+    ifaces, err = pcap.FindAllDevs()
     if err != nil {
         log.Println(err)
     }
-
     blacklist = appendFilter("224.0.0.0/3", blacklist)
 
-    hostHash := fmt.Sprint(hash(hostname))
+    hostHash = fmt.Sprint(hash(hostname))
     RegisterAgent(hostHash, key)
 
-    conn := initializeWebSocket(*SERVER_IP, "/ws/agent")
-    defer conn.Close()
-
-    go checkin(hostHash)
-    go readFilter(conn)
-
-    for _, device := range ifaces {
-        log.Printf("Interface Name: %s", device.Name)
-        go capturePackets(device.Name)
-    }
-
-    for {
-        select {
-        case t := <-serverChan:
-            err = conn.WriteMessage(websocket.TextMessage, t)
-            if err != nil {
-                log.Println(err)
-                return
-            }
-        }
-    }
+    go initializeWebSocket(*SERVER_IP, "/ws/agent")
+    select {}
 }
 
 func capturePackets(iface string) {
@@ -265,14 +250,38 @@ func isInterfaceUp(interfaceName string) bool {
     return iface.Flags&net.FlagUp != 0
 }
 
-func initializeWebSocket(server, path string) *websocket.Conn {
+func initializeWebSocket(server, path string) {
     log.Println("Initializing WebSocket...")
     url := url.URL{Scheme: "ws", Host: server, Path: path}
     conn, _, err := websocket.DefaultDialer.Dial(url.String(), nil)
     if err != nil {
-        log.Println(err)
+        fmt.Println(err)
+        time.Sleep(5 * time.Second)
+        go initializeWebSocket(server, path)
+        return
+    }
+
+    go checkin(hostHash)
+    go readFilter(conn)
+
+    for _, device := range ifaces {
+        log.Printf("Interface Name: %s", device.Name)
+        go capturePackets(device.Name)
+    }
+
+    for {
+        select {
+        case t := <-serverChan:
+            fmt.Println(string(t))
+            err = conn.WriteMessage(websocket.TextMessage, t)
+            if err != nil {
+                log.Println(err)
+                return
+            }
+        case <-quit:
+            return
+        }
     }
-    return conn
 }
 
 func RegisterAgent(hash, key string) {
@@ -311,6 +320,11 @@ func readFilter(conn *websocket.Conn) {
         _, msg, err := conn.ReadMessage()
         if err != nil {
             fmt.Println(err)
+            quit <- true
+            conn.Close()
+            time.Sleep(5 * time.Second)
+            go initializeWebSocket(*SERVER_IP, "/ws/agent")
+            return
         } else {
             filter := make(map[string]interface{})
             err := json.Unmarshal(msg, &filter)