2013-10-21 17:42:46 +02:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <getopt.h>
|
|
|
|
#include <assert.h>
|
2013-10-26 16:31:41 +02:00
|
|
|
#include <errno.h>
|
|
|
|
#include <stdlib.h>
|
2013-10-21 17:42:46 +02:00
|
|
|
|
|
|
|
#include <jansson.h>
|
|
|
|
|
|
|
|
#include "nghttp2_hd.h"
|
2013-10-26 15:46:44 +02:00
|
|
|
#include "nghttp2_frame.h"
|
2013-10-21 17:42:46 +02:00
|
|
|
|
2013-10-26 18:04:42 +02:00
|
|
|
#include "comp_helper.h"
|
|
|
|
|
2013-10-26 16:31:41 +02:00
|
|
|
typedef struct {
|
|
|
|
nghttp2_hd_side side;
|
|
|
|
size_t table_size;
|
|
|
|
size_t local_table_size;
|
|
|
|
int http1text;
|
2013-10-26 18:04:42 +02:00
|
|
|
int dump_header_table;
|
2013-10-26 16:31:41 +02:00
|
|
|
} deflate_config;
|
|
|
|
|
|
|
|
static deflate_config config;
|
|
|
|
|
2013-10-21 17:42:46 +02:00
|
|
|
static void to_hex(char *dest, const uint8_t *src, size_t len)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
for(i = 0; i < len; ++i) {
|
|
|
|
sprintf(dest, "%02x", src[i]);
|
|
|
|
dest += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-26 18:04:42 +02:00
|
|
|
static void output_to_json(nghttp2_hd_context *deflater,
|
|
|
|
const uint8_t *buf, size_t len, size_t inputlen,
|
2013-10-21 17:42:46 +02:00
|
|
|
int seq)
|
|
|
|
{
|
|
|
|
json_t *obj;
|
|
|
|
char hex[16*1024];
|
|
|
|
|
|
|
|
if(len * 2 > sizeof(hex)) {
|
|
|
|
fprintf(stderr, "Output too large at %d\n", seq);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
obj = json_object();
|
|
|
|
json_object_set_new(obj, "seq", json_integer(seq));
|
|
|
|
json_object_set_new(obj, "inputLen", json_integer(inputlen));
|
|
|
|
json_object_set_new(obj, "outputLength", json_integer(len));
|
2013-10-28 16:21:31 +01:00
|
|
|
json_object_set_new(obj, "percentageOfOriginalSize",
|
2013-10-21 17:42:46 +02:00
|
|
|
json_real((double)len / inputlen * 100));
|
|
|
|
to_hex(hex, buf, len);
|
|
|
|
json_object_set_new(obj, "output", json_pack("s#", hex, len * 2));
|
2013-10-26 18:04:42 +02:00
|
|
|
if(config.dump_header_table) {
|
|
|
|
json_object_set_new(obj, "headerTable", dump_header_table(deflater));
|
|
|
|
}
|
|
|
|
json_dumpf(obj, stdout, JSON_PRESERVE_ORDER | JSON_INDENT(2));
|
2013-10-21 17:42:46 +02:00
|
|
|
printf("\n");
|
|
|
|
json_decref(obj);
|
|
|
|
}
|
|
|
|
|
2013-10-26 15:46:44 +02:00
|
|
|
static void deflate_hd(nghttp2_hd_context *deflater,
|
|
|
|
nghttp2_nv *nva, size_t nvlen, size_t inputlen, int seq)
|
2013-10-21 17:42:46 +02:00
|
|
|
{
|
2013-10-26 15:46:44 +02:00
|
|
|
ssize_t rv;
|
2013-10-21 17:42:46 +02:00
|
|
|
uint8_t *buf = NULL;
|
|
|
|
size_t buflen = 0;
|
2013-10-26 15:46:44 +02:00
|
|
|
rv = nghttp2_hd_deflate_hd(deflater, &buf, &buflen, 0, nva, nvlen);
|
|
|
|
if(rv < 0) {
|
|
|
|
fprintf(stderr, "deflate failed with error code %zd at %d\n", rv, seq);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2013-10-26 18:04:42 +02:00
|
|
|
output_to_json(deflater, buf, rv, inputlen, seq);
|
2013-10-26 15:46:44 +02:00
|
|
|
nghttp2_hd_end_headers(deflater);
|
|
|
|
free(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int deflate_hd_json(json_t *obj, nghttp2_hd_context *deflater, int seq)
|
|
|
|
{
|
|
|
|
json_t *js;
|
2013-10-21 17:42:46 +02:00
|
|
|
nghttp2_nv nva[128];
|
|
|
|
size_t len;
|
|
|
|
size_t i;
|
|
|
|
size_t inputlen = 0;
|
|
|
|
|
|
|
|
js = json_object_get(obj, "headers");
|
|
|
|
if(js == NULL) {
|
|
|
|
fprintf(stderr, "headers key is missing at %d\n", seq);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if(!json_is_array(js)) {
|
|
|
|
fprintf(stderr, "headers value must be an array at %d\n", seq);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
len = json_array_size(js);
|
|
|
|
if(len > sizeof(nva)/sizeof(nva[0])) {
|
|
|
|
fprintf(stderr, "Too many headers (> %zu) at %d\n",
|
|
|
|
sizeof(nva)/sizeof(nva[0]), seq);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for(i = 0; i < len; ++i) {
|
|
|
|
json_t *nv_pair = json_array_get(js, i);
|
|
|
|
json_t *s;
|
|
|
|
if(!json_is_array(nv_pair) || json_array_size(nv_pair) != 2) {
|
|
|
|
fprintf(stderr, "bad formatted name/value pair array at %d\n", seq);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
s = json_array_get(nv_pair, 0);
|
|
|
|
if(!json_is_string(s)) {
|
|
|
|
fprintf(stderr, "bad formatted name/value pair array at %d\n", seq);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
nva[i].name = (uint8_t*)json_string_value(s);
|
|
|
|
nva[i].namelen = strlen(json_string_value(s));
|
|
|
|
|
|
|
|
s = json_array_get(nv_pair, 1);
|
|
|
|
if(!json_is_string(s)) {
|
|
|
|
fprintf(stderr, "bad formatted name/value pair array at %d\n", seq);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
nva[i].value = (uint8_t*)json_string_value(s);
|
|
|
|
nva[i].valuelen = strlen(json_string_value(s));
|
|
|
|
inputlen += nva[i].namelen + nva[i].valuelen;
|
|
|
|
}
|
2013-10-26 15:46:44 +02:00
|
|
|
deflate_hd(deflater, nva, len, inputlen, seq);
|
2013-10-21 17:42:46 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-26 16:31:41 +02:00
|
|
|
static int perform(nghttp2_hd_context *deflater)
|
2013-10-21 17:42:46 +02:00
|
|
|
{
|
2013-10-21 17:50:09 +02:00
|
|
|
size_t i;
|
2013-10-21 17:42:46 +02:00
|
|
|
json_t *json;
|
|
|
|
json_error_t error;
|
|
|
|
size_t len;
|
|
|
|
json = json_loadf(stdin, 0, &error);
|
|
|
|
if(json == NULL) {
|
|
|
|
fprintf(stderr, "JSON loading failed\n");
|
2013-10-21 17:50:09 +02:00
|
|
|
exit(EXIT_FAILURE);
|
2013-10-21 17:42:46 +02:00
|
|
|
}
|
|
|
|
printf("[\n");
|
|
|
|
len = json_array_size(json);
|
|
|
|
for(i = 0; i < len; ++i) {
|
|
|
|
json_t *obj = json_array_get(json, i);
|
|
|
|
if(!json_is_object(obj)) {
|
2013-10-21 17:50:09 +02:00
|
|
|
fprintf(stderr, "Unexpected JSON type at %zu. It should be object.\n",
|
|
|
|
i);
|
2013-10-21 17:42:46 +02:00
|
|
|
continue;
|
|
|
|
}
|
2013-10-26 16:31:41 +02:00
|
|
|
if(deflate_hd_json(obj, deflater, i) != 0) {
|
2013-10-21 17:42:46 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if(i + 1 < len) {
|
|
|
|
printf(",\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("]\n");
|
|
|
|
json_decref(json);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-26 16:31:41 +02:00
|
|
|
static int perform_from_http1text(nghttp2_hd_context *deflater)
|
2013-10-26 15:46:44 +02:00
|
|
|
{
|
|
|
|
char line[1 << 14];
|
|
|
|
nghttp2_nv nva[256];
|
|
|
|
int seq = 0;
|
|
|
|
printf("[\n");
|
|
|
|
for(;;) {
|
|
|
|
size_t nvlen = 0;
|
|
|
|
int end = 0;
|
|
|
|
size_t inputlen = 0;
|
|
|
|
size_t i;
|
|
|
|
for(;;) {
|
|
|
|
nghttp2_nv *nv;
|
|
|
|
char *rv = fgets(line, sizeof(line), stdin);
|
|
|
|
char *val, *val_end;
|
|
|
|
if(rv == NULL) {
|
|
|
|
end = 1;
|
|
|
|
break;
|
|
|
|
} else if(line[0] == '\n') {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
assert(nvlen < sizeof(nva)/sizeof(nva[0]));
|
|
|
|
nv = &nva[nvlen];
|
|
|
|
val = strchr(line+1, ':');
|
|
|
|
if(val == NULL) {
|
|
|
|
fprintf(stderr, "Bad HTTP/1 header field format at %d.\n", seq);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
*val = '\0';
|
|
|
|
++val;
|
|
|
|
for(; *val && (*val == ' ' || *val == '\t'); ++val);
|
|
|
|
for(val_end = val; *val_end && (*val_end != '\r' && *val_end != '\n');
|
|
|
|
++val_end);
|
|
|
|
*val_end = '\0';
|
|
|
|
/* printf("[%s] : [%s]\n", line, val); */
|
|
|
|
nv->namelen = strlen(line);
|
|
|
|
nv->valuelen = strlen(val);
|
|
|
|
nv->name = (uint8_t*)strdup(line);
|
|
|
|
nv->value = (uint8_t*)strdup(val);
|
|
|
|
++nvlen;
|
|
|
|
inputlen += nv->namelen + nv->valuelen;
|
|
|
|
}
|
|
|
|
|
2013-10-26 16:31:41 +02:00
|
|
|
deflate_hd(deflater, nva, nvlen, inputlen, seq);
|
2013-10-26 15:46:44 +02:00
|
|
|
|
|
|
|
for(i = 0; i < nvlen; ++i) {
|
|
|
|
free(nva[i].name);
|
|
|
|
free(nva[i].value);
|
|
|
|
}
|
|
|
|
if(end) break;
|
|
|
|
printf(",\n");
|
|
|
|
++seq;
|
|
|
|
}
|
|
|
|
printf("]\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-21 17:50:09 +02:00
|
|
|
static void print_help(void)
|
2013-10-21 17:42:46 +02:00
|
|
|
{
|
2013-10-26 15:46:44 +02:00
|
|
|
printf("HPACK-draft-04 header compressor\n"
|
2013-10-26 16:31:41 +02:00
|
|
|
"Usage: deflatehd [OPTIONS] < INPUT\n"
|
2013-10-26 15:46:44 +02:00
|
|
|
"\n"
|
|
|
|
"Reads JSON array or HTTP/1-style header fields from stdin and\n"
|
|
|
|
"outputs deflated header block in JSON array.\n"
|
|
|
|
"\n"
|
|
|
|
"For the JSON input, the element of input array must be a JSON\n"
|
|
|
|
"object. Each object must have at least following key:\n"
|
2013-10-21 17:42:46 +02:00
|
|
|
"\n"
|
|
|
|
" headers: a JSON array of name/value pairs. The each element is\n"
|
|
|
|
" a JSON array of 2 strings. The index 0 must\n"
|
|
|
|
" contain header name and the index 1 must contain\n"
|
|
|
|
" header value.\n"
|
|
|
|
"\n"
|
|
|
|
"Example:\n"
|
|
|
|
"[\n"
|
|
|
|
" {\n"
|
2013-10-28 16:21:31 +01:00
|
|
|
" \"headers\": [\n"
|
2013-10-21 17:42:46 +02:00
|
|
|
" [ \":method\", \"GET\" ],\n"
|
|
|
|
" [ \":path\", \"/\" ]\n"
|
|
|
|
" ]\n"
|
|
|
|
" },\n"
|
|
|
|
" {\n"
|
2013-10-28 16:21:31 +01:00
|
|
|
" \"headers\": [\n"
|
2013-10-21 17:42:46 +02:00
|
|
|
" [ \":method\", \"POST\" ],\n"
|
|
|
|
" [ \":path\", \"/\" ]\n"
|
|
|
|
" ]\n"
|
|
|
|
" }\n"
|
|
|
|
"]\n"
|
|
|
|
"\n"
|
2013-10-26 15:46:44 +02:00
|
|
|
"With -t option, the program can accept more familiar HTTP/1 style\n"
|
|
|
|
"header field block. Each header set is delimited by empty line:\n"
|
|
|
|
"\n"
|
|
|
|
"Example:\n"
|
|
|
|
":method: GET\n"
|
|
|
|
":scheme: https\n"
|
|
|
|
":path: /\n"
|
|
|
|
"\n"
|
|
|
|
":method: POST\n"
|
|
|
|
"user-agent: nghttp2\n"
|
|
|
|
"\n"
|
2013-10-21 17:42:46 +02:00
|
|
|
"The output of this program can be used as input for inflatehd.\n"
|
|
|
|
"\n"
|
|
|
|
"OPTIONS:\n"
|
|
|
|
" -r, --response Use response compression context instead of\n"
|
2013-10-26 15:46:44 +02:00
|
|
|
" request.\n"
|
|
|
|
" -t, --http1text Use HTTP/1 style header field text as input.\n"
|
|
|
|
" Each header set is delimited by single empty\n"
|
2013-10-26 16:31:41 +02:00
|
|
|
" line.\n"
|
|
|
|
" -s, --table-size=<N>\n"
|
2013-10-26 18:04:42 +02:00
|
|
|
" Set dynamic table size. In the HPACK\n"
|
2013-10-26 16:31:41 +02:00
|
|
|
" specification, this value is denoted by\n"
|
|
|
|
" SETTINGS_HEADER_TABLE_SIZE.\n"
|
|
|
|
" Default: 4096\n"
|
|
|
|
" -S, --local-table-size=<N>\n"
|
2013-10-26 18:04:42 +02:00
|
|
|
" Use first N bytes of dynamic header table\n"
|
|
|
|
" buffer.\n"
|
|
|
|
" Default: 4096\n"
|
|
|
|
" -d, --dump-header-table\n"
|
|
|
|
" Output dynamic header table.\n");
|
2013-10-21 17:42:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct option long_options[] = {
|
|
|
|
{"response", no_argument, NULL, 'r'},
|
2013-10-26 15:46:44 +02:00
|
|
|
{"http1text", no_argument, NULL, 't'},
|
2013-10-26 16:31:41 +02:00
|
|
|
{"table-size", required_argument, NULL, 's'},
|
|
|
|
{"local-table-size", required_argument, NULL, 'S'},
|
2013-10-26 18:04:42 +02:00
|
|
|
{"dump-header-table", no_argument, NULL, 'd'},
|
2013-10-21 17:42:46 +02:00
|
|
|
{NULL, 0, NULL, 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
2013-10-26 16:31:41 +02:00
|
|
|
nghttp2_hd_context deflater;
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
config.side = NGHTTP2_HD_SIDE_REQUEST;
|
|
|
|
config.table_size = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
|
|
|
|
config.local_table_size = NGHTTP2_HD_DEFAULT_LOCAL_MAX_BUFFER_SIZE;
|
|
|
|
config.http1text = 0;
|
2013-10-26 18:04:42 +02:00
|
|
|
config.dump_header_table = 0;
|
2013-10-21 17:42:46 +02:00
|
|
|
while(1) {
|
|
|
|
int option_index = 0;
|
2013-10-26 18:04:42 +02:00
|
|
|
int c = getopt_long(argc, argv, "S:dhrs:t", long_options, &option_index);
|
2013-10-21 17:42:46 +02:00
|
|
|
if(c == -1) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch(c) {
|
|
|
|
case 'r':
|
|
|
|
/* --response */
|
2013-10-26 16:31:41 +02:00
|
|
|
config.side = NGHTTP2_HD_SIDE_RESPONSE;
|
2013-10-21 17:42:46 +02:00
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
print_help();
|
|
|
|
exit(EXIT_SUCCESS);
|
2013-10-26 15:46:44 +02:00
|
|
|
case 't':
|
2013-10-26 16:31:41 +02:00
|
|
|
/* --http1text */
|
|
|
|
config.http1text = 1;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
/* --table-size */
|
|
|
|
config.table_size = strtoul(optarg, &end, 10);
|
|
|
|
if(errno == ERANGE || *end != '\0') {
|
|
|
|
fprintf(stderr, "-s: Bad option value\n");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'S':
|
|
|
|
/* --local-table-size */
|
|
|
|
config.local_table_size = strtoul(optarg, &end, 10);
|
|
|
|
if(errno == ERANGE || *end != '\0') {
|
|
|
|
fprintf(stderr, "-S: Bad option value\n");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2013-10-26 15:46:44 +02:00
|
|
|
break;
|
2013-10-26 18:04:42 +02:00
|
|
|
case 'd':
|
|
|
|
/* --dump-header-table */
|
|
|
|
config.dump_header_table = 1;
|
|
|
|
break;
|
2013-10-21 17:42:46 +02:00
|
|
|
case '?':
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-10-26 16:31:41 +02:00
|
|
|
nghttp2_hd_deflate_init2(&deflater, config.side, config.local_table_size);
|
|
|
|
nghttp2_hd_change_table_size(&deflater, config.table_size);
|
|
|
|
if(config.http1text) {
|
|
|
|
perform_from_http1text(&deflater);
|
2013-10-26 15:46:44 +02:00
|
|
|
} else {
|
2013-10-26 16:31:41 +02:00
|
|
|
perform(&deflater);
|
2013-10-26 15:46:44 +02:00
|
|
|
}
|
2013-10-26 16:31:41 +02:00
|
|
|
nghttp2_hd_deflate_free(&deflater);
|
2013-10-21 17:42:46 +02:00
|
|
|
return 0;
|
|
|
|
}
|