Merge pull request #46 from jhalter/implement_access_no_agreement

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index e5a7b8eb08a4ed8be7c0fce1555e7839264a8587..f3574dea99e0b047b6ab78776311c0b850269803 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -308,16 +308,16 @@ func (s *Server) keepaliveHandler() {
                        if c.IdleTime > userIdleSeconds && !c.Idle {
                                c.Idle = true
 
                        if c.IdleTime > userIdleSeconds && !c.Idle {
                                c.Idle = true
 

-                               flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*c.Flags)))
+                               flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(c.Flags)))

                                flagBitmap.SetBit(flagBitmap, userFlagAway, 1)
                                flagBitmap.SetBit(flagBitmap, userFlagAway, 1)

-                               binary.BigEndian.PutUint16(*c.Flags, uint16(flagBitmap.Int64()))
+                               binary.BigEndian.PutUint16(c.Flags, uint16(flagBitmap.Int64()))

 
                                c.sendAll(
                                        tranNotifyChangeUser,
                                        NewField(fieldUserID, *c.ID),
 
                                c.sendAll(
                                        tranNotifyChangeUser,
                                        NewField(fieldUserID, *c.ID),

-                                       NewField(fieldUserFlags, *c.Flags),
+                                       NewField(fieldUserFlags, c.Flags),

                                        NewField(fieldUserName, c.UserName),
                                        NewField(fieldUserName, c.UserName),

-                                       NewField(fieldUserIconID, *c.Icon),
+                                       NewField(fieldUserIconID, c.Icon),

                                )
                        }
                }
                                )
                        }
                }


@@ -363,12 +363,12 @@ func (s *Server) NewClientConn(conn io.ReadWriteCloser, remoteAddr string) *Clie
 
        clientConn := &ClientConn{
                ID:         &[]byte{0, 0},
 
        clientConn := &ClientConn{
                ID:         &[]byte{0, 0},

-               Icon:       &[]byte{0, 0},
-               Flags:      &[]byte{0, 0},
+               Icon:       []byte{0, 0},
+               Flags:      []byte{0, 0},

                UserName:   []byte{},
                Connection: conn,
                Server:     s,
                UserName:   []byte{},
                Connection: conn,
                Server:     s,

-               Version:    &[]byte{},
+               Version:    []byte{},

                AutoReply:  []byte{},
                transfers:  map[int]map[[4]byte]*FileTransfer{},
                Agreed:     false,
                AutoReply:  []byte{},
                transfers:  map[int]map[[4]byte]*FileTransfer{},
                Agreed:     false,


@@ -463,8 +463,8 @@ func (s *Server) connectedUsers() []Field {
                }
                user := User{
                        ID:    *c.ID,
                }
                user := User{
                        ID:    *c.ID,

-                       Icon:  *c.Icon,
-                       Flags: *c.Flags,
+                       Icon:  c.Icon,
+                       Flags: c.Flags,

                        Name:  string(c.UserName),
                }
                connectedUsers = append(connectedUsers, NewField(fieldUsernameWithInfo, user.Payload()))
                        Name:  string(c.UserName),
                }
                connectedUsers = append(connectedUsers, NewField(fieldUsernameWithInfo, user.Payload()))


@@ -598,7 +598,7 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 
        encodedLogin := clientLogin.GetField(fieldUserLogin).Data
        encodedPassword := clientLogin.GetField(fieldUserPassword).Data
 
        encodedLogin := clientLogin.GetField(fieldUserLogin).Data
        encodedPassword := clientLogin.GetField(fieldUserPassword).Data

-       *c.Version = clientLogin.GetField(fieldVersion).Data
+       c.Version = clientLogin.GetField(fieldVersion).Data

 
        var login string
        for _, char := range encodedLogin {
 
        var login string
        for _, char := range encodedLogin {


@@ -621,11 +621,17 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
                        return err
                }
 
                        return err
                }
 

-               c.logger.Infow("Login failed", "clientVersion", fmt.Sprintf("%x", *c.Version))
+               c.logger.Infow("Login failed", "clientVersion", fmt.Sprintf("%x", c.Version))

 
                return nil
        }
 
 
                return nil
        }
 

+       if clientLogin.GetField(fieldUserIconID).Data != nil {
+               c.Icon = clientLogin.GetField(fieldUserIconID).Data
+       }
+
+       c.Account = c.Server.Accounts[login]
+

        if clientLogin.GetField(fieldUserName).Data != nil {
                if c.Authorize(accessAnyName) {
                        c.UserName = clientLogin.GetField(fieldUserName).Data
        if clientLogin.GetField(fieldUserName).Data != nil {
                if c.Authorize(accessAnyName) {
                        c.UserName = clientLogin.GetField(fieldUserName).Data


@@ -634,14 +640,8 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
                }
        }
 
                }
        }
 

-       if clientLogin.GetField(fieldUserIconID).Data != nil {
-               *c.Icon = clientLogin.GetField(fieldUserIconID).Data
-       }
-
-       c.Account = c.Server.Accounts[login]
-

        if c.Authorize(accessDisconUser) {
        if c.Authorize(accessDisconUser) {

-               *c.Flags = []byte{0, 2}
+               c.Flags = []byte{0, 2}

        }
 
        s.outbox <- c.NewReply(clientLogin,
        }
 
        s.outbox <- c.NewReply(clientLogin,


@@ -653,22 +653,26 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
        // Send user access privs so client UI knows how to behave
        c.Server.outbox <- *NewTransaction(tranUserAccess, c.ID, NewField(fieldUserAccess, *c.Account.Access))
 
        // Send user access privs so client UI knows how to behave
        c.Server.outbox <- *NewTransaction(tranUserAccess, c.ID, NewField(fieldUserAccess, *c.Account.Access))
 

-       // Show agreement to client
-       c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
+       // Users with accessNoAgreement do not receive the server agreement on login
+       if c.Authorize(accessNoAgreement) {
+               c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldNoServerAgreement, []byte{1}))
+       } else {
+               c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
+       }

 
        // Used simplified hotline v1.2.3 login flow for clients that do not send login info in tranAgreed
 
        // Used simplified hotline v1.2.3 login flow for clients that do not send login info in tranAgreed

-       if *c.Version == nil || bytes.Equal(*c.Version, nostalgiaVersion) {
+       if c.Version == nil || bytes.Equal(c.Version, nostalgiaVersion) {

                c.Agreed = true
                c.logger = c.logger.With("name", string(c.UserName))
                c.Agreed = true
                c.logger = c.logger.With("name", string(c.UserName))

-               c.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", *c.Version))
+               c.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", c.Version))

 
                for _, t := range c.notifyOthers(
                        *NewTransaction(
                                tranNotifyChangeUser, nil,
                                NewField(fieldUserName, c.UserName),
                                NewField(fieldUserID, *c.ID),
 
                for _, t := range c.notifyOthers(
                        *NewTransaction(
                                tranNotifyChangeUser, nil,
                                NewField(fieldUserName, c.UserName),
                                NewField(fieldUserID, *c.ID),

-                               NewField(fieldUserIconID, *c.Icon),
-                               NewField(fieldUserFlags, *c.Flags),
+                               NewField(fieldUserIconID, c.Icon),
+                               NewField(fieldUserFlags, c.Flags),

                        ),
                ) {
                        c.Server.outbox <- t
                        ),
                ) {
                        c.Server.outbox <- t