X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyindex.c;h=fbd32c710959ebc0ce6c30fa8543e2d92bf9d3a1;hb=74282725064951c7cc35584f6ed792b05dc5a52b;hp=eeac56cac47d238c7c3c3e270a7178e535418095;hpb=b3c67e7383ef6ece55dcf6fbfa9587f5d0a14546;p=onak.git

diff --git a/keyindex.c b/keyindex.c
index eeac56c..fbd32c7 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -24,7 +24,6 @@
 #include <time.h>
 
 #include "decodekey.h"
-#include "getcgi.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
@@ -74,6 +73,54 @@ char pkalgo2char(uint8_t algo)
 	return typech;
 }
 
+/**
+ *	txt2html - Takes a string and converts it to HTML.
+ *	@string: The string to HTMLize.
+ *
+ *	Takes a string and escapes any HTML entities.
+ */
+const char *txt2html(const char *string)
+{
+	static char buf[1024];
+	char *ptr = NULL;
+	char *nextptr = NULL;
+
+	if (strlen(string) > 1000) {
+		return string;
+	}
+
+	memset(buf, 0, 1024);
+
+	ptr = strchr(string, '<');
+	if (ptr != NULL) {
+		nextptr = ptr + 1;
+		*ptr = 0;
+		strncpy(buf, string, 1023);
+		strncat(buf, "&lt;", 1023 - strlen(buf));
+		string = nextptr;
+	}
+
+	ptr = strchr(string, '>');
+	if (ptr != NULL) {
+		nextptr = ptr + 1;
+		*ptr = 0;
+		strncat(buf, string, 1023 - strlen(buf));
+		strncat(buf, "&gt;", 1023 - strlen(buf));
+		string = nextptr;
+	}
+
+	/*
+	 * TODO: We need to while() this really as each entity may appear more
+	 * than once. We need to start with & and ; as we replace with those
+	 * throughout. Fuck it for the moment though; it's Easter and < & > are
+	 * the most common and tend to only appear once.
+	 */
+
+	strncat(buf, string, 1023 - strlen(buf));
+
+	return buf;
+}
+
 /*
  * Given a public key/subkey packet return the key length.
  */
@@ -231,7 +278,7 @@ int list_subkeys(struct onak_dbctx *dbctx,
 		struct openpgp_signedpacket_list *subkeys, bool verbose,
 		bool html)
 {
-	struct tm	*created = NULL;
+	struct tm	created;
 	time_t		created_time = 0;
 	int	 	type = 0;
 	int	 	length = 0;
@@ -244,7 +291,7 @@ int list_subkeys(struct onak_dbctx *dbctx,
 					(subkeys->packet->data[2] << 16) +
 					(subkeys->packet->data[3] << 8) +
 					subkeys->packet->data[4];
-			created = gmtime(&created_time);
+			gmtime_r(&created_time, &created);
 
 			switch (subkeys->packet->data[0]) {
 			case 2:
@@ -270,9 +317,9 @@ int list_subkeys(struct onak_dbctx *dbctx,
 				length,
 				pkalgo2char(type),
 				keyid,
-				created->tm_year + 1900,
-				created->tm_mon + 1,
-				created->tm_mday);
+				created.tm_year + 1900,
+				created.tm_mon + 1,
+				created.tm_mday);
 
 		}
 		if (verbose) {
@@ -348,13 +395,14 @@ int key_index(struct onak_dbctx *dbctx,
 			bool skshash, bool html)
 {
 	struct openpgp_signedpacket_list	*curuid = NULL;
-	struct tm				*created = NULL;
+	struct tm				 created;
 	time_t					 created_time = 0;
 	int					 type = 0;
 	int					 length = 0;
 	char					 buf[1024];
 	uint64_t				 keyid;
 
+
 	if (html) {
 		puts("<pre>");
 	}
@@ -364,7 +412,7 @@ int key_index(struct onak_dbctx *dbctx,
 					(keys->publickey->data[2] << 16) +
 					(keys->publickey->data[3] << 8) +
 					keys->publickey->data[4];
-		created = gmtime(&created_time);
+		gmtime_r(&created_time, &created);
 
 		switch (keys->publickey->data[0]) {
 		case 2:
@@ -393,17 +441,17 @@ int key_index(struct onak_dbctx *dbctx,
 				pkalgo2char(type),
 				keyid,
 				keyid,
-				created->tm_year + 1900,
-				created->tm_mon + 1,
-				created->tm_mday);
+				created.tm_year + 1900,
+				created.tm_mon + 1,
+				created.tm_mday);
 		} else {
 			printf("pub  %5d%c/0x%016" PRIX64 " %04d/%02d/%02d ",
 				length,
 				pkalgo2char(type),
 				keyid,
-				created->tm_year + 1900,
-				created->tm_mon + 1,
-				created->tm_mday);
+				created.tm_year + 1900,
+				created.tm_mon + 1,
+				created.tm_mday);
 		}
 
 		curuid = keys->uids;