aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 15:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

implemented trust mode

Browse Source 
* implemented possibility to set the trust mode globally

see #240
This commit is contained in:
Bernhard B
2022-05-06 19:28:23 +02:00
parent a6927896ef
commit 25775a4c10
8 changed files with 348 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
src/client/client.go
View File

@@ -1,26 +1,19 @@
package client
import (
"bufio"
"bytes"
"encoding/base64"
"encoding/json"
"errors"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
"time"
securejoin "github.com/cyphar/filepath-securejoin"
"github.com/gabriel-vasile/mimetype"
"github.com/h2non/filetype"
//"github.com/sourcegraph/jsonrpc2"//"net/rpc/jsonrpc"
log "github.com/sirupsen/logrus"
uuid "github.com/gofrs/uuid"
qrcode "github.com/skip2/go-qrcode"
@@ -200,84 +193,6 @@ func getContainerId() (string, error) {
return containerId, nil
}
func runSignalCli(wait bool, args []string, stdin string, signalCliMode SignalCliMode) (string, error) {
containerId, err := getContainerId()
log.Debug("If you want to run this command manually, run the following steps on your host system:")
if err == nil {
log.Debug("*) docker exec -it ", containerId, " /bin/bash")
} else {
log.Debug("*) docker exec -it <container id> /bin/bash")
}
signalCliBinary := ""
if signalCliMode == Normal {
signalCliBinary = "signal-cli"
} else if signalCliMode == Native {
signalCliBinary = "signal-cli-native"
} else {
return "", errors.New("Invalid signal-cli mode")
}
fullCmd := ""
if stdin != "" {
fullCmd += "echo '" + stdin + "' | "
}
fullCmd += signalCliBinary + " " + strings.Join(args, " ")
log.Debug("*) su signal-api")
log.Debug("*) ", fullCmd)
cmdTimeout, err := utils.GetIntEnv("SIGNAL_CLI_CMD_TIMEOUT", 120)
if err != nil {
log.Error("Env variable 'SIGNAL_CLI_CMD_TIMEOUT' contains an invalid timeout...falling back to default timeout (120 seconds)")
cmdTimeout = 120
}
cmd := exec.Command(signalCliBinary, args...)
if stdin != "" {
cmd.Stdin = strings.NewReader(stdin)
}
if wait {
var errBuffer bytes.Buffer
var outBuffer bytes.Buffer
cmd.Stderr = &errBuffer
cmd.Stdout = &outBuffer
err := cmd.Start()
if err != nil {
return "", err
}
done := make(chan error, 1)
go func() {
done <- cmd.Wait()
}()
select {
case <-time.After(time.Duration(cmdTimeout) * time.Second):
err := cmd.Process.Kill()
if err != nil {
return "", err
}
return "", errors.New("process killed as timeout reached")
case err := <-done:
if err != nil {
return "", errors.New(errBuffer.String())
}
}
return outBuffer.String(), nil
} else {
stdout, err := cmd.StdoutPipe()
if err != nil {
return "", err
}
cmd.Start()
buf := bufio.NewReader(stdout) // Notice that this is not in a loop
line, _, _ := buf.ReadLine()
return string(line), nil
}
}
func ConvertGroupIdToInternalGroupId(id string) (string, error) {
@@ -309,10 +224,13 @@ type SignalClient struct {
jsonRpc2ClientConfig *utils.JsonRpc2ClientConfig
jsonRpc2ClientConfigPath string
jsonRpc2Clients map[string]*JsonRpc2Client
signalCliApiConfigPath string
signalCliApiConfig *utils.SignalCliApiConfig
cliClient *CliClient
}
func NewSignalClient(signalCliConfig string, attachmentTmpDir string, avatarTmpDir string, signalCliMode SignalCliMode,
jsonRpc2ClientConfigPath string) *SignalClient {
jsonRpc2ClientConfigPath string, signalCliApiConfigPath string) *SignalClient {
return &SignalClient{
signalCliConfig: signalCliConfig,
attachmentTmpDir: attachmentTmpDir,
@@ -320,6 +238,7 @@ func NewSignalClient(signalCliConfig string, attachmentTmpDir string, avatarTmpD
signalCliMode: signalCliMode,
jsonRpc2ClientConfigPath: jsonRpc2ClientConfigPath,
jsonRpc2Clients: make(map[string]*JsonRpc2Client),
signalCliApiConfigPath: signalCliApiConfigPath,
}
}
@@ -328,6 +247,12 @@ func (s *SignalClient) GetSignalCliMode() SignalCliMode {
}
func (s *SignalClient) Init() error {
s.signalCliApiConfig = utils.NewSignalCliApiConfig()
err := s.signalCliApiConfig.Load(s.signalCliApiConfigPath)
if err != nil {
return err
}
if s.signalCliMode == JsonRpc {
s.jsonRpc2ClientConfig = utils.NewJsonRpc2ClientConfig()
err := s.jsonRpc2ClientConfig.Load(s.jsonRpc2ClientConfigPath)
@@ -337,7 +262,7 @@ func (s *SignalClient) Init() error {
tcpPortsNumberMapping := s.jsonRpc2ClientConfig.GetTcpPortsForNumbers()
for number, tcpPort := range tcpPortsNumberMapping {
s.jsonRpc2Clients[number] = NewJsonRpc2Client()
s.jsonRpc2Clients[number] = NewJsonRpc2Client(s.signalCliApiConfig)
err := s.jsonRpc2Clients[number].Dial("127.0.0.1:" + strconv.FormatInt(tcpPort, 10))
if err != nil {
return err
@@ -345,7 +270,10 @@ func (s *SignalClient) Init() error {
go s.jsonRpc2Clients[number].ReceiveData(number) //receive messages in goroutine
}
} else {
s.cliClient = NewCliClient(s.signalCliMode, s.signalCliApiConfig)
}
return nil
}
@@ -455,7 +383,7 @@ func (s *SignalClient) send(number string, message string,
cmd = append(cmd, attachmentTmpPaths...)
}
rawData, err := runSignalCli(true, cmd, message, s.signalCliMode)
rawData, err := s.cliClient.Execute(true, cmd, message)
if err != nil {
cleanupTmpFiles(attachmentTmpPaths)
if strings.Contains(err.Error(), signalCliV2GroupError) {
@@ -495,7 +423,7 @@ func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha stri
command = append(command, []string{"--captcha", captcha}...)
}
_, err := runSignalCli(true, command, "", s.signalCliMode)
_, err := s.cliClient.Execute(true, command, "")
return err
}
@@ -509,7 +437,7 @@ func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool) error
command = append(command, "--delete-account")
}
_, err := runSignalCli(true, command, "", s.signalCliMode)
_, err := s.cliClient.Execute(true, command, "")
return err
}
@@ -524,7 +452,7 @@ func (s *SignalClient) VerifyRegisteredNumber(number string, token string, pin s
cmd = append(cmd, pin)
}
_, err := runSignalCli(true, cmd, "", s.signalCliMode)
_, err := s.cliClient.Execute(true, cmd, "")
return err
}
@@ -602,7 +530,7 @@ func (s *SignalClient) Receive(number string, timeout int64) (string, error) {
} else {
command := []string{"--config", s.signalCliConfig, "--output", "json", "-a", number, "receive", "-t", strconv.FormatInt(timeout, 10)}
out, err := runSignalCli(true, command, "", s.signalCliMode)
out, err := s.cliClient.Execute(true, command, "")
if err != nil {
return "", err
}
@@ -679,7 +607,7 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string,
cmd = append(cmd, []string{"--description", description}...)
}
rawData, err := runSignalCli(true, cmd, "", s.signalCliMode)
rawData, err := s.cliClient.Execute(true, cmd, "")
if err != nil {
if strings.Contains(err.Error(), signalCliV2GroupError) {
return "", errors.New("Cannot create group - please first update your profile.")
@@ -743,7 +671,7 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
}
cmd = append(cmd, members...)
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
}
@@ -806,7 +734,7 @@ func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins [
}
cmd = append(cmd, admins...)
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
}
@@ -836,7 +764,7 @@ func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
return groupEntries, err
}
} else {
rawData, err = runSignalCli(true, []string{"--config", s.signalCliConfig, "--output", "json", "-a", number, "listGroups", "-d"}, "", s.signalCliMode)
rawData, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "--output", "json", "-a", number, "listGroups", "-d"}, "")
if err != nil {
return groupEntries, err
}
@@ -904,7 +832,7 @@ func (s *SignalClient) GetGroup(number string, groupId string) (*GroupEntry, err
}
func (s *SignalClient) DeleteGroup(number string, groupId string) error {
_, err := runSignalCli(true, []string{"--config", s.signalCliConfig, "-a", number, "quitGroup", "-g", string(groupId)}, "", s.signalCliMode)
_, err := s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "quitGroup", "-g", string(groupId)}, "")
return err
}
@@ -914,7 +842,7 @@ func (s *SignalClient) GetQrCodeLink(deviceName string) ([]byte, error) {
}
command := []string{"--config", s.signalCliConfig, "link", "-n", deviceName}
tsdeviceLink, err := runSignalCli(false, command, "", s.signalCliMode)
tsdeviceLink, err := s.cliClient.Execute(false, command, "")
if err != nil {
return []byte{}, errors.New("Couldn't create QR code: " + err.Error())
}
@@ -1046,7 +974,7 @@ func (s *SignalClient) UpdateProfile(number string, profileName string, base64Av
cmd = append(cmd, []string{"--avatar", avatarTmpPath}...)
}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
cleanupTmpFiles([]string{avatarTmpPath})
@@ -1077,7 +1005,7 @@ func (s *SignalClient) ListIdentities(number string) (*[]IdentityEntry, error) {
identityEntries = append(identityEntries, identityEntry)
}
} else {
rawData, err := runSignalCli(true, []string{"--config", s.signalCliConfig, "-a", number, "listIdentities"}, "", s.signalCliMode)
rawData, err := s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "listIdentities"}, "")
if err != nil {
return nil, err
}
@@ -1134,7 +1062,7 @@ func (s *SignalClient) TrustIdentity(number string, numberToTrust string, verifi
cmd = append(cmd, "--trust-all-known-keys")
}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
}
@@ -1152,7 +1080,7 @@ func (s *SignalClient) BlockGroup(number string, groupId string) error {
}
_, err = jsonRpc2Client.getRaw("block", request)
} else {
_, err = runSignalCli(true, []string{"--config", s.signalCliConfig, "-a", number, "block", "-g", groupId}, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "block", "-g", groupId}, "")
}
return err
}
@@ -1170,7 +1098,7 @@ func (s *SignalClient) JoinGroup(number string, groupId string) error {
}
_, err = jsonRpc2Client.getRaw("updateGroup", request)
} else {
_, err = runSignalCli(true, []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-g", groupId}, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-g", groupId}, "")
}
return err
}
@@ -1188,7 +1116,7 @@ func (s *SignalClient) QuitGroup(number string, groupId string) error {
}
_, err = jsonRpc2Client.getRaw("quitGroup", request)
} else {
_, err = runSignalCli(true, []string{"--config", s.signalCliConfig, "-a", number, "quitGroup", "-g", groupId}, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "quitGroup", "-g", groupId}, "")
}
return err
}
@@ -1252,7 +1180,7 @@ func (s *SignalClient) SendReaction(number string, recipient string, emoji strin
if remove {
cmd = append(cmd, "-r")
}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
return err
}
@@ -1292,7 +1220,7 @@ func (s *SignalClient) SendStartTyping(number string, recipient string) error {
} else {
cmd = append(cmd, []string{"-g", recp}...)
}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
@@ -1335,7 +1263,7 @@ func (s *SignalClient) SendStopTyping(number string, recipient string) error {
} else {
cmd = append(cmd, []string{"-g", recp}...)
}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
@@ -1369,7 +1297,7 @@ func (s *SignalClient) SearchForNumbers(numbers []string) ([]SearchResultEntry,
} else {
cmd := []string{"--config", s.signalCliConfig, "--output", "json", "getUserStatus"}
cmd = append(cmd, numbers...)
rawData, err = runSignalCli(true, cmd, "", s.signalCliMode)
rawData, err = s.cliClient.Execute(true, cmd, "")
}
if err != nil {
@@ -1423,7 +1351,7 @@ func (s *SignalClient) UpdateContact(number string, recipient string, name *stri
if expirationInSeconds != nil {
cmd = append(cmd, []string{"-e", strconv.Itoa(*expirationInSeconds)}...)
}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
}
@@ -1442,7 +1370,20 @@ func (s *SignalClient) AddDevice(number string, uri string) error {
_, err = jsonRpc2Client.getRaw("addDevice", request)
} else {
cmd := []string{"--config", s.signalCliConfig, "-a", number, "addDevice", "--uri", uri}
_, err = runSignalCli(true, cmd, "", s.signalCliMode)
_, err = s.cliClient.Execute(true, cmd, "")
}
return err
}
func (s *SignalClient) SetTrustMode(number string, trustMode utils.SignalCliTrustMode) error {
s.signalCliApiConfig.SetTrustModeForNumber(number, trustMode)
return s.signalCliApiConfig.Persist()
}
func (s *SignalClient) GetTrustMode(number string) utils.SignalCliTrustMode {
trustMode, err := s.signalCliApiConfig.GetTrustModeForNumber(number)
if err != nil { //no trust mode explicitly set, use signal-cli default
return utils.OnFirstUseTrust
}
return trustMode
}