Merge branch 'master' into add-shell-scripts-lint

.github/dependabot.yml

@@ -3,48 +3,48 @@ updates:
   - package-ecosystem: npm
     directory: "/packages/dashboard"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: npm
     directory: "/packages/dnslink-api"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: npm
     directory: "/packages/handshake-api"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: npm
     directory: "/packages/health-check"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: npm
     directory: "/packages/website"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/docker/nginx"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/docker/sia"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/packages/dashboard"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/packages/dnslink-api"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/packages/handshake-api"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/packages/health-check"
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: docker
     directory: "/packages/website"
     schedule:
-      interval: weekly
+      interval: monthly

.github/workflows/lint-dockerfiles.yml

@@ -0,0 +1,29 @@
+name: Dockerfile Lint
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        dockerfile:
+          - docker/nginx/Dockerfile
+          - docker/nginx/testing/Dockerfile
+          - docker/sia/Dockerfile
+          - packages/dashboard/Dockerfile
+          - packages/dashboard-v2/Dockerfile
+          - packages/dnslink-api/Dockerfile
+          - packages/handshake-api/Dockerfile
+          - packages/health-check/Dockerfile
+          - packages/website/Dockerfile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: hadolint/hadolint-action@v2.0.0
+        with:
+          dockerfile: ${{ matrix.dockerfile }}

.github/workflows/nginx-lua-unit-tests.yml

@@ -6,48 +6,41 @@ name: Nginx Lua Unit Tests
 on:
   push:
     branches:
-      - "master"
+      - master
     paths:
-      - ".github/workflows/nginx-lua-unit-tests.yml"
-      - "docker/nginx/libs/**.lua"
+      - docker/nginx/libs/**
   pull_request:
     paths:
-      - ".github/workflows/nginx-lua-unit-tests.yml"
-      - "docker/nginx/libs/**.lua"
+      - docker/nginx/libs/**
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
-
+    container: openresty/openresty:1.19.9.1-focal
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: "3.x"
-          architecture: "x64"
+      - uses: actions/checkout@v3
 
       - name: Install Dependencies
         run: |
-          pip install hererocks
-          hererocks env --lua=5.1 -rlatest
-          source env/bin/activate
+          luarocks install lua-resty-http
+          luarocks install hasher
           luarocks install busted
           luarocks install luacov
-          luarocks install hasher
           luarocks install luacheck
 
-      - name: Lint code
-        run: |
-          source env/bin/activate
-          luacheck docker/nginx/libs --std ngx_lua+busted
+      - name: Lint Code With Luacheck
+        run: luacheck docker/nginx/libs --std ngx_lua+busted
 
-      - name: Unit Tests
-        run: |
-          source env/bin/activate
-          busted --verbose --coverage --pattern=spec --directory=docker/nginx/libs .
-          cd docker/nginx/libs && luacov
+      - name: Run Tests With Busted
+        # ran from root repo directory; produces luacov.stats.out file
+        run: docker/nginx/testing/rbusted --lpath='docker/nginx/libs/?.lua;docker/nginx/libs/?/?.lua' --verbose --coverage --pattern=spec docker/nginx/libs
 
-      - uses: codecov/codecov-action@v2
+      - name: Generate Code Coverage Report With Luacov
+        # requires config file in cwd; produces luacov.report.out file
+        run: cp docker/nginx/testing/.luacov . && luacov && rm .luacov
+
+      - uses: codecov/codecov-action@v3
         with:
-          directory: docker/nginx/libs
+          root_dir: ${GITHUB_WORKSPACE}
+          files: ./luacov.report.out
           flags: nginx-lua

.gitignore

@@ -86,6 +86,10 @@ __pycache__
 /.idea/
 /venv*
 
+# Luacov file
+luacov.stats.out
+luacov.report.out
+
 # Setup-script log files
 setup-scripts/serverload.log
 setup-scripts/serverload.json

README.md

@@ -3,10 +3,10 @@
 ## Latest Setup Documentation
 
 Latest Skynet Webportal setup documentation and the setup process Skynet Labs
-supports is located at https://docs.siasky.net/webportal-management/overview.
+supports is located at https://portal-docs.skynetlabs.com/.
 
-Some of the scripts and setup documentation contained in this repository
-(`skynet-webportal`) can be outdated and generally should not be used.
+Some scripts and setup documentation contained in this repository
+(`skynet-webportal`) may be outdated and generally should not be used.
 
 ## Web application
 
@@ -35,7 +35,7 @@ For the purposes of complying with our code license, you can use the following S
 `fb6c9320bc7e01fbb9cd8d8c3caaa371386928793c736837832e634aaaa484650a3177d6714a`
 
 ## Running a Portal
-For those interested in running a Webportal, head over to our developer docs [here](https://docs.siasky.net/webportal-management/overview.) to learn more.
+For those interested in running a Webportal, head over to our developer docs [here](https://portal-docs.skynetlabs.com/) to learn more.
 
 ## Contributing
 

changelog/items/bugs-fixed/fix-context.md

@@ -0,0 +1,2 @@
+- Fix `dashboard-v2` Dockerfile context in `docker-compose.accounts.yml` to
+  avoid Ansible deploy (docker compose build) `permission denied` issues.

docker-compose.abuse-scanner.yml

@@ -10,7 +10,7 @@ services:
   abuse-scanner:
     # uncomment "build" and comment out "image" to build from sources
     # build: https://github.com/SkynetLabs/abuse-scanner.git#main
-    image: skynetlabs/abuse-scanner
+    image: skynetlabs/abuse-scanner:0.1.1
     container_name: abuse-scanner
     restart: unless-stopped
     logging: *default-logging

docker-compose.accounts.yml

@@ -55,9 +55,11 @@ services:
       - mongo
 
   dashboard:
-    build:
-      context: ./packages/dashboard
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/dashboard/Dockerfile
+    image: skynetlabs/dashboard
     container_name: dashboard
     restart: unless-stopped
     logging: *default-logging
@@ -75,3 +77,26 @@ services:
       - 3000
     depends_on:
       - mongo
+
+  dashboard-v2:
+    build:
+      context: ./packages/dashboard-v2
+      dockerfile: Dockerfile
+    container_name: dashboard-v2
+    restart: unless-stopped
+    logging: *default-logging
+    env_file:
+      - .env
+    environment:
+      - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN}
+      - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
+    volumes:
+      - ./docker/data/dashboard-v2/.cache:/usr/app/.cache
+      - ./docker/data/dashboard-v2/public:/usr/app/public
+    networks:
+      shared:
+        ipv4_address: 10.10.10.86
+    expose:
+      - 9000
+    depends_on:
+      - mongo

docker-compose.blocker.yml

@@ -15,7 +15,7 @@ services:
   blocker:
     # uncomment "build" and comment out "image" to build from sources
     # build: https://github.com/SkynetLabs/blocker.git#main
-    image: skynetlabs/blocker
+    image: skynetlabs/blocker:0.1.1
     container_name: blocker
     restart: unless-stopped
     logging: *default-logging

docker-compose.malware-scanner.yml

@@ -28,7 +28,7 @@ services:
   malware-scanner:
     # uncomment "build" and comment out "image" to build from sources
     # build: https://github.com/SkynetLabs/malware-scanner.git#main
-    image: skynetlabs/malware-scanner
+    image: skynetlabs/malware-scanner:0.1.0
     container_name: malware-scanner
     restart: unless-stopped
     logging: *default-logging

docker-compose.mongodb.yml

@@ -15,7 +15,7 @@ services:
 
   mongo:
     image: mongo:4.4.1
-    command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet}
+    command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} --setParameter ShardingTaskExecutorPoolMinSize=10
     container_name: mongo
     restart: unless-stopped
     logging: *default-logging

docker-compose.yml

@@ -54,9 +54,11 @@ services:
       - ./docker/data/certbot:/etc/letsencrypt
 
   nginx:
-    build:
-      context: ./docker/nginx
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./docker/nginx/Dockerfile
+    image: skynetlabs/nginx
     container_name: nginx
     restart: unless-stopped
     logging: *default-logging
@@ -69,6 +71,10 @@ services:
       - ./docker/data/nginx/skynet:/data/nginx/skynet:ro
       - ./docker/data/sia/apipassword:/data/sia/apipassword:ro
       - ./docker/data/certbot:/etc/letsencrypt
+      - ./docker/nginx/libs:/etc/nginx/libs
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d
+      - ./docker/nginx/conf.d.templates:/etc/nginx/templates
+      - ./docker/nginx/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf
     networks:
       shared:
         ipv4_address: 10.10.10.30
@@ -82,9 +88,11 @@ services:
       - website
 
   website:
-    build:
-      context: ./packages/website
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/website/Dockerfile
+    image: skynetlabs/website
     container_name: website
     restart: unless-stopped
     logging: *default-logging
@@ -118,9 +126,11 @@ services:
       - 12037
 
   handshake-api:
-    build:
-      context: ./packages/handshake-api
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/handshake-api/Dockerfile
+    image: skynetlabs/handshake-api
     container_name: handshake-api
     restart: unless-stopped
     logging: *default-logging
@@ -140,9 +150,11 @@ services:
       - handshake
 
   dnslink-api:
-    build:
-      context: ./packages/dnslink-api
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/dnslink-api/Dockerfile
+    image: skynetlabs/dnslink-api
     container_name: dnslink-api
     restart: unless-stopped
     logging: *default-logging
@@ -153,9 +165,11 @@ services:
       - 3100
 
   health-check:
-    build:
-      context: ./packages/health-check
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/health-check/Dockerfile
+    image: skynetlabs/health-check
     container_name: health-check
     restart: unless-stopped
     logging: *default-logging

docker/nginx/Dockerfile

@@ -1,24 +1,21 @@
 FROM openresty/openresty:1.19.9.1-focal
 
-RUN luarocks install lua-resty-http && \
-    luarocks install hasher && \
-    openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
-    -subj '/CN=local-certificate' \
-    -keyout /etc/ssl/local-certificate.key \
-    -out /etc/ssl/local-certificate.crt
+WORKDIR /
 
-COPY mo ./
-COPY libs /etc/nginx/libs
-COPY conf.d /etc/nginx/conf.d
-COPY conf.d.templates /etc/nginx/conf.d.templates
-COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
+RUN apt-get update && apt-get --no-install-recommends -y install bc=1.07.1-2build1 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    luarocks install lua-resty-http && \
+    luarocks install hasher
 
-CMD [ "bash", "-c", \
-      "./mo < /etc/nginx/conf.d.templates/server.account.conf > /etc/nginx/conf.d/server.account.conf ; \
-       ./mo < /etc/nginx/conf.d.templates/server.api.conf > /etc/nginx/conf.d/server.api.conf; \
-       ./mo < /etc/nginx/conf.d.templates/server.dnslink.conf > /etc/nginx/conf.d/server.dnslink.conf; \
-       ./mo < /etc/nginx/conf.d.templates/server.hns.conf > /etc/nginx/conf.d/server.hns.conf; \
-       ./mo < /etc/nginx/conf.d.templates/server.skylink.conf > /etc/nginx/conf.d/server.skylink.conf ; \
-       while :; do sleep 6h & wait ${!}; /usr/local/openresty/bin/openresty -s reload; done & \
-       /usr/local/openresty/bin/openresty '-g daemon off;'" \
-    ]
+# reload nginx every 6 hours (for reloading certificates)
+ENV NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS 6
+
+# copy entrypoint and entrypoint scripts
+COPY docker/nginx/docker-entrypoint.sh /
+COPY docker/nginx/docker-entrypoint.d /docker-entrypoint.d
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+STOPSIGNAL SIGQUIT
+
+CMD ["nginx", "-g", "daemon off;"]

docker/nginx/conf.d.templates/server.account.conf

@@ -1,45 +0,0 @@
-{{#ACCOUNTS_ENABLED}}
-	{{#PORTAL_DOMAIN}}
-	server {
-		server_name account.{{PORTAL_DOMAIN}}; # example: account.siasky.net
-		
-		include /etc/nginx/conf.d/server/server.http;
-	}
-
-	server {
-		server_name account.{{PORTAL_DOMAIN}}; # example: account.siasky.net
-
-		set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-		set_by_lua_block $skynet_server_domain {
-			-- fall back to portal domain if server domain is not defined
-			if "{{SERVER_DOMAIN}}" == "" then
-				return "{{PORTAL_DOMAIN}}"
-			end
-			return "{{SERVER_DOMAIN}}"
-		}
-
-		include /etc/nginx/conf.d/server/server.account;
-	}
-	{{/PORTAL_DOMAIN}}
-
-	{{#SERVER_DOMAIN}}
-	server {
-		server_name account.{{SERVER_DOMAIN}}; # example: account.eu-ger-1.siasky.net
-
-		include /etc/nginx/conf.d/server/server.http;
-
-		set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-	}
-
-	server {
-		server_name account.{{SERVER_DOMAIN}}; # example: account.eu-ger-1.siasky.net
-
-		set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-		set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-
-		include /etc/nginx/conf.d/server/server.account;
-		
-		set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-	}
-	{{/SERVER_DOMAIN}}
-{{/ACCOUNTS_ENABLED}}

docker/nginx/conf.d.templates/server.account.conf.template

@@ -0,0 +1,44 @@
+server {
+	server_name account.${PORTAL_DOMAIN}; # example: account.siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name account.${PORTAL_DOMAIN}; # example: account.siasky.net
+
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	include /etc/nginx/conf.d/server/server.account;
+}
+
+server {
+	server_name account.${SERVER_DOMAIN}; # example: account.eu-ger-1.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name account.${SERVER_DOMAIN}; # example: account.eu-ger-1.siasky.net
+
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+
+	include /etc/nginx/conf.d/server/server.account;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}

docker/nginx/conf.d.templates/server.api.conf

@@ -1,43 +0,0 @@
-{{#PORTAL_DOMAIN}}
-server {
-	server_name {{PORTAL_DOMAIN}}; # example: siasky.net
-	
-	include /etc/nginx/conf.d/server/server.http;
-}
-
-server {
-	server_name {{PORTAL_DOMAIN}}; # example: siasky.net
-
-	set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain {
-		-- fall back to portal domain if server domain is not defined
-		if "{{SERVER_DOMAIN}}" == "" then
-			return "{{PORTAL_DOMAIN}}"
-		end
-		return "{{SERVER_DOMAIN}}"
-	}
-
-	include /etc/nginx/conf.d/server/server.api;
-}
-{{/PORTAL_DOMAIN}}
-
-{{#SERVER_DOMAIN}}
-server {
-	server_name {{SERVER_DOMAIN}}; # example: eu-ger-1.siasky.net
-
-	include /etc/nginx/conf.d/server/server.http;
-
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-
-server {
-	server_name {{SERVER_DOMAIN}}; # example: eu-ger-1.siasky.net
-
-	set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-
-	include /etc/nginx/conf.d/server/server.api;
-	
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-{{/SERVER_DOMAIN}}

docker/nginx/conf.d.templates/server.api.conf.template

@@ -0,0 +1,44 @@
+server {
+	server_name ${PORTAL_DOMAIN}; # example: siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name ${PORTAL_DOMAIN}; # example: siasky.net
+
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	include /etc/nginx/conf.d/server/server.api;
+}
+
+server {
+	server_name ${SERVER_DOMAIN}; # example: eu-ger-1.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name ${SERVER_DOMAIN}; # example: eu-ger-1.siasky.net
+
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+
+	include /etc/nginx/conf.d/server/server.api;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}

docker/nginx/conf.d.templates/server.dnslink.conf.template

@@ -12,13 +12,13 @@ server {
     ssl_certificate     /etc/ssl/local-certificate.crt;
     ssl_certificate_key /etc/ssl/local-certificate.key;
 
-    set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
+    set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
     set_by_lua_block $skynet_server_domain {
         -- fall back to portal domain if server domain is not defined
-        if "{{SERVER_DOMAIN}}" == "" then
-            return "{{PORTAL_DOMAIN}}"
+        if "${SERVER_DOMAIN}" == "" then
+            return "${PORTAL_DOMAIN}"
         end
-        return "{{SERVER_DOMAIN}}"
+        return "${SERVER_DOMAIN}"
     }
 
     include /etc/nginx/conf.d/server/server.dnslink;

docker/nginx/conf.d.templates/server.hns.conf

@@ -1,45 +0,0 @@
-{{#PORTAL_DOMAIN}}
-server {
-	server_name *.hns.{{PORTAL_DOMAIN}}; # example: *.hns.siasky.net
-	
-	include /etc/nginx/conf.d/server/server.http;
-}
-
-server {
-	server_name *.hns.{{PORTAL_DOMAIN}}; # example: *.hns.siasky.net
-	
-	set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain {
-		-- fall back to portal domain if server domain is not defined
-		if "{{SERVER_DOMAIN}}" == "" then
-			return "{{PORTAL_DOMAIN}}"
-		end
-		return "{{SERVER_DOMAIN}}"
-	}
-
-	proxy_set_header Host {{PORTAL_DOMAIN}};
-	include /etc/nginx/conf.d/server/server.hns;
-}
-{{/PORTAL_DOMAIN}}
-
-{{#SERVER_DOMAIN}}
-server {
-	server_name *.hns.{{SERVER_DOMAIN}}; # example: *.hns.eu-ger-1.siasky.net
-	
-	include /etc/nginx/conf.d/server/server.http;
-
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-
-server {
-	server_name *.hns.{{SERVER_DOMAIN}}; # example: *.hns.eu-ger-1.siasky.net
-	
-	set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-    
-	proxy_set_header Host {{SERVER_DOMAIN}};
-	include /etc/nginx/conf.d/server/server.hns;
-	
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-{{/SERVER_DOMAIN}}

docker/nginx/conf.d.templates/server.hns.conf.template

@@ -0,0 +1,46 @@
+server {
+	server_name *.hns.${PORTAL_DOMAIN}; # example: *.hns.siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name *.hns.${PORTAL_DOMAIN}; # example: *.hns.siasky.net
+	
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	proxy_set_header Host ${PORTAL_DOMAIN};
+	include /etc/nginx/conf.d/server/server.hns;
+}
+
+server {
+	server_name *.hns.${SERVER_DOMAIN}; # example: *.hns.eu-ger-1.siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name *.hns.${SERVER_DOMAIN}; # example: *.hns.eu-ger-1.siasky.net
+	
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+    
+	proxy_set_header Host ${SERVER_DOMAIN};
+	include /etc/nginx/conf.d/server/server.hns;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}

docker/nginx/conf.d.templates/server.skylink.conf

@@ -1,43 +0,0 @@
-{{#PORTAL_DOMAIN}}
-server {
-	server_name *.{{PORTAL_DOMAIN}}; # example: *.siasky.net
-
-	include /etc/nginx/conf.d/server/server.http;
-}
-
-server {
-	server_name *.{{PORTAL_DOMAIN}}; # example: *.siasky.net
-	
-	set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain {
-		-- fall back to portal domain if server domain is not defined
-		if "{{SERVER_DOMAIN}}" == "" then
-			return "{{PORTAL_DOMAIN}}"
-		end
-		return "{{SERVER_DOMAIN}}"
-	}
-
-	include /etc/nginx/conf.d/server/server.skylink;
-}
-{{/PORTAL_DOMAIN}}
-
-{{#SERVER_DOMAIN}}
-server {
-	server_name *.{{SERVER_DOMAIN}}; # example: *.eu-ger-1.siasky.net
-
-	include /etc/nginx/conf.d/server/server.http;
-
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-
-server {
-	server_name *.{{SERVER_DOMAIN}}; # example: *.eu-ger-1.siasky.net
-
-	set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-	
-	include /etc/nginx/conf.d/server/server.skylink;
-	
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-{{/SERVER_DOMAIN}}

docker/nginx/conf.d.templates/server.skylink.conf.template

@@ -0,0 +1,44 @@
+server {
+	server_name *.${PORTAL_DOMAIN}; # example: *.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name *.${PORTAL_DOMAIN}; # example: *.siasky.net
+	
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	include /etc/nginx/conf.d/server/server.skylink;
+}
+
+server {
+	server_name *.${SERVER_DOMAIN}; # example: *.eu-ger-1.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name *.${SERVER_DOMAIN}; # example: *.eu-ger-1.siasky.net
+
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+	
+	include /etc/nginx/conf.d/server/server.skylink;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}

docker/nginx/conf.d/include/location-skylink

@@ -1,5 +1,4 @@
 include /etc/nginx/conf.d/include/cors;
-include /etc/nginx/conf.d/include/track-download;
 
 limit_conn downloads_by_ip 100; # ddos protection: max 100 downloads at a time
 
@@ -37,3 +36,18 @@ proxy_read_timeout 600;
 proxy_set_header User-Agent: Sia-Agent;
 
 proxy_pass http://sia:9980/skynet/skylink/$skylink$path$is_args$args;
+
+log_by_lua_block {
+    local skynet_account = require("skynet.account")
+    local skynet_modules = require("skynet.modules")
+    local skynet_scanner = require("skynet.scanner")
+    local skynet_tracker = require("skynet.tracker")
+
+    if skynet_modules.is_enabled("a") then
+        skynet_tracker.track_download(ngx.header["Skynet-Skylink"], ngx.status, skynet_account.get_auth_headers(), ngx.var.body_bytes_sent)
+    end
+
+    if skynet_modules.is_enabled("s") then
+        skynet_scanner.scan_skylink(ngx.header["Skynet-Skylink"])
+    end
+}

docker/nginx/conf.d/include/location-skynet-registry

@@ -1,6 +1,5 @@
 include /etc/nginx/conf.d/include/cors;
 include /etc/nginx/conf.d/include/sia-auth;
-include /etc/nginx/conf.d/include/track-registry;
 
 limit_req zone=registry_access_by_ip burst=600 nodelay;
 limit_req zone=registry_access_by_ip_throttled burst=200 nodelay;
@@ -30,3 +29,10 @@ access_by_lua_block {
         end
     end
 }
+
+log_by_lua_block {
+    local skynet_account = require("skynet.account")
+    local skynet_tracker = require("skynet.tracker")
+
+    skynet_tracker.track_registry(ngx.status, skynet_account.get_auth_headers(), ngx.req.get_method())
+}

docker/nginx/conf.d/include/track-download

@@ -1,55 +0,0 @@
-log_by_lua_block {
-    local skynet_account = require("skynet.account")
-
-    -- tracking runs only when request comes from authenticated user
-    if skynet_account.is_authenticated() then
-        local function track(premature, skylink, status, body_bytes_sent, auth_headers)
-            if premature then return end
-
-            local httpc = require("resty.http").new()
-            local query = table.concat({ "status=" .. status, "bytes=" .. body_bytes_sent }, "&")
-
-            -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
-            local res, err = httpc:request_uri("http://10.10.10.70:3000/track/download/" .. skylink .. "?" .. query, {
-                method = "POST",
-                headers = auth_headers,
-            })
-
-            if err or (res and res.status ~= ngx.HTTP_NO_CONTENT) then
-                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
-                ngx.log(ngx.ERR, "Failed accounts service request /track/download/" .. skylink .. ": ", error_response)
-            end
-        end
-
-        if ngx.header["Skynet-Skylink"] and ngx.status >= ngx.HTTP_OK and ngx.status < ngx.HTTP_SPECIAL_RESPONSE then
-            local auth_headers = skynet_account.get_auth_headers()
-            local ok, err = ngx.timer.at(0, track, ngx.header["Skynet-Skylink"], ngx.status, ngx.var.body_bytes_sent, auth_headers)
-            if err then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
-        end
-    end
-
-    -- this block runs only when scanner module is enabled
-    if os.getenv("PORTAL_MODULES"):match("s") then
-        local function scan(premature, skylink)
-            if premature then return end
-
-            local httpc = require("resty.http").new()
-
-            -- 10.10.10.101 points to malware-scanner service (alias not available when using resty-http)
-            local res, err = httpc:request_uri("http://10.10.10.101:4000/scan/" .. skylink, {
-                method = "POST",
-            })
-
-            if err or (res and res.status ~= ngx.HTTP_OK) then
-                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
-                ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", error_response)
-            end
-        end
-
-        -- scan all skylinks but make sure to only run if skylink is present (empty if request failed)
-        if ngx.header["Skynet-Skylink"] then
-            local ok, err = ngx.timer.at(0, scan, ngx.header["Skynet-Skylink"])
-            if err then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
-        end
-    end
-}

docker/nginx/conf.d/include/track-registry

@@ -1,33 +0,0 @@
-log_by_lua_block {
-    local skynet_account = require("skynet.account")
-
-    -- tracking runs only when request comes from authenticated user
-    if skynet_account.is_authenticated() then
-        local function track(premature, request_method, auth_headers)
-            if premature then return end
-
-            local httpc = require("resty.http").new()
-
-            -- based on request method we assign a registry action string used
-            -- in track endpoint namely "read" for GET and "write" for POST
-            local registry_action = request_method == "GET" and "read" or "write"
-
-            -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
-            local res, err = httpc:request_uri("http://10.10.10.70:3000/track/registry/" .. registry_action, {
-                method = "POST",
-                headers = auth_headers,
-            })
-
-            if err or (res and res.status ~= ngx.HTTP_NO_CONTENT) then
-                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
-                ngx.log(ngx.ERR, "Failed accounts service request /track/registry/" .. registry_action .. ": ", error_response)
-            end
-        end
-
-        if ngx.status == ngx.HTTP_OK or ngx.status == ngx.HTTP_NOT_FOUND then
-            local auth_headers = skynet_account.get_auth_headers()
-            local ok, err = ngx.timer.at(0, track, ngx.req.get_method(), auth_headers)
-            if err then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
-        end
-    end
-}

docker/nginx/conf.d/include/track-upload

@@ -1,55 +0,0 @@
-log_by_lua_block {
-    local skynet_account = require("skynet.account")
-
-    -- tracking runs only when request comes from authenticated user
-    if skynet_account.is_authenticated() then
-        local function track(premature, skylink, auth_headers)
-            if premature then return end
-
-            local httpc = require("resty.http").new()
-
-            -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
-            local res, err = httpc:request_uri("http://10.10.10.70:3000/track/upload/" .. skylink, {
-                method = "POST",
-                headers = auth_headers,
-            })
-
-            if err or (res and res.status ~= ngx.HTTP_NO_CONTENT) then
-                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
-                ngx.log(ngx.ERR, "Failed accounts service request /track/upload/" .. skylink .. ": ", error_response)
-            end
-        end
-
-        -- report all skylinks (header empty if request failed) but only if jwt is preset (user is authenticated)
-        if ngx.header["Skynet-Skylink"] then
-            local auth_headers = skynet_account.get_auth_headers()
-            local ok, err = ngx.timer.at(0, track, ngx.header["Skynet-Skylink"], auth_headers)
-            if err then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
-        end
-    end
-
-    -- this block runs only when scanner module is enabled
-    if os.getenv("PORTAL_MODULES"):match("s") then
-        local function scan(premature, skylink)
-            if premature then return end
-
-            local httpc = require("resty.http").new()
-
-            -- 10.10.10.101 points to malware-scanner service (alias not available when using resty-http)
-            local res, err = httpc:request_uri("http://10.10.10.101:4000/scan/" .. skylink, {
-                method = "POST",
-            })
-
-            if err or (res and res.status ~= ngx.HTTP_OK) then
-                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
-                ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", error_response)
-            end
-        end
-
-        -- scan all skylinks but make sure to only run if skylink is present (empty if request failed)
-        if ngx.header["Skynet-Skylink"] then
-            local ok, err = ngx.timer.at(0, scan, ngx.header["Skynet-Skylink"])
-            if err then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
-        end
-    end
-}

docker/nginx/conf.d/server/server.account

@@ -3,6 +3,11 @@ listen 443 ssl http2;
 include /etc/nginx/conf.d/include/ssl-settings;
 include /etc/nginx/conf.d/include/init-optional-variables;
 
+# Uncomment to launch new Dashboard under /v2 path 
+# location /v2 {
+#   proxy_pass http://dashboard-v2:9000;
+# }
+
 location / {
     proxy_pass http://dashboard:3000;
 }

docker/nginx/conf.d/server/server.api

@@ -206,7 +206,6 @@ location /skynet/registry/subscription {
 location /skynet/skyfile {
     include /etc/nginx/conf.d/include/cors;
     include /etc/nginx/conf.d/include/sia-auth;
-    include /etc/nginx/conf.d/include/track-upload;
     include /etc/nginx/conf.d/include/generate-siapath;
     include /etc/nginx/conf.d/include/portal-access-check;
 
@@ -228,12 +227,31 @@ location /skynet/skyfile {
 
     # proxy this call to siad endpoint (make sure the ip is correct)
     proxy_pass http://sia:9980/skynet/skyfile/$dir1/$dir2/$dir3$is_args$args;
+
+    log_by_lua_block {
+        local skynet_account = require("skynet.account")
+        local skynet_modules = require("skynet.modules")
+        local skynet_scanner = require("skynet.scanner")
+        local skynet_tracker = require("skynet.tracker")
+
+        if skynet_modules.is_enabled("a") then
+            skynet_tracker.track_upload(
+                ngx.header["Skynet-Skylink"],
+                ngx.status,
+                skynet_account.get_auth_headers(),
+                ngx.var.remote_addr
+            )
+        end
+
+        if skynet_modules.is_enabled("s") then
+            skynet_scanner.scan_skylink(ngx.header["Skynet-Skylink"])
+        end
+    }
 }
 
 # endpoint implementing resumable file uploads open protocol https://tus.io
 location /skynet/tus {
     include /etc/nginx/conf.d/include/cors-headers; # include cors headers but do not overwrite OPTIONS response
-    include /etc/nginx/conf.d/include/track-upload;
 
     limit_req zone=uploads_by_ip burst=10 nodelay;
     limit_req zone=uploads_by_ip_throttled;
@@ -241,8 +259,8 @@ location /skynet/tus {
     limit_conn upload_conn 5;
     limit_conn upload_conn_rl 1;
 
-    # TUS chunks size is 40M + leaving 10M of breathing room
-    client_max_body_size 50M;
+    # Do not limit body size in nginx, skyd will reject early on too large upload
+    client_max_body_size 0;
 
     # Those timeouts need to be elevated since skyd can stall reading
     # data for a while when overloaded which would terminate connection
@@ -294,12 +312,31 @@ location /skynet/tus {
             end
         end
     }
+
+    log_by_lua_block {
+        local skynet_account = require("skynet.account")
+        local skynet_modules = require("skynet.modules")
+        local skynet_scanner = require("skynet.scanner")
+        local skynet_tracker = require("skynet.tracker")
+
+        if skynet_modules.is_enabled("a") then
+            skynet_tracker.track_upload(
+                ngx.header["Skynet-Skylink"],
+                ngx.status,
+                skynet_account.get_auth_headers(),
+                ngx.var.remote_addr
+            )
+        end
+
+        if skynet_modules.is_enabled("s") then
+            skynet_scanner.scan_skylink(ngx.header["Skynet-Skylink"])
+        end
+    }
 }
 
 location /skynet/pin {
     include /etc/nginx/conf.d/include/cors;
     include /etc/nginx/conf.d/include/sia-auth;
-    include /etc/nginx/conf.d/include/track-upload;
     include /etc/nginx/conf.d/include/generate-siapath;
     include /etc/nginx/conf.d/include/portal-access-check;
 
@@ -311,6 +348,26 @@ location /skynet/pin {
 
     proxy_set_header User-Agent: Sia-Agent;
     proxy_pass http://sia:9980$uri?siapath=$dir1/$dir2/$dir3&$args;
+
+    log_by_lua_block {
+        local skynet_account = require("skynet.account")
+        local skynet_modules = require("skynet.modules")
+        local skynet_scanner = require("skynet.scanner")
+        local skynet_tracker = require("skynet.tracker")
+
+        if skynet_modules.is_enabled("a") then
+            skynet_tracker.track_upload(
+                ngx.header["Skynet-Skylink"],
+                ngx.status,
+                skynet_account.get_auth_headers(),
+                ngx.var.remote_addr
+            )
+        end
+
+        if skynet_modules.is_enabled("s") then
+            skynet_scanner.scan_skylink(ngx.header["Skynet-Skylink"])
+        end
+    }
 }
 
 location /skynet/metadata {
@@ -357,7 +414,6 @@ location ~ "^/file/(([a-zA-Z0-9-_]{46}|[a-z0-9]{55})(/.*)?)$" {
 
 location /skynet/trustless/basesector {
     include /etc/nginx/conf.d/include/cors;
-    include /etc/nginx/conf.d/include/track-download;
 
     limit_conn downloads_by_ip 100; # ddos protection: max 100 downloads at a time
 
@@ -391,6 +447,21 @@ location /skynet/trustless/basesector {
 
     proxy_set_header User-Agent: Sia-Agent;
     proxy_pass http://sia:9980;
+
+    log_by_lua_block {
+        local skynet_account = require("skynet.account")
+        local skynet_modules = require("skynet.modules")
+        local skynet_scanner = require("skynet.scanner")
+        local skynet_tracker = require("skynet.tracker")
+
+        if skynet_modules.is_enabled("a") then
+            skynet_tracker.track_download(ngx.header["Skynet-Skylink"], ngx.status, skynet_account.get_auth_headers(), ngx.var.body_bytes_sent)
+        end
+
+        if skynet_modules.is_enabled("s") then
+            skynet_scanner.scan_skylink(ngx.header["Skynet-Skylink"])
+        end
+    }
 }
 
 location /__internal/do/not/use/accounts {

docker/nginx/conf.d/server/server.dnslink

@@ -5,6 +5,7 @@ location / {
     set $path $uri;
 
     rewrite_by_lua_block {
+        local cjson = require("cjson")
         local cache = ngx.shared.dnslink
         local cache_value = cache:get(ngx.var.host)
 
@@ -28,13 +29,23 @@ location / {
                     ngx.exit(ngx.status)
                 end
             else
-                ngx.var.skylink = res.body
+                local resolved = cjson.decode(res.body)
+
+                ngx.var.skylink = resolved.skylink
+                if resolved.sponsor then
+                    ngx.req.set_header("Skynet-Api-Key", resolved.sponsor)
+                end
 
                 local cache_ttl = 300 -- 5 minutes cache expire time
-                cache:set(ngx.var.host, ngx.var.skylink, cache_ttl)
+                cache:set(ngx.var.host, res.body, cache_ttl)
             end
         else
-            ngx.var.skylink = cache_value
+            local resolved = cjson.decode(cache_value)
+
+            ngx.var.skylink = resolved.skylink
+            if resolved.sponsor then
+                ngx.req.set_header("Skynet-Api-Key", resolved.sponsor)
+            end
         end
 
         ngx.var.skylink = require("skynet.skylink").parse(ngx.var.skylink)

docker/nginx/docker-entrypoint.d/20-envsubst-on-templates.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+# https://github.com/nginxinc/docker-nginx/blob/master/entrypoint/20-envsubst-on-templates.sh
+# https://github.com/nginxinc/docker-nginx/blob/master/LICENSE
+
+# Copyright (C) 2011-2016 Nginx, Inc.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+ME=$(basename $0)
+
+auto_envsubst() {
+  local template_dir="${NGINX_ENVSUBST_TEMPLATE_DIR:-/etc/nginx/templates}"
+  local suffix="${NGINX_ENVSUBST_TEMPLATE_SUFFIX:-.template}"
+  local output_dir="${NGINX_ENVSUBST_OUTPUT_DIR:-/etc/nginx/conf.d}"
+
+  local template defined_envs relative_path output_path subdir
+  defined_envs=$(printf '${%s} ' $(env | cut -d= -f1))
+  [ -d "$template_dir" ] || return 0
+  if [ ! -w "$output_dir" ]; then
+    echo >&3 "$ME: ERROR: $template_dir exists, but $output_dir is not writable"
+    return 0
+  fi
+  find "$template_dir" -follow -type f -name "*$suffix" -print | while read -r template; do
+    relative_path="${template#$template_dir/}"
+    output_path="$output_dir/${relative_path%$suffix}"
+    subdir=$(dirname "$relative_path")
+    # create a subdirectory where the template file exists
+    mkdir -p "$output_dir/$subdir"
+    echo >&3 "$ME: Running envsubst on $template to $output_path"
+    envsubst "$defined_envs" < "$template" > "$output_path"
+  done
+}
+
+auto_envsubst
+
+exit 0

docker/nginx/docker-entrypoint.d/40-reload-every-x-hours.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# source: https://github.com/nginxinc/docker-nginx/pull/509
+
+set -e
+
+ME=$(basename $0)
+
+[ "${NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS:-}" ] || exit 0
+if [ $(echo "$NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS > 0" | bc) = 0 ]; then
+  echo >&3 "$ME: Error. Provide integer or floating point number greater that 0. See 'man sleep'." 
+  exit 1
+fi
+
+start_background_reload() {
+  echo >&3 "$ME: Reloading Nginx every $NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS hour(s)"
+  while :; do sleep ${NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS}h; echo >&3 "$ME: Reloading Nginx ..." && nginx -s reload; done &
+}
+
+start_background_reload

docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Generate locally signed ssl certificate to be used on routes
+# that do not require certificate issued by trusted CA
+
+set -e
+
+ME=$(basename $0)
+
+generate_local_certificate() {
+  echo >&3 "$ME: Generating locally signed ssl certificate"
+  openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
+    -subj '/CN=local-certificate' \
+    -keyout /etc/ssl/local-certificate.key \
+    -out /etc/ssl/local-certificate.crt
+}
+
+generate_local_certificate

docker/nginx/docker-entrypoint.sh

@@ -0,0 +1,65 @@
+#!/bin/sh
+# vim:sw=4:ts=4:et
+
+# https://github.com/nginxinc/docker-nginx/blob/master/entrypoint/docker-entrypoint.sh
+# https://github.com/nginxinc/docker-nginx/blob/master/LICENSE
+
+# Copyright (C) 2011-2016 Nginx, Inc.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
+    exec 3>&1
+else
+    exec 3>/dev/null
+fi
+
+if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
+    if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then
+        echo >&3 "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration"
+
+        echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
+        find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
+            case "$f" in
+                *.sh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Launching $f";
+                        "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
+                *) echo >&3 "$0: Ignoring $f";;
+            esac
+        done
+
+        echo >&3 "$0: Configuration complete; ready for start up"
+    else
+        echo >&3 "$0: No files found in /docker-entrypoint.d/, skipping configuration"
+    fi
+fi
+
+exec "$@"

docker/nginx/libs/skynet/account.lua

@@ -59,7 +59,9 @@ function _M.exit_access_forbidden(message)
 end
 
 function _M.accounts_enabled()
-    return os.getenv("PORTAL_MODULES"):match("a") ~= nil
+    local skynet_modules = require("skynet.modules")
+
+    return skynet_modules.is_enabled("a")
 end
 
 function _M.get_account_limits()
@@ -74,9 +76,16 @@ function _M.get_account_limits()
 
     if ngx.var.account_limits == "" then
         local httpc = require("resty.http").new()
+        local uri = "http://10.10.10.70:3000/user/limits"
+
+        -- include skylink if it is available in the context of request
+        -- todo: this should not rely on skylink variable to be defined
+        if ngx.var.skylink ~= nil and ngx.var.skylink ~= "" then
+            uri = uri .. "/" .. ngx.var.skylink
+        end
 
         -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
-        local res, err = httpc:request_uri("http://10.10.10.70:3000/user/limits?unit=byte", {
+        local res, err = httpc:request_uri(uri .. "?unit=byte", {
             headers = auth_headers,
         })
 

docker/nginx/libs/skynet/modules.lua

@@ -0,0 +1,23 @@
+local _M = {}
+
+local utils = require("utils")
+
+function _M.is_enabled(module_abbr)
+    if type(module_abbr) ~= "string" or module_abbr:len() ~= 1 then
+        error("Module abbreviation '" .. tostring(module_abbr) .. "' should be exactly one character long string")
+    end
+
+    local enabled_modules = utils.getenv("PORTAL_MODULES")
+
+    if not enabled_modules then
+        return false
+    end
+
+    return enabled_modules:find(module_abbr) ~= nil
+end
+
+function _M.is_disabled(module_abbr)
+    return not _M.is_enabled(module_abbr)
+end
+
+return _M

docker/nginx/libs/skynet/modules.spec.lua

@@ -0,0 +1,95 @@
+-- luacheck: ignore os
+
+local skynet_modules = require("skynet.modules")
+
+describe("is_enabled", function()
+   before_each(function()
+      stub(os, "getenv")
+   end)
+
+   after_each(function()
+      os.getenv:revert()
+   end)
+
+   it("should return false if PORTAL_MODULES are not defined", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns(nil)
+
+      assert.is_false(skynet_modules.is_enabled("a"))
+   end)
+
+   it("should return false if PORTAL_MODULES are empty", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns("")
+
+      assert.is_false(skynet_modules.is_enabled("a"))
+   end)
+
+   it("should return false if module is not enabled", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns("qwerty")
+
+      assert.is_false(skynet_modules.is_enabled("a"))
+   end)
+
+   it("should return true if module is enabled", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns("asdfg")
+
+      assert.is_true(skynet_modules.is_enabled("a"))
+   end)
+
+   it("should throw an error for empty module", function()
+      assert.has_error(function()
+         skynet_modules.is_enabled()
+      end, "Module abbreviation 'nil' should be exactly one character long string")
+   end)
+
+   it("should throw an error for too long module", function()
+      assert.has_error(function()
+         skynet_modules.is_enabled("gandalf")
+      end, "Module abbreviation 'gandalf' should be exactly one character long string")
+   end)
+end)
+
+describe("is_disabled", function()
+   before_each(function()
+      stub(os, "getenv")
+   end)
+
+   after_each(function()
+      os.getenv:revert()
+   end)
+
+   it("should return true if PORTAL_MODULES are not defined", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns(nil)
+
+      assert.is_true(skynet_modules.is_disabled("a"))
+   end)
+
+   it("should return true if PORTAL_MODULES are empty", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns("")
+
+      assert.is_true(skynet_modules.is_disabled("a"))
+   end)
+
+   it("should return true if module is not enabled", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns("qwerty")
+
+      assert.is_true(skynet_modules.is_disabled("a"))
+   end)
+
+   it("should return false if module is enabled", function()
+      os.getenv.on_call_with("PORTAL_MODULES").returns("asdfg")
+
+      assert.is_false(skynet_modules.is_disabled("a"))
+   end)
+
+   it("should throw an error for empty module", function()
+      assert.has_error(function()
+         skynet_modules.is_disabled()
+      end, "Module abbreviation 'nil' should be exactly one character long string")
+   end)
+
+   it("should throw an error for too long module", function()
+      assert.has_error(function()
+         skynet_modules.is_disabled("gandalf")
+      end, "Module abbreviation 'gandalf' should be exactly one character long string")
+   end)
+end)

docker/nginx/libs/skynet/scanner.lua

@@ -0,0 +1,26 @@
+local _M = {}
+
+function _M.scan_skylink_timer(premature, skylink)
+    if premature then return end
+
+    local httpc = require("resty.http").new()
+
+    -- 10.10.10.101 points to malware-scanner service (alias not available when using resty-http)
+    local res, err = httpc:request_uri("http://10.10.10.101:4000/scan/" .. skylink, {
+        method = "POST",
+    })
+
+    if err or (res and res.status ~= ngx.HTTP_OK) then
+        local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+        ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", error_response)
+    end
+end
+
+function _M.scan_skylink(skylink)
+    if not skylink then return end
+
+    local ok, err = ngx.timer.at(0, _M.scan_skylink_timer, skylink)
+    if not ok then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
+end
+
+return _M

docker/nginx/libs/skynet/scanner.spec.lua

@@ -0,0 +1,119 @@
+-- luacheck: ignore ngx
+
+local skynet_scanner = require("skynet.scanner")
+local skylink = "AQBG8n_sgEM_nlEp3G0w3vLjmdvSZ46ln8ZXHn-eObZNjA"
+
+describe("scan_skylink", function()
+    before_each(function()
+        stub(ngx.timer, "at")
+    end)
+
+    after_each(function()
+        ngx.timer.at:revert()
+    end)
+
+    it("should schedule a timer when skylink is provided", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_scanner.scan_skylink(skylink)
+
+        assert.stub(ngx.timer.at).was_called_with(0, skynet_scanner.scan_skylink_timer, skylink)
+    end)
+
+    it("should log an error if timer failed to create", function()
+        stub(ngx, "log")
+
+        ngx.timer.at.invokes(function() return false, "such a failure" end)
+
+        skynet_scanner.scan_skylink(skylink)
+
+        assert.stub(ngx.timer.at).was_called_with(0, skynet_scanner.scan_skylink_timer, skylink)
+        assert.stub(ngx.log).was_called_with(ngx.ERR, "Failed to create timer: ", "such a failure")
+
+        ngx.log:revert()
+    end)
+
+    it("should not schedule a timer if skylink is not provided", function()
+        skynet_scanner.scan_skylink()
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+end)
+
+describe("scan_skylink_timer", function()
+    before_each(function()
+        stub(ngx, "log")
+    end)
+
+    after_each(function()
+        local resty_http = require("resty.http")
+
+        ngx.log:revert()
+        resty_http.new:revert()
+    end)
+
+    it("should exit early on premature", function()
+        local resty_http = require("resty.http")
+        local request_uri = spy.new()
+        local httpc = mock({ request_uri = request_uri })
+        stub(resty_http, "new").returns(httpc)
+
+        skynet_scanner.scan_skylink_timer(true, skylink)
+
+        assert.stub(request_uri).was_not_called()
+        assert.stub(ngx.log).was_not_called()
+    end)
+
+    it("should make a post request with skylink to scanner service", function()
+        local resty_http = require("resty.http")
+        local request_uri = spy.new(function()
+            return { status = 200 } -- return 200 success
+        end)
+        local httpc = mock({ request_uri = request_uri })
+        stub(resty_http, "new").returns(httpc)
+
+        skynet_scanner.scan_skylink_timer(false, skylink)
+
+        local uri = "http://10.10.10.101:4000/scan/" .. skylink
+        assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST" })
+        assert.stub(ngx.log).was_not_called()
+    end)
+
+    it("should log message on scanner request failure with response code", function()
+        local resty_http = require("resty.http")
+        local request_uri = spy.new(function()
+            return { status = 404, body = "baz" } -- return 404 failure
+        end)
+        local httpc = mock({ request_uri = request_uri })
+        stub(resty_http, "new").returns(httpc)
+
+        skynet_scanner.scan_skylink_timer(false, skylink)
+
+        local uri = "http://10.10.10.101:4000/scan/" .. skylink
+        assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST" })
+        assert.stub(ngx.log).was_called_with(
+            ngx.ERR,
+            "Failed malware-scanner request /scan/AQBG8n_sgEM_nlEp3G0w3vLjmdvSZ46ln8ZXHn-eObZNjA: ",
+            "[HTTP 404] baz"
+        )
+    end)
+
+    it("should log message on scanner request error", function()
+        local resty_http = require("resty.http")
+        local request_uri = spy.new(function()
+            return nil, "foo != bar" -- return error
+        end)
+        local httpc = mock({ request_uri = request_uri })
+        stub(resty_http, "new").returns(httpc)
+
+        skynet_scanner.scan_skylink_timer(false, skylink)
+
+        local uri = "http://10.10.10.101:4000/scan/" .. skylink
+        assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST" })
+        assert.stub(ngx.log).was_called_with(
+            ngx.ERR,
+            "Failed malware-scanner request /scan/AQBG8n_sgEM_nlEp3G0w3vLjmdvSZ46ln8ZXHn-eObZNjA: ",
+            "foo != bar"
+        )
+    end)
+end)

docker/nginx/libs/skynet/tracker.lua

@@ -0,0 +1,99 @@
+local _M = {}
+
+local utils = require("utils")
+
+function _M.track_download_timer(premature, skylink, status, auth_headers, body_bytes_sent)
+    if premature then return end
+
+    local httpc = require("resty.http").new()
+    local query = table.concat({ "status=" .. status, "bytes=" .. body_bytes_sent }, "&")
+
+    -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
+    local res, err = httpc:request_uri("http://10.10.10.70:3000/track/download/" .. skylink .. "?" .. query, {
+        method = "POST",
+        headers = auth_headers,
+    })
+
+    if err or (res and res.status ~= 204) then
+        local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+        ngx.log(ngx.ERR, "Failed accounts service request /track/download/" .. skylink .. ": ", error_response)
+    end
+end
+
+function _M.track_download(skylink, status_code, auth_headers, body_bytes_sent)
+    local has_auth_headers = not utils.is_table_empty(auth_headers)
+    local status_success = status_code >= 200 and status_code <= 299
+
+    if skylink and status_success and has_auth_headers then
+        local ok, err = ngx.timer.at(0, _M.track_download_timer, skylink, status_code, auth_headers, body_bytes_sent)
+        if not ok then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
+    end
+end
+
+function _M.track_upload_timer(premature, skylink, auth_headers, uploader_ip)
+    if premature then return end
+
+    local httpc = require("resty.http").new()
+
+    -- set correct content type header and include auth headers
+    local headers = {
+        ["Content-Type"] = "application/x-www-form-urlencoded",
+    }
+    for key, value in pairs(auth_headers) do
+        headers[key] = value
+    end
+
+    -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
+    local res, err = httpc:request_uri("http://10.10.10.70:3000/track/upload/" .. skylink, {
+        method = "POST",
+        headers = headers,
+        body = "ip=" .. uploader_ip,
+    })
+
+    if err or (res and res.status ~= 204) then
+        local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+        ngx.log(ngx.ERR, "Failed accounts service request /track/upload/" .. skylink .. ": ", error_response)
+    end
+end
+
+function _M.track_upload(skylink, status_code, auth_headers, uploader_ip)
+    local status_success = status_code >= 200 and status_code <= 299
+
+    if skylink and status_success then
+        local ok, err = ngx.timer.at(0, _M.track_upload_timer, skylink, auth_headers, uploader_ip)
+        if not ok then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
+    end
+end
+
+function _M.track_registry_timer(premature, auth_headers, request_method)
+    if premature then return end
+
+    local httpc = require("resty.http").new()
+
+    -- based on request method we assign a registry action string used
+    -- in track endpoint namely "read" for GET and "write" for POST
+    local registry_action = request_method == "GET" and "read" or "write"
+
+    -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
+    local res, err = httpc:request_uri("http://10.10.10.70:3000/track/registry/" .. registry_action, {
+        method = "POST",
+        headers = auth_headers,
+    })
+
+    if err or (res and res.status ~= 204) then
+        local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+        ngx.log(ngx.ERR, "Failed accounts service request /track/registry/" .. registry_action .. ": ", error_response)
+    end
+end
+
+function _M.track_registry(status_code, auth_headers, request_method)
+    local has_auth_headers = not utils.is_table_empty(auth_headers)
+    local tracked_status = status_code == 200 or status_code == 404
+
+    if tracked_status and has_auth_headers then
+        local ok, err = ngx.timer.at(0, _M.track_registry_timer, auth_headers, request_method)
+        if not ok then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
+    end
+end
+
+return _M

docker/nginx/libs/skynet/tracker.spec.lua

@@ -0,0 +1,584 @@
+-- luacheck: ignore ngx
+
+local skynet_tracker = require("skynet.tracker")
+
+local valid_skylink = "AQBG8n_sgEM_nlEp3G0w3vLjmdvSZ46ln8ZXHn-eObZNjA"
+local valid_status_code = 200
+local valid_auth_headers = { ["Skynet-Api-Key"] = "foo" }
+local valid_ip = "12.34.56.78"
+
+describe("track_download", function()
+    local valid_body_bytes_sent = 12345
+
+    before_each(function()
+        stub(ngx.timer, "at")
+    end)
+
+    after_each(function()
+        ngx.timer.at:revert()
+    end)
+
+    it("should schedule a timer when conditions are met", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_download(valid_skylink, valid_status_code, valid_auth_headers, valid_body_bytes_sent)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_download_timer,
+            valid_skylink,
+            valid_status_code,
+            valid_auth_headers,
+            valid_body_bytes_sent
+        )
+    end)
+
+    it("should not schedule a timer if skylink is empty", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_download(nil, valid_status_code, valid_auth_headers, valid_body_bytes_sent)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should not schedule a timer if status code is not in 2XX range", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        -- couple of example of 4XX and 5XX codes
+        skynet_tracker.track_download(valid_skylink, 401, valid_auth_headers, valid_body_bytes_sent)
+        skynet_tracker.track_download(valid_skylink, 403, valid_auth_headers, valid_body_bytes_sent)
+        skynet_tracker.track_download(valid_skylink, 490, valid_auth_headers, valid_body_bytes_sent)
+        skynet_tracker.track_download(valid_skylink, 500, valid_auth_headers, valid_body_bytes_sent)
+        skynet_tracker.track_download(valid_skylink, 502, valid_auth_headers, valid_body_bytes_sent)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should not schedule a timer if auth headers are empty", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_download(valid_skylink, valid_status_code, {}, valid_body_bytes_sent)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should log an error if timer failed to create", function()
+        stub(ngx, "log")
+        ngx.timer.at.invokes(function() return false, "such a failure" end)
+
+        skynet_tracker.track_download(valid_skylink, valid_status_code, valid_auth_headers, valid_body_bytes_sent)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_download_timer,
+            valid_skylink,
+            valid_status_code,
+            valid_auth_headers,
+            valid_body_bytes_sent
+        )
+        assert.stub(ngx.log).was_called_with(ngx.ERR, "Failed to create timer: ", "such a failure")
+
+        ngx.log:revert()
+    end)
+
+    describe("track_download_timer", function()
+        before_each(function()
+            stub(ngx, "log")
+        end)
+
+        after_each(function()
+            local resty_http = require("resty.http")
+
+            ngx.log:revert()
+            resty_http.new:revert()
+        end)
+
+        it("should exit early on premature", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 200 } -- return 200 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_download_timer(
+                true,
+                valid_skylink,
+                valid_status_code,
+                valid_auth_headers,
+                valid_body_bytes_sent
+            )
+
+            assert.stub(request_uri).was_not_called()
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should make a post request to tracker service", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 204 } -- return 204 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_download_timer(
+                false,
+                valid_skylink,
+                valid_status_code,
+                valid_auth_headers,
+                valid_body_bytes_sent
+            )
+
+            local uri_params = "status=" .. valid_status_code .. "&bytes=" .. valid_body_bytes_sent
+            local uri = "http://10.10.10.70:3000/track/download/" .. valid_skylink .. "?" .. uri_params
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should log message on tracker request failure with response code", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 404, body = "baz" } -- return 404 failure
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_download_timer(
+                false,
+                valid_skylink,
+                valid_status_code,
+                valid_auth_headers,
+                valid_body_bytes_sent
+            )
+
+            local uri_params = "status=" .. valid_status_code .. "&bytes=" .. valid_body_bytes_sent
+            local uri = "http://10.10.10.70:3000/track/download/" .. valid_skylink .. "?" .. uri_params
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_called_with(
+                ngx.ERR,
+                "Failed accounts service request /track/download/" .. valid_skylink .. ": ",
+                "[HTTP 404] baz"
+            )
+        end)
+
+        it("should log message on tracker request error", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return nil, "foo != bar" -- return error
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_download_timer(
+                false,
+                valid_skylink,
+                valid_status_code,
+                valid_auth_headers,
+                valid_body_bytes_sent
+            )
+
+            local uri_params = "status=" .. valid_status_code .. "&bytes=" .. valid_body_bytes_sent
+            local uri = "http://10.10.10.70:3000/track/download/" .. valid_skylink .. "?" .. uri_params
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_called_with(
+                ngx.ERR,
+                "Failed accounts service request /track/download/" .. valid_skylink .. ": ",
+                "foo != bar"
+            )
+        end)
+    end)
+end)
+
+describe("track_upload", function()
+    before_each(function()
+        stub(ngx.timer, "at")
+    end)
+
+    after_each(function()
+        ngx.timer.at:revert()
+    end)
+
+    it("should schedule a timer when conditions are met", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_upload(valid_skylink, valid_status_code, valid_auth_headers, valid_ip)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_upload_timer,
+            valid_skylink,
+            valid_auth_headers,
+            valid_ip
+        )
+    end)
+
+    it("should not schedule a timer if skylink is empty", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_upload(nil, valid_status_code, valid_auth_headers, valid_ip)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should not schedule a timer if status code is not in 2XX range", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        -- couple of example of 4XX and 5XX codes
+        skynet_tracker.track_upload(valid_skylink, 401, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 403, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 490, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 500, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 502, valid_auth_headers, valid_ip)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should schedule a timer if auth headers are empty", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_upload(valid_skylink, valid_status_code, {}, valid_ip)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_upload_timer,
+            valid_skylink,
+            {},
+            valid_ip
+        )
+    end)
+
+    it("should log an error if timer failed to create", function()
+        stub(ngx, "log")
+        ngx.timer.at.invokes(function() return false, "such a failure" end)
+
+        skynet_tracker.track_upload(valid_skylink, valid_status_code, valid_auth_headers, valid_ip)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_upload_timer,
+            valid_skylink,
+            valid_auth_headers,
+            valid_ip
+        )
+        assert.stub(ngx.log).was_called_with(ngx.ERR, "Failed to create timer: ", "such a failure")
+
+        ngx.log:revert()
+    end)
+
+    describe("track_upload_timer", function()
+        before_each(function()
+            stub(ngx, "log")
+        end)
+
+        after_each(function()
+            local resty_http = require("resty.http")
+
+            ngx.log:revert()
+            resty_http.new:revert()
+        end)
+
+        it("should exit early on premature", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 200 } -- return 200 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_upload_timer(
+                true,
+                valid_skylink,
+                valid_auth_headers,
+                valid_ip
+            )
+
+            assert.stub(request_uri).was_not_called()
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should make a post request to tracker service", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 204 } -- return 204 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_upload_timer(
+                false,
+                valid_skylink,
+                valid_auth_headers,
+                valid_ip
+            )
+
+            local uri = "http://10.10.10.70:3000/track/upload/" .. valid_skylink
+            assert.stub(request_uri).was_called_with(httpc, uri, {
+                method = "POST",
+                headers = {
+                    ["Content-Type"] = "application/x-www-form-urlencoded",
+                    ["Skynet-Api-Key"] = "foo",
+                },
+                body = "ip=" .. valid_ip
+            })
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should log message on tracker request failure with response code", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 404, body = "baz" } -- return 404 failure
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_upload_timer(
+                false,
+                valid_skylink,
+                valid_auth_headers,
+                valid_ip
+            )
+
+            local uri = "http://10.10.10.70:3000/track/upload/" .. valid_skylink
+            assert.stub(request_uri).was_called_with(httpc, uri, {
+                method = "POST",
+                headers = {
+                    ["Content-Type"] = "application/x-www-form-urlencoded",
+                    ["Skynet-Api-Key"] = "foo",
+                },
+                body = "ip=" .. valid_ip
+            })
+            assert.stub(ngx.log).was_called_with(
+                ngx.ERR,
+                "Failed accounts service request /track/upload/" .. valid_skylink .. ": ",
+                "[HTTP 404] baz"
+            )
+        end)
+
+        it("should log message on tracker request error", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return nil, "foo != bar" -- return error
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_upload_timer(
+                false,
+                valid_skylink,
+                valid_auth_headers,
+                valid_ip
+            )
+
+            local uri = "http://10.10.10.70:3000/track/upload/" .. valid_skylink
+            assert.stub(request_uri).was_called_with(httpc, uri, {
+                method = "POST",
+                headers = {
+                    ["Content-Type"] = "application/x-www-form-urlencoded",
+                    ["Skynet-Api-Key"] = "foo",
+                },
+                body = "ip=" .. valid_ip
+            })
+            assert.stub(ngx.log).was_called_with(
+                ngx.ERR,
+                "Failed accounts service request /track/upload/" .. valid_skylink .. ": ",
+                "foo != bar"
+            )
+        end)
+    end)
+end)
+
+describe("track_registry", function()
+    local status_code_ok = 200
+    local status_code_not_found = 404
+    local request_method_write = "POST"
+    local request_method_read = "GET"
+
+    before_each(function()
+        stub(ngx.timer, "at")
+    end)
+
+    after_each(function()
+        ngx.timer.at:revert()
+    end)
+
+    it("should schedule a timer when status code was 200", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_registry(status_code_ok, valid_auth_headers, request_method_write)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_registry_timer,
+            valid_auth_headers,
+            request_method_write
+        )
+    end)
+
+    it("should schedule a timer when status code was 404", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_registry(status_code_not_found, valid_auth_headers, request_method_write)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_registry_timer,
+            valid_auth_headers,
+            request_method_write
+        )
+    end)
+
+    it("should not schedule a timer if status code is not in 200 or 404", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        -- couple of example of invalid 2XX, 4XX and 5XX codes
+        skynet_tracker.track_registry(204, valid_auth_headers, request_method_write)
+        skynet_tracker.track_registry(206, valid_auth_headers, request_method_write)
+        skynet_tracker.track_registry(401, valid_auth_headers, request_method_write)
+        skynet_tracker.track_registry(403, valid_auth_headers, request_method_write)
+        skynet_tracker.track_registry(490, valid_auth_headers, request_method_write)
+        skynet_tracker.track_registry(500, valid_auth_headers, request_method_write)
+        skynet_tracker.track_registry(502, valid_auth_headers, request_method_write)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should not schedule a timer if auth headers are empty", function()
+        ngx.timer.at.invokes(function() return true, nil end)
+
+        skynet_tracker.track_registry(status_code_ok, {}, request_method_write)
+
+        assert.stub(ngx.timer.at).was_not_called()
+    end)
+
+    it("should log an error if timer failed to create", function()
+        stub(ngx, "log")
+        ngx.timer.at.invokes(function() return false, "such a failure" end)
+
+        skynet_tracker.track_registry(status_code_ok, valid_auth_headers, request_method_write)
+
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_registry_timer,
+            valid_auth_headers,
+            request_method_write
+        )
+        assert.stub(ngx.log).was_called_with(ngx.ERR, "Failed to create timer: ", "such a failure")
+
+        ngx.log:revert()
+    end)
+
+    describe("track_registry_timer", function()
+        before_each(function()
+            stub(ngx, "log")
+        end)
+
+        after_each(function()
+            local resty_http = require("resty.http")
+
+            ngx.log:revert()
+            resty_http.new:revert()
+        end)
+
+        it("should exit early on premature", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 200 } -- return 200 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_registry_timer(
+                true,
+                valid_auth_headers,
+                request_method_write
+            )
+
+            assert.stub(request_uri).was_not_called()
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should make a post request to registry write tracker service", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 204 } -- return 204 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_registry_timer(
+                false,
+                valid_auth_headers,
+                request_method_write
+            )
+
+            local uri = "http://10.10.10.70:3000/track/registry/write"
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should make a post request to registry read tracker service", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 204 } -- return 204 success
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_registry_timer(
+                false,
+                valid_auth_headers,
+                request_method_read
+            )
+
+            local uri = "http://10.10.10.70:3000/track/registry/read"
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_not_called()
+        end)
+
+        it("should log message on tracker request failure with response code", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return { status = 404, body = "baz" } -- return 404 failure
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_registry_timer(
+                false,
+                valid_auth_headers,
+                request_method_write
+            )
+
+            local uri = "http://10.10.10.70:3000/track/registry/write"
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_called_with(
+                ngx.ERR,
+                "Failed accounts service request /track/registry/write: ",
+                "[HTTP 404] baz"
+            )
+        end)
+
+        it("should log message on tracker request error", function()
+            local resty_http = require("resty.http")
+            local request_uri = spy.new(function()
+                return nil, "foo != bar" -- return error
+            end)
+            local httpc = mock({ request_uri = request_uri })
+            stub(resty_http, "new").returns(httpc)
+
+            skynet_tracker.track_registry_timer(
+                false,
+                valid_auth_headers,
+                request_method_write
+            )
+
+            local uri = "http://10.10.10.70:3000/track/registry/write"
+            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(ngx.log).was_called_with(
+                ngx.ERR,
+                "Failed accounts service request /track/registry/write: ",
+                "foo != bar"
+            )
+        end)
+    end)
+end)

docker/nginx/libs/skynet/utils.lua

@@ -1,13 +1,20 @@
 local _M = {}
 
+local ngx_base64 = require("ngx.base64")
+local utils = require("utils")
+
 function _M.authorization_header()
     -- read api password from env variable
-    local apipassword = os.getenv("SIA_API_PASSWORD")
+    local apipassword = utils.getenv("SIA_API_PASSWORD")
     -- if api password is not available as env variable, read it from disk
-    if apipassword == nil or apipassword == "" then
+    if not apipassword then
         -- open apipassword file for reading (b flag is required for some reason)
         -- (file /etc/.sia/apipassword has to be mounted from the host system)
         local apipassword_file = io.open("/data/sia/apipassword", "rb")
+        -- make sure to throw a meaningful error if apipassword file does not exist
+        if not apipassword_file then
+            error("Error reading /data/sia/apipassword file")
+        end
         -- read apipassword file contents and trim newline (important)
         apipassword = apipassword_file:read("*all"):gsub("%s+", "")
         -- make sure to close file after reading the password
@@ -15,7 +22,7 @@ function _M.authorization_header()
     end
     -- encode the user:password authorization string
     -- (in our case user is empty so it is just :password)
-    local content = require("ngx.base64").encode_base64url(":" .. apipassword)
+    local content = ngx_base64.encode_base64url(":" .. apipassword)
     -- set authorization header with proper base64 encoded string
     return "Basic " .. content
 end

docker/nginx/libs/skynet/utils.spec.lua

@@ -0,0 +1,65 @@
+-- luacheck: ignore io
+
+local utils = require('utils')
+local skynet_utils = require('skynet.utils')
+
+describe("authorization_header", function()
+    local apipassword = "ddd0c1430fbf2708"
+    local expected_header = "Basic OmRkZDBjMTQzMGZiZjI3MDg"
+
+    it("reads SIA_API_PASSWORD from env variable and returns a header", function()
+        -- stub getenv on SIA_API_PASSWORD
+        stub(utils, "getenv")
+        utils.getenv.on_call_with("SIA_API_PASSWORD").returns(apipassword)
+
+        local header = skynet_utils.authorization_header()
+
+        assert.is_equal(header, expected_header)
+
+        -- revert stub to original function
+        utils.getenv:revert()
+    end)
+
+    it("uses /data/sia/apipassword file if SIA_API_PASSWORD env var is missing", function()
+        -- stub /data/sia/apipassword file
+        stub(io, "open")
+        io.open.on_call_with("/data/sia/apipassword", "rb").returns(mock({
+            read = spy.new(function() return apipassword end),
+            close = spy.new()
+        }))
+
+        local header = skynet_utils.authorization_header()
+
+        assert.is_equal(header, expected_header)
+
+        -- revert stub to original function
+        io.open:revert()
+    end)
+
+    it("should choose env variable over file if both are available", function()
+        -- stub getenv on SIA_API_PASSWORD
+        stub(utils, "getenv")
+        utils.getenv.on_call_with("SIA_API_PASSWORD").returns(apipassword)
+
+        -- stub /data/sia/apipassword file
+        stub(io, "open")
+        io.open.on_call_with("/data/sia/apipassword", "rb").returns(mock({
+            read = spy.new(function() return "foooooooooooooo" end),
+            close = spy.new()
+        }))
+
+        local header = skynet_utils.authorization_header()
+
+        assert.is_equal(header, "Basic OmRkZDBjMTQzMGZiZjI3MDg")
+
+        -- revert stubs to original function
+        utils.getenv:revert()
+        io.open:revert()
+    end)
+
+    it("should error out if neither env variable is available nor file exists", function()
+        assert.has_error(function()
+            skynet_utils.authorization_header()
+        end, "Error reading /data/sia/apipassword file")
+    end)
+end)

docker/nginx/libs/utils.lua

@@ -42,4 +42,42 @@ function _M.extract_cookie_value(cookie_string, name_matcher)
     return string.sub(cookie, value_start)
 end
 
+-- utility function that builds on os.getenv to get environment variable value
+-- * will always return nil for both unset and empty env vars
+-- * parse "boolean": "true" and "1" as true, "false" and "0" as false, throws for others
+-- * parse "integer": any numerical string gets converted, otherwise returns nil
+function _M.getenv(name, parse)
+    local value = os.getenv(name)
+
+    -- treat empty string value as nil to simplify comparisons
+    if value == nil or value == "" then
+        return nil
+    end
+
+    -- do not parse the value
+    if parse == nil then
+        return value
+    end
+
+    -- try to parse as boolean
+    if parse == "boolean" then
+        if string.lower(value) == "true" or value == "1" then
+            return true
+        end
+
+        if string.lower(value) == "false" or value == "0" then
+            return false
+        end
+
+        error("utils.getenv: Parsing value '" .. tostring(value) .. "' to boolean is not supported")
+    end
+
+    -- try to parse as integer
+    if parse == "integer" then
+        return tonumber(value)
+    end
+
+    error("utils.getenv: Parsing to '" .. parse .. "' is not supported")
+end
+
 return _M

docker/nginx/libs/utils.spec.lua

@@ -1,3 +1,5 @@
+-- luacheck: ignore os
+
 local utils = require('utils')
 
 describe("is_table_empty", function()
@@ -77,3 +79,137 @@ describe("extract_cookie_value", function()
         assert.are.equals(value, "MTY0NzUyr8jD-ytiWtspm0tGabKfooxeIDuWcXhJ3lnY0eEw==")
     end)
 end)
+
+describe("getenv", function()
+    before_each(function()
+        stub(os, "getenv")
+    end)
+
+    after_each(function()
+        os.getenv:revert()
+    end)
+
+    it("should return nil for not existing env var", function()
+        os.getenv.on_call_with("foo").returns(nil)
+
+        assert.is_nil(utils.getenv("foo"))
+    end)
+
+    it("should return nil for env var that is an empty string", function()
+        os.getenv.on_call_with("foo").returns("")
+
+        assert.is_nil(utils.getenv("foo"))
+    end)
+
+    it("should return the value as is when it is non empty string", function()
+        os.getenv.on_call_with("foo").returns("bar")
+
+        assert.is_equal(utils.getenv("foo"), "bar")
+    end)
+
+    describe("parse", function()
+        it("should throw on not supported parser", function()
+            os.getenv.on_call_with("foo").returns("test")
+
+            assert.has_error(function()
+                utils.getenv("foo", "starwars")
+            end, "utils.getenv: Parsing to 'starwars' is not supported")
+        end)
+
+        describe("as boolean", function()
+            it("should return nil for not existing env var", function()
+                os.getenv.on_call_with("foo").returns(nil)
+
+                assert.is_nil(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should return nil for env var that is an empty string", function()
+                os.getenv.on_call_with("foo").returns("")
+
+                assert.is_nil(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should parse 'true' string as true", function()
+                os.getenv.on_call_with("foo").returns("true")
+
+                assert.is_true(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should parse 'True' string as true", function()
+                os.getenv.on_call_with("foo").returns("True")
+
+                assert.is_true(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should parse '1' string as true", function()
+                os.getenv.on_call_with("foo").returns("1")
+
+                assert.is_true(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should parse 'false' string as false", function()
+                os.getenv.on_call_with("foo").returns("false")
+
+                assert.is_false(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should parse 'False' string as false", function()
+                os.getenv.on_call_with("foo").returns("False")
+
+                assert.is_false(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should parse '0' string as false", function()
+                os.getenv.on_call_with("foo").returns("0")
+
+                assert.is_false(utils.getenv("foo", "boolean"))
+            end)
+
+            it("should throw an error for not supported string", function()
+                os.getenv.on_call_with("foo").returns("mandalorian")
+
+                assert.has_error(function()
+                    utils.getenv("foo", "boolean")
+                end, "utils.getenv: Parsing value 'mandalorian' to boolean is not supported")
+            end)
+        end)
+
+        describe("as integer", function()
+            it("should return nil for not existing env var", function()
+                os.getenv.on_call_with("foo").returns(nil)
+
+                assert.is_nil(utils.getenv("foo", "integer"))
+            end)
+
+            it("should return nil for env var that is an empty string", function()
+                os.getenv.on_call_with("foo").returns("")
+
+                assert.is_nil(utils.getenv("foo", "integer"))
+            end)
+
+            it("should parse '0' string as 0", function()
+                os.getenv.on_call_with("foo").returns("0")
+
+                assert.equals(utils.getenv("foo", "integer"), 0)
+            end)
+
+            it("should parse '1' string as 1", function()
+                os.getenv.on_call_with("foo").returns("1")
+
+                assert.equals(utils.getenv("foo", "integer"), 1)
+            end)
+
+            it("should parse '-1' string as -1", function()
+                os.getenv.on_call_with("foo").returns("-1")
+
+                assert.equals(utils.getenv("foo", "integer"), -1)
+            end)
+
+            it("should return nil for non numerical string", function()
+                os.getenv.on_call_with("foo").returns("test")
+
+                assert.is_nil(utils.getenv("foo", "integer"))
+            end)
+        end)
+    end)
+end)

docker/nginx/nginx.conf

@@ -19,6 +19,9 @@
 user root;
 worker_processes auto;
 
+# Enables the use of JIT for regular expressions to speed-up their processing.
+pcre_jit on;
+
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;

docker/nginx/testing/.luacov

@@ -0,0 +1,6 @@
+exclude = { 
+    "/usr/local/openresty", -- internal openresty libraries
+    "rbusted", -- busted executable
+    "basexx", -- external library https://github.com/aiq/basexx
+}
+includeuntestedfiles = true

docker/nginx/testing/Dockerfile

@@ -0,0 +1,11 @@
+FROM openresty/openresty:1.19.9.1-focal
+
+WORKDIR /etc/nginx
+
+RUN luarocks install lua-resty-http && \
+    luarocks install hasher && \
+    luarocks install busted
+
+COPY rbusted /etc/nginx/
+
+CMD ["/etc/nginx/rbusted", "--verbose", "--pattern=spec", "/usr/local/openresty/site/lualib"]

docker/nginx/testing/README.md

@@ -0,0 +1,3 @@
+# Running tests locally
+
+`docker run -v $(pwd)/docker/nginx/libs:/usr/local/openresty/site/lualib --rm -it $(docker build -q docker/nginx/testing)`

docker/nginx/testing/rbusted

@@ -0,0 +1,8 @@
+#!/usr/bin/env resty
+
+setmetatable(_G, nil)
+
+pcall(require, "luarocks.loader")
+
+-- Busted command-line runner
+require "busted.runner"({ standalone = false })

docker/sia/Dockerfile

@@ -5,12 +5,12 @@ ENV GOARCH amd64
 
 ARG branch=portal-latest
 
-RUN git clone https://gitlab.com/SkynetLabs/skyd.git Sia --single-branch --branch ${branch}
-RUN make release --directory Sia
+RUN git clone https://gitlab.com/SkynetLabs/skyd.git Sia --single-branch --branch ${branch} && \
+    make release --directory Sia
 
-FROM nebulouslabs/sia:latest
+FROM nebulouslabs/sia:1.5.6
 
 COPY --from=sia-builder /go/bin/ /usr/bin/
 
-RUN mv /usr/bin/skyd /usr/bin/siad || true && \
-    mv /usr/bin/skyc /usr/bin/siac || true
+RUN if [ -f "/usr/bin/skyd" ]; then mv /usr/bin/skyd /usr/bin/siad; fi && \
+    if [ -f "/usr/bin/skyc" ]; then mv /usr/bin/skyc /usr/bin/siac; fi

packages/dashboard-v2/Dockerfile

@@ -0,0 +1,18 @@
+FROM node:16.14.2-alpine
+
+WORKDIR /usr/app
+
+COPY package.json \
+     yarn.lock \
+     ./
+
+RUN yarn --frozen-lockfile
+
+COPY static ./static
+COPY src ./src
+COPY gatsby*.js \
+     postcss.config.js \
+     tailwind.config.js \
+     ./
+
+CMD ["sh", "-c", "yarn build && yarn serve --host 0.0.0.0 -p 9000"]

packages/dashboard-v2/README.md

@@ -11,15 +11,20 @@ This is a Gatsby application. To run it locally, all you need is:
 
 ## Accessing remote APIs
 
-To be able to log in on a local environment with your production credentials, you'll need to make the browser believe you're actually on the same domain, otherwise the browser will block the session cookie.
+To have a fully functioning local environment, you'll need to make the browser believe you're actually on the same domain as a working API (i.e. a remote dev or production server) -- otherwise the browser will block the session cookie.
+To do the trick, configure proper environment variables in the `.env.development` file.
+This file allows to easily control which domain name you want to use locally and which API you'd like to access.
 
-To do the trick, edit your `/etc/hosts` file and add a record like this:
+Example:
 
-```
-127.0.0.1 local.skynetpro.net
+```env
+GATSBY_PORTAL_DOMAIN=skynetfree.net # Use skynetfree.net APIs
+GATSBY_HOST=local.skynetfree.net # Address of your local build
 ```
 
-then run `yarn develop:secure` -- it will run `gatsby develop` with `--https --host=local.skynetpro.net -p=443` options.
-If you're on macOS, you may need to `sudo` the command to successfully bind to port `443`.
+> It's recommended to keep the 2LD the same, so any cookies dispatched by the API work without issues.
 
-> **NOTE:** This should become easier once we have a docker image for the new dashboard.
+With the file configured, run `yarn develop:secure` -- it will run `gatsby develop` with `--https -p=443` options.
+If you're on macOS, you may need to `sudo` the command to successfully bind to port `443` (https).
+
+Gatsby will automatically add a proper entry to your `/etc/hosts` file and clean it up when process exits.

packages/dashboard-v2/gatsby-browser.js

@@ -1,4 +1,7 @@
 import * as React from "react";
+import { SWRConfig } from "swr";
+import { Elements } from "@stripe/react-stripe-js";
+import { loadStripe } from "@stripe/stripe-js";
 import "@fontsource/sora/300.css"; // light
 import "@fontsource/sora/400.css"; // normal
 import "@fontsource/sora/500.css"; // medium
@@ -6,17 +9,24 @@ import "@fontsource/sora/600.css"; // semibold
 import "@fontsource/source-sans-pro/400.css"; // normal
 import "@fontsource/source-sans-pro/600.css"; // semibold
 import "./src/styles/global.css";
+import swrConfig from "./src/lib/swrConfig";
 import { MODAL_ROOT_ID } from "./src/components/Modal";
 import { PortalSettingsProvider } from "./src/contexts/portal-settings";
 
+const stripePromise = loadStripe(process.env.GATSBY_STRIPE_PUBLISHABLE_KEY);
+
 export function wrapPageElement({ element, props }) {
   const Layout = element.type.Layout ?? React.Fragment;
   return (
     <PortalSettingsProvider>
+      <SWRConfig value={swrConfig}>
+        <Elements stripe={stripePromise}>
           <Layout {...props}>
             {element}
             <div id={MODAL_ROOT_ID} />
           </Layout>
+        </Elements>
+      </SWRConfig>
     </PortalSettingsProvider>
   );
 }

packages/dashboard-v2/gatsby-config.js

@@ -1,10 +1,17 @@
+require("dotenv").config({
+  path: `.env.${process.env.NODE_ENV}`,
+});
+
 const { createProxyMiddleware } = require("http-proxy-middleware");
 
+const { GATSBY_PORTAL_DOMAIN } = process.env;
+
 module.exports = {
   siteMetadata: {
-    title: `Accounts Dashboard`,
-    siteUrl: `https://www.yourdomain.tld`,
+    title: `Account Dashboard`,
+    siteUrl: `https://account.${GATSBY_PORTAL_DOMAIN}`,
   },
+  pathPrefix: "/v2",
   trailingSlash: "never",
   plugins: [
     "gatsby-plugin-image",
@@ -18,19 +25,33 @@ module.exports = {
       resolve: "gatsby-source-filesystem",
       options: {
         name: "images",
-        path: "./src/images/",
+        path: "./static/images/",
       },
       __key: "images",
     },
   ],
   developMiddleware: (app) => {
+    // Proxy Accounts service API requests:
     app.use(
       "/api/",
       createProxyMiddleware({
-        target: "https://account.skynetpro.net",
+        target: `https://account.${GATSBY_PORTAL_DOMAIN}`,
         secure: false, // Do not reject self-signed certificates.
         changeOrigin: true,
       })
     );
+
+    // Proxy /skynet requests (e.g. uploads)
+    app.use(
+      ["/skynet", "/__internal/"],
+      createProxyMiddleware({
+        target: `https://${GATSBY_PORTAL_DOMAIN}`,
+        secure: false, // Do not reject self-signed certificates.
+        changeOrigin: true,
+        pathRewrite: {
+          "^/skynet": "",
+        },
+      })
+    );
   },
 };

packages/dashboard-v2/gatsby-ssr.js

@@ -1,4 +1,7 @@
 import * as React from "react";
+import { SWRConfig } from "swr";
+import { Elements } from "@stripe/react-stripe-js";
+import { loadStripe } from "@stripe/stripe-js";
 import "@fontsource/sora/300.css"; // light
 import "@fontsource/sora/400.css"; // normal
 import "@fontsource/sora/500.css"; // medium
@@ -6,17 +9,24 @@ import "@fontsource/sora/600.css"; // semibold
 import "@fontsource/source-sans-pro/400.css"; // normal
 import "@fontsource/source-sans-pro/600.css"; // semibold
 import "./src/styles/global.css";
+import swrConfig from "./src/lib/swrConfig";
 import { MODAL_ROOT_ID } from "./src/components/Modal";
 import { PortalSettingsProvider } from "./src/contexts/portal-settings";
 
+const stripePromise = loadStripe(process.env.GATSBY_STRIPE_PUBLISHABLE_KEY);
+
 export function wrapPageElement({ element, props }) {
   const Layout = element.type.Layout ?? React.Fragment;
   return (
     <PortalSettingsProvider>
+      <SWRConfig value={swrConfig}>
+        <Elements stripe={stripePromise}>
           <Layout {...props}>
             {element}
             <div id={MODAL_ROOT_ID} />
           </Layout>
+        </Elements>
+      </SWRConfig>
     </PortalSettingsProvider>
   );
 }

packages/dashboard-v2/package.json

@@ -9,10 +9,10 @@
   ],
   "scripts": {
     "develop": "gatsby develop",
-    "develop:secure": "gatsby develop --https --host=local.skynetpro.net -p=443",
+    "develop:secure": "dotenv -e .env.development -- gatsby develop --https -p=443",
     "start": "gatsby develop",
-    "build": "gatsby build",
-    "serve": "gatsby serve",
+    "build": "gatsby build --prefix-paths",
+    "serve": "gatsby serve --prefix-paths",
     "clean": "gatsby clean",
     "lint": "eslint .",
     "prettier": "prettier .",
@@ -22,6 +22,8 @@
   "dependencies": {
     "@fontsource/sora": "^4.5.3",
     "@fontsource/source-sans-pro": "^4.5.3",
+    "@stripe/react-stripe-js": "^1.7.1",
+    "@stripe/stripe-js": "^1.27.0",
     "classnames": "^2.3.1",
     "copy-text-to-clipboard": "^3.0.1",
     "dayjs": "^1.10.8",
@@ -33,7 +35,6 @@
     "nanoid": "^3.3.1",
     "path-browserify": "^1.0.1",
     "postcss": "^8.4.6",
-    "pretty-bytes": "^6.0.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-dropzone": "^12.0.4",
@@ -60,6 +61,8 @@
     "babel-loader": "^8.2.3",
     "babel-plugin-preval": "^5.1.0",
     "babel-plugin-styled-components": "^2.0.2",
+    "dotenv": "^16.0.0",
+    "dotenv-cli": "^5.1.0",
     "eslint": "^8.9.0",
     "eslint-config-react-app": "^7.0.0",
     "eslint-plugin-storybook": "^0.5.6",

packages/dashboard-v2/src/components/APIKeyList/APIKey.js

@@ -4,7 +4,7 @@ import { useCallback, useState } from "react";
 
 import { Alert } from "../Alert";
 import { Button } from "../Button";
-import { AddSkylinkToAPIKeyForm } from "../forms/AddSkylinkToAPIKeyForm";
+import { AddSkylinkToSponsorKeyForm } from "../forms/AddSkylinkToSponsorKeyForm";
 import { CogIcon, TrashIcon } from "../Icons";
 import { Modal } from "../Modal";
 
@@ -13,7 +13,7 @@ import { useAPIKeyRemoval } from "./useAPIKeyRemoval";
 
 export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
   const { id, name, createdAt, skylinks } = apiKey;
-  const isPublic = apiKey.public === "true";
+  const isSponsorKey = apiKey.public === "true";
   const [error, setError] = useState(null);
 
   const onSkylinkListEdited = useCallback(() => {
@@ -53,9 +53,9 @@ export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
   }, [abortEdit]);
 
   const skylinksNumber = skylinks?.length ?? 0;
-  const isNotConfigured = isPublic && skylinksNumber === 0;
+  const isNotConfigured = isSponsorKey && skylinksNumber === 0;
   const skylinksPhrasePrefix = skylinksNumber === 0 ? "No" : skylinksNumber;
-  const skylinksPhrase = `${skylinksPhrasePrefix} ${skylinksNumber === 1 ? "skylink" : "skylinks"} configured`;
+  const skylinksPhrase = `${skylinksPhrasePrefix} ${skylinksNumber === 1 ? "skylink" : "skylinks"} sponsored`;
 
   return (
     <li
@@ -66,6 +66,7 @@ export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
       <span className="col-span-2 sm:col-span-1 flex items-center">
         <span className="flex flex-col">
           <span className={cn("truncate", { "text-palette-300": !name })}>{name || "unnamed key"}</span>
+          {isSponsorKey && (
             <button
               onClick={promptEdit}
               className={cn("text-xs hover:underline decoration-dotted", {
@@ -75,21 +76,28 @@ export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
             >
               {skylinksPhrase}
             </button>
+          )}
         </span>
       </span>
       <span className="col-span-2 my-4 border-t border-t-palette-200/50 sm:hidden" />
       <span className="text-palette-400">{dayjs(createdAt).format("MMM DD, YYYY")}</span>
       <span className="flex items-center justify-end">
-        {isPublic && (
+        {isSponsorKey && (
           <button
             title="Add or remove skylinks"
+            aria-label="Add or remove skylinks"
             className="p-1 transition-colors hover:text-primary"
             onClick={promptEdit}
           >
             <CogIcon size={22} />
           </button>
         )}
-        <button title="Delete this API key" className="p-1 transition-colors hover:text-error" onClick={promptRemoval}>
+        <button
+          title="Delete this API key"
+          aria-label="Delete this API key"
+          className="p-1 transition-colors hover:text-error"
+          onClick={promptRemoval}
+        >
           <TrashIcon size={16} />
         </button>
       </span>
@@ -113,7 +121,7 @@ export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
       )}
       {editInitiated && (
         <Modal onClose={closeEditModal} className="flex flex-col gap-4 text-center sm:px-8 sm:py-6">
-          <h4>Covered skylinks</h4>
+          <h4>Sponsored skylinks</h4>
           {skylinks?.length > 0 ? (
             <ul className="text-xs flex flex-col gap-2">
               {skylinks.map((skylink) => (
@@ -121,7 +129,11 @@ export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
                   <code className="whitespace-nowrap select-all truncate bg-palette-100 odd:bg-white p-1">
                     {skylink}
                   </code>
-                  <button className="p-1 transition-colors hover:text-error" onClick={() => removeSkylink(skylink)}>
+                  <button
+                    className="p-1 transition-colors hover:text-error"
+                    onClick={() => removeSkylink(skylink)}
+                    aria-label="Remove skylink"
+                  >
                     <TrashIcon size={16} />
                   </button>
                 </li>
@@ -133,7 +145,7 @@ export const APIKey = ({ apiKey, onRemoved, onEdited, onRemovalError }) => {
 
           <div className="flex flex-col gap-4">
             {error && <Alert $variant="error">{error}</Alert>}
-            <AddSkylinkToAPIKeyForm addSkylink={addSkylink} />
+            <AddSkylinkToSponsorKeyForm addSkylink={addSkylink} />
           </div>
           <div className="flex gap-4 justify-center mt-4">
             <Button onClick={closeEditModal}>Close</Button>

packages/dashboard-v2/src/components/AvatarUploader/AvatarUploader.js

@@ -1,16 +1,16 @@
 import { useEffect, useState } from "react";
 
 import { useUser } from "../../contexts/user";
-import { SimpleUploadIcon } from "../Icons";
+// import { SimpleUploadIcon } from "../Icons";
 
-const AVATAR_PLACEHOLDER = "/images/avatar-placeholder.svg";
+import avatarPlaceholder from "../../../static/images/avatar-placeholder.svg";
 
 export const AvatarUploader = (props) => {
   const { user } = useUser();
-  const [imageUrl, setImageUrl] = useState(AVATAR_PLACEHOLDER);
+  const [imageUrl, setImageUrl] = useState(avatarPlaceholder);
 
   useEffect(() => {
-    setImageUrl(user.avatarUrl ?? AVATAR_PLACEHOLDER);
+    setImageUrl(user.avatarUrl ?? avatarPlaceholder);
   }, [user]);
 
   return (
@@ -20,6 +20,7 @@ export const AvatarUploader = (props) => {
       >
         <img src={imageUrl} className="w-[160px]" alt="" />
       </div>
+      {/* TODO: uncomment when avatar uploads work
       <div className="flex justify-center">
         <button
           className="flex items-center gap-4 hover:underline decoration-1 decoration-dashed underline-offset-2 decoration-gray-400"
@@ -28,8 +29,8 @@ export const AvatarUploader = (props) => {
         >
           <SimpleUploadIcon size={20} className="shrink-0" /> Upload profile picture
         </button>
-        {/* TODO: actual uploading */}
       </div>
+      */}
     </div>
   );
 };

packages/dashboard-v2/src/components/Button/Button.js

@@ -5,15 +5,25 @@ import styled from "styled-components";
 /**
  * Primary UI component for user interaction
  */
-export const Button = styled.button.attrs(({ disabled, $primary, type }) => ({
-  type,
-  className: cn("px-6 py-2.5 rounded-full font-sans uppercase text-xs tracking-wide transition-[opacity_filter]", {
+export const Button = styled.button.attrs(({ as: polymorphicAs, disabled, $primary, type }) => {
+  // We want to default to type=button in most cases, but sometimes we use this component
+  // as a polymorphic one (i.e. for links), and then we should avoid setting `type` property,
+  // as it breaks styling in Safari.
+  const typeAttr = polymorphicAs && polymorphicAs !== "button" ? undefined : type;
+
+  return {
+    type: typeAttr,
+    className: cn(
+      "px-6 py-2.5 inline-block rounded-full font-sans uppercase text-xs tracking-wide transition-[opacity_filter]",
+      {
         "bg-primary text-palette-600": $primary,
         "bg-white border-2 border-black text-palette-600": !$primary,
         "cursor-not-allowed opacity-60": disabled,
         "hover:brightness-90": !disabled,
-  }),
-}))``;
+      }
+    ),
+  };
+})``;
 
 Button.propTypes = {
   /**

packages/dashboard-v2/src/components/CopyButton.js

@@ -22,7 +22,7 @@ const TooltipContent = styled.div.attrs({
   className: "bg-primary-light/10 text-palette-600 py-2 px-4 ",
 })``;
 
-export const CopyButton = ({ value, className }) => {
+export const CopyButton = ({ value, className, ariaLabel = "Copy" }) => {
   const containerRef = useRef();
   const [copied, setCopied] = useState(false);
   const [timer, setTimer] = useState(null);
@@ -39,7 +39,7 @@ export const CopyButton = ({ value, className }) => {
 
   return (
     <div ref={containerRef} className={`inline-flex relative overflow-visible pr-2 ${className ?? ""}`}>
-      <Button onClick={handleCopy} className={copied ? "text-primary" : ""}>
+      <Button onClick={handleCopy} className={copied ? "text-primary" : ""} aria-label={ariaLabel}>
         <CopyIcon size={16} />
       </Button>
       <TooltipContainer $visible={copied}>

packages/dashboard-v2/src/components/CurrentPlan/CurrentPlan.js

@@ -3,6 +3,7 @@ import relativeTime from "dayjs/plugin/relativeTime";
 
 import { useUser } from "../../contexts/user";
 import useActivePlan from "../../hooks/useActivePlan";
+import humanBytes from "../../lib/humanBytes";
 import { ContainerLoadingIndicator } from "../LoadingIndicator";
 
 import LatestPayment from "./LatestPayment";
@@ -28,17 +29,20 @@ const CurrentPlan = () => {
   }
 
   return (
-    <div>
+    <div className="flex flex-col h-full">
       <h4>{activePlan.name}</h4>
-      <div className="text-palette-400">
-        {activePlan.price === 0 && <p>100GB without paying a dime! 🎉</p>}
+      <div className="text-palette-400 justify-between flex flex-col grow">
+        {activePlan.price === 0 && activePlan.limits && (
+          <p>{humanBytes(activePlan.limits.storageLimit)} without paying a dime! 🎉</p>
+        )}
         {activePlan.price !== 0 &&
           (user.subscriptionCancelAtPeriodEnd ? (
             <p>Your subscription expires {dayjs(user.subscribedUntil).fromNow()}</p>
           ) : (
             <p className="first-letter:uppercase">{dayjs(user.subscribedUntil).fromNow(true)} until the next payment</p>
           ))}
-        <LatestPayment user={user} />
+
+        {user.subscriptionStatus && <LatestPayment user={user} />}
         <SuggestedPlan plans={plans} activePlan={activePlan} />
       </div>
     </div>

packages/dashboard-v2/src/components/CurrentPlan/SuggestedPlan.js

@@ -14,7 +14,7 @@ const SuggestedPlan = ({ plans, activePlan }) => {
     <div className="mt-7">
       <p className="font-sans font-semibold text-xs uppercase text-primary">Discover {nextPlan.name}</p>
       <p className="pt-1 text-xs sm:text-base">{nextPlan.description}</p>
-      <Button $primary as={Link} to={`/upgrade?selectedPlan=${nextPlan.id}`} className="mt-6">
+      <Button $primary as={Link} to="/payments" className="mt-6">
         Upgrade
       </Button>
     </div>

packages/dashboard-v2/src/components/CurrentUsage/CurrentUsage.js

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from "react";
-import fileSize from "pretty-bytes";
 import { Link } from "gatsby";
+import cn from "classnames";
 import useSWR from "swr";
 
 import { useUser } from "../../contexts/user";
@@ -9,6 +9,7 @@ import { ContainerLoadingIndicator } from "../LoadingIndicator";
 
 import { GraphBar } from "./GraphBar";
 import { UsageGraph } from "./UsageGraph";
+import humanBytes from "../../lib/humanBytes";
 
 const useUsageData = () => {
   const { user } = useUser();
@@ -44,7 +45,7 @@ const useUsageData = () => {
 };
 
 const size = (bytes) => {
-  const text = fileSize(bytes ?? 0, { maximumFractionDigits: 0 });
+  const text = humanBytes(bytes ?? 0, { precision: 0 });
   const [value, unit] = text.split(" ");
 
   return {
@@ -62,7 +63,9 @@ const ErrorMessage = () => (
 );
 
 export default function CurrentUsage() {
+  const { activePlan, plans } = useActivePlan();
   const { usage, error, loading } = useUsageData();
+  const nextPlan = useMemo(() => plans.find(({ tier }) => tier > activePlan?.tier), [plans, activePlan]);
   const storageUsage = size(usage.storageUsed);
   const storageLimit = size(usage.storageLimit);
   const filesUsedLabel = useMemo(() => ({ value: usage.filesUsed, unit: "files" }), [usage.filesUsed]);
@@ -89,19 +92,21 @@ export default function CurrentUsage() {
           <span>{storageLimit.text}</span>
         </div>
         <UsageGraph>
-          <GraphBar value={usage.storageUsed} limit={usage.storageLimit} label={storageUsage} />
+          <GraphBar value={usage.storageUsed} limit={usage.storageLimit} label={storageUsage} className="normal-case" />
           <GraphBar value={usage.filesUsed} limit={usage.filesLimit} label={filesUsedLabel} />
         </UsageGraph>
         <div className="flex place-content-between">
           <span>Files</span>
           <span className="inline-flex place-content-between w-[37%]">
             <Link
-              to="/upgrade"
-              className="text-primary underline-offset-3 decoration-dotted hover:text-primary-light hover:underline"
+              to="/payments"
+              className={cn(
+                "text-primary underline-offset-3 decoration-dotted hover:text-primary-light hover:underline",
+                { invisible: !nextPlan }
+              )}
             >
               UPGRADE
             </Link>{" "}
-            {/* TODO: proper URL */}
             <span>{usage.filesLimit}</span>
           </span>
         </div>

packages/dashboard-v2/src/components/CurrentUsage/GraphBar.js

@@ -12,18 +12,20 @@ const BarTip = styled.span.attrs({
 })``;
 
 const BarLabel = styled.span.attrs({
-  className: "bg-white rounded border-2 border-palette-200 px-3 whitespace-nowrap absolute shadow",
+  className: "usage-label bg-white rounded border-2 border-palette-200 px-3 whitespace-nowrap absolute shadow",
 })`
-  right: max(0%, ${({ $percentage }) => 100 - $percentage}%);
+  ${({ $percentage }) => `
+    left: max(0%, ${$percentage}%);
     top: -0.5rem;
-  transform: translateX(50%);
+    transform: translateX(-${$percentage}%);
+  `}
 `;
 
-export const GraphBar = ({ value, limit, label }) => {
+export const GraphBar = ({ value, limit, label, className }) => {
   const percentage = typeof limit !== "number" || limit === 0 ? 0 : (value / limit) * 100;
 
   return (
-    <div className="relative flex items-center">
+    <div className={`relative flex items-center ${className}`}>
       <Bar $percentage={percentage}>
         <BarTip />
       </Bar>

packages/dashboard-v2/src/components/CurrentUsage/UsageGraph.js

@@ -1,9 +1,11 @@
 import styled from "styled-components";
 
+import usageGraphBg from "../../../static/images/usage-graph-bg.svg";
+
 export const UsageGraph = styled.div.attrs({
   className: "w-full my-3 grid grid-flow-row grid-rows-2",
 })`
   height: 146px;
-  background: url(/images/usage-graph-bg.svg) no-repeat;
+  background: url(${usageGraphBg}) no-repeat;
   background-size: cover;
 `;

packages/dashboard-v2/src/components/DropdownMenu/DropdownMenu.js

@@ -7,13 +7,10 @@ import { ChevronDownIcon } from "../Icons";
 
 const dropDown = keyframes`
   0% {
-    transform: scaleY(0);
-  }
-  80% {
-    transform: scaleY(1.1);
+    transform: rotateX(-90deg);
   }
   100% {
-    transform: scaleY(1);
+    transform: rotateX(0deg);
   }
 `;
 
@@ -35,10 +32,11 @@ const Flyout = styled.div.attrs(({ open }) => ({
               bg-white shadow-md shadow-palette-200/50
               ${open ? "visible" : "invisible"}`,
 }))`
+  transform-origin: top center;
   animation: ${({ open }) =>
     open
       ? css`
-          ${dropDown} 0.1s ease-in-out
+          ${dropDown} .15s ease-in-out forwards;
         `
       : "none"};
 `;

packages/dashboard-v2/src/components/FileList/FileList.js

@@ -1,29 +1,40 @@
-import * as React from "react";
+import { useState } from "react";
 import useSWR from "swr";
 import { useMedia } from "react-use";
 
 import theme from "../../lib/theme";
 
 import { ContainerLoadingIndicator } from "../LoadingIndicator";
-import { Select, SelectOption } from "../Select";
-import { Switch } from "../Switch";
-import { TextInputIcon } from "../TextInputIcon/TextInputIcon";
-import { SearchIcon } from "../Icons";
 
 import FileTable from "./FileTable";
 import useFormattedFilesData from "./useFormattedFilesData";
+import { MobileFileList } from "./MobileFileList";
+import { Pagination } from "./Pagination";
+
+const PAGE_SIZE = 10;
 
 const FileList = ({ type }) => {
   const isMediumScreenOrLarger = useMedia(`(min-width: ${theme.screens.md})`);
-  const { data, error } = useSWR(`user/${type}?pageSize=10`);
+  const [offset, setOffset] = useState(0);
+  const baseUrl = `user/${type}?pageSize=${PAGE_SIZE}`;
+  const {
+    data,
+    error,
+    mutate: refreshList,
+  } = useSWR(`${baseUrl}&offset=${offset}`, {
+    revalidateOnMount: true,
+  });
   const items = useFormattedFilesData(data?.items || []);
+  const count = data?.count || 0;
 
-  const setFilter = (name, value) => console.log("filter", name, "set to", value);
+  // Next page preloading
+  const hasMoreRecords = data ? data.offset + data.pageSize < data.count : false;
+  const nextPageOffset = hasMoreRecords ? data.offset + data.pageSize : offset;
+  useSWR(`${baseUrl}&offset=${nextPageOffset}`);
 
   if (!items.length) {
     return (
       <div className="flex w-full h-full justify-center items-center text-palette-400">
-        {/* TODO: proper error message */}
         {!data && !error && <ContainerLoadingIndicator />}
         {!data && error && <p>An error occurred while loading this data.</p>}
         {data && <p>No {type} found.</p>}
@@ -32,42 +43,14 @@ const FileList = ({ type }) => {
   }
 
   return (
-    <div className="flex flex-col gap-4 pt-4">
-      <div className="flex flex-col gap-4 lg:flex-row justify-between items-center">
-        <TextInputIcon
-          className="w-full lg:w-[280px] xl:w-[420px]"
-          placeholder="Search"
-          icon={<SearchIcon size={20} />}
-          onChange={console.log.bind(console)}
-        />
-        <div className="flex flex-row items-center uppercase font-light text-sm gap-4">
-          <Switch onChange={(value) => setFilter("showSmallFiles", value)} className="mr-8">
-            <span className="underline decoration-dashed underline-offset-2 decoration-2 decoration-gray-300">
-              Show small files
-            </span>
-          </Switch>
-          <div>
-            <span className="pr-2">File type:</span>
-            <Select onChange={(value) => setFilter("type", value)}>
-              <SelectOption value="all" label="All" />
-              <SelectOption value="mp4" label=".mp4" />
-              <SelectOption value="pdf" label=".pdf" />
-            </Select>
-          </div>
-          <div>
-            <span className="pr-2">Sort:</span>
-            <Select onChange={(value) => setFilter("type", value)}>
-              <SelectOption value="size-desc" label="Biggest size" />
-              <SelectOption value="size-asc" label="Smallest size" />
-              <SelectOption value="date-desc" label="Latest" />
-              <SelectOption value="date-asc" label="Oldest" />
-            </Select>
-          </div>
-        </div>
-      </div>
-      {/* TODO: mobile view (it's not tabular) */}
-      {isMediumScreenOrLarger ? <FileTable items={items} /> : "Mobile view"}
-    </div>
+    <>
+      {isMediumScreenOrLarger ? (
+        <FileTable onUpdated={refreshList} items={items} />
+      ) : (
+        <MobileFileList items={items} onUpdated={refreshList} />
+      )}
+      <Pagination count={count} offset={offset} setOffset={setOffset} pageSize={PAGE_SIZE} />
+    </>
   );
 };
 

packages/dashboard-v2/src/components/FileList/FileTable.js

@@ -2,72 +2,47 @@ import { CogIcon, ShareIcon } from "../Icons";
 import { PopoverMenu } from "../PopoverMenu/PopoverMenu";
 import { Table, TableBody, TableCell, TableHead, TableHeadCell, TableRow } from "../Table";
 import { CopyButton } from "../CopyButton";
+import { useSkylinkOptions } from "./useSkylinkOptions";
+import { useSkylinkSharing } from "./useSkylinkSharing";
 
-const buildShareMenu = (item) => {
-  return [
-    {
-      label: "Facebook",
-      callback: () => {
-        console.info("share to Facebook", item);
-      },
-    },
-    {
-      label: "Twitter",
-      callback: () => {
-        console.info("share to Twitter", item);
-      },
-    },
-    {
-      label: "Discord",
-      callback: () => {
-        console.info("share to Discord", item);
-      },
-    },
-  ];
-};
+const SkylinkOptionsMenu = ({ skylink, onUpdated }) => {
+  const { inProgress, options } = useSkylinkOptions({ skylink, onUpdated });
 
-const buildOptionsMenu = (item) => {
-  return [
-    {
-      label: "Preview",
-      callback: () => {
-        console.info("preview", item);
-      },
-    },
-    {
-      label: "Download",
-      callback: () => {
-        console.info("download", item);
-      },
-    },
-    {
-      label: "Unpin",
-      callback: () => {
-        console.info("unpin", item);
-      },
-    },
-    {
-      label: "Report",
-      callback: () => {
-        console.info("report", item);
-      },
-    },
-  ];
-};
-
-export default function FileTable({ items }) {
   return (
+    <PopoverMenu inProgress={inProgress} options={options} openClassName="text-primary">
+      <button aria-label="Manage this skylink">
+        <CogIcon />
+      </button>
+    </PopoverMenu>
+  );
+};
+
+const SkylinkSharingMenu = ({ skylink }) => {
+  const { options } = useSkylinkSharing(skylink);
+
+  return (
+    <PopoverMenu options={options} openClassName="text-primary">
+      <button aria-label="Share this skylink">
+        <ShareIcon size={22} />
+      </button>
+    </PopoverMenu>
+  );
+};
+
+export default function FileTable({ items, onUpdated }) {
+  return (
+    <div className="flex flex-col gap-4">
       <Table style={{ tableLayout: "fixed" }}>
         <TableHead>
           <TableRow noHoverEffect>
-          <TableHeadCell className="w-[240px] xl:w-[360px]">Name</TableHeadCell>
+            <TableHeadCell className="w-[180px] xl:w-[360px]">Name</TableHeadCell>
             <TableHeadCell className="w-[80px]">Type</TableHeadCell>
-          <TableHeadCell className="w-[80px]" align="right">
+            <TableHeadCell className="w-[100px]" align="right">
               Size
             </TableHeadCell>
-          <TableHeadCell className="w-[180px]">Uploaded</TableHeadCell>
+            <TableHeadCell className="w-[160px]">Uploaded</TableHeadCell>
             <TableHeadCell className="hidden lg:table-cell">Skylink</TableHeadCell>
-          <TableHeadCell className="w-[100px]">Activity</TableHeadCell>
+            <TableHeadCell className="w-[90px]">Activity</TableHeadCell>
           </TableRow>
         </TableHead>
         <TableBody>
@@ -76,30 +51,22 @@ export default function FileTable({ items }) {
 
             return (
               <TableRow key={id}>
-              <TableCell className="w-[240px] xl:w-[360px]">{name}</TableCell>
+                <TableCell className="w-[180px] xl:w-[360px]">{name}</TableCell>
                 <TableCell className="w-[80px]">{type}</TableCell>
-              <TableCell className="w-[80px]" align="right">
+                <TableCell className="w-[100px]" align="right">
                   {size}
                 </TableCell>
-              <TableCell className="w-[180px]">{date}</TableCell>
+                <TableCell className="w-[160px]">{date}</TableCell>
                 <TableCell className="hidden lg:table-cell pr-6 !overflow-visible">
                   <div className="flex items-center">
-                  <CopyButton value={skylink} className="mr-2" />
+                    <CopyButton value={skylink} className="mr-2" aria-label="Copy skylink" />
                     <span className="w-full inline-block truncate">{skylink}</span>
                   </div>
                 </TableCell>
-              <TableCell className="w-[100px] !overflow-visible">
+                <TableCell className="w-[90px] !overflow-visible">
                   <div className="flex text-palette-600 gap-4">
-                  <PopoverMenu options={buildShareMenu(item)} openClassName="text-primary">
-                    <button>
-                      <ShareIcon size={22} />
-                    </button>
-                  </PopoverMenu>
-                  <PopoverMenu options={buildOptionsMenu(item)} openClassName="text-primary">
-                    <button>
-                      <CogIcon />
-                    </button>
-                  </PopoverMenu>
+                    <SkylinkOptionsMenu skylink={skylink} onUpdated={onUpdated} />
+                    <SkylinkSharingMenu skylink={skylink} />
                   </div>
                 </TableCell>
               </TableRow>
@@ -107,5 +74,6 @@ export default function FileTable({ items }) {
           })}
         </TableBody>
       </Table>
+    </div>
   );
 }

packages/dashboard-v2/src/components/FileList/MobileFileList.js

@@ -0,0 +1,84 @@
+import { useState } from "react";
+import cn from "classnames";
+
+import { ChevronDownIcon } from "../Icons";
+import { useSkylinkSharing } from "./useSkylinkSharing";
+import { ContainerLoadingIndicator } from "../LoadingIndicator";
+import { useSkylinkOptions } from "./useSkylinkOptions";
+
+const SharingMenu = ({ skylink }) => {
+  const { options } = useSkylinkSharing(skylink);
+
+  return (
+    <div className="flex flex-col gap-4 bg-white px-4 py-6 w-1/2">
+      {options.map(({ label, callback }, index) => (
+        <button key={index} className="uppercase text-left" onClick={callback}>
+          {label}
+        </button>
+      ))}
+    </div>
+  );
+};
+
+const OptionsMenu = ({ skylink, onUpdated }) => {
+  const { inProgress, options } = useSkylinkOptions({ skylink, onUpdated });
+
+  return (
+    <div className={cn("relative px-4 py-6 w-1/2", { "bg-primary/10": !inProgress })}>
+      <div className={cn("flex flex-col gap-4", { "opacity-0": inProgress })}>
+        {options.map(({ label, callback }, index) => (
+          <button key={index} className="uppercase text-left" onClick={callback}>
+            {label}
+          </button>
+        ))}
+      </div>
+      {inProgress && (
+        <ContainerLoadingIndicator className="absolute inset-0 !p-0 z-50 bg-primary/10 !text-palette-200" />
+      )}
+    </div>
+  );
+};
+
+const ListItem = ({ item, onUpdated }) => {
+  const { name, type, size, date, skylink } = item;
+  const [open, setOpen] = useState(false);
+
+  const toggle = () => setOpen((open) => !open);
+
+  return (
+    <div className={cn("p-4 flex flex-col bg-palette-100", { "bg-opacity-50": !open })}>
+      <div className="flex items-center gap-4 justify-between">
+        <div className="info flex flex-col gap-2 truncate">
+          <div className="truncate">{name}</div>
+          <div className="flex divide-x divide-palette-200 text-xs">
+            <span className="px-1">{type}</span>
+            <span className="px-1">{size}</span>
+            <span className="px-1">{date}</span>
+          </div>
+        </div>
+        <button onClick={toggle}>
+          <ChevronDownIcon className={cn("transition-[transform]", { "-scale-100": open })} />
+        </button>
+      </div>
+      <div
+        className={cn(
+          "flex transition-[max-height_padding] overflow-hidden text-xs text-left font-sans tracking-normal",
+          { "pt-4 max-h-[150px]": open, "pt-0 max-h-0": !open }
+        )}
+      >
+        <SharingMenu skylink={skylink} />
+        <OptionsMenu skylink={skylink} onUpdated={onUpdated} />
+      </div>
+    </div>
+  );
+};
+
+export const MobileFileList = ({ items, onUpdated }) => {
+  return (
+    <div className="flex flex-col gap-2">
+      {items.map((item) => (
+        <ListItem key={item.id} item={item} onUpdated={onUpdated} />
+      ))}
+    </div>
+  );
+};

packages/dashboard-v2/src/components/FileList/Pagination.js

@@ -0,0 +1,32 @@
+import { Button } from "../Button";
+
+export const Pagination = ({ count, offset, setOffset, pageSize }) => {
+  const start = count ? offset + 1 : 0;
+  const end = offset + pageSize > count ? count : offset + pageSize;
+
+  const showPaginationButtons = offset > 0 || count > end;
+
+  return (
+    <nav className="px-4 py-3 flex items-center justify-between" aria-label="Pagination">
+      <div className="hidden sm:block">
+        <p className="text-sm text-gray-700">
+          Showing {start} to {end} of {count} results
+        </p>
+      </div>
+      {showPaginationButtons && (
+        <div className="flex-1 flex justify-between sm:justify-end space-x-3">
+          <Button disabled={offset - pageSize < 0} onClick={() => setOffset(offset - pageSize)} className="!border-0">
+            Previous page
+          </Button>
+          <Button
+            disabled={offset + pageSize >= count}
+            onClick={() => setOffset(offset + pageSize)}
+            className="!border-0"
+          >
+            Next page
+          </Button>
+        </div>
+      )}
+    </nav>
+  );
+};

packages/dashboard-v2/src/components/FileList/useFormattedFilesData.js

@@ -1,6 +1,7 @@
 import { useMemo } from "react";
-import prettyBytes from "pretty-bytes";
 import dayjs from "dayjs";
+import { DATE_FORMAT } from "../../lib/config";
+import humanBytes from "../../lib/humanBytes";
 
 const parseFileName = (fileName) => {
   const lastDotIndex = Math.max(0, fileName.lastIndexOf(".")) || Infinity;
@@ -10,12 +11,12 @@ const parseFileName = (fileName) => {
 
 const formatItem = ({ size, name: rawFileName, uploadedOn, downloadedOn, ...rest }) => {
   const [name, type] = parseFileName(rawFileName);
-  const date = dayjs(uploadedOn || downloadedOn).format("MM/DD/YYYY; HH:MM");
+  const date = dayjs(uploadedOn || downloadedOn).format(DATE_FORMAT);
 
   return {
     ...rest,
     date,
-    size: prettyBytes(size),
+    size: humanBytes(size, { precision: 2 }),
     type,
     name,
   };

packages/dashboard-v2/src/components/FileList/useSkylinkOptions.js

@@ -0,0 +1,35 @@
+import { useMemo, useState } from "react";
+
+import accountsService from "../../services/accountsService";
+import skynetClient from "../../services/skynetClient";
+
+export const useSkylinkOptions = ({ skylink, onUpdated }) => {
+  const [inProgress, setInProgress] = useState(false);
+
+  const options = useMemo(
+    () => [
+      {
+        label: "Preview",
+        callback: async () => window.open(await skynetClient.getSkylinkUrl(skylink)),
+      },
+      {
+        label: "Download",
+        callback: () => skynetClient.downloadFile(skylink),
+      },
+      {
+        label: "Unpin",
+        callback: async () => {
+          setInProgress(true);
+          await accountsService.delete(`user/uploads/${skylink}`);
+          await onUpdated(); // No need to setInProgress(false), since at this point this hook should already be unmounted
+        },
+      },
+    ],
+    [skylink, onUpdated]
+  );
+
+  return {
+    inProgress,
+    options,
+  };
+};

packages/dashboard-v2/src/components/FileList/useSkylinkSharing.js

@@ -0,0 +1,40 @@
+import { useEffect, useMemo, useState } from "react";
+import copy from "copy-text-to-clipboard";
+
+import skynetClient from "../../services/skynetClient";
+
+const COPY_LINK_LABEL = "Copy link";
+
+export const useSkylinkSharing = (skylink) => {
+  const [copied, setCopied] = useState(false);
+  const [copyLabel, setCopyLabel] = useState(COPY_LINK_LABEL);
+
+  useEffect(() => {
+    if (copied) {
+      setCopyLabel("Copied!");
+
+      const timeout = setTimeout(() => setCopied(false), 1500);
+
+      return () => clearTimeout(timeout);
+    } else {
+      setCopyLabel(COPY_LINK_LABEL);
+    }
+  }, [copied]);
+
+  const options = useMemo(
+    () => [
+      {
+        label: copyLabel,
+        callback: async () => {
+          setCopied(true);
+          copy(await skynetClient.getSkylinkUrl(skylink));
+        },
+      },
+    ],
+    [skylink, copyLabel]
+  );
+
+  return {
+    options,
+  };
+};

packages/dashboard-v2/src/components/Footer/Footer.js

@@ -1,8 +1,19 @@
 import * as React from "react";
+import styled from "styled-components";
+
 import { PageContainer } from "../PageContainer";
 
+const FooterLink = styled.a.attrs({
+  className: "text-palette-400 underline decoration-dotted decoration-offset-4 decoration-1",
+  rel: "noreferrer",
+  target: "_blank",
+})``;
+
 export const Footer = () => (
   <PageContainer className="font-content text-palette-300 py-4">
-    <p>© Skynet Labs Inc. All rights reserved.</p>
+    <p>
+      Made by <FooterLink href="https://skynetlabs.com">Skynet Labs</FooterLink>. Open-sourced{" "}
+      <FooterLink href="https://github.com/SkynetLabs/skynet-webportal">on Github</FooterLink>.
+    </p>
   </PageContainer>
 );

packages/dashboard-v2/src/components/HighlightedLink.js

@@ -2,5 +2,5 @@ import { Link } from "gatsby";
 import styled from "styled-components";
 
 export default styled(Link).attrs({
-  className: "text-primary underline-offset-3 decoration-dotted hover:text-primary-light hover:underline",
+  className: "text-primary underline-offset-2 decoration-1 decoration-dotted hover:text-primary-light hover:underline",
 })``;

packages/dashboard-v2/src/components/LatestActivity/ActivityTable.js

@@ -3,12 +3,13 @@ import useSWR from "swr";
 
 import { Table, TableBody, TableCell, TableRow } from "../Table";
 import { ContainerLoadingIndicator } from "../LoadingIndicator";
+import useFormattedFilesData from "../FileList/useFormattedFilesData";
 
-import useFormattedActivityData from "./useFormattedActivityData";
+import { ViewAllLink } from "./ViewAllLink";
 
 export default function ActivityTable({ type }) {
   const { data, error } = useSWR(`user/${type}?pageSize=3`);
-  const items = useFormattedActivityData(data?.items || []);
+  const items = useFormattedFilesData(data?.items || []);
 
   if (!items.length) {
     return (
@@ -22,6 +23,7 @@ export default function ActivityTable({ type }) {
   }
 
   return (
+    <>
       <Table style={{ tableLayout: "fixed" }}>
         <TableBody>
           {items.map(({ id, name, type, size, date, skylink }) => (
@@ -37,5 +39,7 @@ export default function ActivityTable({ type }) {
           ))}
         </TableBody>
       </Table>
+      <ViewAllLink to={`/files?tab=${type}`} />
+    </>
   );
 }

packages/dashboard-v2/src/components/LatestActivity/LatestActivity.js

@@ -1,36 +1,13 @@
 import * as React from "react";
-import { Link } from "gatsby";
 
 import { Panel } from "../Panel";
-import { Tab, TabPanel, Tabs } from "../Tabs";
-import { ArrowRightIcon } from "../Icons";
 
 import ActivityTable from "./ActivityTable";
 
-const ViewAllLink = (props) => (
-  <Link className="inline-flex mt-6 items-center gap-3 ease-in-out hover:brightness-90" {...props}>
-    <span className="bg-primary rounded-full w-[32px] h-[32px] inline-flex justify-center items-center">
-      <ArrowRightIcon />
-    </span>
-    <span className="font-sans text-xs uppercase text-palette-400">View all</span>
-  </Link>
-);
-
 export default function LatestActivity() {
   return (
-    <Panel title="Latest activity">
-      <Tabs>
-        <Tab id="uploads" title="Uploads" />
-        <Tab id="downloads" title="Downloads" />
-        <TabPanel tabId="uploads" className="pt-4">
+    <Panel title="Latest uploads">
       <ActivityTable type="uploads" />
-          <ViewAllLink to="/files?tab=uploads" />
-        </TabPanel>
-        <TabPanel tabId="downloads" className="pt-4">
-          <ActivityTable type="downloads" />
-          <ViewAllLink to="/files?tab=downloads" />
-        </TabPanel>
-      </Tabs>
     </Panel>
   );
 }

packages/dashboard-v2/src/components/LatestActivity/ViewAllLink.js

@@ -0,0 +1,12 @@
+import { Link } from "gatsby";
+
+import { ArrowRightIcon } from "../Icons";
+
+export const ViewAllLink = (props) => (
+  <Link className="inline-flex mt-6 items-center gap-3 ease-in-out hover:brightness-90" {...props}>
+    <span className="bg-primary rounded-full w-[32px] h-[32px] inline-flex justify-center items-center">
+      <ArrowRightIcon />
+    </span>
+    <span className="font-sans text-xs uppercase text-palette-400">View all</span>
+  </Link>
+);

packages/dashboard-v2/src/components/LatestActivity/useFormattedActivityData.js

@@ -1,26 +0,0 @@
-import { useMemo } from "react";
-import prettyBytes from "pretty-bytes";
-import dayjs from "dayjs";
-
-const parseFileName = (fileName) => {
-  const lastDotIndex = Math.max(0, fileName.lastIndexOf(".")) || Infinity;
-
-  return [fileName.substr(0, lastDotIndex), fileName.substr(lastDotIndex)];
-};
-
-const formatItem = ({ size, name: rawFileName, uploadedOn, downloadedOn, ...rest }) => {
-  const [name, type] = parseFileName(rawFileName);
-  const date = dayjs(uploadedOn || downloadedOn).format("MM/DD/YYYY; HH:MM");
-
-  return {
-    ...rest,
-    date,
-    size: prettyBytes(size),
-    type,
-    name,
-  };
-};
-
-const useFormattedActivityData = (items) => useMemo(() => items.map(formatItem), [items]);
-
-export default useFormattedActivityData;

packages/dashboard-v2/src/components/Metadata/Metadata.js

@@ -0,0 +1,42 @@
+import { Helmet } from "react-helmet";
+import { graphql, useStaticQuery } from "gatsby";
+
+import favicon from "../../../static/favicon.ico";
+import favicon16 from "../../../static/favicon-16x16.png";
+import favicon32 from "../../../static/favicon-32x32.png";
+import appleIcon144 from "../../../static/apple-touch-icon-144x144.png";
+import appleIcon152 from "../../../static/apple-touch-icon-152x152.png";
+import msTileIcon from "../../../static/mstile-144x144.png";
+
+export const Metadata = ({ children }) => {
+  const { site } = useStaticQuery(
+    graphql`
+      query Q {
+        site {
+          siteMetadata {
+            title
+          }
+        }
+      }
+    `
+  );
+
+  const { title } = site.siteMetadata;
+
+  return (
+    <Helmet htmlAttributes={{ lang: "en" }} titleTemplate={`%s | ${title}`} defaultTitle={title}>
+      <meta name="application-name" content="Skynet Account Dashboard" />
+      <link rel="icon" type="image/x-icon" href={favicon} />
+      <link rel="icon" type="image/png" href={favicon16} sizes="16x16" />
+      <link rel="icon" type="image/png" href={favicon32} sizes="32x32" />
+      <link rel="apple-touch-icon-precomposed" sizes="144x144" href={appleIcon144} />
+      <link rel="apple-touch-icon-precomposed" sizes="152x152" href={appleIcon152} />
+      <meta name="msapplication-TileColor" content="#FFFFFF" />
+      <meta name="msapplication-TileImage" content={msTileIcon} />
+
+      <meta name="description" content="Manage your Skynet uploads, account subscription, settings and API keys" />
+      <link rel="preconnect" href={`https://${process.env.GATSBY_PORTAL_DOMAIN}/`} />
+      {children}
+    </Helmet>
+  );
+};

packages/dashboard-v2/src/components/Metadata/index.js

@@ -0,0 +1 @@
+export * from "./Metadata";

packages/dashboard-v2/src/components/Modal/Modal.js

@@ -11,7 +11,7 @@ export const Modal = ({ children, className, onClose }) => (
   <ModalPortal>
     <Overlay onClick={onClose}>
       <div className={cn("relative w-modal max-w-modal shadow-sm rounded")}>
-        <button onClick={onClose} className="absolute top-[20px] right-[20px]">
+        <button onClick={onClose} className="absolute top-[20px] right-[20px]" aria-label="Close">
           <PlusIcon size={14} className="rotate-45" />
         </button>
         <Panel className={cn("px-8 py-6 sm:px-12 sm:py-10", className)}>{children}</Panel>

packages/dashboard-v2/src/components/NavBar/NavBar.js

@@ -94,9 +94,10 @@ export const NavBar = () => {
                 partiallyActive
               />
               <DropdownMenuLink
+                as="button"
                 onClick={onLogout}
                 activeClassName="text-primary"
-                className="cursor-pointer"
+                className="cursor-pointer w-full"
                 icon={LockClosedIcon}
                 label="Log out"
               />

packages/dashboard-v2/src/components/Panel/Panel.js

@@ -14,8 +14,8 @@ const PanelTitle = styled.h6.attrs({
  *
  * These additional props will be rendered onto the panel's body element.
  */
-export const Panel = ({ title, ...props }) => (
-  <div>
+export const Panel = ({ title, wrapperClassName, ...props }) => (
+  <div className={wrapperClassName}>
     {title && <PanelTitle>{title}</PanelTitle>}
     <PanelBody {...props} />
   </div>
@@ -26,8 +26,13 @@ Panel.propTypes = {
    * Label of the panel
    */
   title: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  /**
+   * CSS class to be applied to the external container
+   */
+  wrapperClassName: PropTypes.string,
 };
 
 Panel.defaultProps = {
   title: "",
+  wrapperClassName: "",
 };

packages/dashboard-v2/src/components/PopoverMenu/PopoverMenu.js

@@ -2,6 +2,9 @@ import { Children, cloneElement, useRef, useState } from "react";
 import PropTypes from "prop-types";
 import { useClickAway } from "react-use";
 import styled, { css, keyframes } from "styled-components";
+import cn from "classnames";
+
+import { ContainerLoadingIndicator } from "../LoadingIndicator";
 
 const dropDown = keyframes`
   0% {
@@ -41,15 +44,15 @@ const Option = styled.li.attrs({
               hover:before:content-['']`,
 })``;
 
-export const PopoverMenu = ({ options, children, openClassName, ...props }) => {
+export const PopoverMenu = ({ options, children, openClassName, inProgress, ...props }) => {
   const containerRef = useRef();
   const [open, setOpen] = useState(false);
 
   useClickAway(containerRef, () => setOpen(false));
 
-  const handleChoice = (callback) => () => {
+  const handleChoice = (callback) => async () => {
+    await callback();
     setOpen(false);
-    callback();
   };
 
   return (
@@ -62,11 +65,16 @@ export const PopoverMenu = ({ options, children, openClassName, ...props }) => {
       )}
       {open && (
         <Flyout>
+          <div className={cn("relative", { "opacity-50": inProgress })}>
             {options.map(({ label, callback }) => (
               <Option key={label} onClick={handleChoice(callback)}>
                 {label}
               </Option>
             ))}
+            {inProgress && (
+              <ContainerLoadingIndicator className="absolute inset-0 !p-0 z-50 bg-white !text-palette-300" />
+            )}
+          </div>
         </Flyout>
       )}
     </Container>
@@ -87,4 +95,9 @@ PopoverMenu.propTypes = {
       callback: PropTypes.func.isRequired,
     })
   ).isRequired,
+
+  /**
+   * If true, a loading icon will be displayed to signal an async action is taking place.
+   */
+  inProgress: PropTypes.bool,
 };

packages/dashboard-v2/src/components/Slider/Bullets.js

@@ -12,6 +12,7 @@ export default function Bullets({ visibleSlides, activeIndex, allSlides, changeS
         .map((_, index) => (
           <button
             key={index}
+            aria-label={`Slide ${index + 1}`}
             type="button"
             className={`rounded-full w-3 h-3 ${activeIndex === index ? "bg-primary" : "border-2 cursor-pointer"}`}
             onClick={(event) => changeSlide(event, index)}

packages/dashboard-v2/src/components/Slider/Slide.js

@@ -2,7 +2,7 @@ import styled from "styled-components";
 import PropTypes from "prop-types";
 
 const Slide = styled.div.attrs(({ isVisible }) => ({
-  className: `slider-slide transition-opacity ${isVisible ? "" : "opacity-50 cursor-pointer select-none"}`,
+  className: `slider-slide transition-opacity h-full ${isVisible ? "" : "opacity-50 cursor-pointer select-none"}`,
 }))``;
 
 Slide.propTypes = {

packages/dashboard-v2/src/components/Slider/Slider.js

@@ -62,7 +62,7 @@ const Slider = ({ slides, breakpoints, scrollerClassName, className }) => {
           const isVisible = index >= activeIndex && index < activeIndex + visibleSlides;
 
           return (
-            <div key={`slide-${index}`}>
+            <div key={`slide-${index}`} className="h-full">
               <Slide
                 isVisible={isVisible || !scrollable}
                 onClickCapture={

packages/dashboard-v2/src/components/Tooltip/index.js

@@ -0,0 +1 @@
+export * from "./Tooltip";

packages/dashboard-v2/src/components/Uploader/Uploader.js

@@ -105,7 +105,11 @@ const Uploader = ({ mode }) => {
           </div>
         ) : (
           <div className="p-5">
-            <Button $primary className="w-[40px] h-[40px] !p-0 inline-flex justify-center items-center">
+            <Button
+              $primary
+              className="w-[40px] h-[40px] !p-0 inline-flex justify-center items-center"
+              aria-label="Upload new file"
+            >
               <PlusIcon size={12} />
             </Button>
             <span className="ml-4">Add, or drop your files here</span>
@@ -114,7 +118,7 @@ const Uploader = ({ mode }) => {
       </div>
 
       {uploads.length > 0 && (
-        <div className="flex flex-col space-y-4 py-10">
+        <div className="flex flex-col space-y-4 pt-6 pb-10">
           {uploads.map((upload) => (
             <UploaderItem key={upload.id} onUploadStateChange={onUploadStateChange} upload={upload} />
           ))}

packages/dashboard-v2/src/components/Uploader/UploaderItem.js

@@ -1,6 +1,5 @@
 import * as React from "react";
 import cn from "classnames";
-import bytes from "pretty-bytes";
 import { StatusCodes } from "http-status-codes";
 import copy from "copy-text-to-clipboard";
 import path from "path-browserify";
@@ -9,6 +8,7 @@ import { ProgressBar } from "./ProgressBar";
 import UploaderItemIcon from "./UploaderItemIcon";
 import buildUploadErrorMessage from "./buildUploadErrorMessage";
 import skynetClient from "../../services/skynetClient";
+import humanBytes from "../../lib/humanBytes";
 
 const getFilePath = (file) => file.webkitRelativePath || file.path || file.name;
 
@@ -88,7 +88,7 @@ export default function UploaderItem({ onUploadStateChange, upload }) {
             <div className="font-content truncate">
               {upload.status === "uploading" && (
                 <span className="tabular-nums">
-                  Uploading {bytes(upload.file.size * upload.progress)} of {bytes(upload.file.size)}
+                  Uploading {humanBytes(upload.file.size * upload.progress)} of {humanBytes(upload.file.size)}
                 </span>
               )}
               {upload.status === "enqueued" && <span className="text-palette-300">Upload in queue, please wait</span>}
@@ -109,7 +109,6 @@ export default function UploaderItem({ onUploadStateChange, upload }) {
           {upload.status === "uploading" && (
             <span className="uppercase tabular-nums">{Math.floor(upload.progress * 100)}%</span>
           )}
-          {upload.status === "processing" && <span className="uppercase text-palette-300">Wait</span>}
           {upload.status === "complete" && (
             <button
               className="uppercase hover:text-primary transition-colors duration-200"

packages/dashboard-v2/src/components/Uploader/buildUploadErrorMessage.js

@@ -1,5 +1,5 @@
 import { getReasonPhrase } from "http-status-codes";
-import bytes from "pretty-bytes";
+import humanBytes from "../../lib/humanBytes";
 
 export default function buildUploadErrorMessage(error) {
   // The request was made and the server responded with a status code that falls out of the range of 2xx
@@ -29,7 +29,7 @@ export default function buildUploadErrorMessage(error) {
   const matchTusMaxFileSizeError = error.message.match(/upload exceeds maximum size: \d+ > (?<limit>\d+)/);
 
   if (matchTusMaxFileSizeError) {
-    return `File exceeds size limit of ${bytes(parseInt(matchTusMaxFileSizeError.groups.limit, 10))}`;
+    return `File exceeds size limit of ${humanBytes(matchTusMaxFileSizeError.groups.limit, { precision: 0 })}`;
   }
 
   // TODO: We should add a note "our team has been notified" and have some kind of notification with this error.

packages/dashboard-v2/src/components/forms/AccountRemovalForm.js

@@ -34,8 +34,9 @@ export const AccountRemovalForm = ({ abort, onSuccess }) => {
         <Form className="flex flex-col gap-4">
           <div>
             <h4>Delete account</h4>
+            <p>This will completely delete your account.</p>
             <p>
-              This will completely delete your account. <strong>This process can't be undone.</strong>
+              <strong>This process cannot be undone.</strong>
             </p>
           </div>
 

packages/dashboard-v2/src/components/forms/AddAPIKeyForm.js

@@ -2,6 +2,7 @@ import * as Yup from "yup";
 import { forwardRef, useImperativeHandle, useState } from "react";
 import PropTypes from "prop-types";
 import { Formik, Form } from "formik";
+import cn from "classnames";
 
 import accountsService from "../../services/accountsService";
 
@@ -9,7 +10,6 @@ import { Alert } from "../Alert";
 import { Button } from "../Button";
 import { CopyButton } from "../CopyButton";
 import { TextField } from "../Form/TextField";
-import { CircledProgressIcon, PlusIcon } from "../Icons";
 
 const newAPIKeySchema = Yup.object().shape({
   name: Yup.string(),
@@ -22,7 +22,7 @@ const State = {
 };
 
 export const APIKeyType = {
-  Public: "public",
+  Sponsor: "sponsor",
   General: "general",
 };
 
@@ -37,14 +37,14 @@ export const AddAPIKeyForm = forwardRef(({ onSuccess, type }, ref) => {
   return (
     <div ref={ref} className="flex flex-col gap-4">
       {state === State.Success && (
-        <Alert $variant="success" className="text-center">
+        <Alert $variant="success">
           <strong>Success!</strong>
           <p>Please copy your new API key below. We'll never show it again!</p>
-          <div className="flex items-center gap-2 mt-4 justify-center">
+          <div className="flex items-center gap-2 mt-4">
             <code className="p-2 rounded border border-palette-200 text-xs selection:bg-primary/30 truncate">
               {generatedKey}
             </code>
-            <CopyButton value={generatedKey} className="whitespace-nowrap" />
+            <CopyButton value={generatedKey} className="whitespace-nowrap" aria-label="Copy the new API key" />
           </div>
         </Alert>
       )}
@@ -62,8 +62,8 @@ export const AddAPIKeyForm = forwardRef(({ onSuccess, type }, ref) => {
               .post("user/apikeys", {
                 json: {
                   name,
-                  public: type === APIKeyType.Public ? "true" : "false",
-                  skylinks: type === APIKeyType.Public ? [] : null,
+                  public: type === APIKeyType.Sponsor ? "true" : "false",
+                  skylinks: type === APIKeyType.Sponsor ? [] : null,
                 },
               })
               .json();
@@ -78,26 +78,20 @@ export const AddAPIKeyForm = forwardRef(({ onSuccess, type }, ref) => {
         }}
       >
         {({ errors, touched, isSubmitting }) => (
-          <Form className="grid grid-cols-[1fr_min-content] w-full gap-y-2 gap-x-4 items-start">
-            <div className="flex items-center">
+          <Form className="flex flex-col gap-4">
             <TextField
               type="text"
               id="name"
               name="name"
-                label="New API Key Name"
+              label="New API Key Label"
               placeholder="my_applications_statistics"
               error={errors.name}
               touched={touched.name}
             />
-            </div>
-            <div className="flex mt-5 justify-center">
-              {isSubmitting ? (
-                <CircledProgressIcon size={38} className="text-palette-300 animate-[spin_3s_linear_infinite]" />
-              ) : (
-                <Button type="submit" className="px-2.5">
-                  <PlusIcon size={14} />
+            <div className="flex justify-center">
+              <Button type="submit" disabled={isSubmitting} className={cn({ "cursor-wait": isSubmitting })}>
+                {isSubmitting ? "Generating your API key..." : "Generate your API key"}
               </Button>
-              )}
             </div>
           </Form>
         )}
@@ -110,5 +104,5 @@ AddAPIKeyForm.displayName = "AddAPIKeyForm";
 
 AddAPIKeyForm.propTypes = {
   onSuccess: PropTypes.func.isRequired,
-  type: PropTypes.oneOf([APIKeyType.Public, APIKeyType.General]).isRequired,
+  type: PropTypes.oneOf([APIKeyType.Sponsor, APIKeyType.General]).isRequired,
 };

packages/dashboard-v2/src/components/forms/AddSkylinkToSponsorKeyForm.js

@@ -19,7 +19,7 @@ const newSkylinkSchema = Yup.object().shape({
     }),
 });
 
-export const AddSkylinkToAPIKeyForm = ({ addSkylink }) => (
+export const AddSkylinkToSponsorKeyForm = ({ addSkylink }) => (
   <Formik
     initialValues={{
       skylink: "",
@@ -48,7 +48,7 @@ export const AddSkylinkToAPIKeyForm = ({ addSkylink }) => (
           {isSubmitting ? (
             <CircledProgressIcon size={38} className="text-palette-300 animate-[spin_3s_linear_infinite]" />
           ) : (
-            <Button type="submit" className="px-2.5">
+            <Button type="submit" className="px-2.5" aria-label="Add this skylink">
               <PlusIcon size={14} />
             </Button>
           )}
@@ -58,6 +58,6 @@ export const AddSkylinkToAPIKeyForm = ({ addSkylink }) => (
   </Formik>
 );
 
-AddSkylinkToAPIKeyForm.propTypes = {
+AddSkylinkToSponsorKeyForm.propTypes = {
   addSkylink: PropTypes.func.isRequired,
 };

packages/dashboard-v2/src/components/forms/AddSponsorKeyForm.js

@@ -25,7 +25,7 @@ const skylinkValidator = (optional) => (value) => {
   }
 };
 
-const newPublicAPIKeySchema = Yup.object().shape({
+const newSponsorKeySchema = Yup.object().shape({
   name: Yup.string(),
   skylinks: Yup.array().of(Yup.string().test("skylink", "Provide a valid Skylink", skylinkValidator(false))),
   nextSkylink: Yup.string().when("skylinks", {
@@ -41,7 +41,7 @@ const State = {
   Failure: "FAILURE",
 };
 
-export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
+export const AddSponsorKeyForm = forwardRef(({ onSuccess }, ref) => {
   const [state, setState] = useState(State.Pure);
   const [generatedKey, setGeneratedKey] = useState(null);
 
@@ -52,14 +52,14 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
   return (
     <div ref={ref} className="flex flex-col gap-4">
       {state === State.Success && (
-        <Alert $variant="success" className="text-center">
+        <Alert $variant="success">
           <strong>Success!</strong>
           <p>Please copy your new API key below. We'll never show it again!</p>
-          <div className="flex items-center gap-2 mt-4 justify-center">
+          <div className="flex items-center gap-2 mt-4">
             <code className="p-2 rounded border border-palette-200 text-xs selection:bg-primary/30 truncate">
               {generatedKey}
             </code>
-            <CopyButton value={generatedKey} className="whitespace-nowrap" />
+            <CopyButton value={generatedKey} className="whitespace-nowrap" aria-label="Copy the new public API key" />
           </div>
         </Alert>
       )}
@@ -72,7 +72,7 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
           skylinks: [],
           nextSkylink: "",
         }}
-        validationSchema={newPublicAPIKeySchema}
+        validationSchema={newSponsorKeySchema}
         onSubmit={async ({ name, skylinks, nextSkylink }, { resetForm }) => {
           try {
             const { key } = await accountsService
@@ -80,7 +80,7 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
                 json: {
                   name,
                   public: "true",
-                  skylinks: [...skylinks, nextSkylink].filter(Boolean).map(parseSkylink),
+                  skylinks: [...skylinks, nextSkylink].filter(Boolean).map((skylink) => parseSkylink(skylink)),
                 },
               })
               .json();
@@ -101,14 +101,14 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
                 type="text"
                 id="name"
                 name="name"
-                label="Public API Key Name"
+                label="Sponsor API Key Name"
                 placeholder="my_applications_statistics"
                 error={errors.name}
                 touched={touched.name}
               />
             </div>
             <div>
-              <h6 className="text-palette-300 mb-2">Skylinks accessible with the new key</h6>
+              <h6 className="text-palette-300 mb-2">Skylinks sponsored by the new key</h6>
               <FieldArray
                 name="skylinks"
                 render={({ push, remove }) => {
@@ -137,7 +137,7 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
                             touched={skylinksTouched[index]}
                           />
                           <span className="w-[24px] shrink-0 mt-3">
-                            <button type="button" onClick={() => remove(index)}>
+                            <button type="button" onClick={() => remove(index)} aria-label="Remove this skylink">
                               <TrashIcon size={16} />
                             </button>
                           </span>
@@ -160,6 +160,7 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
                         />
                         <button
                           type="button"
+                          aria-label="Add this skylink"
                           onClick={() => appendSkylink(values.nextSkylink)}
                           className={cn("shrink-0 mt-1.5 w-[24px] h-[24px]", {
                             "text-palette-300 cursor-not-allowed": isNextSkylinkInvalid,
@@ -181,7 +182,7 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
                 className={cn("px-2.5", { "cursor-wait": isSubmitting })}
                 disabled={!isValid || isSubmitting}
               >
-                {isSubmitting ? "Generating" : "Generate"} your public key
+                {isSubmitting ? "Generating your sponsor key..." : "Generate your sponsor key"}
               </Button>
             </div>
           </Form>
@@ -191,8 +192,8 @@ export const AddPublicAPIKeyForm = forwardRef(({ onSuccess }, ref) => {
   );
 });
 
-AddPublicAPIKeyForm.displayName = "AddAPIKeyForm";
+AddSponsorKeyForm.displayName = "AddSponsorKeyForm";
 
-AddPublicAPIKeyForm.propTypes = {
+AddSponsorKeyForm.propTypes = {
   onSuccess: PropTypes.func.isRequired,
 };

packages/dashboard-v2/src/components/forms/LoginForm.js

@@ -82,7 +82,7 @@ export const LoginForm = ({ onSuccess }) => {
           </div>
 
           <p className="text-sm text-center mt-8">
-            Don't have an account? <HighlightedLink to="/auth/signup">Sign up</HighlightedLink>
+            Don't have an account? <HighlightedLink to="/auth/registration">Sign up</HighlightedLink>
           </p>
         </Form>
       )}

packages/dashboard-v2/src/components/forms/SignUpForm.js

@@ -32,14 +32,16 @@ export const SignUpForm = ({ onSuccess, onFailure }) => (
     validationSchema={registrationSchema}
     onSubmit={async ({ email, password }, { setErrors }) => {
       try {
-        await accountsService.post("user", {
+        const user = await accountsService
+          .post("user", {
             json: {
               email,
               password,
             },
-        });
+          })
+          .json();
 
-        onSuccess();
+        onSuccess(user);
       } catch (err) {
         let isFormErrorSet = false;