Skip to content

Commit f9f4ec7

Browse files
tobychuitobychui
authored
V2.021 (#175)
* Update v2.021 - Updated Lax mode cookies - Updated diskmg implementation for new Linux utilities - Fixed CPU usage over 100% bug - CSS optimization for login page * Create LICENSE.txt
1 parent 62d78c6 commit f9f4ec7

22 files changed

+404
-63
lines changed

‎src/go.mod‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ require (
99
github.com/fclairamb/ftpserverlib v0.22.0
1010
github.com/fogleman/fauxgl v0.0.0-20200818143847-27cddc103802
1111
github.com/gabriel-vasile/mimetype v1.4.3
12-
github.com/go-git/go-billy/v5 v5.5.0
1312
github.com/go-git/go-git/v5 v5.11.0
1413
github.com/go-ldap/ldap v3.0.3+incompatible
1514
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
@@ -26,13 +25,13 @@ require (
2625
github.com/pkg/sftp v1.13.6
2726
github.com/robertkrimen/otto v0.3.0
2827
github.com/satori/go.uuid v1.2.0
29-
github.com/smallfz/libnfs-go v0.0.5
3028
github.com/spf13/afero v1.11.0
3129
github.com/studio-b12/gowebdav v0.9.0
30+
github.com/willscott/go-nfs v0.0.0-20230313234243-d94d22138e1e
3231
gitlab.com/NebulousLabs/go-upnp v0.0.0-20211002182029-11da932010b6
33-
golang.org/x/crypto v0.23.0
32+
golang.org/x/crypto v0.21.0
3433
golang.org/x/oauth2 v0.15.0
35-
golang.org/x/sync v0.7.0
34+
golang.org/x/sync v0.6.0
3635
)
3736

3837
require (
@@ -51,6 +50,7 @@ require (
5150
github.com/fogleman/simplify v0.0.0-20170216171241-d32f302d5046 // indirect
5251
github.com/geoffgarside/ber v1.1.0 // indirect
5352
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
53+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
5454
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5555
github.com/golang/protobuf v1.5.3 // indirect
5656
github.com/golang/snappy v0.0.4 // indirect
@@ -69,19 +69,22 @@ require (
6969
github.com/nwaples/rardecode v1.1.3 // indirect
7070
github.com/pierrec/lz4/v4 v4.1.19 // indirect
7171
github.com/pjbgf/sha1cd v0.3.0 // indirect
72+
github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93 // indirect
7273
github.com/rs/zerolog v1.32.0 // indirect
7374
github.com/sergi/go-diff v1.3.1 // indirect
7475
github.com/skeema/knownhosts v1.2.1 // indirect
76+
github.com/smallfz/libnfs-go v0.0.5 // indirect
7577
github.com/ulikunitz/xz v0.5.11 // indirect
78+
github.com/willscott/go-nfs-client v0.0.0-20200605172546-271fa9065b33 // indirect
7679
github.com/xanzy/ssh-agent v0.3.3 // indirect
7780
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
7881
gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 // indirect
79-
golang.org/x/image v0.18.0 // indirect
80-
golang.org/x/mod v0.17.0 // indirect
81-
golang.org/x/net v0.25.0 // indirect
82+
golang.org/x/image v0.15.0 // indirect
83+
golang.org/x/mod v0.14.0 // indirect
84+
golang.org/x/net v0.23.0 // indirect
8285
golang.org/x/sys v0.20.0 // indirect
83-
golang.org/x/text v0.16.0 // indirect
84-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
86+
golang.org/x/text v0.14.0 // indirect
87+
golang.org/x/tools v0.16.1 // indirect
8588
google.golang.org/appengine v1.6.8 // indirect
8689
google.golang.org/protobuf v1.33.0 // indirect
8790
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect

‎src/go.sum‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
7878
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
7979
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
8080
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
81+
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
8182
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
8283
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
8384
github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
@@ -93,6 +94,7 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
9394
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
9495
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
9596
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
97+
github.com/hashicorp/golang-lru/v2 v2.0.2 h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5twqnfBdU=
9698
github.com/hirochachacha/go-smb2 v1.1.0 h1:b6hs9qKIql9eVXAiN0M2wSFY5xnhbHAQoCwRKbaRTZI=
9799
github.com/hirochachacha/go-smb2 v1.1.0/go.mod h1:8F1A4d5EZzrGu5R7PU163UcMRDJQl4FtcxjBfsY8TZE=
98100
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -150,6 +152,8 @@ github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo=
150152
github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
151153
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
152154
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
155+
github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93 h1:UVArwN/wkKjMVhh2EQGC0tEc1+FqiLlvYXY5mQ2f8Wg=
156+
github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93/go.mod h1:Nfe4efndBz4TibWycNE+lqyJZiMX4ycx+QKV8Ta0f/o=
153157
github.com/robertkrimen/otto v0.3.0 h1:5RI+8860NSxvXywDY9ddF5HcPw0puRsd8EgbXV0oqRE=
154158
github.com/robertkrimen/otto v0.3.0/go.mod h1:uW9yN1CYflmUQYvAMS0m+ZiNo3dMzRUDQJX0jWbzgxw=
155159
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
@@ -183,12 +187,17 @@ github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW
183187
github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
184188
github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
185189
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
190+
github.com/willscott/go-nfs v0.0.0-20230313234243-d94d22138e1e h1:2a1G+FL68xrqllzlh9TMcu0I/1j7hQj9m/9X5Kqd6Ko=
191+
github.com/willscott/go-nfs v0.0.0-20230313234243-d94d22138e1e/go.mod h1:AdubZNWE4Oq6Z0Ggdvg4vZYXhllCYj+utUUfs4PHYVc=
192+
github.com/willscott/go-nfs-client v0.0.0-20200605172546-271fa9065b33 h1:Wd8wdpRzPXskyHvZLyw7Wc1fp5oCE2mhBCj7bAiibUs=
193+
github.com/willscott/go-nfs-client v0.0.0-20200605172546-271fa9065b33/go.mod h1:cOUKSNty+RabZqKhm5yTJT5Vq/Fe83ZRWAJ5Kj8nRes=
186194
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
187195
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
188196
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
189197
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
190198
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
191199
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
200+
github.com/zema1/go-nfs-client v0.0.0-20200604081958-0cf942f0e0fe/go.mod h1:im3CVJ32XM3+E+2RhY0sa5IVJVQehUrX0oE1wX4xOwU=
192201
gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 h1:dizWJqTWjwyD8KGcMOwgrkqu1JIkofYgKkmDeNE7oAs=
193202
gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40/go.mod h1:rOnSnoRyxMI3fe/7KIbVcsHRGxe30OONv8dEgo+vCfA=
194203
gitlab.com/NebulousLabs/go-upnp v0.0.0-20211002182029-11da932010b6 h1:WKij6HF8ECp9E7K0E44dew9NrRDGiNR5u4EFsXnJUx4=
@@ -202,17 +211,17 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
202211
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
203212
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
204213
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
205-
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
206-
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
214+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
215+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
207216
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
208-
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
209-
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
217+
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
218+
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
210219
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
211220
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
212221
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
213222
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
214-
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
215-
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
223+
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
224+
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
216225
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
217226
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
218227
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -226,16 +235,16 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
226235
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
227236
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
228237
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
229-
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
230-
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
238+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
239+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
231240
golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
232241
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
233242
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
234243
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
235244
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
236245
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
237-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
238-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
246+
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
247+
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
239248
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
240249
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
241250
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -256,6 +265,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
256265
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
257266
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
258267
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
268+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
269+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
259270
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
260271
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
261272
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -264,7 +275,7 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
264275
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
265276
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
266277
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
267-
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
278+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
268279
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
269280
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
270281
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -273,16 +284,16 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
273284
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
274285
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
275286
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
276-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
277-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
287+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
288+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
278289
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
279290
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
280291
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
281292
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
282293
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
283294
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
284-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
285-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
295+
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
296+
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
286297
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
287298
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
288299
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎src/main.flags.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var subserviceBasePort = 12810 //Next subservice port
3333

3434
// =========== SYSTEM BUILD INFORMATION ==============
3535
var build_version = "development" //System build flag, this can be either {development / production / stable}
36-
var internal_version = "0.2.020" //Internal build version, [fork_id].[major_release_no].[minor_release_no]
36+
var internal_version = "0.2.021" //Internal build version, [fork_id].[major_release_no].[minor_release_no]
3737
var deviceUUID string //The device uuid of this host
3838
var deviceVendor = "IMUSLAB.INC" //Vendor of the system
3939
var deviceVendorURL = "http://imuslab.com" //Vendor contact information

‎src/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,22 @@ func main() {
116116
if *use_tls {
117117
if !*disable_http {
118118
go func() {
119-
var address = fmt.Sprintf("%s:%d", *listen_host, *listen_port)
119+
address := fmt.Sprintf("%s:%d", *listen_host, *listen_port)
120120
log.Println("Standard (HTTP) Web server listening at", address)
121121
http.ListenAndServe(address, nil)
122122
}()
123123
}
124-
var address = fmt.Sprintf("%s:%d", *listen_host, *tls_listen_port)
124+
address := fmt.Sprintf("%s:%d", *listen_host, *tls_listen_port)
125125
log.Println("Secure (HTTPS) Web server listening at", address)
126126
http.ListenAndServeTLS(address, *tls_cert, *tls_key, nil)
127127
} else {
128-
var address = fmt.Sprintf("%s:%d", *listen_host, *listen_port)
128+
address := fmt.Sprintf("%s:%d", *listen_host, *listen_port)
129129
log.Println("Web server listening at", address)
130130
http.ListenAndServe(address, nil)
131131
}
132132
}()
133133

134-
if *enable_console == true {
134+
if *enable_console {
135135
//Startup interactive shell for debug and basic controls
136136
Console := console.NewConsole(consoleCommandHandler)
137137
Console.ListenAndHandle()

‎src/mod/auth/auth.go‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,16 +306,24 @@ func (a *AuthAgent) LoginUserByRequest(w http.ResponseWriter, r *http.Request, u
306306
session.Values["username"] = username
307307
session.Values["rememberMe"] = rememberme
308308

309+
CookieSetSameSitePolicy := http.SameSiteNoneMode
310+
if r.TLS == nil {
311+
//Connection is done via http
312+
CookieSetSameSitePolicy = http.SameSiteLaxMode
313+
}
314+
309315
//Check if remember me is clicked. If yes, set the maxage to 1 week.
310316
if rememberme {
311317
session.Options = &sessions.Options{
312-
MaxAge: 3600 * 24 * 7, //One week
313-
Path: "/",
318+
MaxAge: 3600 * 24 * 7, //One week
319+
Path: "/",
320+
SameSite: CookieSetSameSitePolicy,
314321
}
315322
} else {
316323
session.Options = &sessions.Options{
317-
MaxAge: 3600 * 1, //One hour
318-
Path: "/",
324+
MaxAge: 3600 * 1, //One hour
325+
Path: "/",
326+
SameSite: CookieSetSameSitePolicy,
319327
}
320328
}
321329
session.Save(r, w)

‎src/mod/disk/diskmg/diskmg.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type LsblkF struct {
5151
Fstype string `json:"fstype"`
5252
Label interface{} `json:"label"`
5353
UUID string `json:"uuid"`
54-
Fsavail string `json:"fsavail"`
54+
Fsavail int64 `json:"fsavail"`
5555
Fsuse string `json:"fsuse%"`
5656
Mountpoint string `json:"mountpoint"`
5757
} `json:"children"`

‎src/mod/info/usageinfo/cpu.go‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package usageinfo
2+
3+
import (
4+
"fmt"
5+
"io/ioutil"
6+
"strconv"
7+
"strings"
8+
"time"
9+
)
10+
11+
type CPUStats struct {
12+
user uint64
13+
nice uint64
14+
system uint64
15+
idle uint64
16+
iowait uint64
17+
irq uint64
18+
softirq uint64
19+
}
20+
21+
// getCPUStats reads and parses the CPU stats from /proc/stat
22+
func getCPUStats() (CPUStats, error) {
23+
data, err := ioutil.ReadFile("/proc/stat")
24+
if err != nil {
25+
return CPUStats{}, err
26+
}
27+
28+
lines := strings.Split(string(data), "\n")
29+
for _, line := range lines {
30+
if strings.HasPrefix(line, "cpu ") {
31+
fields := strings.Fields(line)
32+
if len(fields) < 8 {
33+
return CPUStats{}, fmt.Errorf("unexpected format in /proc/stat")
34+
}
35+
36+
// Parse the CPU fields into the CPUStats struct
37+
user, _ := strconv.ParseUint(fields[1], 10, 64)
38+
nice, _ := strconv.ParseUint(fields[2], 10, 64)
39+
system, _ := strconv.ParseUint(fields[3], 10, 64)
40+
idle, _ := strconv.ParseUint(fields[4], 10, 64)
41+
iowait, _ := strconv.ParseUint(fields[5], 10, 64)
42+
irq, _ := strconv.ParseUint(fields[6], 10, 64)
43+
softirq, _ := strconv.ParseUint(fields[7], 10, 64)
44+
45+
return CPUStats{
46+
user: user,
47+
nice: nice,
48+
system: system,
49+
idle: idle,
50+
iowait: iowait,
51+
irq: irq,
52+
softirq: softirq,
53+
}, nil
54+
}
55+
}
56+
57+
return CPUStats{}, fmt.Errorf("could not find CPU stats")
58+
}
59+
60+
// calculateCPUUsage calculates the percentage of CPU usage
61+
func calculateCPUUsage(prev, current CPUStats) float64 {
62+
prevTotal := prev.user + prev.nice + prev.system + prev.idle + prev.iowait + prev.irq + prev.softirq
63+
currentTotal := current.user + current.nice + current.system + current.idle + current.iowait + current.irq + current.softirq
64+
65+
totalDiff := currentTotal - prevTotal
66+
idleDiff := current.idle - prev.idle
67+
68+
if totalDiff == 0 {
69+
return 0.0
70+
}
71+
72+
usage := (float64(totalDiff-idleDiff) / float64(totalDiff)) * 100.0
73+
return usage
74+
}
75+
76+
// GetCPUUsage returns the current CPU usage as a percentage
77+
// Note this is blocking and will sleep for 1 second
78+
func GetCPUUsageUsingProcStat() (float64, error) {
79+
// Get initial CPU stats
80+
prevStats, err := getCPUStats()
81+
if err != nil {
82+
return 0, err
83+
}
84+
85+
// Sleep for 1 second to compare stats over time
86+
time.Sleep(1 * time.Second)
87+
88+
// Get current CPU stats after 1 second
89+
currentStats, err := getCPUStats()
90+
if err != nil {
91+
return 0, err
92+
}
93+
94+
// Calculate and print the CPU usage
95+
cpuUsage := calculateCPUUsage(prevStats, currentStats)
96+
return cpuUsage, nil
97+
}

0 commit comments

Comments
 (0)