| Name | IP Address | Model | Serial Number | Firmware | Method | Action |
|---|
| Name & Model | IP Address | Device & Account ID | Firmware & Serial | Method | Action | ||||
|---|---|---|---|---|---|---|---|---|---|
| ${d.name} | +${d.name} ${d.product_code} |
${d.ip_address} | -${d.product_code} | -${d.device_serial_number} | -${d.firmware_version || '0.0.0'} | +${d.device_id} ${d.account_id || 'default'} |
+ ${d.firmware_version || '0.0.0'} ${d.device_serial_number} |
${methodLabel} |
@@ -336,6 +335,12 @@ async function updateDeviceInfo(ip) {
const firmwareEl = row.querySelector('.col-firmware');
if (firmwareEl && info.softwareVersion) firmwareEl.innerText = info.softwareVersion;
+
+ const deviceIdEl = row.querySelector('.col-deviceid');
+ if (deviceIdEl && info.deviceID) deviceIdEl.innerText = info.deviceID;
+
+ const accountIdEl = row.querySelector('.col-accountid');
+ if (accountIdEl && info.margeAccountUUID) accountIdEl.innerText = info.margeAccountUUID;
}
} catch (error) {
console.warn('Failed to fetch live info for ' + ip, error);
@@ -396,6 +401,12 @@ async function showSummary(ip) {
const firmwareEl = row.querySelector('.col-firmware');
if (firmwareEl && summary.firmware_version) firmwareEl.innerText = summary.firmware_version;
+
+ const deviceIdEl = row.querySelector('.col-deviceid');
+ if (deviceIdEl && summary.device_id) deviceIdEl.innerText = summary.device_id;
+
+ const accountIdEl = row.querySelector('.col-accountid');
+ if (accountIdEl && summary.account_id) accountIdEl.innerText = summary.account_id;
}
document.getElementById('ssh-status').innerText = summary.ssh_success ? '✅ Success' : '❌ Failed';
diff --git a/pkg/service/proxy/patterns.go b/pkg/service/proxy/patterns.go
index c525c46..b8cc819 100644
--- a/pkg/service/proxy/patterns.go
+++ b/pkg/service/proxy/patterns.go
@@ -59,13 +59,26 @@ func (pp PathPatterns) Sanitize(segment string) (string, string) {
// DefaultPatterns returns the default set of path patterns.
func DefaultPatterns() PathPatterns {
- p := PathPattern{
- Name: "IPv4",
- Regexp: `^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`,
- Replacement: "{ip}",
+ return PathPatterns{
+ {
+ Name: "IPv4",
+ Regexp: `^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`,
+ Replacement: "{ip}",
+ },
+ {
+ Name: "UUID",
+ Regexp: `^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$`,
+ Replacement: "{uuid}",
+ },
+ {
+ Name: "AccountID",
+ Regexp: `^\d{5,10}$`,
+ Replacement: "{accountId}",
+ },
+ {
+ Name: "DeviceID",
+ Regexp: `^[0-9a-fA-F]{12}$`,
+ Replacement: "{device_id}",
+ },
}
- re, _ := regexp.Compile(p.Regexp)
- p.compiled = re
-
- return PathPatterns{p}
}
diff --git a/pkg/service/proxy/patterns_test.go b/pkg/service/proxy/patterns_test.go
new file mode 100644
index 0000000..91c43bb
--- /dev/null
+++ b/pkg/service/proxy/patterns_test.go
@@ -0,0 +1,61 @@
+package proxy
+
+import (
+ "regexp"
+ "testing"
+)
+
+func TestDefaultPatterns(t *testing.T) {
+ patterns := DefaultPatterns()
+ if len(patterns) != 4 {
+ t.Errorf("Expected 4 default patterns, got %d", len(patterns))
+ }
+
+ expectedNames := []string{"IPv4", "UUID", "AccountID", "DeviceID"}
+ for i, name := range expectedNames {
+ if patterns[i].Name != name {
+ t.Errorf("Expected pattern %d name %s, got %s", i, name, patterns[i].Name)
+ }
+ }
+}
+
+func TestPathPatterns_Sanitize(t *testing.T) {
+ patterns := DefaultPatterns()
+ // Need to compile them as DefaultPatterns() in its new form doesn't compile them (main.go or LoadPatterns does it)
+ // Wait, actually the new DefaultPatterns() I wrote doesn't compile them.
+ // But PathPatterns.Sanitize checks for compiled != nil.
+
+ // Let's manually compile for the test
+ for i := range patterns {
+ patterns[i].compiled = mustCompile(patterns[i].Regexp)
+ }
+
+ tests := []struct {
+ segment string
+ wantRepl string
+ }{
+ {"192.168.1.100", "{ip}"},
+ {"1234567", "{accountId}"},
+ {"12345", "{accountId}"},
+ {"12345678-1234-5678-9012-123456789012", "{uuid}"},
+ {"D05FB8A848E5", "{device_id}"},
+ {"some-other-segment", ""},
+ }
+
+ for _, tt := range tests {
+ repl, _ := patterns.Sanitize(tt.segment)
+ if tt.wantRepl == "" {
+ if repl != tt.segment {
+ t.Errorf("Sanitize(%q) = %q, want %q (no change)", tt.segment, repl, tt.segment)
+ }
+ } else {
+ if repl != tt.wantRepl {
+ t.Errorf("Sanitize(%q) = %q, want %q", tt.segment, repl, tt.wantRepl)
+ }
+ }
+ }
+}
+
+func mustCompile(re string) *regexp.Regexp {
+ return regexp.MustCompile(re)
+}
diff --git a/pkg/service/proxy/recorder_test.go b/pkg/service/proxy/recorder_test.go
index 29e056c..0939f50 100644
--- a/pkg/service/proxy/recorder_test.go
+++ b/pkg/service/proxy/recorder_test.go
@@ -19,6 +19,11 @@ func TestRecorder_Record_Structure(t *testing.T) {
defer os.RemoveAll(tmpDir)
r := NewRecorder(tmpDir)
+ // Compile default patterns
+ for i := range r.Patterns {
+ re, _ := regexp.Compile(r.Patterns[i].Regexp)
+ r.Patterns[i].compiled = re
+ }
tests := []struct {
name string
@@ -100,11 +105,11 @@ func TestRecorder_Record_Sanitization(t *testing.T) {
r := NewRecorder(tmpDir)
// Add a custom pattern
r.Patterns = append(r.Patterns, PathPattern{
- Name: "DeviceID",
+ Name: "CustomDeviceID",
Regexp: `^A81B\w{8}$`,
Replacement: "{deviceId}",
})
- // Re-compile
+ // Compile all patterns
for i := range r.Patterns {
re, _ := regexp.Compile(r.Patterns[i].Regexp)
r.Patterns[i].compiled = re
@@ -124,7 +129,7 @@ func TestRecorder_Record_Sanitization(t *testing.T) {
t.Fatalf("Record failed: %v", err)
}
- expectedDir := filepath.Join(tmpDir, "interactions", r.SessionID, "self", "info", "{ip}", "{deviceId}")
+ expectedDir := filepath.Join(tmpDir, "interactions", r.SessionID, "self", "info", "{ip}", "{device_id}")
if _, err := os.Stat(expectedDir); os.IsNotExist(err) {
t.Errorf("Expected directory %s does not exist", expectedDir)
}
@@ -137,13 +142,13 @@ func TestRecorder_Record_Sanitization(t *testing.T) {
content, _ := os.ReadFile(filepath.Join(expectedDir, files[0].Name()))
contentStr := string(content)
- if !strings.Contains(contentStr, "### GET /info/{{ip}}/{{deviceId}}") {
+ if !strings.Contains(contentStr, "### GET /info/{{ip}}/{{device_id}}") {
t.Errorf("Expected sanitized comment in .http file, got:\n%s", contentStr)
}
- if !strings.Contains(contentStr, "GET /info/{{ip}}/{{deviceId}}") {
+ if !strings.Contains(contentStr, "GET /info/{{ip}}/{{device_id}}") {
t.Errorf("Expected sanitized URL in .http file, got:\n%s", contentStr)
}
- if !strings.Contains(contentStr, "X-Device: {{deviceId}}") {
+ if !strings.Contains(contentStr, "X-Device: {{device_id}}") {
t.Errorf("Expected sanitized Header in .http file, got:\n%s", contentStr)
}
}
@@ -156,22 +161,19 @@ func TestRecorder_Record_Sanitization_Account(t *testing.T) {
defer os.RemoveAll(tmpDir)
r := NewRecorder(tmpDir)
- // Add AccountID pattern
- r.Patterns = append(r.Patterns, PathPattern{
- Name: "AccountID",
- Regexp: `^\d{1,10}$`,
- Replacement: "{accountId}",
- })
- // Re-compile
+ // Use default patterns which now include AccountID
+ r.Patterns = DefaultPatterns()
+ // Compile all patterns
for i := range r.Patterns {
re, _ := regexp.Compile(r.Patterns[i].Regexp)
r.Patterns[i].compiled = re
}
+ accountID := "1234567"
req := &http.Request{
Method: "GET",
URL: &url.URL{
- Path: "/marge/accounts/12345/full",
+ Path: "/marge/accounts/" + accountID + "/full",
},
Header: make(http.Header),
}
@@ -200,7 +202,7 @@ func TestRecorder_Record_Sanitization_Account(t *testing.T) {
if !strings.Contains(contentStr, "GET /marge/accounts/{{accountId}}/full") {
t.Errorf("Expected sanitized URL in .http file, got:\n%s", contentStr)
}
- if !strings.Contains(contentStr, "// accountId: 12345") {
+ if !strings.Contains(contentStr, "// accountId: "+accountID) {
t.Errorf("Expected accountId comment in .http file, got:\n%s", contentStr)
}
}
@@ -262,6 +264,11 @@ func TestRecorder_IncreasingPrefix(t *testing.T) {
defer os.RemoveAll(tmpDir)
r := NewRecorder(tmpDir)
+ // Compile default patterns
+ for i := range r.Patterns {
+ re, _ := regexp.Compile(r.Patterns[i].Regexp)
+ r.Patterns[i].compiled = re
+ }
req := &http.Request{
Method: "GET",
URL: &url.URL{
@@ -299,6 +306,11 @@ func TestRecorder_EnvFile(t *testing.T) {
defer os.RemoveAll(tmpDir)
r := NewRecorder(tmpDir)
+ // Compile default patterns
+ for i := range r.Patterns {
+ re, _ := regexp.Compile(r.Patterns[i].Regexp)
+ r.Patterns[i].compiled = re
+ }
req := &http.Request{
Method: "GET",
URL: &url.URL{
diff --git a/pkg/service/setup/setup.go b/pkg/service/setup/setup.go
index 38f8181..f98e4a3 100644
--- a/pkg/service/setup/setup.go
+++ b/pkg/service/setup/setup.go
@@ -59,6 +59,8 @@ type MigrationSummary struct {
DeviceName string `json:"device_name,omitempty"`
DeviceModel string `json:"device_model,omitempty"`
DeviceSerial string `json:"device_serial,omitempty"`
+ DeviceID string `json:"device_id,omitempty"`
+ AccountID string `json:"account_id,omitempty"`
FirmwareVersion string `json:"firmware_version,omitempty"`
CACertTrusted bool `json:"ca_cert_trusted"`
ServerHTTPSURL string `json:"server_https_url,omitempty"`
@@ -92,14 +94,15 @@ func NewManager(serverURL string, ds *datastore.DataStore, cm *certmanager.Certi
// DeviceInfoXML represents the XML structure from :8090/info
type DeviceInfoXML struct {
- XMLName xml.Name `xml:"info" json:"-"`
- DeviceID string `xml:"deviceID,attr" json:"deviceID"`
- Name string `xml:"name" json:"name"`
- Type string `xml:"type" json:"type"`
- MaccAddress string `xml:"maccAddress" json:"maccAddress"`
- SoftwareVer string `xml:"-" json:"softwareVersion"`
- SerialNumber string `xml:"-" json:"serialNumber"`
- Components []struct {
+ XMLName xml.Name `xml:"info" json:"-"`
+ DeviceID string `xml:"deviceID,attr" json:"deviceID"`
+ Name string `xml:"name" json:"name"`
+ Type string `xml:"type" json:"type"`
+ MaccAddress string `xml:"maccAddress" json:"maccAddress"`
+ SoftwareVer string `xml:"-" json:"softwareVersion"`
+ SerialNumber string `xml:"-" json:"serialNumber"`
+ MargeAccountUUID string `xml:"margeAccountUUID" json:"margeAccountUUID"`
+ Components []struct {
Category string `xml:"componentCategory"`
SoftwareVersion string `xml:"softwareVersion"`
SerialNumber string `xml:"serialNumber"`
@@ -260,6 +263,8 @@ func (m *Manager) populateDeviceInfo(summary *MigrationSummary, deviceIP string)
summary.DeviceName = d.Name
summary.DeviceModel = d.ProductCode
summary.DeviceSerial = d.DeviceSerialNumber
+ summary.DeviceID = d.DeviceID
+ summary.AccountID = d.AccountID
summary.FirmwareVersion = d.FirmwareVersion
break
@@ -284,6 +289,14 @@ func (m *Manager) populateDeviceInfo(summary *MigrationSummary, deviceIP string)
if infoXML.SoftwareVer != "" {
summary.FirmwareVersion = infoXML.SoftwareVer
}
+
+ if infoXML.DeviceID != "" {
+ summary.DeviceID = infoXML.DeviceID
+ }
+
+ if infoXML.MargeAccountUUID != "" {
+ summary.AccountID = infoXML.MargeAccountUUID
+ }
}
}
@@ -557,18 +570,39 @@ func (m *Manager) BackupConfigOffDevice(deviceIP string) error {
client := m.NewSSH(deviceIP)
- // We need the serial number to find the right directory in DataStore
+ // We need the serial number and account identifier to find the right directory in DataStore
info, err := m.GetLiveDeviceInfo(deviceIP)
if err != nil {
return fmt.Errorf("failed to get device info: %w", err)
}
- serial := info.SerialNumber
- if serial == "" {
- return fmt.Errorf("could not determine device serial number")
+ accountID := info.MargeAccountUUID
+ deviceID := info.SerialNumber
+
+ if deviceID == "" {
+ deviceID = info.DeviceID
}
- deviceDir := m.DataStore.AccountDeviceDir("default", serial)
+ if deviceID == "" {
+ deviceID = deviceIP
+ }
+
+ if accountID == "" {
+ // Try to find account ID from existing device entries if info didn't have it
+ devices, _ := m.DataStore.ListAllDevices()
+ for i := range devices {
+ if devices[i].DeviceSerialNumber == info.SerialNumber || (info.DeviceID != "" && devices[i].DeviceID == info.DeviceID) {
+ accountID = devices[i].AccountID
+ break
+ }
+ }
+ }
+
+ if accountID == "" {
+ accountID = "default"
+ }
+
+ deviceDir := m.DataStore.AccountDeviceDir(accountID, deviceID)
if err := os.MkdirAll(deviceDir, 0755); err != nil {
return fmt.Errorf("failed to create device directory: %w", err)
}
@@ -1207,13 +1241,32 @@ func (m *Manager) SyncDeviceData(deviceIP string) error {
return fmt.Errorf("failed to get device info: %w", err)
}
- accountID := "default"
+ accountID := ""
deviceID := info.SerialNumber
if deviceID == "" {
deviceID = deviceIP
}
+ if info.MargeAccountUUID != "" {
+ accountID = info.MargeAccountUUID
+ }
+
+ if accountID == "" {
+ // Try to find account ID from existing device entries if info didn't have it
+ devices, _ := m.DataStore.ListAllDevices()
+ for i := range devices {
+ if devices[i].DeviceSerialNumber == info.SerialNumber || devices[i].DeviceID == info.DeviceID {
+ accountID = devices[i].AccountID
+ break
+ }
+ }
+ }
+
+ if accountID == "" {
+ accountID = "default"
+ }
+
// 2. Fetch Presets from :8090
m.syncPresets(deviceIP, accountID, deviceID)
diff --git a/pkg/service/setup/setup_test.go b/pkg/service/setup/setup_test.go
index 68ef214..93eafe3 100644
--- a/pkg/service/setup/setup_test.go
+++ b/pkg/service/setup/setup_test.go
@@ -776,11 +776,12 @@ func TestBackupConfigOffDevice(t *testing.T) {
m := NewManager("http://localhost:8000", ds, nil)
serial := "08DF1F0BA325"
+ accountID := "3230304"
// Mock info server
infoServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/xml")
- fmt.Fprintf(w, ` |