@zerops/zcli 1.0.0 → 8.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +12 -7
- package/{tools/npm → utils}/binary.js +8 -4
- package/{tools/npm → utils}/install.js +0 -0
- package/{tools/npm → utils}/run.js +0 -0
- package/{tools/npm → utils}/uninstall.js +0 -0
- package/.github/workflows/master.yml +0 -36
- package/.github/workflows/tag.yml +0 -67
- package/.golangci.yaml +0 -58
- package/LICENSE +0 -1
- package/README.md +0 -2
- package/bin/.gitignore +0 -2
- package/cmd/deploy.go +0 -65
- package/cmd/di.go +0 -65
- package/cmd/login.go +0 -48
- package/cmd/root.go +0 -70
- package/cmd/startVpn.go +0 -59
- package/cmd/stopVpn.go +0 -36
- package/go.mod +0 -21
- package/go.sum +0 -230
- package/main.go +0 -13
- package/src/command/deploy/handler.go +0 -43
- package/src/command/deploy/handler_checkProcess.go +0 -38
- package/src/command/deploy/handler_run.go +0 -126
- package/src/command/login/handler.go +0 -128
- package/src/command/login/handler_parseRestApiError.go +0 -48
- package/src/command/startVpn/handler.go +0 -150
- package/src/command/startVpn/handler_clean_linux.go +0 -24
- package/src/command/startVpn/handler_clean_linux_macos.go +0 -19
- package/src/command/startVpn/handler_generateKeys.go +0 -26
- package/src/command/startVpn/handler_isVpnAlive.go +0 -23
- package/src/command/startVpn/handler_setVpn_linux.go +0 -97
- package/src/command/startVpn/handler_setVpn_macos.go +0 -98
- package/src/command/startVpn/handler_startVpnClient.go +0 -27
- package/src/command/stopVpn/handler.go +0 -55
- package/src/command/stopVpn/handler_clean_linux.go +0 -24
- package/src/command/stopVpn/handler_clean_linux_macos.go +0 -19
- package/src/command/userInfo/handler.go +0 -21
- package/src/helpers/cmdRunner/run.go +0 -40
- package/src/helpers/grpcErrors.go +0 -40
- package/src/helpers/ip.go +0 -11
- package/src/service/certReader/handler.go +0 -97
- package/src/service/httpClient/handler.go +0 -90
- package/src/service/logger/handler.go +0 -32
- package/src/service/logger/interface.go +0 -8
- package/src/service/params/handler.go +0 -111
- package/src/service/storage/handler.go +0 -71
- package/src/service/sudoers/handler.go +0 -49
- package/src/service/tlsConfig/handler.go +0 -36
- package/src/service/zipClient/handler.go +0 -144
- package/src/service/zipClient/test/var/www/dir/file2.1.txt +0 -1
- package/src/service/zipClient/test/var/www/dir/file2.2.txt +0 -0
- package/src/service/zipClient/test/var/www/dir/subDir/file3.1.txt +0 -0
- package/src/service/zipClient/test/var/www/dir/subDir/file3.2.txt +0 -0
- package/src/service/zipClient/test/var/www/file1.1.txt +0 -0
- package/src/service/zipClient/test/zip_test.go +0 -289
- package/src/zeropsApiProtocol/build-pb +0 -13
- package/src/zeropsApiProtocol/build-pb-generate.go +0 -3
- package/src/zeropsApiProtocol/protocol_extra.go +0 -19
- package/src/zeropsApiProtocol/zeropsApiProtocol.pb.go +0 -5518
- package/src/zeropsApiProtocol/zeropsApiProtocol.proto +0 -819
- package/src/zeropsVpnProtocol/build-pb +0 -13
- package/src/zeropsVpnProtocol/build-pb-generate.go +0 -3
- package/src/zeropsVpnProtocol/protocol_extra.go +0 -45
- package/src/zeropsVpnProtocol/zeropsVpnProtocol.pb.go +0 -578
- package/src/zeropsVpnProtocol/zeropsVpnProtocol.proto +0 -58
- package/tools/gomodrun.go +0 -60
- package/tools/install.sh +0 -40
- package/tools/npm/match-version.js +0 -12
|
@@ -1,289 +0,0 @@
|
|
|
1
|
-
package test
|
|
2
|
-
|
|
3
|
-
import (
|
|
4
|
-
"archive/zip"
|
|
5
|
-
"bytes"
|
|
6
|
-
"io"
|
|
7
|
-
"testing"
|
|
8
|
-
|
|
9
|
-
"github.com/zerops-io/zcli/src/service/zipClient"
|
|
10
|
-
|
|
11
|
-
. "github.com/onsi/gomega"
|
|
12
|
-
)
|
|
13
|
-
|
|
14
|
-
var testErrorResponseDataProvider = []struct {
|
|
15
|
-
name string
|
|
16
|
-
workingDir string
|
|
17
|
-
input []string
|
|
18
|
-
output []string
|
|
19
|
-
}{
|
|
20
|
-
|
|
21
|
-
{
|
|
22
|
-
name: "all",
|
|
23
|
-
workingDir: "./",
|
|
24
|
-
input: []string{
|
|
25
|
-
"./",
|
|
26
|
-
},
|
|
27
|
-
output: []string{
|
|
28
|
-
"var/",
|
|
29
|
-
"var/www/",
|
|
30
|
-
"var/www/dir/",
|
|
31
|
-
"var/www/dir/file2.1.txt",
|
|
32
|
-
"var/www/dir/file2.2.txt",
|
|
33
|
-
"var/www/dir/subDir/",
|
|
34
|
-
"var/www/dir/subDir/file3.1.txt",
|
|
35
|
-
"var/www/dir/subDir/file3.2.txt",
|
|
36
|
-
"var/www/dir/subDir/file3.3.symlink.txt",
|
|
37
|
-
"var/www/file1.1.txt",
|
|
38
|
-
"zip_test.go",
|
|
39
|
-
},
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
name: "single files",
|
|
43
|
-
workingDir: "./",
|
|
44
|
-
input: []string{
|
|
45
|
-
"var/www/file1.1.txt",
|
|
46
|
-
"var/www/dir/file2.1.txt",
|
|
47
|
-
"var/www/dir/subDir/file3.1.txt",
|
|
48
|
-
},
|
|
49
|
-
output: []string{
|
|
50
|
-
"var/www/file1.1.txt",
|
|
51
|
-
"var/www/dir/file2.1.txt",
|
|
52
|
-
"var/www/dir/subDir/file3.1.txt",
|
|
53
|
-
},
|
|
54
|
-
},
|
|
55
|
-
{
|
|
56
|
-
name: "all files in directory",
|
|
57
|
-
workingDir: "./",
|
|
58
|
-
input: []string{
|
|
59
|
-
"var/www/dir",
|
|
60
|
-
},
|
|
61
|
-
output: []string{
|
|
62
|
-
"var/www/dir/",
|
|
63
|
-
"var/www/dir/file2.1.txt",
|
|
64
|
-
"var/www/dir/file2.2.txt",
|
|
65
|
-
"var/www/dir/subDir/",
|
|
66
|
-
"var/www/dir/subDir/file3.1.txt",
|
|
67
|
-
"var/www/dir/subDir/file3.2.txt",
|
|
68
|
-
"var/www/dir/subDir/file3.3.symlink.txt",
|
|
69
|
-
},
|
|
70
|
-
},
|
|
71
|
-
{
|
|
72
|
-
name: "all files in sub directory",
|
|
73
|
-
workingDir: "./",
|
|
74
|
-
input: []string{
|
|
75
|
-
"var/www/dir/subDir",
|
|
76
|
-
},
|
|
77
|
-
output: []string{
|
|
78
|
-
"var/www/dir/subDir/",
|
|
79
|
-
"var/www/dir/subDir/file3.1.txt",
|
|
80
|
-
"var/www/dir/subDir/file3.2.txt",
|
|
81
|
-
"var/www/dir/subDir/file3.3.symlink.txt",
|
|
82
|
-
},
|
|
83
|
-
},
|
|
84
|
-
{
|
|
85
|
-
name: "single files - strip directory",
|
|
86
|
-
workingDir: "./",
|
|
87
|
-
input: []string{
|
|
88
|
-
"var/www/dir/*/file2.1.txt",
|
|
89
|
-
"var/www/dir/*/subDir/file3.1.txt",
|
|
90
|
-
"var/www/dir/subDir/*/file3.1.txt",
|
|
91
|
-
},
|
|
92
|
-
output: []string{
|
|
93
|
-
"file2.1.txt",
|
|
94
|
-
"subDir/file3.1.txt",
|
|
95
|
-
"file3.1.txt",
|
|
96
|
-
},
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
name: "all files - strip directory",
|
|
100
|
-
workingDir: "./",
|
|
101
|
-
input: []string{
|
|
102
|
-
"var/www/dir/*",
|
|
103
|
-
"var/www/dir/subDir/*",
|
|
104
|
-
},
|
|
105
|
-
output: []string{
|
|
106
|
-
"file2.1.txt",
|
|
107
|
-
"file2.2.txt",
|
|
108
|
-
"subDir/",
|
|
109
|
-
"subDir/file3.1.txt",
|
|
110
|
-
"subDir/file3.2.txt",
|
|
111
|
-
"subDir/file3.3.symlink.txt",
|
|
112
|
-
"file3.1.txt",
|
|
113
|
-
"file3.2.txt",
|
|
114
|
-
"file3.3.symlink.txt",
|
|
115
|
-
},
|
|
116
|
-
},
|
|
117
|
-
|
|
118
|
-
//////////////////////
|
|
119
|
-
// with working dir
|
|
120
|
-
/////////////////////
|
|
121
|
-
|
|
122
|
-
{
|
|
123
|
-
name: "all",
|
|
124
|
-
workingDir: "var/www/",
|
|
125
|
-
input: []string{
|
|
126
|
-
"./",
|
|
127
|
-
},
|
|
128
|
-
output: []string{
|
|
129
|
-
"dir/",
|
|
130
|
-
"dir/file2.1.txt",
|
|
131
|
-
"dir/file2.2.txt",
|
|
132
|
-
"dir/subDir/",
|
|
133
|
-
"dir/subDir/file3.1.txt",
|
|
134
|
-
"dir/subDir/file3.2.txt",
|
|
135
|
-
"dir/subDir/file3.3.symlink.txt",
|
|
136
|
-
"file1.1.txt",
|
|
137
|
-
},
|
|
138
|
-
},
|
|
139
|
-
{
|
|
140
|
-
name: "single files",
|
|
141
|
-
workingDir: "var/www/",
|
|
142
|
-
input: []string{
|
|
143
|
-
"file1.1.txt",
|
|
144
|
-
"dir/file2.1.txt",
|
|
145
|
-
"dir/subDir/file3.1.txt",
|
|
146
|
-
},
|
|
147
|
-
output: []string{
|
|
148
|
-
"file1.1.txt",
|
|
149
|
-
"dir/file2.1.txt",
|
|
150
|
-
"dir/subDir/file3.1.txt",
|
|
151
|
-
},
|
|
152
|
-
},
|
|
153
|
-
{
|
|
154
|
-
name: "all files in directory",
|
|
155
|
-
workingDir: "var/www/",
|
|
156
|
-
input: []string{
|
|
157
|
-
"dir",
|
|
158
|
-
},
|
|
159
|
-
output: []string{
|
|
160
|
-
"dir/",
|
|
161
|
-
"dir/file2.1.txt",
|
|
162
|
-
"dir/file2.2.txt",
|
|
163
|
-
"dir/subDir/",
|
|
164
|
-
"dir/subDir/file3.1.txt",
|
|
165
|
-
"dir/subDir/file3.2.txt",
|
|
166
|
-
"dir/subDir/file3.3.symlink.txt",
|
|
167
|
-
},
|
|
168
|
-
},
|
|
169
|
-
{
|
|
170
|
-
name: "all files in sub directory",
|
|
171
|
-
workingDir: "var/www/",
|
|
172
|
-
input: []string{
|
|
173
|
-
"dir/subDir",
|
|
174
|
-
},
|
|
175
|
-
output: []string{
|
|
176
|
-
"dir/subDir/",
|
|
177
|
-
"dir/subDir/file3.1.txt",
|
|
178
|
-
"dir/subDir/file3.2.txt",
|
|
179
|
-
"dir/subDir/file3.3.symlink.txt",
|
|
180
|
-
},
|
|
181
|
-
},
|
|
182
|
-
{
|
|
183
|
-
name: "single files - strip directory",
|
|
184
|
-
workingDir: "var/www/",
|
|
185
|
-
input: []string{
|
|
186
|
-
"dir/*/file2.1.txt",
|
|
187
|
-
"dir/*/subDir/file3.1.txt",
|
|
188
|
-
"dir/subDir/*/file3.1.txt",
|
|
189
|
-
},
|
|
190
|
-
output: []string{
|
|
191
|
-
"file2.1.txt",
|
|
192
|
-
"subDir/file3.1.txt",
|
|
193
|
-
"file3.1.txt",
|
|
194
|
-
},
|
|
195
|
-
},
|
|
196
|
-
{
|
|
197
|
-
name: "all files - strip directory",
|
|
198
|
-
workingDir: "var/www/",
|
|
199
|
-
input: []string{
|
|
200
|
-
"dir/*",
|
|
201
|
-
"dir/subDir/*",
|
|
202
|
-
},
|
|
203
|
-
output: []string{
|
|
204
|
-
"file2.1.txt",
|
|
205
|
-
"file2.2.txt",
|
|
206
|
-
"subDir/",
|
|
207
|
-
"subDir/file3.1.txt",
|
|
208
|
-
"subDir/file3.2.txt",
|
|
209
|
-
"subDir/file3.3.symlink.txt",
|
|
210
|
-
"file3.1.txt",
|
|
211
|
-
"file3.2.txt",
|
|
212
|
-
"file3.3.symlink.txt",
|
|
213
|
-
},
|
|
214
|
-
},
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
func TestValidation(t *testing.T) {
|
|
218
|
-
for _, test := range testErrorResponseDataProvider {
|
|
219
|
-
test := test // scope lint
|
|
220
|
-
t.Run(test.name+" in "+test.workingDir, func(t *testing.T) {
|
|
221
|
-
RegisterTestingT(t)
|
|
222
|
-
|
|
223
|
-
logger := debugLogger{}
|
|
224
|
-
|
|
225
|
-
ziper := zipClient.New(zipClient.Config{}, logger)
|
|
226
|
-
|
|
227
|
-
b := &bytes.Buffer{}
|
|
228
|
-
err := ziper.Zip(b, test.workingDir, test.input...)
|
|
229
|
-
Expect(err).ShouldNot(HaveOccurred())
|
|
230
|
-
|
|
231
|
-
r, err := zip.NewReader(bytes.NewReader(b.Bytes()), int64(len(b.Bytes())))
|
|
232
|
-
Expect(err).ShouldNot(HaveOccurred())
|
|
233
|
-
|
|
234
|
-
output := func() (res []string) {
|
|
235
|
-
for _, f := range r.File {
|
|
236
|
-
res = append(res, f.Name)
|
|
237
|
-
}
|
|
238
|
-
return
|
|
239
|
-
}()
|
|
240
|
-
|
|
241
|
-
Expect(output).To(Equal(test.output))
|
|
242
|
-
})
|
|
243
|
-
}
|
|
244
|
-
}
|
|
245
|
-
|
|
246
|
-
func TestSymlink(t *testing.T) {
|
|
247
|
-
RegisterTestingT(t)
|
|
248
|
-
|
|
249
|
-
logger := debugLogger{}
|
|
250
|
-
|
|
251
|
-
ziper := zipClient.New(zipClient.Config{}, &logger)
|
|
252
|
-
|
|
253
|
-
b := &bytes.Buffer{}
|
|
254
|
-
err := ziper.Zip(b, "var/www/", "dir/subDir/file3.3.symlink.txt")
|
|
255
|
-
Expect(err).ShouldNot(HaveOccurred())
|
|
256
|
-
|
|
257
|
-
r, err := zip.NewReader(bytes.NewReader(b.Bytes()), int64(len(b.Bytes())))
|
|
258
|
-
Expect(err).ShouldNot(HaveOccurred())
|
|
259
|
-
|
|
260
|
-
Expect(r.File).To(HaveLen(1))
|
|
261
|
-
|
|
262
|
-
fo, err := r.File[0].Open()
|
|
263
|
-
Expect(err).ShouldNot(HaveOccurred())
|
|
264
|
-
defer fo.Close()
|
|
265
|
-
buf := new(bytes.Buffer)
|
|
266
|
-
_, err = io.Copy(buf, fo)
|
|
267
|
-
Expect(err).ShouldNot(HaveOccurred())
|
|
268
|
-
Expect(buf.String()).To(Equal("../file2.1.txt"))
|
|
269
|
-
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
type debugLogger struct {
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
func (d debugLogger) Info(a ...interface{}) {
|
|
276
|
-
|
|
277
|
-
}
|
|
278
|
-
|
|
279
|
-
func (d debugLogger) Warning(a ...interface{}) {
|
|
280
|
-
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
func (d debugLogger) Error(a ...interface{}) {
|
|
284
|
-
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
func (d debugLogger) Debug(a ...interface{}) {
|
|
288
|
-
|
|
289
|
-
}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
package zeropsApiProtocol
|
|
2
|
-
|
|
3
|
-
import (
|
|
4
|
-
"time"
|
|
5
|
-
)
|
|
6
|
-
|
|
7
|
-
func ToProtoTimestamp(t time.Time) *Timestamp {
|
|
8
|
-
if t.IsZero() {
|
|
9
|
-
return &Timestamp{}
|
|
10
|
-
}
|
|
11
|
-
return &Timestamp{IsSet: true, Seconds: t.Unix(), Nanos: int32(t.Nanosecond())}
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
func FromProtoTimestamp(t *Timestamp) time.Time {
|
|
15
|
-
if !t.GetIsSet() {
|
|
16
|
-
return time.Time{}
|
|
17
|
-
}
|
|
18
|
-
return time.Unix(t.GetSeconds(), int64(t.GetNanos()))
|
|
19
|
-
}
|