Skip to content

Commit df402fd

Browse files
KbayeroKbayero
committed
fix issues
1 parent eaabe53 commit df402fd

9 files changed

Lines changed: 53 additions & 61 deletions

File tree

‎client/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func ConfigExists() bool {
247247
func CreateInitialConfig() error {
248248
reader := bufio.NewReader(os.Stdin)
249249

250-
fmt.Print("Enter server address (e.g., localhost:50051): ")
250+
fmt.Print("Enter server address (e.g., https://<ip-or-domain>): ")
251251
serverAddress, _ := reader.ReadString('\n')
252252
serverAddress = strings.TrimSpace(serverAddress)
253253

‎client/config/const.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import (
77
)
88

99
var (
10-
ServiceLogFile = filepath.Join(utils.GetMyPath(), "logs", "utmstack_agent.log")
10+
ServiceLogFile = filepath.Join(utils.GetMyPath(), "logs", "signer_agent.log")
1111
)

‎client/serv/client.go‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"log"
99
"mime/multipart"
1010
"net/http"
11-
"net/url"
1211
"os"
1312
"path/filepath"
1413
"strings"
@@ -98,17 +97,20 @@ func (c *SignerClient) connect() error {
9897
c.conn.Close()
9998
}
10099

101-
log.Printf("Connecting to gRPC server at %s", c.serverAddress)
100+
server := strings.TrimPrefix(c.serverAddress, "https://")
101+
server = strings.TrimPrefix(server, "http://")
102102

103-
conn, err := grpc.NewClient(c.serverAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
103+
log.Printf("Connecting to gRPC server at %s:50052", server)
104+
105+
conn, err := grpc.Dial(fmt.Sprintf("%s:50052", server), grpc.WithTransportCredentials(insecure.NewCredentials()))
104106
if err != nil {
105107
return utils.Logger.ErrorF("failed to connect to server: %v", err)
106108
}
107109

108110
c.conn = conn
109111
c.client = pb.NewSignerServiceClient(conn)
110112

111-
utils.Logger.Info("Successfully connected to gRPC server at %s", c.serverAddress)
113+
utils.Logger.Info("Successfully connected to gRPC server at %s:50052", server)
112114

113115
c.retryDelay = 1 * time.Second
114116

@@ -153,9 +155,8 @@ func (c *SignerClient) processSignRequest(req *pb.SignRequest) {
153155
}
154156
defer os.RemoveAll(tempDir)
155157

156-
host := c.extractHostFromServerAddress()
157-
downloadURL := fmt.Sprintf("http://%s:8081%s", host, req.DownloadUrl)
158-
uploadURL := fmt.Sprintf("http://%s:8081%s", host, req.UploadUrl)
158+
downloadURL := fmt.Sprintf("%s:8081%s", c.serverAddress, req.DownloadUrl)
159+
uploadURL := fmt.Sprintf("%s:8081%s", c.serverAddress, req.UploadUrl)
159160

160161
// Download file
161162
filePath := filepath.Join(tempDir, req.FileName)
@@ -297,24 +298,3 @@ func (c *SignerClient) reportError(requestID, errorMsg string) {
297298
utils.Logger.Info("Successfully reported error for request %s: %s", requestID, errorMsg)
298299
}
299300
}
300-
301-
func (c *SignerClient) extractHostFromServerAddress() string {
302-
serverAddr := c.serverAddress
303-
304-
if strings.HasPrefix(serverAddr, "http://") || strings.HasPrefix(serverAddr, "https://") {
305-
if parsedURL, err := url.Parse(serverAddr); err == nil {
306-
if strings.Contains(parsedURL.Host, ":") {
307-
return strings.Split(parsedURL.Host, ":")[0]
308-
}
309-
return parsedURL.Host
310-
}
311-
serverAddr = strings.TrimPrefix(serverAddr, "http://")
312-
serverAddr = strings.TrimPrefix(serverAddr, "https://")
313-
}
314-
315-
if strings.Contains(serverAddr, ":") {
316-
return strings.Split(serverAddr, ":")[0]
317-
}
318-
319-
return serverAddr
320-
}

‎client/utils/services.go‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func UninstallService(name string) error {
4949
path := GetMyPath()
5050
switch runtime.GOOS {
5151
case "windows":
52-
err := Execute("sc", path, "delete", name)
52+
err := Execute("sc.exe", path, "delete", name)
5353
if err != nil {
5454
return fmt.Errorf("error uninstalling service: %v", err)
5555
}
@@ -63,9 +63,18 @@ func UninstallService(name string) error {
6363
return fmt.Errorf("error uninstalling service: %v", err)
6464
}
6565
case "darwin":
66-
Execute("launchctl", path, "remove", name)
67-
Execute("rm", "/Library/LaunchDaemons/"+name+".plist")
68-
Execute("rm", "/Users/"+os.Getenv("USER")+"/Library/LaunchAgents/"+name+".plist")
66+
err := Execute("launchctl", path, "remove", name)
67+
if err != nil {
68+
return fmt.Errorf("error uninstalling service: %v", err)
69+
}
70+
err = Execute("rm", "/Library/LaunchDaemons/"+name+".plist")
71+
if err != nil {
72+
return fmt.Errorf("error uninstalling service: %v", err)
73+
}
74+
err = Execute("rm", "/Users/"+os.Getenv("USER")+"/Library/LaunchAgents/"+name+".plist")
75+
if err != nil {
76+
return fmt.Errorf("error uninstalling service: %v", err)
77+
}
6978

7079
}
7180
return nil

‎server/config/const.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import (
77
)
88

99
var (
10-
ServiceLogFile = filepath.Join(utils.GetMyPath(), "logs", "utmstack_agent.log")
10+
ServiceLogFile = filepath.Join(utils.GetMyPath(), "logs", "signer_agent.log")
1111
)

‎server/go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ require (
99
github.com/kardianos/service v1.2.2
1010
github.com/threatwinds/logger v1.2.2
1111
google.golang.org/grpc v1.73.0
12-
google.golang.org/protobuf v1.36.6
1312
gopkg.in/yaml.v2 v2.4.0
1413
)
1514

15+
require google.golang.org/protobuf v1.36.6 // indirect
16+
1617
require (
1718
github.com/YHVCorp/signer-service/proto v0.0.0-20250715154513-3d7c6a992c9b
1819
github.com/bytedance/sonic v1.13.3 // indirect

‎server/go.sum‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
3737
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
3838
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
3939
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
40-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
41-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
40+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
41+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
4242
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4343
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
4444
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -79,16 +79,18 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
7979
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
8080
github.com/ugorji/go/codec v1.2.14 h1:yOQvXCBc3Ij46LRkRoh4Yd5qK6LVOgi0bYOXfb7ifjw=
8181
github.com/ugorji/go/codec v1.2.14/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
82-
go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
83-
go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
84-
go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=
85-
go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY=
86-
go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk=
87-
go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0=
88-
go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
89-
go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
90-
go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
91-
go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
82+
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
83+
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
84+
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
85+
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
86+
go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
87+
go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
88+
go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
89+
go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
90+
go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
91+
go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
92+
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
93+
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
9294
golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
9395
golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
9496
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
@@ -101,12 +103,8 @@ golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
101103
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
102104
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
103105
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
104-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
106106
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
107107
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
108-
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
109-
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
110108
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
111109
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
112110
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=

‎server/server/http.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ type UploadResponse struct {
3434
}
3535

3636
type StatusResponse struct {
37-
Status string `json:"status"`
38-
SignedURL string `json:"signed_url,omitempty"`
37+
Status string `json:"status"`
3938
}
4039

4140
func NewFileManager() *FileManager {
@@ -168,10 +167,6 @@ func (fm *FileManager) getFileStatus(c *gin.Context) {
168167
Status: fileInfo.Status,
169168
}
170169

171-
if fileInfo.Status == "ready" && fileInfo.SignedURL != "" {
172-
response.SignedURL = fmt.Sprintf("http://%s/api/v1/download/%s", c.Request.Host, fileID)
173-
}
174-
175170
c.JSON(http.StatusOK, response)
176171
}
177172

‎server/utils/services.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,18 @@ func UninstallService(name string) error {
6363
return fmt.Errorf("error uninstalling service: %v", err)
6464
}
6565
case "darwin":
66-
Execute("launchctl", path, "remove", name)
67-
Execute("rm", "/Library/LaunchDaemons/"+name+".plist")
68-
Execute("rm", "/Users/"+os.Getenv("USER")+"/Library/LaunchAgents/"+name+".plist")
66+
err := Execute("launchctl", path, "remove", name)
67+
if err != nil {
68+
return fmt.Errorf("error uninstalling service: %v", err)
69+
}
70+
err = Execute("rm", "/Library/LaunchDaemons/"+name+".plist")
71+
if err != nil {
72+
return fmt.Errorf("error uninstalling service: %v", err)
73+
}
74+
err = Execute("rm", "/Users/"+os.Getenv("USER")+"/Library/LaunchAgents/"+name+".plist")
75+
if err != nil {
76+
return fmt.Errorf("error uninstalling service: %v", err)
77+
}
6978

7079
}
7180
return nil

0 commit comments

Comments
 (0)