Merge pull request #1 from brokenCursor/remote-debug

SMS & remote connection

Author: brokenCursor

args.go

@@ -22,7 +22,7 @@ type (
 	BaseArgs struct {
 		Connection   *ConnectionArgs `validate:"-" arg:"subcommand:conn" help:"Manage cell connection"`
 		SMS          *SMSActionArgs  `validate:"-" arg:"subcommand:sms" help:"Manage SMS"`
-		Ip           string          `validate:"omitempty,ipv4" arg:"--ip" help:"Override IP in config file"`
+		Host         string          `validate:"omitempty,ipv4|hostname" arg:"--host" help:"Override hostname in config file"`
 		DisableColor bool            `arg:"-p,--plain" help:"Disable color for better software interaction"`
 	}
 )

drivers/8810ft.go

@@ -9,12 +9,14 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/warthog618/sms/encoding/gsm7"
 )
 
 // DO NOT USE DIRECTLY
 type (
 	zte8810ft struct {
-		ip       string
+		host     string
 		basePath string
 	}
 
@@ -34,33 +36,32 @@ func init() {
 	registerDriver("ZTE 8810FT", newZTE8810FT)
 }
 
-func newZTE8810FT(ip string) BaseModem {
-	return &zte8810ft{ip: ip, basePath: "/goform/goform_set_cmd_process"}
+func newZTE8810FT(host string) BaseModem {
+	return &zte8810ft{host: host, basePath: "/goform/goform_set_cmd_process"}
 }
 
 func (m *zte8810ft) getBaseURL(path string) *url.URL {
-	return &url.URL{Scheme: "http", Host: m.ip, Path: path}
+	return &url.URL{Scheme: "http", Host: m.host, Path: path}
 }
 
-func (m *zte8810ft) getNewRequest(method string, url *url.URL) *http.Request {
+func (m *zte8810ft) getNewRequest(method string, url *url.URL, headers http.Header) *http.Request {
+	headers.Add("Referer", fmt.Sprintf("http://%s/index.html", m.host))
+
 	return &http.Request{
 		Proto:  "HTTP/1.1",
 		Method: method,
 		URL:    url,
-		Header: http.Header{
-			"Referer": {fmt.Sprintf("http://%s/index.html", m.ip)},
-			"Content"
-		},
+		Header: headers,
 	}
 }
 
-func (m *zte8810ft) SetTargetIP(ip string) error {
-	m.ip = ip
+func (m *zte8810ft) SetHost(ip string) error {
+	m.host = ip
 	return nil
 }
 
-func (m *zte8810ft) GetTargetIP() string {
-	return m.ip
+func (m *zte8810ft) GetHost() string {
+	return m.host
 }
 
 func (m *zte8810ft) GetModel() string {
@@ -74,7 +75,7 @@ func (m *zte8810ft) ConnectCell() error {
 	query := u.Query()
 	query.Add("goformId", "CONNECT_NETWORK")
 	u.RawQuery = query.Encode()
-	request := m.getNewRequest("GET", u)
+	request := m.getNewRequest("GET", u, http.Header{})
 
 	resp, err := httpClient.Do(request)
 
@@ -112,7 +113,7 @@ func (m *zte8810ft) DisconnectCell() error {
 	query := u.Query()
 	query.Add("goformId", "DISCONNECT_NETWORK")
 	u.RawQuery = query.Encode()
-	request := m.getNewRequest("GET", u)
+	request := m.getNewRequest("GET", u, http.Header{})
 
 	resp, err := httpClient.Do(request)
 	// Process errors
@@ -157,7 +158,7 @@ func (m *zte8810ft) GetCellConnStatus() (*LinkStatus, error) {
 	query.Add("_", strconv.FormatInt((time.Now().UnixMilli)(), 10))
 	u.RawQuery = query.Encode()
 
-	request := m.getNewRequest("GET", u)
+	request := m.getNewRequest("GET", u, http.Header{})
 
 	resp, err := httpClient.Do(request)
 
@@ -201,12 +202,20 @@ func (m *zte8810ft) SendSMS(phone string, message string) error {
 	// GET /goform/goform_set_cmd_process?goformId=SEND_SMS
 	// Prepare everything to make a request
 
-	// Encode message into GSM-7
-	// encodedMsg, err := gsm7.Encode([]byte(message))
-	// if err != nil {
-	// 	return ActionError{"sms send", err}
-	// }
+	// Encode message into GSM-7 as byte array
+	encodedMsg, err := gsm7.Encode([]byte(message))
+	switch err {
+
+	}
+	if err != nil {
+		return ActionError{"sms send", err}
+	}
 
+	// Format into proprietary two byte format: 1122 (0074)
+	formattedMsg := ""
+	for _, hex := range encodedMsg {
+		formattedMsg += fmt.Sprintf("00%X", hex)
+	}
 	u := m.getBaseURL("/goform/goform_set_cmd_process")
 
 	// Build body
@@ -215,35 +224,23 @@ func (m *zte8810ft) SendSMS(phone string, message string) error {
 	query.Add("ID", "-1")
 	query.Add("encode_type", "GSM7_default")
 	query.Add("Number", phone)
-	// query.Add("MessageBody", fmt.Sprintf("%X", encodedMsg))
-	query.Add("MessageBody", "0074006500730074")
+	query.Add("MessageBody", formattedMsg)
 
 	// Build send timestamp
-	currTime := time.Now()
-	if _, tz := currTime.Zone(); tz >= 0 {
-		query.Add("sms_time", currTime.Format("06;01;02;15;04;05;+")+strconv.Itoa(tz/3600))
+	t := time.Now()
+	if _, tz := t.Zone(); tz >= 0 {
+		query.Add("sms_time", t.Format("06;01;02;15;04;05;+")+strconv.Itoa(tz/3600))
 	} else {
-		query.Add("sms_time", currTime.Format("06;01;02;15;04;05;")+strconv.Itoa(tz/3600))
+		query.Add("sms_time", t.Format("06;01;02;15;04;05;")+strconv.Itoa(tz/3600))
 	}
 
-	// data := map[string]string{
-	// 	"goformId":    "SEND_SMS",
-	// 	"Number":      phone,
-	// 	"sms_time":    time.Now().Format("02;01;06;15;04;05;-07"),
-	// 	"MessageBody": string(encodedMsg),
-	// 	"ID":          "-1",
-	// 	"encode_type": "GSM7_default",
-	// }
-
-	request := m.getNewRequest("POST", u)
+	request := m.getNewRequest("POST", u, http.Header{
+		"Content-Type": {"application/x-www-form-urlencoded", "charset=UTF-8"}})
 
 	// Some Go-level string manipulation
-	fmt.Println(query.Encode())
-	// stringReader := strings.NewReader(query.Encode())
-	stringReader := strings.NewReader("goformId=SEND_SMS&Number=%2B79124446729&sms_time=24%3B07%3B28%3B19%3B01%3B24%3B%2B4&MessageBody=0074006500730074&ID=-1&encode_type=GSM7_default")
+	stringReader := strings.NewReader(query.Encode())
 	stringReadCloser := io.NopCloser(stringReader)
 	request.Body = stringReadCloser
-	
 
 	resp, err := httpClient.Do(request)
 

drivers/common.go

@@ -6,8 +6,8 @@ import "fmt"
 
 type (
 	BaseModem interface {
-		SetTargetIP(ip string) error
-		GetTargetIP() string
+		SetHost(host string) error
+		GetHost() string
 		GetModel() string
 	}
 
@@ -42,7 +42,7 @@ type (
 	}
 )
 
-var drivers map[string]func(ip string) BaseModem = map[string]func(ip string) BaseModem{}
+var drivers map[string]func(host string) BaseModem = map[string]func(host string) BaseModem{}
 
 func isRegistered(name string) bool {
 	// Check if driver has already been registered
@@ -60,12 +60,12 @@ func registerDriver(name string, generator func(ip string) BaseModem) {
 	drivers[name] = generator
 }
 
-func GetModemDriver(model string, ip string) (BaseModem, error) {
+func GetModemDriver(model string, host string) (BaseModem, error) {
 	if !isRegistered(model) {
 		return nil, ErrUnknownModel
 	}
 
-	return drivers[model](ip), nil
+	return drivers[model](host), nil
 }
 
 func GetAvailableDrivers() *[]string {

drivers/dummy.go

@@ -20,11 +20,11 @@ func (m *dummy) GetModel() string {
 	return "Dummy"
 }
 
-func (m *dummy) SetTargetIP(ip string) error {
+func (m *dummy) SetHost(ip string) error {
 	m.ip = ip
 	return nil
 }
 
-func (m *dummy) GetTargetIP() string {
+func (m *dummy) GetHost() string {
 	return m.ip
 }

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/warthog618/sms v0.3.0 // indirect
+	github.com/warthog618/sms v0.3.0
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect

go.sum

@@ -40,6 +40,7 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
@@ -93,8 +94,6 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

mcli.go

@@ -36,7 +36,7 @@ func init() {
 	config.AddConfigPath(dir + sep + "modem-cli")
 
 	config.SetDefault("modem.model", "dummy")
-	config.SetDefault("modem.ip", "127.0.0.1")
+	config.SetDefault("modem.host", "127.0.0.1")
 
 	err = config.ReadInConfig()
 	if err != nil { // Handle errors reading the config file
@@ -57,20 +57,20 @@ func run() error {
 	modemConfig := config.Sub("modem")
 
 	model := modemConfig.GetString("model")
-	ip := modemConfig.GetString("ip")
+	ip := modemConfig.GetString("host")
 
 	if err := validate.Struct(args); err != nil {
 		// TODO: add actual error output
-		parser.Fail("invalid value for \"--ip\" ")
+		parser.Fail("invalid value for \"--host\" ")
 	}
 
 	if args.DisableColor {
 		cfmt.DisableColors()
 	}
 
 	// If IP has been overridden
-	if len(args.Ip) > 0 {
-		ip = args.Ip
+	if len(args.Host) > 0 {
+		ip = args.Host
 	}
 
 	modem, err := drivers.GetModemDriver(model, ip)
@@ -136,7 +136,7 @@ func run() error {
 				parser.FailSubcommand("Unknown action", "sms")
 			}
 
-			err = sms.SendSMS(args.SMS.Send.PhoneNumber, args.SMS.Send.PhoneNumber)
+			err = sms.SendSMS(args.SMS.Send.PhoneNumber, args.SMS.Send.Message)
 			if err != nil {
 				return err
 			}