GitHubMirror/MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/MUTN.git synced 2026-09-02 15:17:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move device ID generation to sync.DeviceIDGen

Browse Source
This commit is contained in:
RandyTheSilly
2024-05-16 21:26:42 -04:00
parent 854bd906f0
commit a703c6b2ac
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/init.go
+2 -7
View File
@@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"github.com/rwinkhart/MUTN/src/backend" "github.com/rwinkhart/MUTN/src/backend"
"github.com/rwinkhart/MUTN/src/sync" "github.com/rwinkhart/MUTN/src/sync"
"math/rand"
"os" "os"
) )
@@ -40,12 +39,8 @@ func TempInitCli() {
// write config file // write config file
backend.TempInit(map[string]string{"textEditor": textEditor, "gpgID": gpgID, "sshUser": sshUser, "sshIP": sshIP, "sshPort": sshPort, "sshIdentity": sshIdentity}) backend.TempInit(map[string]string{"textEditor": textEditor, "gpgID": gpgID, "sshUser": sshUser, "sshIP": sshIP, "sshPort": sshPort, "sshIdentity": sshIdentity})
// client device ID (perform after writing config files, as sync.GetSSHOutput must be able to read it) TODO move to backend // generate device ID
deviceIDPrefix, _ := os.Hostname() sync.DeviceIDGen()
deviceIDSuffix := backend.StringGen(rand.Intn(48)+48, false, 0) // TODO consider using complex string generator and removing unsafe characters manually
deviceID := deviceIDPrefix + "-" + deviceIDSuffix
os.Create(backend.ConfigDir + backend.PathSeparator + "devices" + backend.PathSeparator + deviceID) // TODO remove existing device ID file if it exists (from both client and server)
sync.GetSSHOutput("libmuttonserver register "+deviceID, false) // register device ID with server
} else { } else {
// write config file // write config file
backend.TempInit(map[string]string{"textEditor": textEditor, "gpgID": gpgID}) backend.TempInit(map[string]string{"textEditor": textEditor, "gpgID": gpgID})