X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fhttp.c;h=13f6f0de1e5a7d20858d52d6fd8e0b1c0ab924b9;hp=4a0211e63a855a0216aa647e4e733f2add45e2c0;hb=HEAD;hpb=d72252a86385d3d417d65d79e09f6cfa544aa47a

diff --git a/webcit-ng/http.c b/webcit-ng/http.c
deleted file mode 100644
index 4a0211e63..000000000
--- a/webcit-ng/http.c
+++ /dev/null
@@ -1,272 +0,0 @@
-//
-// This module handles HTTP transactions.
-//
-// Copyright (c) 1996-2021 by the citadel.org team
-//
-// This program is open source software.  It runs great on the
-// Linux operating system (and probably elsewhere).  You can use,
-// copy, and run it under the terms of the GNU General Public
-// License version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-#include "webcit.h"
-
-// Write data to the HTTP client.  Encrypt if necessary.
-int client_write(struct client_handle *ch, char *buf, int nbytes) {
-	if (is_https) {
-		return client_write_ssl(ch, buf, nbytes);
-	}
-	else {
-		return write(ch->sock, buf, nbytes);
-	}
-}
-
-
-// Read data from the HTTP client.  Decrypt if necessary.
-// Returns number of bytes read, or -1 to indicate an error.
-int client_read(struct client_handle *ch, char *buf, int nbytes) {
-	if (is_https) {
-		return client_read_ssl(ch, buf, nbytes);
-	}
-	else {
-		int bytes_received = 0;
-		int bytes_this_block = 0;
-		while (bytes_received < nbytes) {
-			bytes_this_block = read(ch->sock, &buf[bytes_received], nbytes - bytes_received);
-			if (bytes_this_block < 1) {
-				return (-1);
-			}
-			bytes_received += bytes_this_block;
-		}
-		return (nbytes);
-	}
-}
-
-
-// Read a newline-terminated line of text from the client.
-// Implemented in terms of client_read() and is therefore transparent...
-// Returns the string length or -1 for error.
-int client_readline(struct client_handle *ch, char *buf, int maxbytes) {
-	int len = 0;
-	int c = 0;
-
-	if (buf == NULL) {
-		return (-1);
-	}
-
-	while (len < maxbytes) {
-		c = client_read(ch, &buf[len], 1);
-		if (c <= 0) {
-			syslog(LOG_DEBUG, "Socket error or zero-length read");
-			return (-1);
-		}
-		if (buf[len] == '\n') {
-			if ((len > 0) && (buf[len - 1] == '\r')) {
-				--len;
-			}
-			buf[len] = 0;
-			return (len);
-		}
-		++len;
-	}
-	return (len);
-}
-
-
-// printf() type function to send data to the web client.
-void client_printf(struct client_handle *ch, const char *format, ...) {
-	va_list arg_ptr;
-	StrBuf *Buf = NewStrBuf();
-
-	va_start(arg_ptr, format);
-	StrBufVAppendPrintf(Buf, format, arg_ptr);
-	va_end(arg_ptr);
-
-	client_write(ch, (char *) ChrPtr(Buf), StrLength(Buf));
-	FreeStrBuf(&Buf);
-}
-
-
-// Push one new header into the response of an HTTP request.
-// When completed, the HTTP transaction now owns the memory allocated for key and val.
-void add_response_header(struct http_transaction *h, char *key, char *val) {
-	struct key_val_list *new_response_header = malloc(sizeof(struct key_val_list));
-	new_response_header->key = key;
-	new_response_header->val = val;
-	new_response_header->next = h->response_headers;
-	h->response_headers = new_response_header;
-}
-
-
-// Entry point for this layer.  Socket is connected.  If running as an HTTPS
-// server, SSL has already been negotiated.  Now perform one transaction.
-void perform_one_http_transaction(struct client_handle *ch) {
-	char buf[1024];
-	int len;
-	int lines_read = 0;
-	struct http_transaction h;
-	char *c, *d;
-	struct sockaddr_in sin;
-	struct key_val_list *clh;		// general purpose iterator variable
-
-	memset(&h, 0, sizeof h);
-
-	while (len = client_readline(ch, buf, sizeof buf), (len > 0)) {
-		++lines_read;
-
-		if (lines_read == 1) {		// First line is method and URL.
-			c = strchr(buf, ' ');	// IGnore the HTTP-version.
-			if (c == NULL) {
-				h.method = strdup("NULL");
-				h.url = strdup("/");
-			}
-			else {
-				*c = 0;
-				h.method = strdup(buf);
-				++c;
-				d = c;
-				c = strchr(d, ' ');
-				if (c != NULL) {
-					*c = 0;
-				}
-				++c;
-				h.url = strdup(d);
-			}
-		}
-		else {			// Subsequent lines are headers.
-			c = strchr(buf, ':');	// Header line folding is obsolete so we don't support it.
-			if (c != NULL) {
-				struct key_val_list *new_request_header = malloc(sizeof(struct key_val_list));
-				*c = 0;
-				new_request_header->key = strdup(buf);
-				++c;
-				new_request_header->val = strdup(c);
-				striplt(new_request_header->key);
-				striplt(new_request_header->val);
-				new_request_header->next = h.request_headers;
-				h.request_headers = new_request_header;
-#ifdef DEBUG_HTTP
-				syslog(LOG_DEBUG, "\033[1m\033[35m{ %s: %s\033[0m", new_request_header->key, new_request_header->val);
-#endif
-			}
-		}
-
-	}
-
-	// build up the site prefix, such as https://foo.bar.com:4343
-	h.site_prefix = malloc(256);
-	strcpy(h.site_prefix, (is_https ? "https://" : "http://"));
-	char *hostheader = header_val(&h, "Host");
-	if (hostheader) {
-		strcat(h.site_prefix, hostheader);
-	}
-	else {
-		strcat(h.site_prefix, "127.0.0.1");
-	}
-	socklen_t llen = sizeof(sin);
-	if (getsockname(ch->sock, (struct sockaddr *) &sin, &llen) >= 0) {
-		sprintf(&h.site_prefix[strlen(h.site_prefix)], ":%d", ntohs(sin.sin_port));
-	}
-
-	// Now try to read in the request body (if one is present)
-	if (len < 0) {
-		syslog(LOG_DEBUG, "Client disconnected");
-	}
-	else {
-		syslog(LOG_DEBUG, "\033[33m\033[1m< %s %s\033[0m", h.method, h.url);
-
-		// If there is a request body, read it now.
-		char *ccl = header_val(&h, "Content-Length");
-		if (ccl) {
-			h.request_body_length = atol(ccl);
-		}
-		if (h.request_body_length > 0) {
-			syslog(LOG_DEBUG, "Reading request body (%ld bytes)", h.request_body_length);
-			h.request_body = malloc(h.request_body_length);
-			client_read(ch, h.request_body, h.request_body_length);
-
-			//write(2, HKEY("\033[31m"));
-			//write(2, h.request_body, h.request_body_length);
-			//write(2, HKEY("\033[0m\n"));
-
-		}
-		// Now pass control up to the next layer to perform the request.
-		perform_request(&h);
-
-		// Output the results back to the client.
-		//write(2, HKEY("\033[32m"));
-		//write(2, h.response_body, h.response_body_length);
-		//write(2, HKEY("\033[0m\n"));
-
-		syslog(LOG_DEBUG, "> %03d %s", h.response_code, h.response_string);
-		client_printf(ch, "HTTP/1.1 %03d %s\r\n", h.response_code, h.response_string);
-		client_printf(ch, "Connection: close\r\n");
-		client_printf(ch, "Content-Length: %ld\r\n", h.response_body_length);
-		char *datestring = http_datestring(time(NULL));
-		if (datestring) {
-			client_printf(ch, "Date: %s\r\n", datestring);
-			free(datestring);
-		}
-
-		client_printf(ch, "Content-encoding: identity\r\n");	// change if we gzip/deflate
-		for (clh = h.response_headers; clh != NULL; clh = clh->next) {
-#ifdef DEBUG_HTTP
-			syslog(LOG_DEBUG, "\033[1m\033[35m} %s: %s\033[0m", clh->key, clh->val);
-#endif
-			client_printf(ch, "%s: %s\r\n", clh->key, clh->val);
-		}
-		client_printf(ch, "\r\n");
-		if ((h.response_body_length > 0) && (h.response_body != NULL)) {
-			client_write(ch, h.response_body, h.response_body_length);
-		}
-	}
-
-	// free the transaction memory
-	while (h.request_headers) {
-		if (h.request_headers->key)
-			free(h.request_headers->key);
-		if (h.request_headers->val)
-			free(h.request_headers->val);
-		clh = h.request_headers->next;
-		free(h.request_headers);
-		h.request_headers = clh;
-	}
-	while (h.response_headers) {
-		if (h.response_headers->key)
-			free(h.response_headers->key);
-		if (h.response_headers->val)
-			free(h.response_headers->val);
-		clh = h.response_headers->next;
-		free(h.response_headers);
-		h.response_headers = clh;
-	}
-	if (h.method)
-		free(h.method);
-	if (h.url)
-		free(h.url);
-	if (h.request_body)
-		free(h.request_body);
-	if (h.response_string)
-		free(h.response_string);
-	if (h.site_prefix)
-		free(h.site_prefix);
-}
-
-
-// Utility function to fetch a specific header from a completely read-in request.
-// Returns the value of the requested header, or NULL if the specified header was not sent.
-// The caller does NOT own the memory of the returned pointer, but can count on the pointer
-// to still be valid through the end of the transaction.
-char *header_val(struct http_transaction *h, char *requested_header) {
-	struct key_val_list *clh;	// general purpose iterator variable
-	for (clh = h->request_headers; clh != NULL; clh = clh->next) {
-		if (!strcasecmp(clh->key, requested_header)) {
-			return (clh->val);
-		}
-	}
-	return (NULL);
-}