add emissary events data to ui (#4)

Author: imdawon

cmd/drawbridge/api.go

@@ -291,13 +291,18 @@ func (d *Drawbridge) SetUpProtectedServiceTunnel() error {
 			if emissaryRequestType != "PS_LIST" {
 				emissaryRequestedServiceId = emissaryRequestPayload[8:11]
 			}
+
+			// Create and insert an Emissary event into the db.
 			eventUUID, err := utils.NewUUID()
 			if err != nil {
 				slog.Error("Emissary Event", slog.Any("Error", err))
 			}
+			// Retrieve the client certificate from the connection by casting the connection as a tls.Conn.
+			clientCert := clientConn.(*tls.Conn).ConnectionState().PeerCertificates[0]
+			deviceUUID := clientCert.Subject.SerialNumber
 			event := emissary.Event{
 				ID:             eventUUID,
-				DeviceID:       eventUUID,
+				DeviceID:       deviceUUID,
 				ConnectionIP:   conn.RemoteAddr().String(),
 				Type:           emissaryRequestType,
 				TargetService:  emissaryRequestedServiceId,
@@ -312,7 +317,8 @@ func (d *Drawbridge) SetUpProtectedServiceTunnel() error {
 				slog.Error("Emissary Event", slog.Any("DB Error", err))
 			}
 
-			if emissaryRequestType == "PS_CONN" {
+			switch emissaryRequestType {
+			case "PS_CONN":
 				// May be used later after we standardize how and when to read the tcp connection into the buf above.
 				// d.getRequestProtectedServiceName(clientConn)
 				emissaryRequestedServiceIdNum, err := strconv.Atoi(emissaryRequestedServiceId)
@@ -357,18 +363,17 @@ func (d *Drawbridge) SetUpProtectedServiceTunnel() error {
 				io.Copy(clientConn, resourceConn)
 				// Shut down the connection.
 				clientConn.Close()
-
-			} else {
+			case "PS_LIST":
 				// On a new connection, write available services to TCP connection so Emissary can know which
-				// d.ProtectedServices
-
+				// Protected Services are available
 				var serviceList string
 				for _, value := range d.ProtectedServices {
 					// We pad the service id with zeros as we want a fixed-width id for easy parsing. This will allow support for up to 1000 Protected Services.
 					serviceList += fmt.Sprintf("%s%s,", utils.PadWithZeros(int(value.Service.ID)), value.Service.Name)
 				}
 				serviceConnectCommand := fmt.Sprintf("PS_LIST: %s", serviceList)
 				clientConn.Write([]byte(serviceConnectCommand))
+			default:
 			}
 		}(conn)
 	}

cmd/drawbridge/persistence/emissary_client_event.go

@@ -2,6 +2,7 @@ package persistence
 
 import (
 	"dhens/drawbridge/cmd/drawbridge/emissary"
+	"dhens/drawbridge/cmd/utils"
 	"fmt"
 )
 
@@ -26,16 +27,17 @@ func (r *SQLiteRepository) MigrateEmissaryClientEvent() error {
 
 var queryLatestDeviceEventForEachDevice = `
 SELECT
-    c.id AS device_id,
-	device_ip,
-    c.name AS device_name,
-    e.type,
-    e.target_service,
-    e.connection_type,
-    e.timestamp
+	e.id AS event_id,
+	e.device_id,
+	e.device_ip,
+	e.type,
+	e.target_service,
+	e.connection_type,
+	e.timestamp
 FROM
     (
         SELECT
+			id,
             device_id,
 			device_ip,
             type,
@@ -96,6 +98,7 @@ func (r *SQLiteRepository) GetLatestEventForEachDeviceId(deviceIDs []string) (ma
 		); err != nil {
 			return nil, fmt.Errorf("error scanning emissary client database row into a emissary client struct: %s", err)
 		}
+		event.Timestamp = utils.BeautifulTimeSince(event.Timestamp)
 		events[event.DeviceID] = event
 	}
 	return events, nil

cmd/utils/utils.go

@@ -12,6 +12,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
 // Save file if it does not already exist.
@@ -359,3 +360,40 @@ func NewUUID() (string, error) {
 func RandInt(min, max int) int {
 	return min + rand.Intn(max-min)
 }
+
+func BeautifulTimeSince(timestamp string) string {
+	// Parse the timestamp string
+	t, err := time.Parse(time.RFC3339, timestamp)
+	if err != nil {
+		return "Invalid timestamp"
+	}
+
+	// Calculate the duration between the timestamp and the current time
+	duration := time.Since(t)
+
+	// Define the time thresholds
+	minuteThreshold := time.Minute
+	hourThreshold := time.Hour
+	dayThreshold := 24 * time.Hour
+
+	switch {
+	case duration < minuteThreshold:
+		return "less than a minute ago"
+	case duration < 2*minuteThreshold:
+		return "around a minute ago"
+	case duration < hourThreshold:
+		minutes := int(duration.Minutes())
+		return fmt.Sprintf("%d minutes ago", minutes)
+	case duration < 2*hourThreshold:
+		return "around 1 hour ago"
+	case duration < dayThreshold:
+		hours := int(duration.Hours())
+		return fmt.Sprintf("around %d hours ago", hours)
+	default:
+		days := int(duration.Hours() / 24)
+		if days == 1 {
+			return "1 day ago"
+		}
+		return fmt.Sprintf("%d days ago", days)
+	}
+}