1088421567

Committed 02 Nov 2023 01:04PM UTC coverage: 64.099% (-7.0%) from 71.056%

Build # 1088421567

Build Type

push

gitlab-ci

Committed by

web-flow

Commit Message

Merge pull request #112 from lluiscampos/MEN-6671-new-mender-client

MEN-6827: Support new CLI interface of the mender client

Run Details

9 of 16 new or added lines in 1 file covered. (56.25%)

10 existing lines in 1 file now uncovered.

491 of 766 relevant lines covered (64.1%)

28.12 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

72.22

/session/menderclient.go

// Copyright 2021 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.

package session

import (
        "os"
        "os/exec"

        "github.com/mendersoftware/go-lib-micro/ws"
        "github.com/mendersoftware/go-lib-micro/ws/menderclient"
        "github.com/pkg/errors"
        log "github.com/sirupsen/logrus"
)

const (
        NormalMessage int = iota + 1
        ErrorMessage
)

const propertyStatus = "status"

func MenderClient() Constructor {
        f := HandlerFunc(menderClientHandler)
        return func() SessionHandler { return f }
}

func getMenderClientBinaryPath() (string, error) {
        candidates := []string{"/usr/bin/mender-update", "/usr/bin/mender"}

        for _, candidate := range candidates {
                if info, _ := os.Stat(candidate); info != nil {
                        log.Debugf("Found Mender client binary %s\n", candidate)
                        return candidate, nil
                }
        }
        return "", errors.Errorf("Cannot find Mender client binary, tried %v", candidates)
}

var runCommand = func(command []string) error {
        if len(command) > 0 {
                cmd := exec.Command(command[0], command[1:]...)
                return cmd.Run()
        }
        return errors.New("no command provided")
}

func menderClientHandler(message *ws.ProtoMsg, w ResponseWriter) {
        command := ""
        switch message.Header.MsgType {
        case menderclient.MessageTypeMenderClientCheckUpdate:
                command = "check-update"
        case menderclient.MessageTypeMenderClientSendInventory:
                command = "send-inventory"
        }

        var err error
        if command != "" {
                var binary string
                binary, err = getMenderClientBinaryPath()
                if err == nil {
                        args := []string{binary, command}
                        log.Debugf("Running command %v", args)
                        err = runCommand(args)
                }
        } else {
                err = errors.New("unknown message type")
        }
        response := &ws.ProtoMsg{
                Header: ws.ProtoHdr{
                        Proto:     message.Header.Proto,
                        MsgType:   message.Header.MsgType,
                        SessionID: message.Header.SessionID,
                        Properties: map[string]interface{}{
                                propertyStatus: int(NormalMessage),
                        },
                },
        }
        if err != nil {
                response.Header.Properties[propertyStatus] = ErrorMessage
                response.Body = []byte(err.Error())
        }
        if err := w.WriteProtoMsg(response); err != nil {
                log.Errorf("menderClientHandler: webSock.WriteMessage(%+v)", err)
        }
}

1	// Copyright 2021 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	package session
16
17	import (
18	"os"
19	"os/exec"
20
21	"github.com/mendersoftware/go-lib-micro/ws"
22	"github.com/mendersoftware/go-lib-micro/ws/menderclient"
23	"github.com/pkg/errors"
24	log "github.com/sirupsen/logrus"
25	)
26
27	const (
28	NormalMessage int = iota + 1
29	ErrorMessage
30	)
31
32	const propertyStatus = "status"
33
34	func MenderClient() Constructor {	×
35	f := HandlerFunc(menderClientHandler)	×
36	return func() SessionHandler { return f }	×
37	}
38
39	func getMenderClientBinaryPath() (string, error) {	2✔
40	candidates := []string{"/usr/bin/mender-update", "/usr/bin/mender"}	2✔
41		2✔
42	for _, candidate := range candidates {	6✔
43	if info, _ := os.Stat(candidate); info != nil {	4✔
NEW 44	log.Debugf("Found Mender client binary %s\n", candidate)	×
NEW 45	return candidate, nil	×
NEW 46	}	×
47	}
48	return "", errors.Errorf("Cannot find Mender client binary, tried %v", candidates)	2✔
49	}
50
51	var runCommand = func(command []string) error {	2✔
52	if len(command) > 0 {	3✔
53	cmd := exec.Command(command[0], command[1:]...)	1✔
54	return cmd.Run()	1✔
55	}	1✔
56	return errors.New("no command provided")	1✔
57	}
58
59	func menderClientHandler(message *ws.ProtoMsg, w ResponseWriter) {	2✔
60	command := ""	2✔
61	switch message.Header.MsgType {	2✔
62	case menderclient.MessageTypeMenderClientCheckUpdate:	1✔
63	command = "check-update"	1✔
64	case menderclient.MessageTypeMenderClientSendInventory:	1✔
65	command = "send-inventory"	1✔
66	}
67
68	var err error	2✔
69	if command != "" {	4✔
70	var binary string	2✔
71	binary, err = getMenderClientBinaryPath()	2✔
72	if err == nil {	2✔
NEW 73	args := []string{binary, command}	×
NEW 74	log.Debugf("Running command %v", args)	×
NEW 75	err = runCommand(args)	×
NEW 76	}	×
77	} else {	×
78	err = errors.New("unknown message type")	×
79	}	×
80	response := &ws.ProtoMsg{	2✔
81	Header: ws.ProtoHdr{	2✔
82	Proto: message.Header.Proto,	2✔
83	MsgType: message.Header.MsgType,	2✔
84	SessionID: message.Header.SessionID,	2✔
85	Properties: map[string]interface{}{	2✔
86	propertyStatus: int(NormalMessage),	2✔
87	},	2✔
88	},	2✔
89	}	2✔
90	if err != nil {	4✔
91	response.Header.Properties[propertyStatus] = ErrorMessage	2✔
92	response.Body = []byte(err.Error())	2✔
93	}	2✔
94	if err := w.WriteProtoMsg(response); err != nil {	2✔
95	log.Errorf("menderClientHandler: webSock.WriteMessage(%+v)", err)	×
96	}	×
97	}

mendersoftware / mender-connect / 1088421567

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous