/*
* Handle connections.
*
- * Copyright (C) 2011 Simon Ruderich
+ * Copyright (C) 2011-2012 Simon Ruderich
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
char path[1024];
FILE *file = NULL;
- if (-2 == server_certificate_path(&file, host, path, sizeof(path))) {
+ if (-2 == server_certificate_file(&file, host, path, sizeof(path))) {
/* We've established a connection, tell the client. */
fprintf(client_fd, "HTTP/1.0 200 Connection established\r\n");
fprintf(client_fd, "\r\n");
goto out;
}
- /* server_certificate_path() may have opened the file, close it. */
+ /* server_certificate_file() may have opened the file, close it. */
if (NULL != file) {
fclose(file);
}
/* The "invalid" hostname is special. If it's used we send an invalid
* certificate to let the client know something is wrong. */
- use_invalid_cert = 0 == strcmp(hostname, "invalid");
+ use_invalid_cert = (0 == strcmp(hostname, "invalid"));
- /* Hostname too long. */
- if (sizeof(path) - strlen(PROXY_SERVER_CERT_FORMAT) <= strlen(hostname)) {
- LOG(LOG_WARNING,
- "initialize_tls_session_client(): hostname too long: '%s'",
- hostname);
- return -1;
- }
- /* Try to prevent path traversals in hostnames. */
- if (NULL != strstr(hostname, "..")) {
- LOG(LOG_WARNING,
- "initialize_tls_session_client(): possible path traversal: '%s'",
- hostname);
- return -1;
- }
- result = snprintf(path, sizeof(path), PROXY_SERVER_CERT_FORMAT, hostname);
- if (result < 0) {
- LOG_PERROR(LOG_ERROR,
- "initialize_tls_session_client(): snprintf failed");
- return -1;
- } else if ((size_t)result >= sizeof(path)) {
+ if (0 != proxy_certificate_path(hostname, path, sizeof(path))) {
LOG(LOG_ERROR,
- "initialize_tls_session_client(): snprintf buffer too short");
+ "initialize_tls_session_client(): \
+failed to get proxy certificate path");
return -1;
}
return -2;
}
- while (NULL != fgets(buffer, MAX_REQUEST_LINE, client_fd)) {
+ while (NULL != fgets(buffer, sizeof(buffer), client_fd)) {
/* End of header. */
if (0 == strcmp(buffer, "\n") || 0 == strcmp(buffer, "\r\n")) {
break;
/* Get maximum possible buffer size. */
buffer_size = gnutls_record_get_max_size(client_session);
- LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
- (long int)buffer_size);
if (buffer_size > gnutls_record_get_max_size(server_session)) {
buffer_size = gnutls_record_get_max_size(server_session);
}
+ LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
+ (long int)buffer_size);
for (;;) {
int result = poll(fds, 2, -1 /* no timeout */);