Commit Graph

396 Commits

Author SHA1 Message Date
Ivaylo Novakov b3e7716a01
Merge branch 'master' into ivo/clamav 2021-12-09 14:32:13 +01:00
Ivaylo Novakov 39c4790364 Weekly Deploy for Dec 6, 2021. Including cache pruning fix
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEl73IdNcm91gzFlRkmt3TRPEwV/YFAmGuXlsACgkQmt3TRPEw
 V/b+dA//THc5/LWTRs8r7BAOQj8V9QzxJsuS7g+gV4zeDW5ymXlK0lSRSXvjNsOW
 mQ21Qx5fE05ztRlUNOUPKd1bZUgnL4O5AUBWUm87rq6NXHVop1JYaFGOpbfUpRZT
 HWE2SwGgwBRUjSgkwkz+jsg8SkajADwThLf8aSNAmKWienondtEFA8hMtBqUcyjK
 A7AsQbjjjS62lUsP78SJEPM5pG0vX+FxHzMAUtkqT94foJlI4RosyAp3yDPjrR/8
 eUn/CCci9p/ORzKnKos9DAo+1G5X0qgrP/9aGlnpDlkYZ2SQfJVMAKWaMpfIUsWi
 zihJYPogFAUHaDY1ddEnx47aYRN7hmumDGM+iUvbi39LshPBdBaeW56RRyA3qBel
 pD5eXr53C6kje5Wu6t9SbzILjh5cuQ8vd50hnrJ282vSMZbwqwwKjpliZu4FsrQC
 OiA1K7l7P8gAiL8d5YQOJ2uBTviAA0A8wNVPHx8qd/hWNOr7WxSM75POyTvRNtRq
 GdZko6/FDrK48Gw8LNxZMUa7x5LfjgtyiWfGsYomRG3GLBcy44neEhk3P37sELJv
 /jr0aOhLW+95r3OI7sUqnMppWdCKa5XFEqxTHc5Zax+NKzao3aSvRDNtujKxe+IC
 NfzJVXLtsde/Bho1B1q7GSG3YTINcJ422YwDNWfbCV0qajW40GU=
 =JEZB
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEWWr7bKPf/zmGZCrIBrk1SrCL6cYFAmGyAhsACgkQBrk1SrCL
 6ca/cwf/eXbHwojF27fYPoziWWskatsdCKJ2jnu1ovqVceVYztX9Kt+CQ++Ri4A9
 LqKvDPwLfKXF0W3x/nK6FtL2CSq81SPED/mLKMH/XTsbwtsnPFbnAzxdl7tqSA2Y
 6mqyBnyeyGby6tGW2ZE5EAYRv/dkKYzlTp7WMqoalleoRy6sbS6RZ8bJMA8xrbPo
 RwIAfvl4MVItt/qpws+J9g/qQ2QR8ZZKZtDxLxGNSFw9GDQBk/hKxRI9nP1WEsVp
 SEHCmfveOAdbzf8Cbr4j/m6wmoXPr+2qF5QIJ8eDiEAQ2YLPKbMpk6xO500geAFl
 k+6BHOQR2dOfsyyo33IFIcV9NyvDAQ==
 =F885
 -----END PGP SIGNATURE-----

Merge tag 'deploy-2021-12-06' into ivo/clamav

Weekly Deploy for Dec 6, 2021. Including cache pruning fix

# gpg: Signature made Mon Dec  6 20:02:51 2021 CET
# gpg:                using RSA key 97BDC874D726F758331654649ADDD344F13057F6
# gpg: key 9ADDD344F13057F6: public key "Matthew Sevey (Created on MacOS Big Sur for Yubi Key Nano 5) <mjsevey@gmail.com>" imported
# gpg: Total number processed: 1
# gpg:               imported: 1
# gpg: Good signature from "Matthew Sevey (Created on MacOS Big Sur for Yubi Key Nano 5) <mjsevey@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 97BD C874 D726 F758 3316  5464 9ADD D344 F130 57F6
2021-12-09 14:18:19 +01:00
Ivaylo Novakov a4242a9234
Merge branch 'master' into accounts-api-refactor
# Conflicts:
#	.gitignore
2021-12-09 14:03:59 +01:00
Matthew Sevey 7bf366db24
Add serverload endpoint (#1410)
* write usage script for cpu and free disk space tracking, testing new endpoint

* Test alias nginx path

* testing json

* fix server load json file being served by nginx

* Fix filenames

* Add changelog

* Add systemd file for serverload

* Update setup-scripts/serverload.sh

Co-authored-by: Peter-Jan Brone <peter-jan@settlemint.com>
2021-12-06 12:49:58 +01:00
Chris Schinnerl 495dd8d14b
Merge remote-tracking branch 'origin/master' into accounts-api-refactor 2021-12-03 10:20:33 +01:00
Christopher Schinnerl b2dbe4bdb4
Merge pull request #1408 from SkynetLabs/pj/abuse
Abuse Reports
2021-12-02 19:12:28 +01:00
PJ 341f313839
Remove comments 2021-12-02 17:28:40 +01:00
PJ 6e1af409c6
Remove commented out code 2021-12-02 17:23:37 +01:00
PJ 7f28d30a44
Update branch arg 2021-12-02 17:20:14 +01:00
PJ 938c5905c5
Remove CORS settings 2021-12-02 17:07:11 +01:00
PJ c89663b393
Add missing semi colon 2021-12-02 14:05:41 +01:00
PJ 6c99803749
Bypass CORS issue 2021-12-01 16:51:40 +01:00
PJ 25fd697d5f
Configure routes 2021-12-01 16:23:56 +01:00
PJ 63b283fc42
Update block routes 2021-12-01 12:56:25 +01:00
PJ 1fe2c3d76f
Add abuse location 2021-12-01 11:18:25 +01:00
PJ a03860419f
Update dockerfile 2021-12-01 11:04:02 +01:00
PJ 3722969f0f
Add blocker Dockerfile 2021-12-01 10:57:28 +01:00
PJ d1cbbb4ebb
Add min_free param to proxy_cache_path directive 2021-12-01 10:38:25 +01:00
Matthew Sevey c273634e27
Update docker/nginx/conf.d/server/server.api 2021-11-30 07:43:17 -05:00
Karol Wypchło b0fefce39e
Update docker/accounts/Dockerfile
Co-authored-by: Matthew Sevey <mjsevey@gmail.com>
2021-11-24 00:38:45 +01:00
Ivaylo Novakov 57c15cd833
Scan a maximum of 100MB of each stream. 2021-11-16 14:13:49 +01:00
Ivaylo Novakov ec94429f2a
Expose accounts's challenge-response endpoints + CORS. 2021-11-16 09:27:04 +01:00
Ivaylo Novakov 6f20d223b1
No custom port for malware-scanner. 2021-11-16 09:19:47 +01:00
Matthew Sevey 0e9d9a624e
Merge branch 'master' into sevey/update-default-limit 2021-11-15 10:12:07 -08:00
Matthew Sevey aba544aa2e
increase to 5GB limit for uploading large directories: 2021-11-15 10:11:38 -08:00
Karol Wypchlo 74084a8da8
upgrade accounts to new api 2021-11-13 01:34:00 +01:00
Ivaylo Novakov 030b8b9419
Set burst to 10, parallel to 5. 2021-11-12 18:10:38 +01:00
Ivaylo Novakov a0789be7a4
Move the clamd.conf where it should be. 2021-11-12 18:04:26 +01:00
Ivaylo Novakov c0eb41d10d
Set burst to 2. 2021-11-11 17:17:53 +01:00
Karol Wypchlo e0520de05e
introduce hard upload limits 2021-11-11 16:59:51 +01:00
Ivaylo Novakov b34d213274
Update docker/malware-scanner/Dockerfile
Co-authored-by: Karol Wypchło <kwypchlo@gmail.com>
2021-11-11 13:33:52 +01:00
Ivaylo Novakov f92ff89d71
Use the `malware-scanner` data dir. 2021-11-11 10:34:50 +01:00
Ivaylo Novakov 50b2c8f85c
Add ClamAV config and continue the setup. 2021-11-10 21:09:16 +01:00
Matthew Sevey 2f0f7d64e0
Update handshake to use v3.0.1 2021-11-09 18:19:49 -05:00
Ivaylo Novakov f0a4dc5f8f
Add a malware-scanner service. 2021-11-09 18:04:05 +01:00
Karol Wypchło 81acfe1e48
Update Dockerfile 2021-11-09 12:45:11 +01:00
dependabot[bot] c25618cd76
Bump caddy from 2.4.5-builder to 2.4.6-builder in /docker/caddy
Bumps caddy from 2.4.5-builder to 2.4.6-builder.

---
updated-dependencies:
- dependency-name: caddy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-09 11:37:06 +00:00
Matthew Sevey 6a3edd6848
Drop unused requested skylink header 2021-11-08 13:13:44 -05:00
Karol Wypchło d4eb04f702
Merge pull request #1346 from SkynetLabs/ivo/inc_body_restore
Increase the request body size of the /skynet/restore endpoint to 5MB.
2021-11-08 16:31:40 +01:00
dependabot[bot] 162a9fa200
Bump node from 16.12.0-alpine to 16.13.0-alpine in /docker/handshake
Bumps node from 16.12.0-alpine to 16.13.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 12:10:15 +00:00
Karol Wypchlo c4e771759b
unit tests 2021-11-05 17:12:01 +01:00
Karol Wypchlo a4ce3c935d
implement base32 decoder 2021-11-05 13:29:33 +01:00
Karol Wypchlo 878660c52a
remove siapath 2021-11-03 17:16:28 +01:00
Karol Wypchlo d4b9146ecf
add siapath 2021-11-03 15:06:09 +01:00
Karol Wypchlo eec5150264
fix /restore endpoint 2021-11-03 14:51:10 +01:00
Karol Wypchlo 040ea5b581
fix /restore endpoint 2021-11-03 14:50:20 +01:00
Ivaylo Novakov 7787903c06
Proxy-pass /skynet/restore to skyd. 2021-11-03 14:22:05 +01:00
Ivaylo Novakov c34a32a3fd
Require auth. 2021-11-03 12:51:29 +01:00
Ivaylo Novakov adff743fde
Add CORS. 2021-11-03 10:17:44 +01:00
Ivaylo Novakov 45688eeab1
Increase the request body size of the /skynet/restore endpoint to 5MB. 2021-11-03 09:57:55 +01:00
Karol Wypchlo 40d0bb0e4d
fix caching 2021-10-26 16:47:06 +02:00
Karol Wypchlo d13a68d825
fix caching 2021-10-26 16:44:06 +02:00
Karol Wypchlo 81a1338f00
move cache to lua to minimise number of requests 2021-10-26 13:01:15 +02:00
Karol Wypchlo d4bc9df1ce
Merge remote-tracking branch 'origin/master' into wildcard-api 2021-10-26 12:48:00 +02:00
dependabot[bot] 9f1050fbb8
Bump node from 16.11.1-alpine to 16.12.0-alpine in /docker/handshake
Bumps node from 16.11.1-alpine to 16.12.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-26 08:42:34 +00:00
Karol Wypchło 97b1920409
fix registry tracking method (#1299) 2021-10-19 16:59:23 +02:00
Karol Wypchlo ffb1e499b9
use skynet to load our homepage 2021-10-18 16:24:23 +01:00
dependabot[bot] adc971f0b8
Bump node from 16.10.0-alpine to 16.11.1-alpine in /docker/handshake
Bumps node from 16.10.0-alpine to 16.11.1-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 12:09:48 +00:00
Karol Wypchlo aa99006822
Merge remote-tracking branch 'origin/master' into wildcard-api 2021-10-15 15:04:06 +02:00
Karol Wypchlo 26a3e6a81d
expose upload-concat header for tus 2021-10-05 21:08:53 +02:00
Karol Wypchlo add8b7d9e5
Merge remote-tracking branch 'origin/master' into unpin-from-dashboard 2021-09-29 12:22:50 +02:00
dependabot[bot] 7e2cb78893
Bump node from 16.9.1-alpine to 16.10.0-alpine in /docker/handshake
Bumps node from 16.9.1-alpine to 16.10.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 12:09:40 +00:00
Karol Wypchlo 70f5e4128d
Merge remote-tracking branch 'origin/master' into unpin-from-dashboard 2021-09-25 19:20:03 +02:00
Karol Wypchlo f1240c7c60
drop max_retries and add email to caddy dns challenge 2021-09-24 01:40:21 +02:00
Karol Wypchlo 3a41bc9ae7
change caddy running container from builder to alpine 2021-09-24 01:26:39 +02:00
Karol Wypchlo 62c7f3cece
Merge remote-tracking branch 'origin/master' into unpin-from-dashboard 2021-09-23 23:55:54 +02:00
Karol Wypchlo 42f16ced25
drop ttl until the bug is fixed 2021-09-23 23:54:03 +02:00
Karol Wypchło 8dbff497d4
fix invalid json in config file (#1224) 2021-09-22 11:44:42 +02:00
Karol Wypchlo 91dbd990e4
Merge remote-tracking branch 'origin/master' into unpin-from-dashboard 2021-09-21 13:52:41 +02:00
Karol Wypchlo a96158d5a4
add / 2021-09-20 22:28:38 +02:00
Karol Wypchlo f1346f23ad
expose skylink endpoint over external domains 2021-09-20 22:21:45 +02:00
dependabot[bot] cdd06394d9
Bump node from 16.9.0-alpine to 16.9.1-alpine in /docker/handshake
Bumps node from 16.9.0-alpine to 16.9.1-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 12:08:37 +00:00
Ivaylo Novakov 49774d2f04
Bump the go version used by accounts's container to 1.16.7 2021-09-13 09:33:22 +02:00
Matthew Sevey cd4d1d5565
Merge pull request #1181 from SkynetLabs/caddy-dns-entry-ttl
make caddy dns entries ttl 15 minutes
2021-09-10 14:26:03 -04:00
Karol Wypchło 50ec789e95
Update caddy.json.template 2021-09-10 19:11:19 +02:00
Karol Wypchlo fba0fd64f7
make caddy dns entries ttl 10 minutes 2021-09-10 17:21:39 +02:00
Karol Wypchlo a888aae6ca
cherry pick to a different pr 2021-09-10 17:21:05 +02:00
Karol Wypchlo d52f9bd698
add ttl for caddy dns entry 2021-09-10 17:20:44 +02:00
Karol Wypchlo f802165509
/skynet/tus should handle options response 2021-09-10 17:13:06 +02:00
Karol Wypchlo c8822168bf
unpin skylink action 2021-09-10 12:22:36 +02:00
Karol Wypchło 059f553745
Merge pull request #1163 from SkynetLabs/dependabot/docker/docker/caddy/caddy-2.4.5-builder
Bump caddy from 2.4.3-builder to 2.4.5-builder in /docker/caddy
2021-09-10 11:34:54 +02:00
dependabot[bot] 016e0c7ab7
Bump node from 16.8.0-alpine to 16.9.0-alpine in /docker/handshake
Bumps node from 16.8.0-alpine to 16.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-10 09:26:37 +00:00
dependabot[bot] e42dfacfdb
Bump caddy from 2.4.3-builder to 2.4.5-builder in /docker/caddy
Bumps caddy from 2.4.3-builder to 2.4.5-builder.

---
updated-dependencies:
- dependency-name: caddy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-10 09:26:35 +00:00
Matthew Sevey 0f60a395b3
Remove outdated NebulousLabs references 2021-09-08 15:04:02 -04:00
Karol Wypchlo 3946ad4a77
use 308 as new skyd redirect code 2021-09-07 12:56:25 +02:00
Karol Wypchło f8de4438cd
Merge pull request #1147 from SkynetLabs/dependabot/docker/docker/nginx/openresty/openresty-1.19.9.1-bionic
Bump openresty/openresty from 1.19.3.2-3-bionic to 1.19.9.1-bionic in /docker/nginx
2021-09-06 13:10:59 +02:00
dependabot[bot] bf1dcc92d0
Bump node from 16.5.0-alpine to 16.8.0-alpine in /docker/handshake
Bumps node from 16.5.0-alpine to 16.8.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-06 11:05:22 +00:00
dependabot[bot] 0304298437
Bump openresty/openresty in /docker/nginx
Bumps openresty/openresty from 1.19.3.2-3-bionic to 1.19.9.1-bionic.

---
updated-dependencies:
- dependency-name: openresty/openresty
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-06 11:05:20 +00:00
Karol Wypchło 2fc575df8f
Merge pull request #1062 from SkynetLabs/sevey/handshake
Update handshake chain migration in docker compose
2021-09-03 16:55:17 +02:00
Matthew Sevey a7bb3743a3
Update comments 2021-09-03 10:52:54 -04:00
Matthew Sevey 343fc6286f
Update hsd docker file to point to new commit 2021-09-03 10:37:40 -04:00
Karol Wypchlo f6f3863736
fix tus upload limits not set 2021-09-02 10:16:41 +02:00
Karol Wypchlo 2cb0707fa5
allow If-None-Match 2021-08-31 16:55:18 +02:00
Karol Wypchlo c5afe554b5
do not expose Skynet-Requested-Skylink 2021-08-31 16:39:42 +02:00
Karol Wypchlo f01bc7ff7a
expose ETag 2021-08-31 16:01:55 +02:00
Karol Wypchlo 9ff776fdea
fix account endpoint nginx subrequests 2021-08-27 18:33:27 +02:00
Karol Wypchlo ecb73e7498
drop caddy as proxy 2021-08-27 14:15:22 +02:00
Matthew Sevey 907925e115
Merge pull request #1105 from SkynetLabs/expose-skynet-health-endpoint
expose /skynet/health endpoints
2021-08-24 13:31:38 -04:00
Karol Wypchlo 3b4a6bbd58
extend timeout on health endpoint and cache result for 1 minute 2021-08-24 19:02:11 +02:00
Karol Wypchlo 999a0d85aa
expose /skynet/health endpoint 2021-08-24 16:42:33 +02:00