X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnntp%2Fserv_nntp.c;h=1e686d3bc1cc92b53299c66af109333f2507a74d;hb=78d67438d8eb34ece9946f1bc9c2a8410cbf166c;hp=f32ce1d733a095a2088cb1a6675dd6c8b563a86d;hpb=5e549537216ea1b602dd979d75838519412b5252;p=citadel.git

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index f32ce1d73..1e686d3bc 100644
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -1,5 +1,5 @@
 //
-// NNTP server module FIXME THIS IS NOT FINISHED
+// NNTP server module (RFC 3977)
 //
 // Copyright (c) 2014 by the citadel.org team
 //
@@ -74,6 +74,7 @@ extern long timezone;
 int is_valid_newsgroup_name(char *name) {
 	char *ptr = name;
 	int has_a_letter = 0;
+	int num_dots = 0;
 
 	if (!ptr) return(0);
 	if (!strncasecmp(name, "ctdl.", 5)) return(0);
@@ -84,6 +85,10 @@ int is_valid_newsgroup_name(char *name) {
 			has_a_letter = 1;
 		}
 
+		if (ptr[0] == '.') {
+			++num_dots;
+		}
+
 		if (	(isalnum(ptr[0]))
 			|| (ptr[0] == '.')
 			|| (ptr[0] == '+')
@@ -95,7 +100,7 @@ int is_valid_newsgroup_name(char *name) {
 			return(0);
 		}
 	}
-	return(has_a_letter);
+	return( (has_a_letter) && (num_dots >= 1) ) ;
 }
 
 
@@ -123,7 +128,7 @@ void room_to_newsgroup(char *target, char *source, size_t target_size) {
 			|| (ch == '.')
 			|| (ch == '-')
 		) {
-			target[len++] = ch;
+			target[len++] = tolower(ch);
 			target[len] = 0;
 		}
 		else {
@@ -238,6 +243,7 @@ void nntp_capabilities(void)
 	cprintf("READER\r\n");
 	cprintf("MODE-READER\r\n");
 	cprintf("LIST ACTIVE NEWSGROUPS\r\n");
+	cprintf("OVER\r\n");
 #ifdef HAVE_OPENSSL
 	cprintf("STARTTLS\r\n");
 #endif
@@ -509,11 +515,30 @@ void nntp_list(const char *cmd) {
 	else if (!strcasecmp(list_format, "NEWSGROUPS")) {
 		nld.list_format = NNTP_LIST_NEWSGROUPS;
 	}
+	else if (!strcasecmp(list_format, "OVERVIEW.FMT")) {
+		nld.list_format = NNTP_LIST_OVERVIEW_FMT;
+	}
 	else {
 		cprintf("501 syntax error , unsupported list format\r\n");
 		return;
 	}
 
+	// OVERVIEW.FMT delivers a completely different type of data than all of the
+	// other LIST commands.  It's a stupid place to put it.  But that's how it's
+	// written into RFC3977, so we have to handle it here.
+	if (nld.list_format == NNTP_LIST_OVERVIEW_FMT) {
+		cprintf("215 Order of fields in overview database.\r\n");
+		cprintf("Subject:\r\n");
+		cprintf("From:\r\n");
+		cprintf("Date:\r\n");
+		cprintf("Message-ID:\r\n");
+		cprintf("References:\r\n");
+		cprintf(":bytes\r\n");
+		cprintf(":lines\r\n");
+		cprintf(".\r\n");
+		return;
+	}
+
 	cprintf("215 list of newsgroups follows\r\n");
 	CtdlGetUser(&CC->user, CC->curr_user);
 	CtdlForEachRoom(nntp_list_backend, &nld);
@@ -940,6 +965,91 @@ void nntp_last_next(const char *cmd) {
 }
 
 
+//
+// back end for the XOVER command , called for each message number
+//
+void nntp_xover_backend(long msgnum, void *userdata) {
+
+	struct listgroup_range *lr = (struct listgroup_range *)userdata;
+
+	// check range if supplied
+	if (msgnum < lr->lo) return;
+	if ((lr->hi != 0) && (msgnum > lr->hi)) return;
+
+	struct CtdlMessage *msg = CtdlFetchMessage(msgnum, 0);
+	if (msg == NULL) {
+		return;
+	}
+
+	// Teh RFC says we need:
+	// -------------------------
+	// Subject header content
+	// From header content
+	// Date header content
+	// Message-ID header content
+	// References header content
+	// :bytes metadata item
+	// :lines metadata item
+
+	time_t msgtime = atol(msg->cm_fields[eTimestamp]);
+	char strtimebuf[26];
+	ctime_r(&msgtime, strtimebuf);
+
+	// here we go -- print the line o'data
+	cprintf("%ld\t%s\t%s <%s>\t%s\t%s\t%s\t100\t10\r\n",
+		msgnum,
+		msg->cm_fields[eMsgSubject],
+		msg->cm_fields[eAuthor],
+		msg->cm_fields[erFc822Addr],
+		strtimebuf,
+		msg->cm_fields[emessageId],
+		msg->cm_fields[eWeferences]
+	);
+
+	CM_Free(msg);
+}
+
+
+//
+//
+// XOVER is used by some clients, even if we don't offer it
+//
+void nntp_xover(const char *cmd) {
+	if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
+
+	citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+	char range[256];
+	struct listgroup_range lr;
+
+	extract_token(range, cmd, 1, ' ', sizeof range);
+	lr.lo = atol(range);
+	if (lr.lo <= 0) {
+		lr.lo = nntpstate->current_article_number;
+		lr.hi = nntpstate->current_article_number;
+	}
+	else {
+		char *dash = strchr(range, '-');
+		if (dash != NULL) {
+			++dash;
+			lr.hi = atol(dash);
+			if (lr.hi == 0) {
+				lr.hi = LONG_MAX;
+			}
+			if (lr.hi < lr.lo) {
+				lr.hi = lr.lo;
+			}
+		}
+		else {
+			lr.hi = lr.lo;
+		}
+	}
+
+	cprintf("224 Overview information follows\r\n");
+	CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, nntp_xover_backend, &lr);
+	cprintf(".\r\n");
+}
+
+
 // 
 // Main command loop for NNTP server sessions.
 //
@@ -1022,6 +1132,14 @@ void nntp_command_loop(void)
 		nntp_last_next(ChrPtr(Cmd));
 	}
 
+	else if (
+			(!strcasecmp(cmdname, "xover"))
+			|| (!strcasecmp(cmdname, "over"))
+		)
+	{
+		nntp_xover(ChrPtr(Cmd));
+	}
+
 	else {
 		cprintf("500 I'm afraid I can't do that.\r\n");
 	}