From 252ee7225779d7b008b6e7e0c5e5ecedae1752c0 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Fri, 12 Jan 2024 19:03:56 +0100 Subject: [PATCH] Fixed issue #1532 --- src/lib/orionld/notifications/notificationSend.cpp | 4 ++-- src/lib/orionld/pernot/pernotSend.cpp | 4 ++-- .../cases/0000_ngsild/ngsild_issue_1495.test | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/orionld/notifications/notificationSend.cpp b/src/lib/orionld/notifications/notificationSend.cpp index a167539253..95cbc2d271 100644 --- a/src/lib/orionld/notifications/notificationSend.cpp +++ b/src/lib/orionld/notifications/notificationSend.cpp @@ -741,10 +741,10 @@ int notificationSend(OrionldAlterationMatch* mAltP, double timestamp, CURL** cur if (headers > 50) LM_X(1, ("Too many HTTP headers (>50) for a Notification - to support that many, the broker needs a SW update and to be recompiled")); - char hostHeader[256]; + char hostHeader[512]; size_t hostHeaderLen; - hostHeaderLen = snprintf(hostHeader, sizeof(hostHeader), "Host: %s\r\n", mAltP->subP->ip); + hostHeaderLen = snprintf(hostHeader, sizeof(hostHeader), "Host: %s:%d\r\n", mAltP->subP->ip, mAltP->subP->port); int ioVecLen = headers + 3; // Request line + X headers + empty line + payload body int headerIx = 7; diff --git a/src/lib/orionld/pernot/pernotSend.cpp b/src/lib/orionld/pernot/pernotSend.cpp index 4d3ef3dbf5..ae87436c02 100644 --- a/src/lib/orionld/pernot/pernotSend.cpp +++ b/src/lib/orionld/pernot/pernotSend.cpp @@ -148,8 +148,8 @@ bool pernotSend(PernotSubscription* subP, KjNode* entityArray) // headers += subP->headers.items; - char hostHeader[128]; - size_t hostHeaderLen = snprintf(hostHeader, sizeof(hostHeader) - 1, "Host: %s\r\n", subP->ip); + char hostHeader[512]; + size_t hostHeaderLen = snprintf(hostHeader, sizeof(hostHeader) - 1, "Host: %s:%d\r\n", subP->ip, subP->port); int ioVecLen = headers + 3; // Request line + X headers + empty line + payload body struct iovec ioVec[53] = { diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1495.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1495.test index 771fd8a7b7..c9260e7fd2 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1495.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1495.test @@ -234,11 +234,11 @@ Date: REGEX(.*) 03. Dump/Reset the accumulator, see the entity ============================================== -POST https://127.0.0.1/notify +POST https://127.0.0.1:REGEX(\d+)/notify Content-Length: 590 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJCT0JsSEliWlV1ZHFydmpPQjZXbktBaHlFdU1IdWViZ2RkOXNKS3U5RWNFIn0.eyJleHAiOjE3ODk0OTE4MjEsImlhdCI6MTcwMzE3ODIyMSwianRpIjoiODFlNmVmNTktZTExZC00YjI1LWE5ZTAtZWNhNDQzNDkxYTBlIiwiaXNzIjoiaHR0cDovLzE1OC40Mi4xNjEuMTc3OjMxNTUxL2F1dGgvcmVhbG1zL21hc3RlciIsImF1ZCI6WyJtYXN0ZXItcmVhbG0iLCJhY2NvdW50Il0sInN1YiI6IjU2NjAwOWQ3LWJlMWUtNGYxZC05OWY2LTdiMjBkZmVlMDAyZiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFlcm9zIiwic2Vzc2lvbl9zdGF0ZSI6ImNkZTk5OTQ2LTUwM2UtNDY2OS04NDU2LTdlMjhhODQ2MzdhOSIsImFjciI6IjEiLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiY3JlYXRlLXJlYWxtIiwiZGVmYXVsdC1yb2xlcy1tYXN0ZXIiLCJvZmZsaW5lX2FjY2VzcyIsImFkbWluIiwiZG9tYWluX2FkbWlucyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWVyb3MiOnsicm9sZXMiOlsidXB2X3JvbGVfMSJdfSwibWFzdGVyLXJlYWxtIjp7InJvbGVzIjpbInZpZXctcmVhbG0iLCJ2aWV3LWlkZW50aXR5LXByb3ZpZGVycyIsIm1hbmFnZS1pZGVudGl0eS1wcm92aWRlcnMiLCJpbXBlcnNvbmF0aW9uIiwiY3JlYXRlLWNsaWVudCIsIm1hbmFnZS11c2VycyIsInF1ZXJ5LXJlYWxtcyIsInZpZXctYXV0aG9yaXphdGlvbiIsInF1ZXJ5LWNsaWVudHMiLCJxdWVyeS11c2VycyIsIm1hbmFnZS1ldmVudHMiLCJtYW5hZ2UtcmVhbG0iLCJ2aWV3LWV2ZW50cyIsInZpZXctdXNlcnMiLCJ2aWV3LWNsaWVudHMiLCJtYW5hZ2UtYXV0aG9yaXphdGlvbiIsIm1hbmFnZS1jbGllbnRzIiwicXVlcnktZ3JvdXBzIl19LCJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6InByb2ZpbGUgZW1haWwiLCJzaWQiOiJjZGU5OTk0Ni01MDNlLTQ2NjktODQ1Ni03ZTI4YTg0NjM3YTkiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsInByZWZlcnJlZF91c2VybmFtZSI6ImFlcm9zX3VzZXJfMiIsImdpdmVuX25hbWUiOiIiLCJmYW1pbHlfbmFtZSI6IiJ9.VDnNuP497t7SjYlXzCWaWUw33e3OPwLpB0xqCsOgekgwBySuaUpqJ6xaCssrmdgx8WYg3EE76GdcvnKSkC1oeTiR49AeKXK3D-UE8uj60zZKwXwQVapP7LhowraQpGeiwirGDZc9DV5at8pMR2gH3c88KSVtudxJQUcwm7wt0qvlX0M1eDJOo4YYjs41mIQiBWmIxantt3qXapk7ZzyByp3sp2Kzo6wJVAcJRlkoIsXBxAh6n5D1gerJzwh0f5OZMpxgjwCF3Jjps4Wjkh0je-CHFF-x0cSIS_LsqbPgys--mmuxyeXUF4W1wI2WyW36glEkCDdnZpbGhQXqtpFlxg User-Agent: orionld/REGEX(.*) -Host: 127.0.0.1 +Host: 127.0.0.1:REGEX(\d+) Accept: application/json Content-Type: application/json Link: