Bug/2763 bug fix not refactor

CHANGES_NEXT_RELEASE

@@ -15,6 +15,9 @@
 - Fix: bug when tenants are over 44 bytes long (#2811)
 - Add: Support for null values in string filters (#2359)
 - Fix: Partial sanity check for custon url, only if the url contains no replacements using ${xxx} (#2280, #2279)
+- Fix: if entity::type is given but as an empty string, an error is returned (#1985)
+- Fix: admin requests with errors now return '400 Bad Request', not '200 OK'
+- Fix: attempt to create an entity with an error in service path (and probably more types of errors) now returns '400 Bad Request', not '200 OK' (#2763)
 - Fix: not calling regfree when regcomp fails. Potential fix for a crash (#2769)
 - Fix: wrongly overlogging metadata abscense in csub docs as Runtime Error (#2796)
 - Fix: if HTTP header Content-Length contains a value above the maximum payload size, an error is returned and the message is not read (#2761)

doc/manuals/user/ngsiv2_implementation_notes.md

@@ -144,7 +144,7 @@ The particular validations that Orion implements on NGSIv2 subscription payloads
         * **id** or **idPattern**: one of them is mandatory (but both at the same time is not allowed). id
             must follow NGSIv2 restrictions for IDs. idPattern must be not empty and a valid regex.
         * **type** or **typePattern**: optional (but both at the same time is not allowed). type must 
-            follow NGSIv2 restrictions for IDs. typePattern must be not empty and a valid regex.
+            follow NGSIv2 restrictions for IDs. type must not be empty. typePattern must be a valid regex, and non-empty.
     * **condition**: optional (but if present it must have a content, i.e. `{}` is not allowed)
         * **attrs**: optional (but if present it must be a list; empty list is allowed)
         * **expression**: optional (but if present it must have a content, i.e. `{}` is not allowed)

src/lib/jsonParseV2/parseEntity.cpp

@@ -167,6 +167,14 @@ std::string parseEntity(ConnectionInfo* ciP, Entity* eP, bool eidInURL)
 
       eP->type      = iter->value.GetString();
       eP->typeGiven = true;
+
+      if (eP->type.empty())
+      {
+        alarmMgr.badInput(clientIp, "empty entity type");
+        ciP->httpStatusCode = SccBadRequest;
+        OrionError oe(SccBadRequest, "entity type length: 0, min length supported: 1", "BadRequest");
+        return oe.toJson();
+      }
     }
     else  // attribute
     {

src/lib/jsonParseV2/parseEntityObject.cpp

@@ -105,6 +105,11 @@ std::string parseEntityObject(ConnectionInfo* ciP, Value::ConstValueIterator val
       eP->type      = iter->value.GetString();
       eP->typeGiven = true;
 
+      if (eP->type.empty())
+      {
+        return "entity type length: 0, min length supported: 1";
+      }
+
       if (forbiddenChars(eP->type.c_str(), ""))
       {
         return "Invalid characters in entity type";

src/lib/rest/OrionError.cpp

@@ -109,7 +109,7 @@ std::string OrionError::smartRender(ApiVersion apiVersion)
 */
 std::string OrionError::setStatusCodeAndSmartRender(ApiVersion apiVersion, HttpStatusCode* scP)
 {
-  if (apiVersion == V2)
+  if ((apiVersion == V2) || (apiVersion == ADMIN_API))
   {
     *scP = code;
   }

src/lib/serviceRoutinesV2/postEntities.cpp

@@ -100,13 +100,22 @@ std::string postEntities
   // 02. Call standard op postUpdateContext
   postUpdateContext(ciP, components, compV, parseDataP, NGSIV2_FLAVOUR_ONCREATE);
 
-  // 03. Check error
+  //
+  // 03. Check error - 3 different ways to get an error from postUpdateContext ... :-(
+  //     FIXME P4: make postUpdateContext have ONE way to return errors. See github issue #2763
+  //
   std::string  answer = "";
-  if (parseDataP->upcrs.res.oe.code != SccNone )
+  if (parseDataP->upcrs.res.oe.code != SccNone)
   {
     TIMED_RENDER(answer = parseDataP->upcrs.res.oe.toJson());
     ciP->httpStatusCode = parseDataP->upcrs.res.oe.code;
   }
+  else if (parseDataP->upcrs.res.errorCode.code != SccOk)
+  {
+    ciP->httpStatusCode = parseDataP->upcrs.res.errorCode.code;
+    TIMED_RENDER(answer = parseDataP->upcrs.res.errorCode.toJson(true));
+    ciP->answer         = answer;
+  }
   else
   {
     // Prepare HTTP headers

test/functionalTest/cases/2763_postUpdateContext_error_return/invalid_service_path_gives_400_bad_request.test

@@ -0,0 +1,56 @@
+# Copyright 2016 Telefonica Investigacion y Desarrollo, S.A.U
+#
+# This file is part of Orion Context Broker.
+#
+# Orion Context Broker is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# Orion Context Broker is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Orion Context Broker. If not, see http://www.gnu.org/licenses/.
+#
+# For those usages not covered by this license please contact with
+# iot_support at tid dot es
+
+# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh
+
+--NAME--
+invalid_service_path_gives_400_bad_request
+
+--SHELL-INIT--
+dbInit CB
+brokerStart CB
+
+--SHELL--
+
+echo "01. Send a /version request with an Invalid Service Path, see 400 Bad Request"
+echo "============================================================================="
+orionCurl --url /version --servicePath "notStartingWithSlash"
+echo
+echo
+
+
+--REGEXPECT--
+01. Send a /version request with an Invalid Service Path, see 400 Bad Request
+=============================================================================
+HTTP/1.1 400 Bad Request
+Content-Length: 111
+Content-Type: application/json
+Fiware-Correlator: REGEX([0-9a-f\-]{36})
+Date: REGEX(.*)
+
+{
+    "description": "Only /absolute/ Service Paths allowed [a service path must begin with /]",
+    "error": "BadRequest"
+}
+
+
+--TEARDOWN--
+brokerStop CB
+dbDrop CB

test/functionalTest/cases/2763_postUpdateContext_error_return/postEntities_with_errors_in_service_path.test

@@ -0,0 +1,77 @@
+# Copyright 2016 Telefonica Investigacion y Desarrollo, S.A.U
+#
+# This file is part of Orion Context Broker.
+#
+# Orion Context Broker is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# Orion Context Broker is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Orion Context Broker. If not, see http://www.gnu.org/licenses/.
+#
+# For those usages not covered by this license please contact with
+# iot_support at tid dot es
+
+# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh
+
+--NAME--
+postEntities with errors in service-path
+
+--SHELL-INIT--
+dbInit CB
+brokerStart CB
+
+--SHELL--
+
+#
+# 01. Try to create an entity with more than one service path - see error
+# 02. Make sure the entity doesn't exist in the database
+#
+
+echo "01. Try to create an entity with more than one service path - see error"
+echo "======================================================================="
+payload='{ "id": "E1", "type": "T1" }'
+orionCurl --url /v2/entities --payload "$payload" --servicePath /E1,/E2
+echo
+echo
+
+
+echo "02. Make sure the entity doesn't exist in the database"
+echo "======================================================"
+echo "db.entities.findOne()" | mongo ftest
+echo
+echo
+
+
+--REGEXPECT--
+01. Try to create an entity with more than one service path - see error
+=======================================================================
+HTTP/1.1 400 Bad Request
+Content-Length: 79
+Content-Type: application/json
+Fiware-Correlator: REGEX([0-9a-f\-]{36})
+Date: REGEX(.*)
+
+{
+    "code": "400",
+    "details": "more than one service path in context update request"
+}
+
+
+02. Make sure the entity doesn't exist in the database
+======================================================
+MongoDB shell version: REGEX(.*)
+connecting to: ftest
+null
+bye
+
+
+--TEARDOWN--
+brokerStop CB
+dbDrop CB

test/functionalTest/cases/2819_forbiddenChars_in_batch-query_and_NOT_in_URI_param_typePattern/forbiddenChars_in_batch-query_and_NOT_in_URI_param_typePattern.test

@@ -117,27 +117,27 @@ Date: REGEX(.*)
 02. POST /v2/op/query with forbidden chars '<>=;' in entity::id, see it fail due to forbidden chars
 ===================================================================================================
 HTTP/1.1 400 Bad Request
-Content-Length: 67
+Content-Length: 70
 Content-Type: application/json
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Date: REGEX(.*)
 
 {
-    "description": "forbidden chars in entity id",
+    "description": "Invalid characters in entity id",
     "error": "BadRequest"
 }
 
 
 03. POST /v2/op/query with forbidden chars '<>=;' in entity::type, see it fail due to forbidden chars
 =====================================================================================================
 HTTP/1.1 400 Bad Request
-Content-Length: 69
+Content-Length: 72
 Content-Type: application/json
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Date: REGEX(.*)
 
 {
-    "description": "forbidden chars in entity type",
+    "description": "Invalid characters in entity type",
     "error": "BadRequest"
 }