GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Remove the "message" object thingy again.

Browse Source 
* src/gpgme-json.c (process_request): Remove 'nm_mode'.
--

This was an error in the javascript testing code.  Thus the Mozilla
specs are correct that the request is send verbatim.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-03-28 21:21:10 +02:00
parent 4b2fa657d1
commit 3345a17dda
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gpgme-json.c
View File

@ -755,10 +755,9 @@ op_help (cjson_t request, cjson_t result)
/* Process a request and return the response. The response is a newly /* Process a request and return the response. The response is a newly
* allocated staring or NULL in case of an error. With NM_MODE set * allocated string or NULL in case of an error. */
* the actual request is taken from a "message" object. */
static char * static char *
process_request (const char *request, int nm_mode) process_request (const char *request)
{ {
static struct { static struct {
const char *op; const char *op;
@ -772,7 +771,6 @@ process_request (const char *request, int nm_mode)
{ NULL } { NULL }
}; };
size_t erroff; size_t erroff;
cjson_t json_orig;
cjson_t json; cjson_t json;
cjson_t j_tmp, j_op; cjson_t j_tmp, j_op;
cjson_t response; cjson_t response;
@ -783,7 +781,7 @@ process_request (const char *request, int nm_mode)
response = xjson_CreateObject (); response = xjson_CreateObject ();
json = json_orig = cJSON_Parse (request, &erroff); json = cJSON_Parse (request, &erroff);
if (!json) if (!json)
{ {
log_string (GPGRT_LOGLVL_INFO, request); log_string (GPGRT_LOGLVL_INFO, request);
@ -791,16 +789,6 @@ process_request (const char *request, int nm_mode)
error_object (response, "invalid JSON object at offset %zu\n", erroff); error_object (response, "invalid JSON object at offset %zu\n", erroff);
goto leave; goto leave;
} }
if (nm_mode)
{
json = cJSON_GetObjectItem (json, "message");
if (!json)
{
log_info ("no \"message\" object in request\n");
error_object (response, "no \"message\" object in request\n");
goto leave;
}
}
j_tmp = cJSON_GetObjectItem (json, "help"); j_tmp = cJSON_GetObjectItem (json, "help");
helpmode = (j_tmp && cjson_is_true (j_tmp)); helpmode = (j_tmp && cjson_is_true (j_tmp));
@ -857,7 +845,7 @@ process_request (const char *request, int nm_mode)
} }
leave: leave:
cJSON_Delete (json_orig); cJSON_Delete (json);
if (opt_interactive) if (opt_interactive)
res = cJSON_Print (response); res = cJSON_Print (response);
else else
@ -942,7 +930,7 @@ process_meta_commands (const char *request)
"\"\\nMeta commands:\\n" "\"\\nMeta commands:\\n"
" ,help This help\\n" " ,help This help\\n"
" ,quit Terminate process\"" " ,quit Terminate process\""
"}", 0); "}");
else if (!strncmp (request, "quit", 4) && (spacep (request+4) || !request[4])) else if (!strncmp (request, "quit", 4) && (spacep (request+4) || !request[4]))
exit (0); exit (0);
else else
@ -1041,7 +1029,7 @@ interactive_repl (void)
} }
else if (request) else if (request)
{ {
response = process_request (request, 0); response = process_request (request);
} }
xfree (request); xfree (request);
request = NULL; request = NULL;
@ -1105,7 +1093,7 @@ read_and_process_single_request (void)
if (request) if (request)
{ {
xfree (response); xfree (response);
response = process_request (request, 0); response = process_request (request);
if (response) if (response)
{ {
es_fputs (response, es_stdout); es_fputs (response, es_stdout);
@ -1138,7 +1126,7 @@ native_messaging_repl (void)
* binary mode. */ * binary mode. */
es_set_binary (es_stdin); es_set_binary (es_stdin);
es_set_binary (es_stdout); es_set_binary (es_stdout);
es_setbuf (es_stdin, NULL); es_setbuf (es_stdin, NULL); /* stdin needs to be unbuffered! */
for (;;) for (;;)
{ {
@ -1197,7 +1185,7 @@ native_messaging_repl (void)
if (opt_debug) if (opt_debug)
log_debug ("request='%s'\n", request); log_debug ("request='%s'\n", request);
xfree (response); xfree (response);
response = process_request (request, 1); response = process_request (request);
if (opt_debug) if (opt_debug)
log_debug ("response='%s'\n", response); log_debug ("response='%s'\n", response);
} }