FIX improve attribute and metadata invalid format dates for DateTime types in logs

CHANGES_NEXT_RELEASE

@@ -0,0 +1 @@
+- Fix: improve attribute and metadata invalid format dates for DateTime types in logs (#4616)

src/lib/jsonParseV2/parseContextAttribute.cpp

@@ -106,7 +106,8 @@ static std::string parseContextAttributeObject
   const rapidjson::Value&  start,
   ContextAttribute*        caP,
   bool*                    compoundVector,
-  bool                     checkAttrSpecialTypes
+  bool                     checkAttrSpecialTypes,
+  std::string*             extraForLog
 )
 {
   // This is NGSIv2 parsing and in NGSIv2, no value means implicit null. Note that
@@ -229,7 +230,8 @@ static std::string parseContextAttributeObject
 
         if (upOp->numberValue == -1)
         {
-          return "date has invalid format";
+          *extraForLog = ": " +  upOp->stringValue;
+          return "date has invalid format in attribute value";
         }
 
         // Probably reseting stringValue is not needed, but let's do it for cleanliness
@@ -238,7 +240,8 @@ static std::string parseContextAttributeObject
       }
       else
       {
-        return "date has invalid format";
+        *extraForLog = ": must be string or object with max or min operator";
+        return "date has invalid format in attribute value";
       }
     }
     else
@@ -247,7 +250,8 @@ static std::string parseContextAttributeObject
 
       if (caP->numberValue == -1)
       {
-        return "date has invalid format";
+        *extraForLog = ": " + caP->stringValue;
+        return "date has invalid format in attribute value";
       }
 
       // Probably reseting stringValue is not needed, but let's do it for cleanliness
@@ -383,7 +387,8 @@ std::string parseContextAttribute
     // Attribute has a regular structure, in which 'value' is mandatory (except in v2)
     if (iter->value.HasMember("value") || ciP->apiVersion == V2)
     {
-      std::string r = parseContextAttributeObject(iter->value, caP, &compoundVector, checkAttrSpecialTypes);
+      std::string extraForLog = "";
+      std::string r = parseContextAttributeObject(iter->value, caP, &compoundVector, checkAttrSpecialTypes, &extraForLog);
       if (r == "max deep reached")
       {
         alarmMgr.badInput(clientIp, "max deep reached", "found in ContextAttributeObject::Object");
@@ -392,7 +397,7 @@ std::string parseContextAttribute
       }
       else if (r != "OK")  // other error cases get a general treatment
       {
-        alarmMgr.badInput(clientIp, "JSON Parse Error in ContextAttribute::Object", r);
+        alarmMgr.badInput(clientIp, "JSON Parse Error in ContextAttribute::Object", r + extraForLog);
         ciP->httpStatusCode = SccBadRequest;
         return r;
       }
@@ -455,13 +460,14 @@ std::string parseContextAttribute(ConnectionInfo* ciP, ContextAttribute* caP, bo
   }
 
   bool         compoundVector = false;
-  std::string  r = parseContextAttributeObject(document, caP, &compoundVector, checkAttrSpecialTypes);
+  std::string extraForLog = "";
+  std::string  r = parseContextAttributeObject(document, caP, &compoundVector, checkAttrSpecialTypes, &extraForLog);
 
   if (r == "max deep reached")
   {
     OrionError oe(SccBadRequest, ERROR_DESC_PARSE_MAX_JSON_NESTING, ERROR_PARSE);
 
-    alarmMgr.badInput(clientIp, "max deep reached", r);
+    alarmMgr.badInput(clientIp, "max deep reached", "found in ContextAttributeObject::Object");
     ciP->httpStatusCode = SccBadRequest;
 
     return oe.toJson();
@@ -470,7 +476,7 @@ std::string parseContextAttribute(ConnectionInfo* ciP, ContextAttribute* caP, bo
   {
     OrionError oe(SccBadRequest, r, ERROR_BAD_REQUEST);
 
-    alarmMgr.badInput(clientIp, "JSON Parse Error", r);
+    alarmMgr.badInput(clientIp, "JSON Parse Error", r + extraForLog);
     ciP->httpStatusCode = SccBadRequest;
 
     return oe.toJson();

src/lib/jsonParseV2/parseMetadata.cpp

@@ -133,8 +133,8 @@ static std::string parseMetadataObject(const rapidjson::Value& start, Metadata*
 
     if (mdP->numberValue == -1)
     {
-      alarmMgr.badInput(clientIp, "date has invalid format", mdP->stringValue);
-      return "date has invalid format";
+      alarmMgr.badInput(clientIp, "date has invalid format in metadata value", mdP->stringValue);
+      return "date has invalid format in metadata value";
     }
 
     // Probably reseting stringValue is not needed, but let's do it for cleanliness

test/functionalTest/cases/1039_ngsiv2_date_support/basic_dates_support.test

@@ -131,10 +131,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 
@@ -188,10 +188,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 

test/functionalTest/cases/2654_iso8601_as_alias_for_DateTime/basic_dates_support_for_iso8601.test

@@ -131,10 +131,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 
@@ -188,10 +188,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 

test/functionalTest/cases/3000_allow_creation_transient_entities/failing_create_transient_entity_with_invalid_date.test

@@ -55,10 +55,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 

test/functionalTest/cases/3533_null_in_datetime_and_geo/null_in_datetime_attr.test

@@ -239,10 +239,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 
@@ -253,10 +253,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 

test/functionalTest/cases/3533_null_in_datetime_and_geo/null_in_datetime_md.test

@@ -295,10 +295,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 80
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in metadata value",
     "error": "BadRequest"
 }
 
@@ -309,10 +309,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 80
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in metadata value",
     "error": "BadRequest"
 }
 

test/functionalTest/cases/4585_datetime_with_min_max_operators/datetime_with_min_max_operators_errors.test

@@ -131,10 +131,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 
@@ -145,10 +145,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 
@@ -159,10 +159,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }
 
@@ -173,10 +173,10 @@ HTTP/1.1 400 Bad Request
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 62
+Content-Length: 81
 
 {
-    "description": "date has invalid format",
+    "description": "date has invalid format in attribute value",
     "error": "BadRequest"
 }