uid blacklist

kdudkov · Sep 19, 2024 · db235f0 · db235f0
1 parent b51dd8b
commit db235f0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/cmd/goatak_server/config.go b/cmd/goatak_server/config.go
@@ -54,6 +54,10 @@ func (c *AppConfig) LogExclude() []string {
 	return c.k.Strings("log_exclude")
 }
 
+func (c *AppConfig) BlacklistedUID() []string {
+	return c.k.Strings("blacklist")
+}
+
 func (c *AppConfig) processCerts() error {
 	for _, name := range []string{"ssl.ca", "ssl.cert", "ssl.key"} {
 		if c.k.String(name) == "" {

diff --git a/cmd/goatak_server/main.go b/cmd/goatak_server/main.go
@@ -471,6 +471,17 @@ func (app *App) sendToUID(uid string, msg *cot.CotMessage) {
 	})
 }
 
+func (app *App) checkUID(uid string) bool {
+	u := strings.ToLower(uid)
+	for _, s := range app.config.BlacklistedUID() {
+		if u == strings.ToLower(s) {
+			return false
+		}
+	}
+
+	return true
+}
+
 func getDatabase() (*gorm.DB, error) {
 	db, err := gorm.Open(sqlite.Open(dbName), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)})
 	if err != nil {

diff --git a/cmd/goatak_server/tcpserver.go b/cmd/goatak_server/tcpserver.go
@@ -44,6 +44,7 @@ func (app *App) ListenTCP(ctx context.Context, addr string) (err error) {
 			RemoveCb:     app.RemoveHandlerCb,
 			NewContactCb: app.NewContactCb,
 			DropMetric:   dropMetric,
+			UidChecker:   app.checkUID,
 		})
 		app.AddClientHandler(h)
 		h.Start()
@@ -113,6 +114,7 @@ func (app *App) processTLSConn(ctx context.Context, conn *tls.Conn) {
 		RemoveCb:     app.RemoveHandlerCb,
 		NewContactCb: app.NewContactCb,
 		DropMetric:   dropMetric,
+		UidChecker:   app.checkUID,
 	})
 	app.AddClientHandler(h)
 	h.Start()

diff --git a/cmd/goatak_server/templates/points.html b/cmd/goatak_server/templates/points.html
@@ -20,9 +20,7 @@
                         <tr v-for="c in all_conns">
                             <td>{{ c.addr }}</td>
                             <td>
-                                    <span v-for="(k, v) in c.uids">
-                                        {{ k }}: {{ v }}
-                                    </span>
+                                <span v-for="(k, v) in c.uids">{{ k }}: {{ v }}</span>
                             </td>
                             <td>{{ c.user }}</td>
                             <td>{{ c.scope }}</td>
@@ -46,13 +44,12 @@
                             <th>TAK ver.</th>
                         </tr>
                         <tr v-for="u in byCategory('contact')">
-                            <td>
-                                <img :src="getImg(u, 18)"/>
-                            </td>
+                            <td><img :src="getImg(u, 18)"/></td>
                             <td>{{ u.callsign }}</td>
                             <td>{{ u.scope }}</td>
                             <td><span class="badge"
-                                      :class="u.status=='Online' ? 'text-bg-success' : 'text-bg-secondary'">{{ u.status }}</span>
+                                      :class="u.status=='Online' ? 'text-bg-success' : 'text-bg-secondary'">
+                                {{ u.status }}</span>
                             </td>
                             <td>{{ printCoords(u.lat, u.lon) }}</td>
                             <td>{{ u.tak_version }}</td>
@@ -76,8 +73,7 @@
                         <th>stale time</th>
                     </tr>
                     <tr v-for="u in byCategory('unit')">
-                        <td>
-                            <img :src="getImg(u, 18)"/>
+                        <td><img :src="getImg(u, 18)"/>
                         </td>
                         <td>{{ u.type }}</td>
                         <td>{{ u.callsign }}</td>

diff --git a/internal/client/client_handler.go b/internal/client/client_handler.go
@@ -35,6 +35,7 @@ type HandlerConfig struct {
 	NewContactCb func(uid, callsign string)
 	Logger       *slog.Logger
 	DropMetric   *prometheus.CounterVec
+	UidChecker   func(uid string) bool
 }
 
 type ClientHandler interface {
@@ -69,6 +70,7 @@ type ConnClientHandler struct {
 	newContactCb func(uid, callsign string)
 	logger       *slog.Logger
 	dropMetric   *prometheus.CounterVec
+	uidChecker   func(uid string) bool
 }
 
 func NewConnClientHandler(name string, conn net.Conn, config *HandlerConfig) *ConnClientHandler {
@@ -91,6 +93,7 @@ func NewConnClientHandler(name string, conn net.Conn, config *HandlerConfig) *Co
 		c.removeCb = config.RemoveCb
 		c.newContactCb = config.NewContactCb
 		c.dropMetric = config.DropMetric
+		c.uidChecker = config.UidChecker
 
 		params := []any{"client", name}
 
@@ -238,6 +241,11 @@ func (h *ConnClientHandler) handleRead(ctx context.Context) {
 			uid := msg.GetUID()
 			uid = strings.TrimSuffix(uid, "-ping")
 
+			if h.uidChecker != nil && !h.uidChecker(uid) {
+				h.logger.Warn(fmt.Sprintf("blacklisted uid %s - dropped", uid))
+				return
+			}
+
 			if _, present := h.uids.Swap(uid, msg.GetCallsign()); !present {
 				if h.newContactCb != nil {
 					h.newContactCb(uid, msg.GetCallsign())