added the missing response for 429 in the decorator and also did a small improvement in the validatorsHandler and validator classes

Author: ddragosd

src/lua/api-gateway/validation/validator.lua

@@ -114,6 +114,7 @@ end
 -- the method uses HSET redis command --
 -- it retuns true if the information is saved in the cache, false otherwise --
 function BaseValidator:setKeyInRedis(key, hash_name, keyexpires, value)
+    ngx.log(ngx.DEBUG, "Storing in Redis the key [", tostring(key), "], expireat=", tostring(keyexpires), ", value=", tostring(value) )
     local rediss = redis:new()
     local redis_host, redis_port = self:getRedisUpstream(redis_RW_upstream)
     local ok, err = rediss:connect(redis_host, redis_port)

src/lua/api-gateway/validation/validatorsHandler.lua

@@ -61,9 +61,8 @@ function ValidatorsHandler:new(o)
     return o
 end
 
-function ValidatorsHandler:getValidatorsList()
-    return
-     { validate_api_key = {
+local DEFAULT_VALIDATORS = {
+    validate_api_key = {
          defaultProperties = {
             path = '/validate_api_key', order=1
          }
@@ -107,7 +106,10 @@ function ValidatorsHandler:getValidatorsList()
        request_validator_2 = { defaultProperties = { path = '/request_validator-2', order=1 } },
        request_validator_3 = { defaultProperties = { path = '/request_validator-3', order=1 } },
        request_validator_4 = { defaultProperties = { path = '/request_validator-4', order=1 } }
-     }
+}
+
+function ValidatorsHandler:getValidatorsList()
+    return DEFAULT_VALIDATORS
 end
 
 function ValidatorsHandler:trim(s)
@@ -120,7 +122,8 @@ function ValidatorsHandler:getValidatorsFromConfiguration( localContext )
     local defined_props = {}
     local request_props = {}
 
-    for validator_prop_name, validator_default_props in pairs(self:getValidatorsList()) do
+    local validatorsList = self:getValidatorsList()
+    for validator_prop_name, validator_default_props in pairs(validatorsList) do
         request_validator = {}
         defined_props = ngx.var[validator_prop_name]
         if ( defined_props ~= nil and self:trim(defined_props):sub(1,2) == "on") then

src/lua/api-gateway/validation/validatorsHandlerErrorDecorator.lua

@@ -61,6 +61,7 @@ local DEFAULT_RESPONSES = {
     -- Service limit errrors
         LIMIT_EXCEEDED          = { http_status = 429, error_code = 429001, message = '{"error_code":"429001","message":"Service usage limit reached"}'       , headers = { ["X-Request-Id"] = "ngx.var.requestId" }},
         DEV_KEY_LIMIT_EXCEEDED  = { http_status = 429, error_code = 429002, message = '{"error_code":"429002","message":"Developer key usage limit reached"}' , headers = { ["X-Request-Id"] = "ngx.var.requestId" }},
+        BLOCK_REQUEST           = { http_status = 429, error_code = 429050, message = '{"error_code":"429050","message":"Too many requests"}'                 , headers = { ["X-Request-Id"] = "ngx.var.requestId" }},
     -- App valdations
         DELAY_CLIENT_ON_REQUEST = { http_status = 503, error_code = 503071, messsage = '', headers = { ["Retry_After"] = "300s" } , headers = { ["X-Request-Id"] = "ngx.var.requestId" }},
     -- CC Link validation

test/perl/api-gateway/validation/validatorHandler.t

@@ -428,6 +428,7 @@ custom-header-2: this is a lua variable",
 --- http_config eval: $::HttpConfig
 --- config
         include ../../api-gateway/default_validators.conf;
+        error_log ../test-logs/validatorHandler_test7_error.log debug;
 
         location /validator_1 {
             return 200;