hrev52064 adds 1 changeset to branch 'master'
old head: 1dd1976fbaa9dae0f91b69ed608452de11c71083
new head: cd417b96c94b06aa8556e98b283266fd608a64c6
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=cd417b96c94b+%5E1dd1976fbaa9
----------------------------------------------------------------------------
cd417b96c94b: HaikuDepot: Trace Logging of RPC Payloads
Changes the trace logging so that JSON-RPC payloads
are included in the log stream. Also fixes a
memory-leak in the JSON-RPC client.
Change-Id: Ic19c64869acc525232a60ac2fd814a71bfdafdc8
[ Andrew Lindesay <apl@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52064
Commit: cd417b96c94b06aa8556e98b283266fd608a64c6
URL: https://git.haiku-os.org/haiku/commit/?id=cd417b96c94b
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Sat Jun 30 21:22:08 2018 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Jul 4 13:27:42 2018 UTC
----------------------------------------------------------------------------
5 files changed, 118 insertions(+), 9 deletions(-)
src/apps/haikudepot/Jamfile | 3 +-
src/apps/haikudepot/server/WebAppInterface.cpp | 66 +++++++++++++++++++---
src/apps/haikudepot/server/WebAppInterface.h | 3 +-
src/apps/haikudepot/util/DataIOUtils.cpp | 35 ++++++++++++
src/apps/haikudepot/util/DataIOUtils.h | 20 +++++++
----------------------------------------------------------------------------
diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile
index 72c968b781..c95e0fafe6 100644
--- a/src/apps/haikudepot/Jamfile
+++ b/src/apps/haikudepot/Jamfile
@@ -115,8 +115,9 @@ Application HaikuDepot :
TarArchiveService.cpp
#util
- ToFileUrlProtocolListener.cpp
+ DataIOUtils.cpp
StorageUtils.cpp
+ ToFileUrlProtocolListener.cpp
# package_daemon
ProblemWindow.cpp
diff --git a/src/apps/haikudepot/server/WebAppInterface.cpp
b/src/apps/haikudepot/server/WebAppInterface.cpp
index e0b5956828..e4fe354241 100644
--- a/src/apps/haikudepot/server/WebAppInterface.cpp
+++ b/src/apps/haikudepot/server/WebAppInterface.cpp
@@ -25,6 +25,7 @@
#include <UrlProtocolRoster.h>
#include "AutoLocker.h"
+#include "DataIOUtils.h"
#include "HaikuDepotConstants.h"
#include "List.h"
#include "Logger.h"
@@ -35,6 +36,7 @@
#define BASEURL_DEFAULT "https://depot.haiku-os.org";
#define USERAGENT_FALLBACK_VERSION "0.0.0"
+#define LOG_PAYLOAD_LIMIT 8192
class JsonBuilder {
@@ -709,17 +711,19 @@ WebAppInterface::_SendJsonRequest(const char* domain,
BDataIO* requestData,
{
if (!ServerHelper::IsNetworkAvailable()) {
if (Logger::IsDebugEnabled()) {
- printf("dropping json-rpc request to ...[%s] as network
is not "
+ printf("jrpc; dropping request to ...[%s] as network is
not "
"available\n", domain);
}
+ delete requestData;
return HD_NETWORK_INACCESSIBLE;
}
if (ServerSettings::IsClientTooOld()) {
if (Logger::IsDebugEnabled()) {
- printf("dropping json-rpc request to ...[%s] as client
is too "
+ printf("jrpc; dropping request to ...[%s] as client is
too "
"old\n", domain);
}
+ delete requestData;
return HD_CLIENT_TOO_OLD;
}
@@ -727,10 +731,33 @@ WebAppInterface::_SendJsonRequest(const char* domain,
BDataIO* requestData,
bool isSecure = url.Protocol() == "https";
if (Logger::IsDebugEnabled()) {
- printf("will make json-rpc request to [%s]\n",
+ printf("jrpc; will make request to [%s]\n",
url.UrlString().String());
}
+ // If the request payload is logged then it must be copied to local
memory
+ // from the stream. This then requires that the request data is then
+ // delivered from memory.
+
+ if (Logger::IsTraceEnabled()) {
+ BMallocIO *loggedRequestData = new BMallocIO();
+ loggedRequestData->SetSize(requestDataSize);
+ status_t dataCopyResult = DataIOUtils::Copy(loggedRequestData,
+ requestData, requestDataSize);
+ delete requestData;
+ requestData = loggedRequestData;
+
+ if (dataCopyResult != B_OK) {
+ delete requestData;
+ return dataCopyResult;
+ }
+
+ printf("jrpc request; ");
+ _LogPayload(static_cast<const char
*>(loggedRequestData->Buffer()),
+ loggedRequestData->BufferLength());
+ printf("\n");
+ }
+
ProtocolListener listener(Logger::IsTraceEnabled());
BUrlContext context;
@@ -766,7 +793,7 @@ WebAppInterface::_SendJsonRequest(const char* domain,
BDataIO* requestData,
int32 statusCode = result.StatusCode();
if (Logger::IsDebugEnabled()) {
- printf("did receive json-rpc response http status [%" B_PRId32
"] "
+ printf("jrpc; did receive http-status [%" B_PRId32 "] "
"from [%s]\n", statusCode, url.UrlString().String());
}
@@ -784,6 +811,13 @@ WebAppInterface::_SendJsonRequest(const char* domain,
BDataIO* requestData,
return B_ERROR;
}
+ if (Logger::IsTraceEnabled()) {
+ printf("jrpc response; ");
+ _LogPayload(static_cast<const char *>(replyData.Buffer()),
+ replyData.BufferLength());
+ printf("\n");
+ }
+
status_t status = BJson::Parse(
static_cast<const char *>(replyData.Buffer()),
replyData.BufferLength(),
reply);
@@ -800,9 +834,6 @@ status_t
WebAppInterface::_SendJsonRequest(const char* domain, BString jsonString,
uint32 flags, BMessage& reply) const
{
- if (Logger::IsTraceEnabled())
- printf("_SendJsonRequest(%s)\n", jsonString.String());
-
// gets 'adopted' by the subsequent http request.
BMemoryIO* data = new BMemoryIO(
jsonString.String(), jsonString.Length() - 1);
@@ -810,3 +841,24 @@ WebAppInterface::_SendJsonRequest(const char* domain,
BString jsonString,
return _SendJsonRequest(domain, data, jsonString.Length() - 1, flags,
reply);
}
+
+
+void
+WebAppInterface::_LogPayload(const char* data, ssize_t size)
+{
+ if (size > LOG_PAYLOAD_LIMIT)
+ size = LOG_PAYLOAD_LIMIT;
+
+ for (int32 i = 0; i < size; i++) {
+ bool esc = data[i] > 126 ||
+ (data[i] < 0x20 && data[i] != 0x0a);
+
+ if (esc)
+ printf("\\u%02x", data[i]);
+ else
+ putchar(data[i]);
+ }
+
+ if (size == LOG_PAYLOAD_LIMIT)
+ printf("...(continues)");
+}
diff --git a/src/apps/haikudepot/server/WebAppInterface.h
b/src/apps/haikudepot/server/WebAppInterface.h
index b6ce6f7219..cbee69fac8 100644
--- a/src/apps/haikudepot/server/WebAppInterface.h
+++ b/src/apps/haikudepot/server/WebAppInterface.h
@@ -119,7 +119,8 @@ private:
BDataIO* requestData,
size_t
requestDataSize, uint32 flags,
BMessage& reply) const;
-
+ static void _LogPayload(const char* data,
ssize_t size);
+
private:
BString fUsername;
BString fPassword;
diff --git a/src/apps/haikudepot/util/DataIOUtils.cpp
b/src/apps/haikudepot/util/DataIOUtils.cpp
new file mode 100644
index 0000000000..9f5f66cf2b
--- /dev/null
+++ b/src/apps/haikudepot/util/DataIOUtils.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018, Andrew Lindesay <apl@xxxxxxxxxxxxxx>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+
+
+#include "DataIOUtils.h"
+
+
+#define BUFFER_SIZE 1024
+
+
+status_t
+DataIOUtils::Copy(BDataIO* target, BDataIO* source, size_t size)
+{
+ status_t result = B_OK;
+ uint8 buffer[BUFFER_SIZE];
+
+ while (size > 0 && result == B_OK) {
+ size_t sizeToRead = size;
+ size_t sizeRead = 0;
+
+ if (sizeToRead > BUFFER_SIZE)
+ sizeToRead = BUFFER_SIZE;
+
+ result = source->ReadExactly(buffer, sizeToRead, &sizeRead);
+
+ if (result == B_OK)
+ result = target->WriteExactly(buffer, sizeRead);
+
+ size -= sizeRead;
+ }
+
+ return result;
+}
\ No newline at end of file
diff --git a/src/apps/haikudepot/util/DataIOUtils.h
b/src/apps/haikudepot/util/DataIOUtils.h
new file mode 100644
index 0000000000..268cd28e1a
--- /dev/null
+++ b/src/apps/haikudepot/util/DataIOUtils.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018, Andrew Lindesay <apl@xxxxxxxxxxxxxx>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef DATA_IO_UTILS_H
+#define DATA_IO_UTILS_H
+
+
+#include <DataIO.h>
+
+
+class DataIOUtils {
+
+public:
+ static status_t Copy(BDataIO* target, BDataIO* source,
size_t size);
+
+};
+
+
+#endif // DATA_IO_UTILS_H
