kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add "-www" option to server tool.

Browse Source 
Add a simple dumb webserver that responds with the session status for
any GET request. This option is intended to be used with -loop to
generate automated responses to requests and serves two purposes: (1)
test that application data from clients can be decrypted, (2) test that
clients can decrypt data from the server and (3) early data indicator.

Change-Id: I2b8374ca7b8db4c8effab42e86b5e3139d9466e1
Reviewed-on: https://boringssl-review.googlesource.com/20305
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Peter Wu 2017-09-15 15:18:03 +01:00 committed by CQ bot account: commit-bot@chromium.org
parent 5663b634f4
commit 40b24c8154
1 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tool/server.cc
View File

@ -70,6 +70,11 @@ static const struct argument kArguments[] = {
{
"-tls13-variant", kBooleanArgument, "Enable TLS 1.3 variants",
},
{
"-www", kBooleanArgument,
"The server will print connection information in response to a "
"HTTP GET request.",
},
{
"-debug", kBooleanArgument,
"Print debug information about the handshake",
@ -167,6 +172,41 @@ static void KeyLogCallback(const SSL *ssl, const char *line) {
fflush(g_keylog_file);
}
static bool HandleWWW(SSL *ssl) {
bssl::UniquePtr<BIO> bio(BIO_new(BIO_s_mem()));
if (!bio) {
fprintf(stderr, "Cannot create BIO for response\n");
return false;
}
BIO_puts(bio.get(), "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\n");
PrintConnectionInfo(bio.get(), ssl);
char request[4];
size_t request_len = 0;
while (request_len < sizeof(request)) {
int ssl_ret =
SSL_read(ssl, request + request_len, sizeof(request) - request_len);
if (ssl_ret <= 0) {
int ssl_err = SSL_get_error(ssl, ssl_ret);
fprintf(stderr, "Error while reading: %d\n", ssl_err);
ERR_print_errors_cb(PrintErrorCallback, stderr);
return false;
}
request_len += static_cast<size_t>(ssl_ret);
}
// Assume simple HTTP request, print status.
if (memcmp(request, "GET ", 4) == 0) {
const uint8_t *response;
size_t response_len;
if (BIO_mem_contents(bio.get(), &response, &response_len)) {
SSL_write(ssl, response, response_len);
}
}
return true;
}
bool Server(const std::vector<std::string> &args) {
if (!InitSocketLibrary()) {
return false;
@ -309,7 +349,11 @@ bool Server(const std::vector<std::string> &args) {
bssl::UniquePtr<BIO> bio_stderr(BIO_new_fp(stderr, BIO_NOCLOSE));
PrintConnectionInfo(bio_stderr.get(), ssl.get());
result = TransferData(ssl.get(), sock);
if (args_map.count("-www") != 0) {
result = HandleWWW(ssl.get());
} else {
result = TransferData(ssl.get(), sock);
}
} while (args_map.count("-loop") != 0);
return result;