# include "config.h"
#endif
+#include "defs.h"
+
#include <glib.h>
#include <stdio.h>
#include <string.h>
#include <dirent.h>
#include <unistd.h>
-#include "defs.h"
#include "intl.h"
#include "news.h"
#include "nntp.h"
#include "inputdialog.h"
#include "alertpanel.h"
-static gint news_get_article_cmd (Folder *folder,
- NNTPSession *session,
+static gint news_get_article_cmd (NNTPSession *session,
const gchar *cmd,
gint num,
gchar *filename);
-static gint news_get_article (Folder *folder,
- NNTPSession *session,
+static gint news_get_article (NNTPSession *session,
gint num,
gchar *filename);
-static gint news_get_header (Folder *folder,
- NNTPSession *session,
+static gint news_get_header (NNTPSession *session,
gint num,
gchar *filename);
+static gint news_select_group (NNTPSession *session,
+ const char *group);
static GSList *news_get_uncached_articles(NNTPSession *session,
FolderItem *item,
gint cache_last,
gint *rfirst,
gint *rlast);
static MsgInfo *news_parse_xover (const gchar *xover_str);
+static gchar * news_parse_xhdr (const gchar *xover_str,
+ MsgInfo * info);
static GSList *news_delete_old_article (GSList *alist,
gint first);
static void news_delete_all_article (FolderItem *item);
-static gchar *news_query_password (NNTPSession *session,
- const gchar *user);
-static gint news_authenticate (Folder *folder);
-static gint news_nntp_group (Folder *folder,
- SockInfo *sock,
- const gchar *group,
- gint *num,
- gint *first,
- gint *last);
-static gint news_nntp_list (Folder *folder,
- SockInfo *sock);
-static gint news_nntp_xover (Folder *folder,
- SockInfo *sock,
- gint first,
- gint last);
-static gint news_nntp_post (Folder *folder,
- SockInfo *sock,
- FILE *fp);
-static gint news_nntp_mode (Folder *folder,
- SockInfo *sock,
- gboolean stream);
-
-Session *news_session_new(const gchar *server, gushort port)
+
+static Session *news_session_new(const gchar *server, gushort port,
+ const gchar *userid, const gchar *passwd)
{
gchar buf[NNTPBUFSIZE];
NNTPSession *session;
- SockInfo *nntp_sock;
+ NNTPSockInfo *nntp_sock;
g_return_val_if_fail(server != NULL, NULL);
log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
- if ((nntp_sock = nntp_open(server, port, buf)) < 0)
+ if (userid && passwd)
+ nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
+ else
+ nntp_sock = nntp_open(server, port, buf);
+ if (nntp_sock == NULL)
return NULL;
session = g_new(NNTPSession, 1);
SESSION(session)->type = SESSION_NEWS;
SESSION(session)->server = g_strdup(server);
- SESSION(session)->sock = nntp_sock;
+ session->nntp_sock = nntp_sock;
+ SESSION(session)->sock = nntp_sock->sock;
SESSION(session)->connected = TRUE;
SESSION(session)->phase = SESSION_READY;
SESSION(session)->data = NULL;
void news_session_destroy(NNTPSession *session)
{
- sock_close(SESSION(session)->sock);
+ nntp_close(session->nntp_sock);
+ session->nntp_sock = NULL;
SESSION(session)->sock = NULL;
g_free(session->group);
}
+static gchar *news_query_password(const gchar *server,
+ const gchar *user)
+{
+ gchar *message;
+ gchar *pass;
+
+ message = g_strdup_printf(_("Input password for %s on %s:"),
+ user, server);
+
+ pass = input_dialog_with_invisible(_("Input password"),
+ message, NULL);
+ g_free(message);
+/* manage_window_focus_in(inc_dialog->mainwin->window, */
+/* NULL, NULL); */
+ return pass;
+}
+
+static Session *news_session_new_for_folder(Folder *folder)
+{
+ Session *session;
+ PrefsAccount *ac;
+ const gchar *userid;
+ gchar *passwd;
+
+ ac = folder->account;
+ if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
+ userid = ac->userid;
+ if (ac->passwd && ac->passwd[0])
+ passwd = g_strdup(ac->passwd);
+ else {
+ passwd = news_query_password(ac->nntp_server, userid);
+ if (!passwd)
+ userid = NULL;
+ }
+ } else {
+ userid = passwd = NULL;
+ }
+ session = news_session_new(ac->nntp_server, 119, userid, passwd);
+ g_free(passwd);
+ return session;
+}
+
NNTPSession *news_session_get(Folder *folder)
{
+ NNTPSession *session;
+
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->type == F_NEWS, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
if (!REMOTE_FOLDER(folder)->session) {
REMOTE_FOLDER(folder)->session =
- news_session_new(folder->account->nntp_server, 119);
+ news_session_new_for_folder(folder);
} else {
- if (news_nntp_mode(folder,
- REMOTE_FOLDER(folder)->session->sock,
- FALSE)
- != NN_SUCCESS) {
+ session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+ if (nntp_mode(session->nntp_sock, FALSE) != NN_SUCCESS) {
log_warning(_("NNTP connection to %s:%d has been"
" disconnected. Reconnecting...\n"),
folder->account->nntp_server, 119);
session_destroy(REMOTE_FOLDER(folder)->session);
REMOTE_FOLDER(folder)->session =
- news_session_new(folder->account->nntp_server,
- 119);
+ news_session_new_for_folder(folder);
}
}
g_return_val_if_fail(item != NULL, NULL);
path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ make_dir_hier(path);
+
filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
g_free(path);
return NULL;
}
+ ok = news_select_group(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
+ item->path);
+ if (ok != NN_SUCCESS) {
+ g_warning(_("can't select group %s\n"), item->path);
+ g_free(filename);
+ return NULL;
+ }
+
debug_print(_("getting article %d...\n"), num);
- ok = news_get_article(folder,
- NNTP_SESSION(REMOTE_FOLDER(folder)->session),
+ ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
num, filename);
statusbar_pop_all();
if (ok < 0) {
return -1;
}
- ok = news_nntp_post(folder, SESSION(session)->sock, fp);
+ ok = nntp_post(session->nntp_sock, fp);
if (ok != NN_SUCCESS) {
log_warning(_("can't post article.\n"));
return -1;
return 0;
}
-static gint news_get_article_cmd(Folder *folder, NNTPSession *session,
- const gchar *cmd,
+static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
gint num, gchar *filename)
{
- gint ok;
gchar *msgid;
- ok = nntp_get_article(SESSION(session)->sock, cmd, num, &msgid);
- if (ok == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return -1;
- ok = nntp_get_article(SESSION(session)->sock, cmd, num,
- &msgid);
- }
- if (ok != NN_SUCCESS)
+ if (nntp_get_article(session->nntp_sock, cmd, num, &msgid)
+ != NN_SUCCESS)
return -1;
debug_print("Message-Id = %s, num = %d\n", msgid, num);
g_free(msgid);
- if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
+ if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
log_warning(_("can't retrieve article %d\n"), num);
return -1;
}
return 0;
}
-static gint news_get_article(Folder *folder, NNTPSession *session,
- gint num, gchar *filename)
+static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
{
- return news_get_article_cmd(folder, session, "ARTICLE", num, filename);
+ return news_get_article_cmd(session, "ARTICLE", num, filename);
}
-static gint news_get_header(Folder *folder, NNTPSession *session,
- gint num, gchar *filename)
+static gint news_get_header(NNTPSession *session, gint num, gchar *filename)
{
- return news_get_article_cmd(folder, session, "HEAD", num, filename);
+ return news_get_article_cmd(session, "HEAD", num, filename);
+}
+
+/**
+ * news_select_group:
+ * @session: Active NNTP session.
+ * @group: Newsgroup name.
+ *
+ * Select newsgroup @group with the GROUP command if it is not already
+ * selected in @session.
+ *
+ * Return value: NNTP result code.
+ **/
+static gint news_select_group(NNTPSession *session,
+ const char *group)
+{
+ gint ok;
+ gint num, first, last;
+
+ if (g_strcasecmp(session->group, group) == 0)
+ return NN_SUCCESS;
+
+ g_free(session->group);
+ session->group = NULL;
+
+ ok = nntp_group(session->nntp_sock, group, &num, &first, &last);
+
+ if (ok == NN_SUCCESS)
+ session->group = g_strdup(group);
+
+ return ok;
}
static GSList *news_get_uncached_articles(NNTPSession *session,
g_return_val_if_fail(item->folder != NULL, NULL);
g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
- ok = news_nntp_group(item->folder, SESSION(session)->sock, item->path,
- &num, &first, &last);
+ g_free(session->group);
+ session->group = NULL;
+
+ ok = nntp_group(session->nntp_sock, item->path,
+ &num, &first, &last);
if (ok != NN_SUCCESS) {
log_warning(_("can't set group: %s\n"), item->path);
return NULL;
}
+ session->group = g_strdup(item->path);
+
/* calculate getting overview range */
if (first > last) {
log_warning(_("invalid article range: %d - %d\n"),
log_message(_("getting xover %d - %d in %s...\n"),
begin, end, item->path);
- if (news_nntp_xover(item->folder, SESSION(session)->sock,
- begin, end) != NN_SUCCESS) {
+ if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
log_warning(_("can't get xover\n"));
return NULL;
}
for (;;) {
- if (sock_read(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xover.\n"));
return newlist;
}
msginfo->folder = item;
msginfo->flags = MSG_NEW|MSG_UNREAD|MSG_NEWS;
+ msginfo->newsgroups = g_strdup(item->path);
if (!newlist)
llast = newlist = g_slist_append(newlist, msginfo);
}
}
+ if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+ log_warning(_("can't get xhdr\n"));
+ return NULL;
+ }
+
+ llast = newlist;
+
+ for (;;) {
+ gchar * value;
+
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ log_warning(_("error occurred while getting xover.\n"));
+ return newlist;
+ }
+
+ if (buf[0] == '.' && buf[1] == '\r') break;
+
+ msginfo = (MsgInfo *) llast->data;
+
+ value = news_parse_xhdr(buf, msginfo);
+
+ if (value)
+ msginfo->to = value;
+
+ llast = llast->next;
+
+ }
+
+ if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+ log_warning(_("can't get xhdr\n"));
+ return NULL;
+ }
+
+ llast = newlist;
+
+ for (;;) {
+ gchar * value;
+
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ log_warning(_("error occurred while getting xover.\n"));
+ return newlist;
+ }
+
+ if (buf[0] == '.' && buf[1] == '\r') break;
+
+ msginfo = (MsgInfo *) llast->data;
+
+ value = news_parse_xhdr(buf, msginfo);
+
+ if (value)
+ msginfo->cc = value;
+
+ llast = llast->next;
+ }
+
if (rfirst) *rfirst = first;
if (rlast) *rlast = last;
return newlist;
if (*msgid != '\0')
msginfo->msgid = g_strdup(msgid);
+ msginfo->references = g_strdup(ref);
eliminate_parenthesis(ref, '(', ')');
if ((p = strrchr(ref, '<')) != NULL) {
extract_parenthesis(p, '<', '>');
return msginfo;
}
+static gchar * news_parse_xhdr(const gchar *xover_str, MsgInfo * info)
+{
+ gchar buf[NNTPBUFSIZE];
+ gchar *p;
+ gint num;
+ gchar * tmp;
+
+ p = strchr(xover_str, ' ');
+ if (!p)
+ return NULL;
+ else
+ p++;
+
+ num = atoi(xover_str);
+
+ if (info->msgnum != num)
+ return NULL;
+
+ tmp = strchr(p, '\r');
+ if (!tmp) tmp = strchr(p, '\n');
+
+ if (tmp)
+ return g_strndup(p, tmp - p);
+ else
+ return g_strdup(p);
+}
+
static GSList *news_delete_old_article(GSList *alist, gint first)
{
GSList *cur, *next;
gchar *file;
dir = folder_item_get_path(item);
+ if (!is_dir_exist(dir))
+ make_dir_hier(dir);
+
if ((dp = opendir(dir)) == NULL) {
FILE_OP_ERROR(dir, "opendir");
g_free(dir);
debug_print(_("group list has been already cached.\n"));
}
else {
- ok = news_nntp_list(item->folder, SESSION(session)->sock);
+ ok = nntp_list(session->nntp_sock);
if (ok != NN_SUCCESS)
return NULL;
debug_print(_("\tDeleting cached group list... "));
path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ make_dir_hier(path);
+
filename = g_strconcat(path, G_DIR_SEPARATOR_S, GROUPLIST_FILE, NULL);
g_free(path);
if (remove(filename) != 0)
log_warning(_("can't delete cached group list %s\n"), filename);
g_free(filename);
}
-
-\f
-/* NNTP Authentication support (RFC2980). */
-
-
-/**
- * news_query_password:
- * @session: Active NNTP session.
- * @user: User name.
- *
- * Ask user for the NNTP authentication password.
- *
- * Return value: Password string; needs to be freed with g_free()
- * after use.
- **/
-static gchar *news_query_password(NNTPSession *session,
- const gchar *user)
-{
- gchar *message;
- gchar *pass;
-
- message = g_strdup_printf
- (_("Input password for %s on %s:"),
- user,
- SESSION(session)->server);
-
- pass = input_dialog_with_invisible(_("Input password"),
- message, NULL);
- g_free(message);
-/* manage_window_focus_in(inc_dialog->mainwin->window, */
-/* NULL, NULL); */
- return pass;
-}
-
-/**
- * news_authenticate:
- * @folder: NNTP folder.
- *
- * Send NNTP authentication information (AUTHINFO USER, AUTHINFO PASS)
- * as described in RFC2980. May ask user for the password if it is
- * not stored in account settings.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_authenticate(Folder *folder)
-{
- NNTPSession *session;
- gint ok;
- const gchar *user;
- gchar *pass;
- gboolean need_free_pass = FALSE;
-
- debug_print(_("news server requested authentication\n"));
- if (!folder || !folder->account)
- return NN_ERROR;
- user = folder->account->userid;
- if (!user)
- return NN_ERROR;
- session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
- if (!session)
- return NN_ERROR;
- ok = nntp_authinfo_user(SESSION(session)->sock, user);
- if (ok == NN_AUTHCONT) {
- pass = folder->account->passwd;
- if (!pass || !pass[0]) {
- pass = news_query_password(session, user);
- need_free_pass = TRUE;
- }
- ok = nntp_authinfo_pass(SESSION(session)->sock, pass);
- if (need_free_pass)
- g_free(pass);
- }
- if (ok != NN_SUCCESS) {
- log_warning(_("NNTP authentication failed\n"));
- alertpanel_error(_("Authentication for %s on %s failed."),
- user, SESSION(session)->server);
- }
- return ok;
-}
-
-
-/**
- * news_nntp_group:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @group: Group name to select.
- * @num: Pointer to returned number of messages in the group.
- * @first: Pointer to returned number of first message.
- * @last: Pointer to returned number of last message.
- *
- * Wrapper for nntp_group() to do authentication if requested.
- * Selects newsgroup @group and returns information from the server
- * response in @num, @first, @last (which cannot be NULL).
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_group(Folder *folder, SockInfo *sock,
- const gchar *group,
- gint *num, gint *first, gint *last)
-{
- gint ok;
-
- if ((ok = nntp_group(sock, group, num, first, last)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_group(sock, group, num, first, last);
- }
- return ok;
-}
-
-/**
- * news_nntp_list:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- *
- * Wrapper for nntp_list() to do authentication if requested. Sends
- * the LIST command to @sock and receives the status code line.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_list(Folder *folder, SockInfo *sock)
-{
- gint ok;
-
- if ((ok = nntp_list(sock)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_list(sock);
- }
- return ok;
-}
-
-/**
- * news_nntp_xover:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @first: First message number.
- * @last: Last message number.
- *
- * Wrapper for nntp_xover() to do authentication if requested. Sends
- * the XOVER command with parameters @first and @last to @sock and
- * receives the status code line.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_xover(Folder *folder, SockInfo *sock,
- gint first, gint last)
-{
- gint ok;
-
- if ((ok = nntp_xover(sock, first, last)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_xover(sock, first, last);
- }
- return ok;
-}
-
-/**
- * news_nntp_post:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @fp: File with the message (header and body), opened for reading.
- *
- * Wrapper for nntp_post() to do authentication if requested. Sends
- * the POST command to @sock, and if the server accepts it, sends the
- * message from @fp.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_post(Folder *folder, SockInfo *sock, FILE *fp)
-{
- gint ok;
-
- if ((ok = nntp_post(sock, fp)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_post(sock, fp);
- }
- return ok;
-}
-
-/**
- * news_nntp_mode:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @stream: TRUE for stream mode, FALSE for reader mode.
- *
- * Wrapper for nntp_mode() to do authentication if requested. Sends
- * the "MODE READER" or "MODE STREAM" command to @sock, depending on
- * @stream, and receives the status responce.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_mode(Folder *folder, SockInfo *sock, gboolean stream)
-{
- gint ok;
-
- if ((ok = nntp_mode(sock, stream)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_mode(sock, stream);
- }
- return ok;
-}
projects / claws.git / blobdiff