jcarr
/
gus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

events table

This commit is contained in:
Jeff Carr 2025-03-10 06:53:30 -05:00
parent 2e10a2a0d9
commit 22d0798749
7 changed files with 153 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -3,9 +3,8 @@
VERSION = $(shell git describe --tags)
BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
all: portmap.pb.go build
./gus --version
./gus --no-gui --config /etc/gus/gus.text
all: proto build
./gus --config /etc/gus/gus.text
gocui: build
./gus --gui gocui --config /etc/gus/gus.text >/tmp/gocui.log 2>&1
@ -36,9 +35,14 @@ clean:
rm -f go.* *.pb.go
rm -f gus
proto: portmap.pb.go event.pb.go
portmap.pb.go: portmap.proto
autogenpb --proto portmap.proto
event.pb.go: event.proto
autogenpb --proto event.proto
list:
curl "http://localhost:2522/list"

11
doGui.go
View File

@ -51,11 +51,20 @@ func doGui() {
makePortmapWin()
})
grid.NewButton("Events", func() {
grid.NewButton("Save Events", func() {
log.Info("event log is len =", me.events.Len())
me.events.Save()
})
grid.NewButton("Show Last 20 Events", func() {
// if the window exists, just toggle it open or closed
if me.eventswin != nil {
me.eventswin.Toggle()
return
}
makeEventsWin()
})
// sit here forever refreshing the GUI
for {
refresh()

19
event.proto Normal file
View File

@ -0,0 +1,19 @@
syntax = "proto3";
package gus;
import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp
message Event {
string hostname = 1; // the hostname of the client
string address = 2; // the IP address from the client
string where = 3; // where gus was sending the client traffic
google.protobuf.Timestamp ctime = 4; // when the socket opened
google.protobuf.Timestamp etime = 5; // when the socket ended
}
message Events { // `autogenpb:marshal` `autogenpb:gui` `autogenpb:nomutex`
string uuid = 1; // `autogenpb:uuid:4e91f9e6-f545-4c72-bec4-ab951276da1d`
string version = 2; // `autogenpb:version:v0.0.1`
repeated Event events = 3;
}

16
main.go
View File

@ -67,6 +67,16 @@ func main() {
startHTTP()
os.Exit(0)
}
all := me.portmaps.All()
for all.Scan() {
pm := all.Next()
if !pm.Enabled {
continue
}
log.Info("portmap enabled for port", pm.Listen, "to", pm.Connect)
go gus3000(int(pm.Listen), pm.Connect)
}
// go NewWatchdog()
go startHTTP()
doGui()
@ -92,11 +102,11 @@ func gus3000(port int, connect string) {
// log.Printf("Client connected: %s", clientConn.RemoteAddr())
// Handle the connection in a separate goroutine
go handleConnection(clientConn, connect)
go handleConnection(clientConn, connect, port)
}
}
func handleConnection(clientConn net.Conn, where string) {
func handleConnection(clientConn net.Conn, where string, localport int) {
defer clientConn.Close()
// Connect to the target server
@ -108,7 +118,7 @@ func handleConnection(clientConn net.Conn, where string) {
}
defer targetConn.Close()
// log.Printf("Connected to target server: %s where = %s\n", targetConn.RemoteAddr(), where)
log.Printf("Connected to client: %s where = %s\n", clientConn.RemoteAddr(), where)
log.Printf("Connected on port %d from client: %s to where = %s\n", localport, clientConn.RemoteAddr(), where)
e := new(Event)
e.Address = fmt.Sprintf("%s\n", clientConn.RemoteAddr())

32
portmap.proto
View File

@ -2,31 +2,15 @@ syntax = "proto3";
package gus;
import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp
message Event {
string hostname = 1; // the hostname of the client
string address = 2; // the IP address from the client
string where = 3; // where gus was sending the client traffic
google.protobuf.Timestamp ctime = 4; // when the socket opened
google.protobuf.Timestamp etime = 5; // when the socket ended
}
message Events { // `autogenpb:marshal` `autogenpb:gui` `autogenpb:nomutex`
string uuid = 1;
string version = 2;
repeated Event events = 3;
}
message Portmap {
int64 listen = 1; // `autogenpb:unique`
string connect = 2; // `autogenpb:unique`
bool enabled = 3;
string uuid = 4;
int64 listen = 1; // `autogenpb:unique`
string connect = 2; // `autogenpb:unique`
bool enabled = 3;
bool allowIPv4 = 4;
}
message Portmaps { // `autogenpb:marshal` `autogenpb:gui` `autogenpb:nomutex`
string uuid = 1; // `autogenpb:uuid:49a865ea-292d-48fd-8dc2-d0f82d5fd016`
string version = 2; // `autogenpb:version:v0.0.1`
repeated Portmap portmaps = 3;
message Portmaps { // `autogenpb:marshal` `autogenpb:gui` `autogenpb:nomutex`
string uuid = 1; // `autogenpb:uuid:49a865ea-292d-48fd-8dc2-d0f82d5fd016`
string version = 2; // `autogenpb:version:v0.0.1`
repeated Portmap portmaps = 3;
}

39
structs.go
View File

@ -15,16 +15,17 @@ var me *gusconf
// this app's variables
type gusconf struct {
myGui *gui.Node // the base of the gui
portmaps *Portmaps // the portmap window
events *Events // the event log
portwin *stdTableWin // the portwin window
urlbase string // the dns name for the zookeeper
hostname string // my hostname
pollDelay time.Duration // how often to report our status
dog *time.Ticker // the watchdog timer
failcount int // how many times we've failed to contact the zookeeper
failcountmax int // after this, exit and let systemd restart the daemon
myGui *gui.Node // the base of the gui
portmaps *Portmaps // the portmap window
events *Events // the event log
portwin *stdTableWin // the portwin window
eventswin *stdEventTableWin // the event window
urlbase string // the dns name for the zookeeper
hostname string // my hostname
pollDelay time.Duration // how often to report our status
dog *time.Ticker // the watchdog timer
failcount int // how many times we've failed to contact the zookeeper
failcountmax int // after this, exit and let systemd restart the daemon
}
type stdTableWin struct {
@ -44,3 +45,21 @@ func (w *stdTableWin) Toggle() {
}
w.win.Toggle()
}
type stdEventTableWin struct {
sync.Mutex
win *gadgets.GenericWindow // the machines gui window
box *gui.Node // the machines gui parent box widget
TB *EventsTable // the gui table buffer
update bool // if the window should be updated
}
func (w *stdEventTableWin) Toggle() {
if w == nil {
return
}
if w.win == nil {
return
}
w.win.Toggle()
}

67
windowEvents.go Normal file
View File

@ -0,0 +1,67 @@
// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
// Use of this source code is governed by the GPL 3.0
package main
import (
"go.wit.com/gui"
"go.wit.com/lib/gadgets"
"go.wit.com/log"
)
func makeEventsWin() {
me.eventswin = new(stdEventTableWin)
me.eventswin.win = gadgets.NewGenericWindow("zood daemon versions", "todo: add global controls here")
me.eventswin.win.Custom = func() {
log.Info("test delete window here")
}
grid := me.eventswin.win.Group.RawGrid()
grid.NewButton("ConfigSave() ", func() {
saveMachineState()
})
grid.NewButton("Add() ", func() {
})
grid.NewCheckbox("hide active")
grid.NewButton("update", func() {
doMachinesUpgradeTable()
})
// make a box at the bottom of the window for the protobuf table
me.eventswin.box = me.eventswin.win.Bottom.Box().SetProgName("TBOX")
doEventsTable(me.events)
}
func doEventsTable(currentEvents *Events) {
me.eventswin.Lock()
defer me.eventswin.Unlock()
if me.eventswin.TB != nil {
me.eventswin.TB.Delete()
me.eventswin.TB = nil
}
// display the protobuf
me.eventswin.TB = AddEventsPB(me.eventswin.box, currentEvents)
f := func(e *Event) {
log.Info("Triggered. do something here", e.Hostname)
// m.Enabled = true
}
me.eventswin.TB.Custom(f)
// log.Info("table has uuid", me.eventswin.TB.GetUuid())
}
func AddEventsPB(tbox *gui.Node, pb *Events) *EventsTable {
t := pb.NewTable("EventsPB")
t.NewUuid()
t.SetParent(tbox)
enabledf := func(p *Event) string {
return "todo"
}
t.AddStringFunc("enabled", enabledf)
t.AddHostname()
t.AddAddress()
t.AddWhere()
t.ShowTable()
return t
}