Repository navigation
Expand file tree
/
Copy pathbetterfiles.patch
More file actions
16036 lines (15955 loc) · 499 KB
/
Copy pathbetterfiles.patch
File metadata and controls
16036 lines (15955 loc) · 499 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/config/config.go b/config/config.go
index 230062f5..89b9954d 100644
--- a/config/config.go
+++ b/config/config.go
@@ -138,6 +138,11 @@ type SystemConfiguration struct {
// Directory where local backups will be stored on the machine.
BackupDirectory string `default:"/var/lib/pterodactyl/backups" json:"-" yaml:"backup_directory"`
+ // FileHistory controls bounded per-file revision storage for panel file edits.
+ FileHistory FileHistoryConfiguration `json:"-" yaml:"file_history"`
+ // FileCollaboration controls native Yjs collaborative editing limits.
+ FileCollaboration FileCollaborationConfiguration `json:"-" yaml:"file_collaboration"`
+
// TmpDirectory specifies where temporary files for Pterodactyl installation processes
// should be created. This supports environments running docker-in-docker.
TmpDirectory string `default:"/tmp/pterodactyl" json:"-" yaml:"tmp_directory"`
@@ -255,6 +260,21 @@ type SystemConfiguration struct {
OpenatMode string `default:"auto" yaml:"openat_mode"`
}
+type FileHistoryConfiguration struct {
+ Enabled bool `default:"true" yaml:"enabled"`
+ ZstdLevel int `default:"12" yaml:"zstd_level"`
+ AnchorInterval uint64 `default:"4" yaml:"anchor_interval"`
+ KeepChains uint64 `default:"2" yaml:"keep_chains"`
+ FileSizeCap uint64 `default:"1048576" yaml:"file_size_cap"`
+ PerFileDiskBudget uint64 `default:"5242880" yaml:"per_file_disk_budget"`
+ PerServerDiskBudget uint64 `default:"209715200" yaml:"per_server_disk_budget"`
+}
+
+type FileCollaborationConfiguration struct {
+ Enabled bool `default:"true" yaml:"enabled"`
+ FileSizeCap uint64 `default:"10485760" yaml:"file_size_cap"`
+}
+
type CrashDetection struct {
// CrashDetectionEnabled sets if crash detection is enabled globally for all servers on this node.
CrashDetectionEnabled bool `default:"true" yaml:"enabled"`
@@ -400,6 +420,7 @@ func NewAtPath(path string) (*Configuration, error) {
func Set(c *Configuration) {
mu.Lock()
defer mu.Unlock()
+
token := c.Token.Token
if token == "" {
c.Token.Token = c.AuthenticationToken
@@ -432,11 +453,13 @@ func (c *Configuration) ResolveToken(remote bool) error {
if remote && value != local {
return "", fmt.Errorf("config: remote %s does not match environment override", name)
}
+
return value, nil
}
if remote {
return local, nil
}
+
return Expand(local)
}
@@ -447,6 +470,7 @@ func (c *Configuration) ResolveToken(remote bool) error {
if c.Token.Token, err = resolve("token", os.Getenv("WINGS_TOKEN"), c.AuthenticationToken); err != nil {
return err
}
+
return nil
}
@@ -456,6 +480,7 @@ func (c *Configuration) ResolveToken(remote bool) error {
func SetDebugViaFlag(d bool) {
mu.Lock()
defer mu.Unlock()
+
_config.Debug = d
_debugViaFlag = d
}
@@ -483,6 +508,7 @@ func Get() *Configuration {
func Update(callback func(c *Configuration)) {
mu.Lock()
defer mu.Unlock()
+
callback(_config)
}
@@ -490,6 +516,7 @@ func Update(callback func(c *Configuration)) {
func GetJwtAlgorithm() *jwt.HMACSHA {
mu.RLock()
defer mu.RUnlock()
+
return _jwtAlgo
}
@@ -510,6 +537,7 @@ func WriteToDisk(c *Configuration) error {
if c.path == "" {
return errors.New("cannot write configuration, no path defined in struct")
}
+
b, err := yaml.Marshal(&ccopy)
if err != nil {
return err
@@ -517,6 +545,7 @@ func WriteToDisk(c *Configuration) error {
if err := os.WriteFile(c.path, b, 0o600); err != nil {
return err
}
+
return nil
}
@@ -547,6 +576,7 @@ func EnsurePterodactylUser() error {
if err != nil {
return err
}
+
_config.System.Username = u.Username
_config.System.User.Uid = system.MustInt(u.Uid)
_config.System.User.Gid = system.MustInt(u.Gid)
@@ -583,10 +613,12 @@ func EnsurePterodactylUser() error {
if _, err := exec.Command(split[0], split[1:]...).Output(); err != nil {
return err
}
+
u, err = user.Lookup(_config.System.Username)
if err != nil {
return err
}
+
_config.System.User.Uid = system.MustInt(u.Uid)
_config.System.User.Gid = system.MustInt(u.Gid)
return nil
@@ -620,6 +652,7 @@ nobody:x:65534:65534::/var/empty:/bin/sh
if err := os.WriteFile(filepath.Join(passwd.Directory, "passwd"), v, 0o644); err != nil {
return fmt.Errorf("failed to write file to %s/passwd: %v", passwd.Directory, err)
}
+
return nil
}
@@ -630,6 +663,7 @@ func FromFile(path string) error {
if err != nil {
return err
}
+
c, err := NewAtPath(path)
if err != nil {
return err
@@ -742,6 +776,7 @@ func EnableLogRotation() error {
if err != nil {
return err
}
+
defer f.Close()
t, err := template.New("logrotate").Parse(`{{.LogDirectory}}/wings.log {
@@ -803,6 +838,7 @@ func ConfigureTimezone() error {
log.Warn("failed to parse timezone from \"timedatectl\" output, falling back to UTC")
return nil
}
+
_config.System.Timezone = string(matches[1])
} else {
_config.System.Timezone = string(b)
@@ -822,6 +858,7 @@ func getSystemName() (string, error) {
if err != nil {
return "", err
}
+
return release["ID"], nil
}
@@ -834,6 +871,7 @@ func UseOpenat2() bool {
if openat2Set.Load() {
return openat2.Load()
}
+
defer openat2Set.Store(true)
c := Get()
@@ -885,6 +923,7 @@ func Expand(v string) (string, error) {
if err != nil {
return "", err
}
+
v = string(bytes.TrimRight(bytes.TrimRight(b, "\r"), "\n"))
}
diff --git a/environment/docker/client_accessor.go b/environment/docker/client_accessor.go
new file mode 100644
index 00000000..f8eea154
--- /dev/null
+++ b/environment/docker/client_accessor.go
@@ -0,0 +1,7 @@
+package docker
+
+import "github.com/docker/docker/client"
+
+func (e *Environment) Client() *client.Client {
+ return e.client
+}
diff --git a/go.mod b/go.mod
index 6ed6d60f..44c218d8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
module github.com/pterodactyl/wings
-go 1.24.0
-
-toolchain go1.24.1
+go 1.26.7
require (
emperror.dev/errors v0.8.1
@@ -13,11 +11,14 @@ require (
github.com/apex/log v1.9.0
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
github.com/beevik/etree v1.5.0
+ github.com/bmatcuk/doublestar/v4 v4.9.1
github.com/buger/jsonparser v1.1.1
github.com/cenkalti/backoff/v4 v4.3.0
github.com/creasty/defaults v1.8.0
+ github.com/distribution/reference v0.6.0
github.com/docker/docker v28.3.3+incompatible
github.com/docker/go-connections v0.5.0
+ github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707
github.com/fatih/color v1.18.0
github.com/franela/goblin v0.0.0-20211003143422-0a4f594942bf
github.com/gabriel-vasile/mimetype v1.4.8
@@ -39,12 +40,16 @@ require (
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/sftp v1.13.10
+ github.com/reearth/ygo v1.31.0
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
+ github.com/shiv248/operational-transformation-go v1.0.0
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.10.0
+ github.com/ulikunitz/xz v0.5.15
golang.org/x/crypto v0.46.0
- golang.org/x/sync v0.19.0
+ golang.org/x/sync v0.21.0
golang.org/x/sys v0.39.0
+ golang.org/x/time v0.10.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
@@ -66,9 +71,7 @@ require (
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
- github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gammazero/deque v1.0.0 // indirect
@@ -117,7 +120,6 @@ require (
github.com/spf13/pflag v1.0.6 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
- github.com/ulikunitz/xz v0.5.15 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
@@ -131,8 +133,7 @@ require (
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/term v0.38.0 // indirect
- golang.org/x/text v0.32.0 // indirect
- golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
+ golang.org/x/text v0.39.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
google.golang.org/protobuf v1.36.5 // indirect
gotest.tools/v3 v3.0.2 // indirect
diff --git a/go.sum b/go.sum
index 9e2465a9..f38a2fb2 100644
--- a/go.sum
+++ b/go.sum
@@ -51,6 +51,8 @@ github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
github.com/beevik/etree v1.5.0 h1:iaQZFSDS+3kYZiGoc9uKeOkUY3nYMXOKLl6KIJxiJWs=
github.com/beevik/etree v1.5.0/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs=
+github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=
+github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
github.com/bodgit/sevenzip v1.6.1 h1:kikg2pUMYC9ljU7W9SaqHXhym5HyKm8/M/jd31fYan4=
@@ -309,6 +311,8 @@ github.com/pkg/sftp v1.13.10/go.mod h1:bJ1a7uDhrX/4OII+agvy28lzRvQrmIQuaHrcI1Hbe
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/reearth/ygo v1.31.0 h1:JkPDRZq69nFFIKV1FYZJ9/u86xYg65Bn4r4/YVqZZIU=
+github.com/reearth/ygo v1.31.0/go.mod h1:QN5MsM+QBk9cP6Sr/iaKlkJtnJ9Fo0fT+MJqSw2xPUA=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
@@ -324,6 +328,8 @@ github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shiv248/operational-transformation-go v1.0.0 h1:ahbdsqDStbvaOYX8Jhqx7zqpSuL00SoSrI9NC5EdeiE=
+github.com/shiv248/operational-transformation-go v1.0.0/go.mod h1:m9K4grcjjhDlIcXZlqnHVnfaysxUKOhuJ4qZiUPE1ME=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
@@ -449,8 +455,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -485,8 +491,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -525,12 +531,12 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
+golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -560,8 +566,8 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/router/betterfiles_entry.go b/router/betterfiles_entry.go
new file mode 100644
index 00000000..74ccb8f6
--- /dev/null
+++ b/router/betterfiles_entry.go
@@ -0,0 +1,70 @@
+package router
+
+import (
+ "time"
+
+ "github.com/gabriel-vasile/mimetype"
+ "golang.org/x/sys/unix"
+
+ "github.com/pterodactyl/wings/internal/ufs"
+ serverfs "github.com/pterodactyl/wings/server/filesystem"
+)
+
+type betterFilesEntry struct {
+ Name string `json:"name"`
+ Size int64 `json:"size"`
+ SizePhysical int64 `json:"size_physical"`
+ Directory bool `json:"directory"`
+ File bool `json:"file"`
+ Symlink bool `json:"symlink"`
+ Mime string `json:"mime"`
+ Created string `json:"created"`
+ Modified string `json:"modified"`
+}
+
+func newBetterFilesEntry(name string, info ufs.FileInfo, mime string) betterFilesEntry {
+ if mime == "" {
+ if info.IsDir() {
+ mime = "inode/directory"
+ } else {
+ mime = "application/octet-stream"
+ }
+ }
+ return betterFilesEntry{
+ Name: name,
+ Size: info.Size(),
+ SizePhysical: betterFilesPhysicalSize(info),
+ Directory: info.IsDir(),
+ File: info.Mode().IsRegular(),
+ Symlink: info.Mode()&ufs.ModeSymlink != 0,
+ Mime: mime,
+ Created: betterFilesCreatedTime(info).UTC().Format(time.RFC3339),
+ Modified: info.ModTime().UTC().Format(time.RFC3339),
+ }
+}
+
+func betterFilesCreatedTime(info ufs.FileInfo) time.Time {
+ if stat, ok := info.Sys().(*unix.Stat_t); ok {
+ return time.Unix(stat.Ctim.Sec, stat.Ctim.Nsec)
+ }
+ return info.ModTime()
+}
+
+func betterFilesMime(fs *serverfs.Filesystem, value string, info ufs.FileInfo) string {
+ if info.IsDir() {
+ return "inode/directory"
+ }
+ if !info.Mode().IsRegular() {
+ return "application/octet-stream"
+ }
+ file, err := fs.UnixFS().OpenFile(value, ufs.O_RDONLY|ufs.O_NOFOLLOW, 0)
+ if err != nil {
+ return "application/octet-stream"
+ }
+ defer file.Close()
+ detected, err := mimetype.DetectReader(file)
+ if err != nil || detected == nil {
+ return "application/octet-stream"
+ }
+ return detected.String()
+}
diff --git a/router/betterfiles_http_test.go b/router/betterfiles_http_test.go
new file mode 100644
index 00000000..3b1c183d
--- /dev/null
+++ b/router/betterfiles_http_test.go
@@ -0,0 +1,142 @@
+package router
+
+import (
+ "encoding/json"
+ "io"
+ "net/http"
+ "net/http/httptest"
+ "net/url"
+ "os"
+ "path/filepath"
+ "strconv"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/gbrlsnchs/jwt/v3"
+ "github.com/google/uuid"
+ "github.com/stretchr/testify/require"
+
+ "github.com/pterodactyl/wings/config"
+ "github.com/pterodactyl/wings/remote"
+ "github.com/pterodactyl/wings/router/tokens"
+ "github.com/pterodactyl/wings/server"
+)
+
+func newBetterFilesHTTPServer(
+ t *testing.T,
+ uploadLimitMB, diskMB int64,
+ ignored ...string,
+) (*server.Manager, *server.Server, http.Handler) {
+ t.Helper()
+ root := t.TempDir()
+ next, err := config.NewAtPath(filepath.Join(root, "config.yml"))
+ require.NoError(t, err)
+ next.AuthenticationToken = "better-files-http-test-token"
+ next.Api.UploadLimit = uploadLimitMB
+ next.System.Data = filepath.Join(root, "volumes")
+ next.System.RootDirectory = root
+ // These fixtures measure per-write quota accounting from an empty root.
+ // Disable the manager's asynchronous startup scan so it cannot race writes.
+ next.System.DiskCheckInterval = 0
+ next.System.User.Uid = os.Getuid()
+ next.System.User.Gid = os.Getgid()
+ next.System.FileHistory.Enabled = false
+ config.Set(next)
+
+ serverUUID := uuid.NewString()
+ settings, err := json.Marshal(map[string]interface{}{
+ "uuid": serverUUID,
+ "build": map[string]interface{}{"disk_space": diskMB},
+ "container": map[string]interface{}{"image": "alpine:3.20"},
+ "egg": map[string]interface{}{"file_denylist": ignored},
+ })
+ require.NoError(t, err)
+ manager := server.NewEmptyManager(nil)
+ s, err := manager.InitServer(remote.ServerConfigurationResponse{Settings: settings})
+ require.NoError(t, err)
+ manager.Add(s)
+ t.Cleanup(s.CtxCancel)
+ return manager, s, Configure(manager, nil)
+}
+
+func signBetterFilesUploadToken(t *testing.T, serverUUID string) string {
+ t.Helper()
+ now := time.Now().Add(time.Second)
+ payload := tokens.UploadPayload{
+ Payload: jwt.Payload{
+ IssuedAt: jwt.NumericDate(now),
+ ExpirationTime: jwt.NumericDate(now.Add(time.Hour)),
+ },
+ Scoped: tokens.Scoped{Scope: string(tokens.FileUpload)},
+ ServerUuid: serverUUID,
+ UserUuid: uuid.NewString(),
+ UniqueId: uuid.NewString(),
+ }
+ signed, err := jwt.Sign(payload, config.GetJwtAlgorithm())
+ require.NoError(t, err)
+ return string(signed)
+}
+
+func signBetterFilesDownloadToken(t *testing.T, serverUUID, filePath string) string {
+ t.Helper()
+ now := time.Now().Add(time.Second)
+ payload := tokens.FilePayload{
+ Payload: jwt.Payload{
+ IssuedAt: jwt.NumericDate(now),
+ ExpirationTime: jwt.NumericDate(now.Add(time.Hour)),
+ },
+ Scoped: tokens.Scoped{Scope: string(tokens.FileDownload)},
+ FilePath: filePath,
+ ServerUuid: serverUUID,
+ UserUuid: uuid.NewString(),
+ UniqueId: uuid.NewString(),
+ }
+ signed, err := jwt.Sign(payload, config.GetJwtAlgorithm())
+ require.NoError(t, err)
+ return string(signed)
+}
+
+func performResumableRequest(
+ handler http.Handler,
+ method, token, directory, filename string,
+ offset int64,
+ length *int64,
+ complete bool,
+ body io.Reader,
+) *httptest.ResponseRecorder {
+ query := url.Values{
+ "token": {token},
+ "directory": {directory},
+ "file": {filename},
+ }
+ request := httptest.NewRequest(method, "/upload/file?"+query.Encode(), body)
+ if method == http.MethodPatch {
+ request.Header.Set("Content-Type", "application/offset+octet-stream")
+ request.Header.Set("Upload-Offset", strconv.FormatInt(offset, 10))
+ if length != nil {
+ request.Header.Set("Upload-Length", strconv.FormatInt(*length, 10))
+ }
+ if complete {
+ request.Header.Set("Upload-Complete", "?1")
+ }
+ }
+ recorder := httptest.NewRecorder()
+ handler.ServeHTTP(&deadlineResponseRecorder{ResponseRecorder: recorder}, request)
+ return recorder
+}
+
+type deadlineResponseRecorder struct {
+ *httptest.ResponseRecorder
+}
+
+func (*deadlineResponseRecorder) SetReadDeadline(time.Time) error {
+ return nil
+}
+
+func readServerHTTPFixture(t *testing.T, s *server.Server, name string) []byte {
+ t.Helper()
+ data, err := os.ReadFile(filepath.Join(s.Filesystem().Path(), filepath.FromSlash(strings.TrimPrefix(name, "/"))))
+ require.NoError(t, err)
+ return data
+}
diff --git a/router/betterfiles_paths.go b/router/betterfiles_paths.go
new file mode 100644
index 00000000..8ec33a09
--- /dev/null
+++ b/router/betterfiles_paths.go
@@ -0,0 +1,173 @@
+package router
+
+import (
+ "errors"
+ "net/http"
+ pathpkg "path"
+ "strings"
+ "unicode/utf8"
+
+ "github.com/gin-gonic/gin"
+ "golang.org/x/sys/unix"
+
+ "github.com/pterodactyl/wings/internal/ufs"
+ serverfs "github.com/pterodactyl/wings/server/filesystem"
+)
+
+const (
+ betterFilesMaxPathLength = 4096
+ betterFilesMaxNameLength = 255
+)
+
+var errBetterFilesInvalidPath = errors.New("invalid file path")
+
+// normalizeBetterFilesRoot converts a user supplied server path to one canonical,
+// slash-prefixed path. Parent components are rejected before cleaning so that a
+// traversal attempt can never be silently reinterpreted as a different path.
+func normalizeBetterFilesRoot(value string) (string, error) {
+ if value == "" {
+ return "/", nil
+ }
+ if !validBetterFilesPathText(value) {
+ return "", errBetterFilesInvalidPath
+ }
+ if strings.Contains(value, "\\") || hasParentPathComponent(value) {
+ return "", errBetterFilesInvalidPath
+ }
+
+ cleaned := pathpkg.Clean("/" + strings.TrimLeft(value, "/"))
+ if cleaned == "." {
+ cleaned = "/"
+ }
+ if !strings.HasPrefix(cleaned, "/") || len(cleaned) > betterFilesMaxPathLength {
+ return "", errBetterFilesInvalidPath
+ }
+ if !validBetterFilesComponents(cleaned) {
+ return "", errBetterFilesInvalidPath
+ }
+ return cleaned, nil
+}
+
+// joinBetterFilesPath resolves a relative request path below root. Absolute
+// values and values resolving to root itself are deliberately rejected.
+func joinBetterFilesPath(root, value string) (string, error) {
+ if value == "" || pathpkg.IsAbs(value) || !validBetterFilesPathText(value) {
+ return "", errBetterFilesInvalidPath
+ }
+ if strings.Contains(value, "\\") || hasParentPathComponent(value) {
+ return "", errBetterFilesInvalidPath
+ }
+
+ relative := pathpkg.Clean(value)
+ if relative == "." || relative == "/" || strings.HasPrefix(relative, "../") {
+ return "", errBetterFilesInvalidPath
+ }
+ if !validBetterFilesComponents(relative) {
+ return "", errBetterFilesInvalidPath
+ }
+
+ joined := pathpkg.Join(root, relative)
+ if joined == root || joined == "/" || len(joined) > betterFilesMaxPathLength {
+ return "", errBetterFilesInvalidPath
+ }
+ if root != "/" && !strings.HasPrefix(joined, root+"/") {
+ return "", errBetterFilesInvalidPath
+ }
+ return joined, nil
+}
+
+func normalizeBetterFilesUploadPath(directory, filename string) (string, string, error) {
+ root, err := normalizeBetterFilesRoot(directory)
+ if err != nil {
+ return "", "", err
+ }
+ if filename == "" || filename == "." || filename == ".." || !validBetterFilesPathText(filename) {
+ return "", "", errBetterFilesInvalidPath
+ }
+ if strings.ContainsAny(filename, `/\\`) || len(filename) > betterFilesMaxNameLength {
+ return "", "", errBetterFilesInvalidPath
+ }
+ target, err := joinBetterFilesPath(root, filename)
+ if err != nil {
+ return "", "", err
+ }
+ return root, target, nil
+}
+
+func validBetterFilesPathText(value string) bool {
+ return value != "" &&
+ len(value) <= betterFilesMaxPathLength &&
+ utf8.ValidString(value) &&
+ !strings.ContainsRune(value, '\x00')
+}
+
+func validBetterFilesComponents(value string) bool {
+ for _, component := range strings.Split(strings.Trim(value, "/"), "/") {
+ if component == "" {
+ continue
+ }
+ if component == "." || component == ".." || len(component) > betterFilesMaxNameLength {
+ return false
+ }
+ }
+ return true
+}
+
+func hasParentPathComponent(value string) bool {
+ for _, component := range strings.Split(value, "/") {
+ if component == ".." {
+ return true
+ }
+ }
+ return false
+}
+
+// ensureBetterFilesAllowed checks both canonical and relative spellings of a
+// path, including its ancestors. This keeps gitignore-style directory rules
+// effective without changing the behavior of Filesystem.IsIgnored globally.
+func ensureBetterFilesAllowed(fs *serverfs.Filesystem, paths ...string) error {
+ for _, value := range paths {
+ cleaned, err := normalizeBetterFilesRoot(value)
+ if err != nil {
+ return err
+ }
+ if cleaned == "/" {
+ continue
+ }
+
+ parts := strings.Split(strings.TrimPrefix(cleaned, "/"), "/")
+ for i := 1; i <= len(parts); i++ {
+ relative := strings.Join(parts[:i], "/")
+ if err := fs.IsIgnored(relative, "/"+relative); err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+}
+
+func betterFilesLstat(fs *serverfs.Filesystem, value string) (ufs.FileInfo, error) {
+ info, err := fs.UnixFS().Lstat(value)
+ if err != nil {
+ return nil, err
+ }
+ if info.Mode()&ufs.ModeSymlink != 0 {
+ return nil, errBetterFilesInvalidPath
+ }
+ return info, nil
+}
+
+func betterFilesPhysicalSize(info ufs.FileInfo) int64 {
+ if stat, ok := info.Sys().(*unix.Stat_t); ok {
+ return stat.Blocks * 512
+ }
+ return info.Size()
+}
+
+func abortBetterFilesPath(c *gin.Context, err error) {
+ status := http.StatusUnprocessableEntity
+ if errors.Is(err, ufs.ErrNotExist) {
+ status = http.StatusNotFound
+ }
+ c.AbortWithStatusJSON(status, gin.H{"error": "The requested file path is invalid or unavailable."})
+}
diff --git a/router/betterfiles_paths_test.go b/router/betterfiles_paths_test.go
new file mode 100644
index 00000000..5742f97a
--- /dev/null
+++ b/router/betterfiles_paths_test.go
@@ -0,0 +1,32 @@
+package router
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ serverfs "github.com/pterodactyl/wings/server/filesystem"
+)
+
+func TestNormalizeBetterFilesPaths(t *testing.T) {
+ root, err := normalizeBetterFilesRoot("/plugins/./config")
+ require.NoError(t, err)
+ require.Equal(t, "/plugins/config", root)
+
+ joined, err := joinBetterFilesPath(root, "emoji-😀/paper.yml")
+ require.NoError(t, err)
+ require.Equal(t, "/plugins/config/emoji-😀/paper.yml", joined)
+
+ for _, invalid := range []string{"../escape", "folder/../escape", "/absolute", "nul\x00file", `windows\path`} {
+ _, err := joinBetterFilesPath(root, invalid)
+ require.Error(t, err, invalid)
+ }
+}
+
+func TestEnsureBetterFilesAllowedChecksAncestors(t *testing.T) {
+ fs, err := serverfs.New(t.TempDir(), 0, []string{"private/**", "*.secret"})
+ require.NoError(t, err)
+ require.Error(t, ensureBetterFilesAllowed(fs, "/private/nested/file.txt"))
+ require.Error(t, ensureBetterFilesAllowed(fs, "/config/password.secret"))
+ require.NoError(t, ensureBetterFilesAllowed(fs, "/config/paper.yml"))
+}
diff --git a/router/betterfiles_test_helpers_test.go b/router/betterfiles_test_helpers_test.go
new file mode 100644
index 00000000..25a8e740
--- /dev/null
+++ b/router/betterfiles_test_helpers_test.go
@@ -0,0 +1,41 @@
+package router
+
+import (
+ "os"
+ "path/filepath"
+ "strings"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/pterodactyl/wings/config"
+ serverfs "github.com/pterodactyl/wings/server/filesystem"
+)
+
+func newBetterFilesTestFilesystem(t *testing.T, disk int64, ignored ...string) *serverfs.Filesystem {
+ t.Helper()
+ configuration, err := config.NewAtPath(filepath.Join(t.TempDir(), "config.yml"))
+ require.NoError(t, err)
+ configuration.AuthenticationToken = "better-files-filesystem-test-token"
+ configuration.System.User.Uid = os.Getuid()
+ configuration.System.User.Gid = os.Getgid()
+ config.Set(configuration)
+ fs, err := serverfs.New(t.TempDir(), disk, ignored)
+ require.NoError(t, err)
+ return fs
+}
+
+func writeBetterFilesFixture(t *testing.T, fs *serverfs.Filesystem, name string, data []byte) {
+ t.Helper()
+ hostPath := filepath.Join(fs.Path(), filepath.FromSlash(strings.TrimPrefix(name, "/")))
+ require.NoError(t, os.MkdirAll(filepath.Dir(hostPath), 0o755))
+ require.NoError(t, os.WriteFile(hostPath, data, 0o644))
+}
+
+func readBetterFilesFixture(t *testing.T, fs *serverfs.Filesystem, name string) []byte {
+ t.Helper()
+ hostPath := filepath.Join(fs.Path(), filepath.FromSlash(strings.TrimPrefix(name, "/")))
+ data, err := os.ReadFile(hostPath)
+ require.NoError(t, err)
+ return data
+}
diff --git a/router/downloader/downloader.go b/router/downloader/downloader.go
index 2a6271d6..13b26437 100644
--- a/router/downloader/downloader.go
+++ b/router/downloader/downloader.go
@@ -39,19 +39,26 @@ func init() {
if err != nil {
return c, errors.WithStack(err)
}
+
ip := net.ParseIP(ipStr)
if ip == nil {
return c, errors.WithStack(ErrInvalidIPAddress)
}
- if ip.IsLoopback() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() || ip.IsInterfaceLocalMulticast() {
+ if ip.IsLoopback() ||
+ ip.IsLinkLocalUnicast() ||
+ ip.IsLinkLocalMulticast() ||
+ ip.IsInterfaceLocalMulticast() {
return c, errors.WithStack(ErrInternalResolution)
}
+
for _, block := range internalRanges {
if !block.Contains(ip) {
continue
}
+
return c, errors.WithStack(ErrInternalResolution)
}
+
return c, nil
}
@@ -145,6 +152,7 @@ func New(s *server.Server, r DownloadRequest) *Download {
func ByServer(sid string) []*Download {
instance.mu.Lock()
defer instance.mu.Unlock()
+
var downloads []*Download
if v, ok := instance.serverCache[sid]; ok {
for _, id := range v {
@@ -162,8 +170,7 @@ func ByID(dlid string) *Download {
return instance.find(dlid)
}
-//goland:noinspection GoVetCopyLock
-func (dl Download) MarshalJSON() ([]byte, error) {
+func (dl *Download) MarshalJSON() ([]byte, error) {
return json.Marshal(struct {
Identifier string
Progress float64
@@ -194,9 +201,12 @@ func (dl *Download) Execute() error {
if IsDownloadError(err) {
return err
}
+
return errors.Wrap(err, ErrDownloadFailed.Error())
}
+
defer res.Body.Close()
+
if res.StatusCode != http.StatusOK {
return errors.New("downloader: got bad response status from endpoint: " + res.Status)
}
@@ -235,6 +245,7 @@ func (dl *Download) Execute() error {
if err := dl.server.Filesystem().Write(p, r, res.ContentLength, 0o644); err != nil {
return errors.WrapIf(err, "downloader: failed to write file to server directory")
}
+
return nil
}
@@ -257,6 +268,7 @@ func (dl *Download) BelongsTo(s *server.Server) bool {
func (dl *Download) Progress() float64 {
dl.mu.RLock()
defer dl.mu.RUnlock()
+
return dl.progress
}
@@ -270,6 +282,7 @@ func (dl *Download) counter(contentLength int64) *Counter {
onWrite := func(t int) {
dl.mu.Lock()
defer dl.mu.Unlock()
+
dl.progress = float64(t) / float64(contentLength)
}
return &Counter{
@@ -289,6 +302,7 @@ type Downloader struct {
func (d *Downloader) track(dl *Download) {
d.mu.Lock()
defer d.mu.Unlock()
+
sid := dl.server.ID()
if _, ok := d.downloadCache[dl.Identifier]; !ok {
d.downloadCache[dl.Identifier] = dl
@@ -303,9 +317,11 @@ func (d *Downloader) track(dl *Download) {
func (d *Downloader) find(dlid string) *Download {
d.mu.RLock()
defer d.mu.RUnlock()
+
if entry, ok := d.downloadCache[dlid]; ok {
return entry
}
+
return nil
}
@@ -314,9 +330,11 @@ func (d *Downloader) find(dlid string) *Download {
func (d *Downloader) remove(dlID string) {
d.mu.Lock()
defer d.mu.Unlock()
+
if _, ok := d.downloadCache[dlID]; !ok {
return
}
+
sID := d.downloadCache[dlID].server.ID()
delete(d.downloadCache, dlID)
if tracked, ok := d.serverCache[sID]; ok {
@@ -326,6 +344,7 @@ func (d *Downloader) remove(dlID string) {
out = append(out, k)
}
}
+
d.serverCache[sID] = out
}
}
@@ -339,5 +358,7 @@ func mustParseCIDR(ip string) *net.IPNet {
}
func IsDownloadError(err error) bool {
- return errors.Is(err, ErrDownloadFailed) || errors.Is(err, ErrInvalidIPAddress) || errors.Is(err, ErrInternalResolution)
+ return errors.Is(err, ErrDownloadFailed) ||
+ errors.Is(err, ErrInvalidIPAddress) ||
+ errors.Is(err, ErrInternalResolution)
}
diff --git a/router/downloader/downloader_test.go b/router/downloader/downloader_test.go
new file mode 100644
index 00000000..3c968c12
--- /dev/null
+++ b/router/downloader/downloader_test.go
@@ -0,0 +1,62 @@
+package downloader
+
+import (
+ "encoding/json"
+ "sync"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestDownloadJSON(t *testing.T) {
+ download := &Download{Identifier: "download-id", progress: 0.25}
+ data, err := json.Marshal(download)
+ require.NoError(t, err)
+ require.JSONEq(t, `{"Identifier":"download-id","Progress":0.25}`, string(data))
+ data, err = json.Marshal([]*Download{download})