multiple modications
* add a function to dump binary as hexa in logs * implemente the TS response generator * begin to glue it together
This commit is contained in:
kakwa
parent
5ab6bc4325
commit
75dcc97e12
|
|
@ -17,7 +17,6 @@
|
|||
typedef struct {
|
||||
uint64_t query_counter;
|
||||
bool stdout_dbg;
|
||||
TS_RESP_CTX *resp_ctx;
|
||||
int loglevel;
|
||||
const char *http_options[40];
|
||||
TS_RESP_CTX *ts_ctx;
|
||||
|
|
|
|||
|
|
@ -29,10 +29,8 @@ static int reply_command(CONF *conf, char *section, char *engine, char *query,
|
|||
char *in, int token_in, char *out, int token_out,
|
||||
int text);
|
||||
static TS_RESP *read_PKCS7(BIO *in_bio);
|
||||
static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
|
||||
char *query, char *passin, char *inkey,
|
||||
const EVP_MD *md, char *signer, char *chain,
|
||||
const char *policy);
|
||||
int create_response(rfc3161_context *ct, char *query, TS_RESP_CTX *resp_ctx,
|
||||
int *resp_size, unsigned char **resp);
|
||||
static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data);
|
||||
static ASN1_INTEGER *next_serial(const char *serialfile);
|
||||
static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
|
||||
|
|
|
|||
|
|
@ -2,4 +2,6 @@
|
|||
|
||||
void skeleton_daemon();
|
||||
void uts_logger(rfc3161_context *ct, int priority, char *fmt, ...);
|
||||
void log_hex(rfc3161_context *ct, int priority, char *id,
|
||||
unsigned char *content, int content_length);
|
||||
int set_params(rfc3161_context *ct, char *conf_file);
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ void log_request_debug(const struct mg_request_info *request_info,
|
|||
request_info->request_uri);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], local_uri: %s", request_id,
|
||||
request_info->local_uri);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], http_version: %s",
|
||||
request_id, request_info->http_version);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], query_string: %s",
|
||||
request_id, request_info->query_string);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], http_version: %s", request_id,
|
||||
request_info->http_version);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], query_string: %s", request_id,
|
||||
request_info->query_string);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], remote_addr: %s", request_id,
|
||||
request_info->remote_addr);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], is_ssl: %d", request_id,
|
||||
|
|
@ -39,6 +39,12 @@ void log_request_debug(const struct mg_request_info *request_info,
|
|||
request_id, request_info->content_length);
|
||||
uts_logger(context, LOG_DEBUG, "Request[%d], remote_port: %d", request_id,
|
||||
request_info->remote_port);
|
||||
// uts_logger(context, LOG_DEBUG, "Request[%d], user_data: %s",
|
||||
// request_id,
|
||||
// request_info->user_data);
|
||||
// uts_logger(context, LOG_DEBUG, "Request[%d], conn_data: %s",
|
||||
// request_id,
|
||||
// request_info->conn_data);
|
||||
}
|
||||
|
||||
// This function will be called by civetweb on every new request.
|
||||
|
|
@ -76,18 +82,38 @@ int rfc3161_handler(struct mg_connection *conn, void *context) {
|
|||
is_tsq = 1;
|
||||
}
|
||||
|
||||
char *content = "\0";
|
||||
unsigned char *content;
|
||||
int content_length = 0;
|
||||
|
||||
// Send HTTP reply to the client
|
||||
if (is_tsq) {
|
||||
mg_printf(conn,
|
||||
"HTTP/1.1 200 OK\r\n"
|
||||
"Content-Type: application/timestamp-reply\r\n"
|
||||
"Content-Length: %d\r\n" // Always set Content-Length
|
||||
"\r\n"
|
||||
"%s",
|
||||
content_length, content);
|
||||
char *query = calloc(request_info->content_length, sizeof(char));
|
||||
mg_read(conn, query, request_info->content_length);
|
||||
|
||||
log_hex(ct, LOG_DEBUG, "query hexdump content", query,
|
||||
request_info->content_length);
|
||||
|
||||
int ts_resp =
|
||||
create_response(ct, query, ct->ts_ctx, &content_length, &content);
|
||||
if (ts_resp) {
|
||||
log_hex(ct, LOG_DEBUG, "response hexdump content", content,
|
||||
content_length);
|
||||
mg_printf(conn,
|
||||
"HTTP/1.1 200 OK\r\n"
|
||||
"Content-Type: application/timestamp-reply\r\n"
|
||||
"Content-Length: %d\r\n" // Always set Content-Length
|
||||
"\r\n",
|
||||
content_length);
|
||||
mg_write(conn, content, content_length);
|
||||
// free(content);
|
||||
} else {
|
||||
mg_printf(conn,
|
||||
"HTTP/1.1 500 OK\r\n"
|
||||
"Content-Type: text/plain\r\n"
|
||||
"Content-Length: 17\r\n" // Always set Content-Length
|
||||
"\r\n"
|
||||
"uts-server error");
|
||||
}
|
||||
} else {
|
||||
mg_printf(conn,
|
||||
"HTTP/1.1 200 OK\r\n"
|
||||
|
|
|
|||
|
|
@ -32,10 +32,6 @@ static int reply_command(CONF *conf, char *section, char *engine, char *query,
|
|||
char *in, int token_in, char *out, int token_out,
|
||||
int text);
|
||||
static TS_RESP *read_PKCS7(BIO *in_bio);
|
||||
static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
|
||||
char *query, char *passin, char *inkey,
|
||||
const EVP_MD *md, char *signer, char *chain,
|
||||
const char *policy);
|
||||
static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data);
|
||||
static ASN1_INTEGER *next_serial(const char *serialfile);
|
||||
static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
|
||||
|
|
@ -71,10 +67,9 @@ static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
|
|||
* Reply-related method definitions.
|
||||
*/
|
||||
|
||||
int add_oid_section(rfc3161_context *ct, CONF *conf)
|
||||
{
|
||||
int add_oid_section(rfc3161_context *ct, CONF *conf) {
|
||||
char *p;
|
||||
STACK_OF(CONF_VALUE) *sktmp;
|
||||
STACK_OF(CONF_VALUE) * sktmp;
|
||||
CONF_VALUE *cnf;
|
||||
int i;
|
||||
|
||||
|
|
@ -93,82 +88,84 @@ int add_oid_section(rfc3161_context *ct, CONF *conf)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int reply_command(CONF *conf, char *section, char *engine, char *query,
|
||||
char *passin, char *inkey, const EVP_MD *md,
|
||||
char *signer, char *chain, const char *policy,
|
||||
char *in, int token_in, char *out, int token_out,
|
||||
int text) {
|
||||
int ret = 0;
|
||||
TS_RESP *response = NULL;
|
||||
BIO *in_bio = NULL;
|
||||
BIO *query_bio = NULL;
|
||||
BIO *inkey_bio = NULL;
|
||||
BIO *signer_bio = NULL;
|
||||
BIO *out_bio = NULL;
|
||||
BIO *bio_err;
|
||||
|
||||
if (in != NULL) {
|
||||
if ((in_bio = BIO_new_file(in, "rb")) == NULL)
|
||||
goto end;
|
||||
if (token_in) {
|
||||
response = read_PKCS7(in_bio);
|
||||
} else {
|
||||
response = d2i_TS_RESP_bio(in_bio, NULL);
|
||||
}
|
||||
} else {
|
||||
response = create_response(conf, section, engine, query, passin, inkey,
|
||||
md, signer, chain, policy);
|
||||
// if (response)
|
||||
// BIO_printf(bio_err, "Response has been
|
||||
// generated.\n");
|
||||
// else
|
||||
// BIO_printf(bio_err, "Response is not
|
||||
// generated.\n");
|
||||
}
|
||||
if (response == NULL)
|
||||
goto end;
|
||||
|
||||
/* Write response. */
|
||||
if (text) {
|
||||
// if ((out_bio = bio_open_default(out, 'w', FORMAT_TEXT))
|
||||
//==
|
||||
// NULL)
|
||||
// goto end;
|
||||
if (token_out) {
|
||||
TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
|
||||
if (!TS_TST_INFO_print_bio(out_bio, tst_info))
|
||||
goto end;
|
||||
} else {
|
||||
if (!TS_RESP_print_bio(out_bio, response))
|
||||
goto end;
|
||||
}
|
||||
} else {
|
||||
// if ((out_bio = bio_open_default(out, 'w', FORMAT_ASN1))
|
||||
//==
|
||||
// NULL)
|
||||
// goto end;
|
||||
if (token_out) {
|
||||
PKCS7 *token = TS_RESP_get_token(response);
|
||||
if (!i2d_PKCS7_bio(out_bio, token))
|
||||
goto end;
|
||||
} else {
|
||||
if (!i2d_TS_RESP_bio(out_bio, response))
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
ret = 1;
|
||||
|
||||
end:
|
||||
ERR_print_errors(bio_err);
|
||||
BIO_free_all(in_bio);
|
||||
BIO_free_all(query_bio);
|
||||
BIO_free_all(inkey_bio);
|
||||
BIO_free_all(signer_bio);
|
||||
BIO_free_all(out_bio);
|
||||
TS_RESP_free(response);
|
||||
return ret;
|
||||
}
|
||||
// static int reply_command(CONF *conf, char *section, char *engine, char
|
||||
// *query,
|
||||
// char *passin, char *inkey, const EVP_MD *md,
|
||||
// char *signer, char *chain, const char *policy,
|
||||
// char *in, int token_in, char *out, int token_out,
|
||||
// int text) {
|
||||
// int ret = 0;
|
||||
// TS_RESP *response = NULL;
|
||||
// BIO *in_bio = NULL;
|
||||
// BIO *query_bio = NULL;
|
||||
// BIO *inkey_bio = NULL;
|
||||
// BIO *signer_bio = NULL;
|
||||
// BIO *out_bio = NULL;
|
||||
// BIO *bio_err;
|
||||
//
|
||||
// if (in != NULL) {
|
||||
// if ((in_bio = BIO_new_file(in, "rb")) == NULL)
|
||||
// goto end;
|
||||
// if (token_in) {
|
||||
// response = read_PKCS7(in_bio);
|
||||
// } else {
|
||||
// response = d2i_TS_RESP_bio(in_bio, NULL);
|
||||
// }
|
||||
// } else {
|
||||
// response = create_response(conf, section, engine, query, passin,
|
||||
// inkey,
|
||||
// md, signer, chain, policy);
|
||||
// // if (response)
|
||||
// // BIO_printf(bio_err, "Response has been
|
||||
// // generated.\n");
|
||||
// // else
|
||||
// // BIO_printf(bio_err, "Response is not
|
||||
// // generated.\n");
|
||||
// }
|
||||
// if (response == NULL)
|
||||
// goto end;
|
||||
//
|
||||
// /* Write response. */
|
||||
// if (text) {
|
||||
// // if ((out_bio = bio_open_default(out, 'w', FORMAT_TEXT))
|
||||
// //==
|
||||
// // NULL)
|
||||
// // goto end;
|
||||
// if (token_out) {
|
||||
// TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
|
||||
// if (!TS_TST_INFO_print_bio(out_bio, tst_info))
|
||||
// goto end;
|
||||
// } else {
|
||||
// if (!TS_RESP_print_bio(out_bio, response))
|
||||
// goto end;
|
||||
// }
|
||||
// } else {
|
||||
// // if ((out_bio = bio_open_default(out, 'w', FORMAT_ASN1))
|
||||
// //==
|
||||
// // NULL)
|
||||
// // goto end;
|
||||
// if (token_out) {
|
||||
// PKCS7 *token = TS_RESP_get_token(response);
|
||||
// if (!i2d_PKCS7_bio(out_bio, token))
|
||||
// goto end;
|
||||
// } else {
|
||||
// if (!i2d_TS_RESP_bio(out_bio, response))
|
||||
// goto end;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// ret = 1;
|
||||
//
|
||||
// end:
|
||||
// ERR_print_errors(bio_err);
|
||||
// BIO_free_all(in_bio);
|
||||
// BIO_free_all(query_bio);
|
||||
// BIO_free_all(inkey_bio);
|
||||
// BIO_free_all(signer_bio);
|
||||
// BIO_free_all(out_bio);
|
||||
// TS_RESP_free(response);
|
||||
// return ret;
|
||||
//}
|
||||
|
||||
/* Reads a PKCS7 token and adds default 'granted' status info to it. */
|
||||
static TS_RESP *read_PKCS7(BIO *in_bio) {
|
||||
|
|
@ -322,69 +319,34 @@ end:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
|
||||
char *query, char *passin, char *inkey,
|
||||
const EVP_MD *md, char *signer, char *chain,
|
||||
const char *policy) {
|
||||
int create_response(rfc3161_context *ct, char *query, TS_RESP_CTX *resp_ctx,
|
||||
int *resp_size, unsigned char **resp) {
|
||||
int ret = 0;
|
||||
TS_RESP *response = NULL;
|
||||
TS_RESP *ts_response = NULL;
|
||||
char *response = NULL;
|
||||
BIO *query_bio = NULL;
|
||||
TS_RESP_CTX *resp_ctx = NULL;
|
||||
BIO *out_bio = NULL;
|
||||
|
||||
if ((query_bio = BIO_new_mem_buf(query, -1)) == NULL)
|
||||
goto end;
|
||||
if ((section = TS_CONF_get_tsa_section(conf, section)) == NULL)
|
||||
goto end;
|
||||
if ((resp_ctx = TS_RESP_CTX_new()) == NULL)
|
||||
goto end;
|
||||
if (!TS_CONF_set_serial(conf, section, serial_cb, resp_ctx))
|
||||
goto end;
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
if (!TS_CONF_set_crypto_device(conf, section, engine))
|
||||
goto end;
|
||||
#endif
|
||||
if (!TS_CONF_set_signer_cert(conf, section, signer, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_certs(conf, section, chain, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_signer_key(conf, section, inkey, passin, resp_ctx))
|
||||
goto end;
|
||||
|
||||
// if (md) {
|
||||
// if (!TS_RESP_CTX_set_signer_digest(resp_ctx, md))
|
||||
// goto end;
|
||||
// } else if (!TS_CONF_set_signer_digest(conf, section, NULL, resp_ctx)) {
|
||||
// goto end;
|
||||
// }
|
||||
if ((ts_response = TS_RESP_create_response(resp_ctx, query_bio)) == NULL) {
|
||||
uts_logger(ct, LOG_ERR, "failed to create ts response");
|
||||
goto end;
|
||||
}
|
||||
*resp_size = i2d_TS_RESP(ts_response, NULL);
|
||||
*resp = calloc(*resp_size, sizeof(char));
|
||||
|
||||
if (!TS_CONF_set_def_policy(conf, section, policy, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_policies(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_digests(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_accuracy(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_clock_precision_digits(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_ordering(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_tsa_name(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if (!TS_CONF_set_ess_cert_id_chain(conf, section, resp_ctx))
|
||||
goto end;
|
||||
if ((response = TS_RESP_create_response(resp_ctx, query_bio)) == NULL)
|
||||
goto end;
|
||||
i2d_TS_RESP(ts_response, resp);
|
||||
ret = 1;
|
||||
|
||||
end:
|
||||
if (!ret) {
|
||||
TS_RESP_free(response);
|
||||
TS_RESP_free(ts_response);
|
||||
response = NULL;
|
||||
}
|
||||
TS_RESP_CTX_free(resp_ctx);
|
||||
BIO_free_all(query_bio);
|
||||
return response;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data) {
|
||||
|
|
@ -461,7 +423,7 @@ static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial) {
|
|||
ret = 1;
|
||||
err:
|
||||
if (!ret)
|
||||
// BIO_printf(bio_err, "could not save serial number to
|
||||
// BIO_Printf(bio_err, "could not save serial number to
|
||||
//%s\n",
|
||||
// serialfile);
|
||||
BIO_free_all(out);
|
||||
|
|
|
|||
|
|
@ -81,6 +81,26 @@ void skeleton_daemon() {
|
|||
openlog("uts-server", LOG_PID, LOG_DAEMON);
|
||||
}
|
||||
|
||||
void log_hex(rfc3161_context *ct, int priority, char *id,
|
||||
unsigned char *content, int content_length) {
|
||||
if (priority > ct->loglevel && !ct->stdout_dbg)
|
||||
return;
|
||||
FILE *stream;
|
||||
char *out;
|
||||
size_t len;
|
||||
stream = open_memstream(&out, &len);
|
||||
|
||||
for (int i = 0; i < content_length; i++) {
|
||||
fprintf(stream, "%02x ", content[i]);
|
||||
//if (i % 4 == 3)
|
||||
// fprintf(stream, " ");
|
||||
}
|
||||
fflush(stream);
|
||||
fclose(stream);
|
||||
uts_logger(ct, priority, "%s: %s", id, out);
|
||||
free(out);
|
||||
}
|
||||
|
||||
void uts_logger(rfc3161_context *ct, int priority, char *fmt, ...) {
|
||||
// ignore all messages less critical than the loglevel
|
||||
// except if the debug flag is set
|
||||
|
|
@ -240,8 +260,8 @@ int set_params(rfc3161_context *ct, char *conf_file) {
|
|||
ct->http_options[http_counter] = NULL;
|
||||
}
|
||||
|
||||
if(! add_oid_section(ct, conf))
|
||||
ret = 0;
|
||||
if (!add_oid_section(ct, conf))
|
||||
ret = 0;
|
||||
ct->ts_ctx = create_tsctx(ct, conf, NULL, NULL);
|
||||
if (ct->ts_ctx == NULL)
|
||||
ret = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue