.

cmd/goatak_server/http_server.go

@@ -205,10 +205,10 @@ func getConnHandler(app *App) func(req *air.Request, res *air.Response) error {
 		app.ForAllClients(func(ch client.ClientHandler) bool {
 			c := &Connection{
 				Uids:     ch.GetUids(),
-				User:     ch.GetUser(),
+				User:     ch.GetUser().Login,
 				Ver:      ch.GetVersion(),
 				Addr:     ch.GetName(),
-				Scope:    ch.GetScope(),
+				Scope:    ch.GetUser().Scope,
 				LastSeen: ch.GetLastSeen(),
 			}
 			conn = append(conn, c)

cmd/goatak_server/main.go

@@ -196,7 +196,7 @@ func (app *App) RemoveHandlerCb(cl client.ClientHandler) {
 		}
 		msg := &cot.CotMessage{
 			From:       cl.GetName(),
-			Scope:      cl.GetScope(),
+			Scope:      cl.GetUser().Scope,
 			TakMessage: cot.MakeOfflineMsg(uid, ""),
 		}
 		app.NewCotMessage(msg)

cmd/goatak_server/tcpserver.go

@@ -71,16 +71,11 @@ func (app *App) listenTls(addr string) error {
 
 		st := c1.ConnectionState()
 		username, serial := getCertUser(&st)
-		var scope string
-		if user := app.users.GetUser(username); user != nil {
-			scope = user.Scope
-		}
 
 		name := "ssl:" + conn.RemoteAddr().String()
 		h := client.NewConnClientHandler(name, conn, &client.HandlerConfig{
 			Logger:       app.Logger.With(zap.String("user", username), zap.String("addr", name)),
-			User:         username,
-			Scope:        scope,
+			User:         app.users.GetUser(username),
 			Serial:       serial,
 			MessageCb:    app.NewCotMessage,
 			RemoveCb:     app.RemoveHandlerCb,

cmd/goatak_server/ws.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"github.com/kdudkov/goatak/internal/model"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -29,12 +30,8 @@ type WsClientHandler struct {
 func (w *WsClientHandler) GetName() string {
 	return w.name
 }
-func (w *WsClientHandler) GetUser() string {
-	return ""
-}
-
-func (w *WsClientHandler) GetScope() string {
-	return ""
+func (w *WsClientHandler) GetUser() *model.User {
+	return nil
 }
 
 func (w *WsClientHandler) CanSeeScope(scope string) bool {

cmd/userctl/main.go

@@ -12,21 +12,21 @@ import (
 	"github.com/kdudkov/goatak/internal/model"
 )
 
-func read(fn string) []*model.UserInfo {
+func read(fn string) []*model.User {
 	dat, err := os.ReadFile(fn)
 	if err != nil {
 		return nil
 	}
 
-	users := make([]*model.UserInfo, 0)
+	users := make([]*model.User, 0)
 	if err := yaml.Unmarshal(dat, &users); err != nil {
 		panic(err.Error())
 	}
 
 	return users
 }
 
-func write(fn string, users []*model.UserInfo) error {
+func write(fn string, users []*model.User) error {
 	f, err := os.Create(fn)
 	if err != nil {
 		return err
@@ -50,7 +50,7 @@ func main() {
 
 	if *user == "" {
 		for _, user := range users {
-			fmt.Printf("%s\t%s\t%s\t%s\n", user.User, user.Callsign, user.Team, user.Role)
+			fmt.Printf("%s\t%s\t%s\t%s\n", user.Login, user.Callsign, user.Team, user.Role)
 		}
 		return
 	}
@@ -75,7 +75,7 @@ func main() {
 	var found bool
 
 	for _, u := range users {
-		if u.User == *user {
+		if u.Login == *user {
 			found = true
 			u.Password = string(bpass)
 			if *scope != "" {
@@ -86,7 +86,7 @@ func main() {
 	}
 
 	if !found {
-		users = append(users, &model.UserInfo{User: *user, Password: string(bpass), Scope: *scope})
+		users = append(users, &model.User{Login: *user, Password: string(bpass), Scope: *scope})
 	}
 
 	if err := write(*file, users); err != nil {

cmd/webclient/main.go

@@ -5,6 +5,7 @@ import (
 	"crypto/md5"
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/hex"
 	"flag"
 	"fmt"
 	"math/rand"
@@ -206,12 +207,8 @@ func (app *App) IsConnected() bool {
 }
 
 func makeUid(callsign string) string {
-	h := md5.New()
-	h.Write([]byte(callsign))
-	uid := fmt.Sprintf("%x", h.Sum(nil))
-	uid = uid[len(uid)-14:]
-
-	return "ANDROID-" + uid
+	s := hex.EncodeToString(md5.New().Sum([]byte(callsign)))
+	return "ANDROID-" + s[:16]
 }
 
 func (app *App) myPosSender(ctx context.Context, wg *sync.WaitGroup) {

cmd/webclient/main_test.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestMakeUid(t *testing.T) {
+	c := makeUid("s1")
+	fmt.Println(c)
+	assert.Equal(t, 24, len(c))
+	assert.Equal(t, makeUid("string1"), makeUid("string1"))
+	assert.NotEqual(t, makeUid("s1"), makeUid("s2"))
+}

internal/client/client_handler.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/xml"
 	"fmt"
+	"github.com/kdudkov/goatak/internal/model"
 	"github.com/kdudkov/goatak/pkg/cot"
 	"io"
 	"net"
@@ -23,8 +24,7 @@ const (
 )
 
 type HandlerConfig struct {
-	User         string
-	Scope        string
+	User         *model.User
 	Serial       string
 	Uid          string
 	IsClient     bool
@@ -38,8 +38,7 @@ type ClientHandler interface {
 	GetName() string
 	HasUid(uid string) bool
 	GetUids() map[string]string
-	GetUser() string
-	GetScope() string
+	GetUser() *model.User
 	CanSeeScope(scope string) bool
 	GetVersion() int32
 	SendMsg(msg *cotproto.TakMessage) error
@@ -59,8 +58,7 @@ type ConnClientHandler struct {
 	closeTimer   *time.Timer
 	sendChan     chan []byte
 	active       int32
-	user         string
-	scope        string
+	user         *model.User
 	serial       string
 	messageCb    func(msg *cot.CotMessage)
 	removeCb     func(ch ClientHandler)
@@ -83,7 +81,6 @@ func NewConnClientHandler(name string, conn net.Conn, config *HandlerConfig) *Co
 
 	if config != nil {
 		c.user = config.User
-		c.scope = config.Scope
 		c.serial = config.Serial
 		c.localUid = config.Uid
 		if config.Logger != nil {
@@ -102,16 +99,15 @@ func (h *ConnClientHandler) GetName() string {
 	return h.addr
 }
 
-func (h *ConnClientHandler) GetUser() string {
+func (h *ConnClientHandler) GetUser() *model.User {
 	return h.user
 }
 
-func (h *ConnClientHandler) GetScope() string {
-	return h.scope
-}
-
 func (h *ConnClientHandler) CanSeeScope(scope string) bool {
-	return h.scope == "" || scope == "broadcast" || h.scope == scope
+	if h.user == nil {
+		return true
+	}
+	return h.user.Scope == "" || scope == "broadcast" || h.user.Scope == scope
 }
 
 func (h *ConnClientHandler) GetUids() map[string]string {
@@ -202,7 +198,7 @@ func (h *ConnClientHandler) handleRead() {
 
 		cotmsg := &cot.CotMessage{
 			From:       h.addr,
-			Scope:      h.scope,
+			Scope:      h.user.Scope,
 			TakMessage: msg,
 			Detail:     d,
 		}

internal/model/user.go

@@ -1,7 +1,7 @@
 package model
 
-type UserInfo struct {
-	User     string `yaml:"user"`
+type User struct {
+	Login    string `yaml:"user"`
 	Callsign string `yaml:"callsign,omitempty"`
 	Team     string `yaml:"team,omitempty"`
 	Role     string `yaml:"role,omitempty"`

internal/repository/interfaces.go

@@ -10,7 +10,7 @@ type UserRepository interface {
 	Stop()
 	CheckUserAuth(user, password string) bool
 	UserIsValid(user, sn string) bool
-	GetUser(username string) *int.UserInfo
+	GetUser(username string) *int.User
 }
 
 type ItemsRepository interface {

internal/repository/user_repo.go

@@ -15,7 +15,7 @@ import (
 type UserFileRepository struct {
 	userFile string
 	logger   *zap.SugaredLogger
-	users    map[string]*model.UserInfo
+	users    map[string]*model.User
 
 	watcher *fsnotify.Watcher
 
@@ -26,7 +26,7 @@ func NewFileUserRepo(logger *zap.SugaredLogger, userFile string) *UserFileReposi
 	um := &UserFileRepository{
 		logger:   logger.Named("UserManager"),
 		userFile: userFile,
-		users:    make(map[string]*model.UserInfo),
+		users:    make(map[string]*model.User),
 		mx:       sync.RWMutex{},
 	}
 
@@ -36,8 +36,8 @@ func NewFileUserRepo(logger *zap.SugaredLogger, userFile string) *UserFileReposi
 		um.logger.Infof("no valid users found -  create one")
 		bytes, _ := bcrypt.GenerateFromPassword([]byte("11111"), 14)
 
-		um.users["user"] = &model.UserInfo{
-			User:     "user",
+		um.users["user"] = &model.User{
+			Login:    "user",
 			Password: string(bytes),
 		}
 	}
@@ -65,16 +65,16 @@ func (r *UserFileRepository) loadUsersFile() error {
 		return err
 	}
 
-	users := make([]*model.UserInfo, 0)
+	users := make([]*model.User, 0)
 
 	if err := yaml.Unmarshal(dat, &users); err != nil {
 		return err
 	}
 
-	r.users = make(map[string]*model.UserInfo)
+	r.users = make(map[string]*model.User)
 	for _, user := range users {
-		if user.User != "" {
-			r.users[user.User] = user
+		if user.Login != "" {
+			r.users[user.Login] = user
 		}
 	}
 
@@ -141,7 +141,7 @@ func (r *UserFileRepository) UserIsValid(user, sn string) bool {
 	return ok
 }
 
-func (r *UserFileRepository) GetUser(username string) *model.UserInfo {
+func (r *UserFileRepository) GetUser(username string) *model.User {
 	r.mx.RLock()
 	defer r.mx.RUnlock()
 	return r.users[username]