}
-
//
// Convert a Citadel room name to a valid newsgroup name
//
strcpy(CC->cs_clientname, "NNTP session");
CC->cs_flags |= CS_STEALTH;
- /* CC->session_specific_data = malloc(sizeof(citnntp));
- memset(NNTP, 0, sizeof(citnntp));
- */
+ CC->session_specific_data = malloc(sizeof(citnntp));
+ citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+ memset(nntpstate, 0, sizeof(citnntp));
if (CC->nologin==1) {
cprintf("451 Too many connections are already open; please try again later.\r\n");
return;
}
- // Note: the FQDN *must* appear as the first thing after the 220 code.
- // Some clients (including citmail.c) depend on it being there.
- //
+ // Display the standard greeting
cprintf("200 %s NNTP Citadel server is not finished yet\r\n", config.c_fqdn);
}
}
-
//
// implements the STARTTLS command
//
}
-
//
// Implements the AUTHINFO USER command (RFC 4643)
//
}
-
//
// Implements the AUTHINFO extension (RFC 4643) in USER/PASS mode
//
}
-
-//
-// Various output formats for the LIST commands
-//
-enum {
- NNTP_LIST_ACTIVE,
- NNTP_LIST_ACTIVE_TIMES,
- NNTP_LIST_DISTRIB_PATS,
- NNTP_LIST_HEADERS,
- NNTP_LIST_NEWSGROUPS,
- NNTP_LIST_OVERVIEW_FMT
-};
-
-
//
// Output a room name (newsgroup name) in formats required for LIST and NEWGROUPS command
//
}
-
//
// Called once per room by nntp_newgroups() to qualify and possibly output a single room
//
//
if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
+ citnntp *nntpstate = (citnntp *) CC->session_specific_data;
char verb[16];
char requested_group[1024];
char message_range[256];
CtdlUserGoto(NULL, 0, 0, &msgs, &new, &oldest, &newest);
cprintf("211 %d %ld %ld %s\r\n", msgs, oldest, newest, requested_group);
- // If this is a GROUP command, we can stop here.
+ // If this is a GROUP command, set the "current article number" to zero, and then stop here.
if (!strcasecmp(verb, "GROUP")) {
+ nntpstate->current_article_number = oldest;
return;
}
}
-
//
// Implements the ARTICLE, HEAD, BODY, and STAT commands.
// (These commands all accept the same parameters; they differ only in how they output the retrieved message.)
//
void nntp_article(const char *cmd) {
+ /*
+ * HACK: this works because the 5XX series error codes from citadel
+ * protocol will also be considered error codes by an NNTP client
+ */
+ if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
+
+ citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+ char which_command[16];
+ int acmd = 0;
+ char requested_article[256];
+ long requested_msgnum = 0;
+ char *lb, *rb = NULL;
+ int must_change_currently_selected_article = 0;
// We're going to store one of these values in the variable 'acmd' so that
enum {
STAT
};
- char which_command[16];
- int acmd = 0;
extract_token(which_command, cmd, 0, ' ', sizeof which_command);
if (!strcasecmp(which_command, "article")) {
else if (acmd == STAT) headers_only = HEADERS_FAST;
// now figure out what the client is asking for.
- char requested_article[256];
- long requested_msgnum = 0;
- char *lb, *rb = NULL;
extract_token(requested_article, cmd, 1, ' ', sizeof requested_article);
lb = strchr(requested_article, '<');
rb = strchr(requested_article, '>');
requested_msgnum = atol(requested_article);
- // If no article number or message-id is specified, the client wants the "next" article.
- // We don't know how to do that yet.
+ // If no article number or message-id is specified, the client wants the "currently selected article"
if (IsEmptyStr(requested_article)) {
- cprintf("500 FIXME I don't know how to fetch next yet.\r\n");
- return;
+ if (nntpstate->current_article_number < 1) {
+ cprintf("420 No current article selected\r\n");
+ return;
+ }
+ requested_msgnum = nntpstate->current_article_number;
+ must_change_currently_selected_article = 1;
+ // got it -- now fall through and keep going
}
// If the requested article is numeric, it maps directly to a message number. Good.
else if (requested_msgnum > 0) {
+ must_change_currently_selected_article = 1;
// good -- fall through and keep going
}
// If the requested article has angle brackets, the client wants a specific message-id.
// We don't know how to do that yet.
else if ( (lb != NULL) && (rb != NULL) && (lb < rb) ) {
+ must_change_currently_selected_article = 0;
cprintf("500 FIXME I don't know how to fetch by message-id yet.\r\n");
return;
}
// Anything else is noncompliant gobbledygook and should die in a car fire.
- // Also, the weasel who is spreading untrue rumors about me at work should die in a slow and painful car fire.
else {
+ must_change_currently_selected_article = 0;
cprintf("500 syntax error\r\n");
return;
}
return;
}
+ // RFC3977 6.2.1.2 specifes conditions under which the "currently selected article"
+ // MUST or MUST NOT be set to the message we just referenced.
+ if (must_change_currently_selected_article) {
+ nntpstate->current_article_number = requested_msgnum;
+ }
+
+ // Now give the client what it asked for.
if (acmd == ARTICLE) {
cprintf("220 %ld <%s>\r\n", requested_msgnum, fetched_message_id);
}
if (CC->h_command_function != nntp_command_loop) return;
syslog(LOG_DEBUG, "Performing NNTP cleanup hook\n");
+ citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+ if (nntpstate != NULL) {
+ free(nntpstate);
+ nntpstate = NULL;
+ }
}
const char *CitadelServiceNNTP="NNTP";