Merge branch 'master' into lua-code-coverage

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

@@ -34,6 +34,12 @@ jobs:
           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: Unit Tests
         run: |

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

@@ -16,7 +16,8 @@ log_by_lua_block {
             })
 
             if err or (res and res.status ~= ngx.HTTP_NO_CONTENT) then
-                ngx.log(ngx.ERR, "Failed accounts service request /track/download/" .. skylink .. ": ", err or ("[HTTP " .. res.status .. "] " .. res.body))
+                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
 
@@ -40,7 +41,8 @@ log_by_lua_block {
             })
 
             if err or (res and res.status ~= ngx.HTTP_OK) then
-                ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", err or ("[HTTP " .. res.status .. "] " .. res.body))
+                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+                ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", error_response)
             end
         end
 

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

@@ -19,7 +19,8 @@ log_by_lua_block {
             })
 
             if err or (res and res.status ~= ngx.HTTP_NO_CONTENT) then
-                ngx.log(ngx.ERR, "Failed accounts service request /track/registry/" .. registry_action .. ": ", err or ("[HTTP " .. res.status .. "] " .. res.body))
+                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
 

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

@@ -15,7 +15,8 @@ log_by_lua_block {
             })
 
             if err or (res and res.status ~= ngx.HTTP_NO_CONTENT) then
-                ngx.log(ngx.ERR, "Failed accounts service request /track/upload/" .. skylink .. ": ", err or ("[HTTP " .. res.status .. "] " .. res.body))
+                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
 
@@ -40,7 +41,8 @@ log_by_lua_block {
             })
 
             if err or (res and res.status ~= ngx.HTTP_OK) then
-                ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", err or ("[HTTP " .. res.status .. "] " .. res.body))
+                local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+                ngx.log(ngx.ERR, "Failed malware-scanner request /scan/" .. skylink .. ": ", error_response)
             end
         end
 

docker/nginx/libs/skynet/account.lua

@@ -82,7 +82,8 @@ function _M.get_account_limits()
 
         -- fail gracefully in case /user/limits failed
         if err or (res and res.status ~= ngx.HTTP_OK) then
-            ngx.log(ngx.ERR, "Failed accounts service request /user/limits?unit=byte: ", err or ("[HTTP " .. res.status .. "] " .. res.body))
+            local error_response = err or ("[HTTP " .. res.status .. "] " .. res.body)
+            ngx.log(ngx.ERR, "Failed accounts service request /user/limits?unit=byte: ", error_response)
             ngx.var.account_limits = cjson.encode(anon_limits)
         elseif res and res.status == ngx.HTTP_OK then
             ngx.var.account_limits = res.body
@@ -118,7 +119,7 @@ function _M.is_subscription_required()
     return os.getenv("ACCOUNTS_LIMIT_ACCESS") == "subscription"
 end
 
-function is_access_always_allowed()
+local is_access_always_allowed = function ()
     -- options requests do not attach cookies - should always be available
     -- requests should not be limited based on accounts if accounts are not enabled
     return ngx.req.get_method() == "OPTIONS" or not _M.accounts_enabled()