ids = group.getArticleNumbers();
- conn.println("211 " + ids.size() + " " +
- group.getFirstArticleNumber() + " " +
- group.getLastArticleNumber() + " list of article numbers follow");
- for(long id : ids)
- {
- // One index number per line
- conn.println(Long.toString(id));
- }
- conn.println(".");
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/daemon/command/ModeReaderCommand.java
--- a/org/sonews/daemon/command/ModeReaderCommand.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
- * XOVER [range]
- *
- * The XOVER command returns information from the overview
- * database for the article(s) specified.
- *
- * The optional range argument may be any of the following:
- * an article number
- * an article number followed by a dash to indicate
- * all following
- * an article number followed by a dash followed by
- * another article number
- *
- * If no argument is specified, then information from the
- * current article is displayed. Successful responses start
- * with a 224 response followed by the overview information
- * for all matched messages. Once the output is complete, a
- * period is sent on a line by itself. If no argument is
- * specified, the information for the current article is
- * returned. A news group must have been selected earlier,
- * else a 412 error response is returned. If no articles are
- * in the range specified, a 420 error response is returned
- * by the server. A 502 response will be returned if the
- * client only has permission to transfer articles.
- *
- * Each line of output will be formatted with the article number,
- * followed by each of the headers in the overview database or the
- * article itself (when the data is not available in the overview
- * database) for that article separated by a tab character. The
- * sequence of fields must be in this order: subject, author,
- * date, message-id, references, byte count, and line count. Other
- * optional fields may follow line count. Other optional fields may
- * follow line count. These fields are specified by examining the
- * response to the LIST OVERVIEW.FMT command. Where no data exists,
- * a null field must be provided (i.e. the output will have two tab
- * characters adjacent to each other). Servers should not output
- * fields for articles that have been removed since the XOVER database
- * was created.
- *
- * The LIST OVERVIEW.FMT command should be implemented if XOVER
- * is implemented. A client can use LIST OVERVIEW.FMT to determine
- * what optional fields and in which order all fields will be
- * supplied by the XOVER command.
- *
- * Note that any tab and end-of-line characters in any header
- * data that is returned will be converted to a space character.
- *
- * Responses:
- *
- * 224 Overview information follows
- * 412 No news group current selected
- * 420 No article(s) selected
- * 502 no permission
- *
- * OVER defines additional responses:
- *
- * First form (message-id specified)
- * 224 Overview information follows (multi-line)
- * 430 No article with that message-id
- *
- * Second form (range specified)
- * 224 Overview information follows (multi-line)
- * 412 No newsgroup selected
- * 423 No articles in that range
- *
- * Third form (current article number used)
- * 224 Overview information follows (multi-line)
- * 412 No newsgroup selected
- * 420 Current article number is invalid
- *
- *
- * @author Christian Lins
- * @since sonews/0.5.0
- */
-public class OverCommand implements Command
-{
-
- public static final int MAX_LINES_PER_DBREQUEST = 200;
-
- @Override
- public String[] getSupportedCommandStrings()
- {
- return new String[]{"OVER", "XOVER"};
- }
-
- @Override
- public boolean hasFinished()
- {
- return true;
- }
-
- @Override
- public String impliedCapability()
- {
- return null;
- }
-
- @Override
- public boolean isStateful()
- {
- return false;
- }
-
- @Override
- public void processLine(NNTPConnection conn, final String line, byte[] raw)
- throws IOException, StorageBackendException
- {
- if(conn.getCurrentChannel() == null)
- {
- conn.println("412 no newsgroup selected");
- }
- else
- {
- String[] command = line.split(" ");
-
- // If no parameter was specified, show information about
- // the currently selected article(s)
- if(command.length == 1)
- {
- final Article art = conn.getCurrentArticle();
- if(art == null)
- {
- conn.println("420 no article(s) selected");
- return;
- }
-
- conn.println(buildOverview(art, -1));
- }
- // otherwise print information about the specified range
- else
- {
- long artStart;
- long artEnd = conn.getCurrentChannel().getLastArticleNumber();
- String[] nums = command[1].split("-");
- if(nums.length >= 1)
- {
- try
- {
- artStart = Integer.parseInt(nums[0]);
- }
- catch(NumberFormatException e)
- {
- Log.get().info(e.getMessage());
- artStart = Integer.parseInt(command[1]);
- }
- }
- else
- {
- artStart = conn.getCurrentChannel().getFirstArticleNumber();
- }
-
- if(nums.length >=2)
- {
- try
- {
- artEnd = Integer.parseInt(nums[1]);
- }
- catch(NumberFormatException e)
- {
- e.printStackTrace();
- }
- }
-
- if(artStart > artEnd)
- {
- if(command[0].equalsIgnoreCase("OVER"))
- {
- conn.println("423 no articles in that range");
- }
- else
- {
- conn.println("224 (empty) overview information follows:");
- conn.println(".");
- }
- }
- else
- {
- for(long n = artStart; n <= artEnd; n += MAX_LINES_PER_DBREQUEST)
- {
- long nEnd = Math.min(n + MAX_LINES_PER_DBREQUEST - 1, artEnd);
- List> articleHeads = conn.getCurrentChannel()
- .getArticleHeads(n, nEnd);
- if(articleHeads.isEmpty() && n == artStart
- && command[0].equalsIgnoreCase("OVER"))
- {
- // This reply is only valid for OVER, not for XOVER command
- conn.println("423 no articles in that range");
- return;
- }
- else if(n == artStart)
- {
- // XOVER replies this although there is no data available
- conn.println("224 overview information follows");
- }
-
- for(Pair article : articleHeads)
- {
- String overview = buildOverview(article.getB(), article.getA());
- conn.println(overview);
- }
- } // for
- conn.println(".");
- }
- }
- }
- }
-
- private String buildOverview(ArticleHead art, long nr)
- {
- StringBuilder overview = new StringBuilder();
- overview.append(nr);
- overview.append('\t');
-
- String subject = art.getHeader(Headers.SUBJECT)[0];
- if("".equals(subject))
- {
- subject = "";
- }
- overview.append(escapeString(subject));
- overview.append('\t');
-
- overview.append(escapeString(art.getHeader(Headers.FROM)[0]));
- overview.append('\t');
- overview.append(escapeString(art.getHeader(Headers.DATE)[0]));
- overview.append('\t');
- overview.append(escapeString(art.getHeader(Headers.MESSAGE_ID)[0]));
- overview.append('\t');
- overview.append(escapeString(art.getHeader(Headers.REFERENCES)[0]));
- overview.append('\t');
-
- String bytes = art.getHeader(Headers.BYTES)[0];
- if("".equals(bytes))
- {
- bytes = "0";
- }
- overview.append(escapeString(bytes));
- overview.append('\t');
-
- String lines = art.getHeader(Headers.LINES)[0];
- if("".equals(lines))
- {
- lines = "0";
- }
- overview.append(escapeString(lines));
- overview.append('\t');
- overview.append(escapeString(art.getHeader(Headers.XREF)[0]));
-
- // Remove trailing tabs if some data is empty
- return overview.toString().trim();
- }
-
- private String escapeString(String str)
- {
- String nstr = str.replace("\r", "");
- nstr = nstr.replace('\n', ' ');
- nstr = nstr.replace('\t', ' ');
- return nstr.trim();
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/daemon/command/PostCommand.java
--- a/org/sonews/daemon/command/PostCommand.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,332 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .");
- state = PostState.ReadingHeaders;
- }
- else
- {
- conn.println("500 invalid command usage");
- }
- break;
- }
- case ReadingHeaders:
- {
- strHead.append(line);
- strHead.append(NNTPConnection.NEWLINE);
-
- if("".equals(line) || ".".equals(line))
- {
- // we finally met the blank line
- // separating headers from body
-
- try
- {
- // Parse the header using the InternetHeader class from JavaMail API
- headers = new InternetHeaders(
- new ByteArrayInputStream(strHead.toString().trim()
- .getBytes(conn.getCurrentCharset())));
-
- // add the header entries for the article
- article.setHeaders(headers);
- }
- catch (MessagingException e)
- {
- e.printStackTrace();
- conn.println("500 posting failed - invalid header");
- state = PostState.Finished;
- break;
- }
-
- // Change charset for reading body;
- // for multipart messages UTF-8 is returned
- //conn.setCurrentCharset(article.getBodyCharset());
-
- state = PostState.ReadingBody;
-
- if(".".equals(line))
- {
- // Post an article without body
- postArticle(conn, article);
- state = PostState.Finished;
- }
- }
- break;
- }
- case ReadingBody:
- {
- if(".".equals(line))
- {
- // Set some headers needed for Over command
- headers.setHeader(Headers.LINES, Integer.toString(lineCount));
- headers.setHeader(Headers.BYTES, Long.toString(bodySize));
-
- byte[] body = bufBody.toByteArray();
- if(body.length >= 2)
- {
- // Remove trailing CRLF
- body = Arrays.copyOf(body, body.length - 2);
- }
- article.setBody(body); // set the article body
-
- postArticle(conn, article);
- state = PostState.Finished;
- }
- else
- {
- bodySize += line.length() + 1;
- lineCount++;
-
- // Add line to body buffer
- bufBody.write(raw, 0, raw.length);
- bufBody.write(NNTPConnection.NEWLINE.getBytes());
-
- if(bodySize > maxBodySize)
- {
- conn.println("500 article is too long");
- state = PostState.Finished;
- break;
- }
- }
- break;
- }
- default:
- {
- // Should never happen
- Log.get().severe("PostCommand::processLine(): already finished...");
- }
- }
- }
-
- /**
- * Article is a control message and needs special handling.
- * @param article
- */
- private void controlMessage(NNTPConnection conn, Article article)
- throws IOException
- {
- String[] ctrl = article.getHeader(Headers.CONTROL)[0].split(" ");
- if(ctrl.length == 2) // "cancel "
- {
- try
- {
- StorageManager.current().delete(ctrl[1]);
-
- // Move cancel message to "control" group
- article.setHeader(Headers.NEWSGROUPS, "control");
- StorageManager.current().addArticle(article);
- conn.println("240 article cancelled");
- }
- catch(StorageBackendException ex)
- {
- Log.get().severe(ex.toString());
- conn.println("500 internal server error");
- }
- }
- else
- {
- conn.println("441 unknown control header");
- }
- }
-
- private void supersedeMessage(NNTPConnection conn, Article article)
- throws IOException
- {
- try
- {
- String oldMsg = article.getHeader(Headers.SUPERSEDES)[0];
- StorageManager.current().delete(oldMsg);
- StorageManager.current().addArticle(article);
- conn.println("240 article replaced");
- }
- catch(StorageBackendException ex)
- {
- Log.get().severe(ex.toString());
- conn.println("500 internal server error");
- }
- }
-
- private void postArticle(NNTPConnection conn, Article article)
- throws IOException
- {
- if(article.getHeader(Headers.CONTROL)[0].length() > 0)
- {
- controlMessage(conn, article);
- }
- else if(article.getHeader(Headers.SUPERSEDES)[0].length() > 0)
- {
- supersedeMessage(conn, article);
- }
- else // Post the article regularily
- {
- // Circle check; note that Path can already contain the hostname here
- String host = Config.inst().get(Config.HOSTNAME, "localhost");
- if(article.getHeader(Headers.PATH)[0].indexOf(host + "!", 1) > 0)
- {
- Log.get().info(article.getMessageID() + " skipped for host " + host);
- conn.println("441 I know this article already");
- return;
- }
-
- // Try to create the article in the database or post it to
- // appropriate mailing list
- try
- {
- boolean success = false;
- String[] groupnames = article.getHeader(Headers.NEWSGROUPS)[0].split(",");
- for(String groupname : groupnames)
- {
- Group group = StorageManager.current().getGroup(groupname);
- if(group != null && !group.isDeleted())
- {
- if(group.isMailingList() && !conn.isLocalConnection())
- {
- // Send to mailing list; the Dispatcher writes
- // statistics to database
- Dispatcher.toList(article, group.getName());
- success = true;
- }
- else
- {
- // Store in database
- if(!StorageManager.current().isArticleExisting(article.getMessageID()))
- {
- StorageManager.current().addArticle(article);
-
- // Log this posting to statistics
- Stats.getInstance().mailPosted(
- article.getHeader(Headers.NEWSGROUPS)[0]);
- }
- success = true;
- }
- }
- } // end for
-
- if(success)
- {
- conn.println("240 article posted ok");
- FeedManager.queueForPush(article);
- }
- else
- {
- conn.println("441 newsgroup not found");
- }
- }
- catch(AddressException ex)
- {
- Log.get().warning(ex.getMessage());
- conn.println("441 invalid sender address");
- }
- catch(MessagingException ex)
- {
- // A MessageException is thrown when the sender email address is
- // invalid or something is wrong with the SMTP server.
- System.err.println(ex.getLocalizedMessage());
- conn.println("441 " + ex.getClass().getCanonicalName() + ": " + ex.getLocalizedMessage());
- }
- catch(StorageBackendException ex)
- {
- ex.printStackTrace();
- conn.println("500 internal server error");
- }
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/daemon/command/PostState.java
--- a/org/sonews/daemon/command/PostState.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see pull =
- StorageManager.current().getSubscriptions(FeedManager.TYPE_PULL);
- List push =
- StorageManager.current().getSubscriptions(FeedManager.TYPE_PUSH);
- conn.println("100 list of peering rules follows");
- for(Subscription sub : pull)
- {
- conn.println("PULL " + sub.getHost() + ":" + sub.getPort()
- + " " + sub.getGroup());
- }
- for(Subscription sub : push)
- {
- conn.println("PUSH " + sub.getHost() + ":" + sub.getPort()
- + " " + sub.getGroup());
- }
- conn.println(".");
- }
- else
- {
- conn.println("401 unknown sub command");
- }
- }
- else if(commands.length == 3 && commands[1].equalsIgnoreCase("DELETE"))
- {
- StorageManager.current().delete(commands[2]);
- conn.println("200 article " + commands[2] + " deleted");
- }
- else if(commands.length == 4 && commands[1].equalsIgnoreCase("GROUPADD"))
- {
- channelAdd(commands, conn);
- }
- else if(commands.length == 3 && commands[1].equalsIgnoreCase("GROUPDEL"))
- {
- Group group = StorageManager.current().getGroup(commands[2]);
- if(group == null)
- {
- conn.println("400 group not found");
- }
- else
- {
- group.setFlag(Group.DELETED);
- group.update();
- conn.println("200 group " + commands[2] + " marked as deleted");
- }
- }
- else if(commands.length == 4 && commands[1].equalsIgnoreCase("SET"))
- {
- String key = commands[2];
- String val = commands[3];
- Config.inst().set(key, val);
- conn.println("200 new config value set");
- }
- else if(commands.length == 3 && commands[1].equalsIgnoreCase("GET"))
- {
- String key = commands[2];
- String val = Config.inst().get(key, null);
- if(val != null)
- {
- conn.println("100 config value for " + key + " follows");
- conn.println(val);
- conn.println(".");
- }
- else
- {
- conn.println("400 config value not set");
- }
- }
- else if(commands.length >= 3 && commands[1].equalsIgnoreCase("LOG"))
- {
- Group group = null;
- if(commands.length > 3)
- {
- group = (Group)Channel.getByName(commands[3]);
- }
-
- if(commands[2].equalsIgnoreCase("CONNECTED_CLIENTS"))
- {
- conn.println("100 number of connections follow");
- conn.println(Integer.toString(Stats.getInstance().connectedClients()));
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("POSTED_NEWS"))
- {
- conn.println("100 hourly numbers of posted news yesterday");
- for(int n = 0; n < 24; n++)
- {
- conn.println(n + " " + Stats.getInstance()
- .getYesterdaysEvents(Stats.POSTED_NEWS, n, group));
- }
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("GATEWAYED_NEWS"))
- {
- conn.println("100 hourly numbers of gatewayed news yesterday");
- for(int n = 0; n < 24; n++)
- {
- conn.println(n + " " + Stats.getInstance()
- .getYesterdaysEvents(Stats.GATEWAYED_NEWS, n, group));
- }
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("TRANSMITTED_NEWS"))
- {
- conn.println("100 hourly numbers of news transmitted to peers yesterday");
- for(int n = 0; n < 24; n++)
- {
- conn.println(n + " " + Stats.getInstance()
- .getYesterdaysEvents(Stats.FEEDED_NEWS, n, group));
- }
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("HOSTED_NEWS"))
- {
- conn.println("100 number of overall hosted news");
- conn.println(Integer.toString(Stats.getInstance().getNumberOfNews()));
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("HOSTED_GROUPS"))
- {
- conn.println("100 number of hosted groups");
- conn.println(Integer.toString(Stats.getInstance().getNumberOfGroups()));
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("POSTED_NEWS_PER_HOUR"))
- {
- conn.println("100 posted news per hour");
- conn.println(Double.toString(Stats.getInstance().postedPerHour(-1)));
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("FEEDED_NEWS_PER_HOUR"))
- {
- conn.println("100 feeded news per hour");
- conn.println(Double.toString(Stats.getInstance().feededPerHour(-1)));
- conn.println(".");
- }
- else if(commands[2].equalsIgnoreCase("GATEWAYED_NEWS_PER_HOUR"))
- {
- conn.println("100 gatewayed news per hour");
- conn.println(Double.toString(Stats.getInstance().gatewayedPerHour(-1)));
- conn.println(".");
- }
- else
- {
- conn.println("401 unknown sub command");
- }
- }
- else if(commands.length >= 3 && commands[1].equalsIgnoreCase("PLUGIN"))
- {
-
- }
- else
- {
- conn.println("400 invalid command usage");
- }
- }
- else
- {
- conn.println("501 not allowed");
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/daemon/command/XPatCommand.java
--- a/org/sonews/daemon/command/XPatCommand.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
- * XPAT header range| pat [pat...]
- *
- * The XPAT command is used to retrieve specific headers from
- * specific articles, based on pattern matching on the contents of
- * the header. This command was first available in INN.
- *
- * The required header parameter is the name of a header line (e.g.
- * "subject") in a news group article. See RFC-1036 for a list
- * of valid header lines. The required range argument may be
- * any of the following:
- * an article number
- * an article number followed by a dash to indicate
- * all following
- * an article number followed by a dash followed by
- * another article number
- *
- * The required message-id argument indicates a specific
- * article. The range and message-id arguments are mutually
- * exclusive. At least one pattern in wildmat must be specified
- * as well. If there are additional arguments the are joined
- * together separated by a single space to form one complete
- * pattern. Successful responses start with a 221 response
- * followed by a the headers from all messages in which the
- * pattern matched the contents of the specified header line. This
- * includes an empty list. Once the output is complete, a period
- * is sent on a line by itself. If the optional argument is a
- * message-id and no such article exists, the 430 error response
- * is returned. A 502 response will be returned if the client only
- * has permission to transfer articles.
- *
- * Responses
- *
- * 221 Header follows
- * 430 no such article
- * 502 no permission
- *
- * Response Data:
- *
- * art_nr fitting_header_value
- *
- *
- * [Source:"draft-ietf-nntp-imp-02.txt"] [Copyright: 1998 S. Barber]
- *
- * @author Christian Lins
- * @since sonews/0.5.0
- */
-public class XPatCommand implements Command
-{
-
- @Override
- public String[] getSupportedCommandStrings()
- {
- return new String[]{"XPAT"};
- }
-
- @Override
- public boolean hasFinished()
- {
- return true;
- }
-
- @Override
- public String impliedCapability()
- {
- return null;
- }
-
- @Override
- public boolean isStateful()
- {
- return false;
- }
-
- @Override
- public void processLine(NNTPConnection conn, final String line, byte[] raw)
- throws IOException, StorageBackendException
- {
- if(conn.getCurrentChannel() == null)
- {
- conn.println("430 no group selected");
- return;
- }
-
- String[] command = line.split("\\p{Space}+");
-
- // There may be multiple patterns and Thunderbird produces
- // additional spaces between range and pattern
- if(command.length >= 4)
- {
- String header = command[1].toLowerCase(Locale.US);
- String range = command[2];
- String pattern = command[3];
-
- long start = -1;
- long end = -1;
- if(range.contains("-"))
- {
- String[] rsplit = range.split("-", 2);
- start = Long.parseLong(rsplit[0]);
- if(rsplit[1].length() > 0)
- {
- end = Long.parseLong(rsplit[1]);
- }
- }
- else // TODO: Handle Message-IDs
- {
- start = Long.parseLong(range);
- }
-
- try
- {
- List> heads = StorageManager.current().
- getArticleHeaders(conn.getCurrentChannel(), start, end, header, pattern);
-
- conn.println("221 header follows");
- for(Pair head : heads)
- {
- conn.println(head.getA() + " " + head.getB());
- }
- conn.println(".");
- }
- catch(PatternSyntaxException ex)
- {
- ex.printStackTrace();
- conn.println("500 invalid pattern syntax");
- }
- catch(StorageBackendException ex)
- {
- ex.printStackTrace();
- conn.println("500 internal server error");
- }
- }
- else
- {
- conn.println("430 invalid command usage");
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/daemon/command/package.html
--- a/org/sonews/daemon/command/package.html Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Contains a class for every NNTP command.
\ No newline at end of file
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/daemon/package.html
--- a/org/sonews/daemon/package.html Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Contains basic classes of the daemon.
\ No newline at end of file
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/feed/FeedManager.java
--- a/org/sonews/feed/FeedManager.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see highMarks = new HashMap();
- private BufferedReader in;
- private PrintWriter out;
- private Set subscriptions = new HashSet();
-
- private void addSubscription(final Subscription sub)
- {
- subscriptions.add(sub);
-
- if(!highMarks.containsKey(sub))
- {
- // Set a initial highMark
- this.highMarks.put(sub, 0);
- }
- }
-
- /**
- * Changes to the given group and returns its high mark.
- * @param groupName
- * @return
- */
- private int changeGroup(String groupName)
- throws IOException
- {
- this.out.print("GROUP " + groupName + "\r\n");
- this.out.flush();
-
- String line = this.in.readLine();
- if(line.startsWith("211 "))
- {
- int highmark = Integer.parseInt(line.split(" ")[3]);
- return highmark;
- }
- else
- {
- throw new IOException("GROUP " + groupName + " returned: " + line);
- }
- }
-
- private void connectTo(final String host, final int port)
- throws IOException, UnknownHostException
- {
- Socket socket = new Socket(host, port);
- this.out = new PrintWriter(socket.getOutputStream());
- this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-
- String line = in.readLine();
- if(!(line.charAt(0) == '2')) // Could be 200 or 2xx if posting is not allowed
- {
- throw new IOException(line);
- }
-
- // Send MODE READER to peer, some newsservers are friendlier then
- this.out.println("MODE READER\r\n");
- this.out.flush();
- line = this.in.readLine();
- }
-
- private void disconnect()
- throws IOException
- {
- this.out.print("QUIT\r\n");
- this.out.flush();
- this.out.close();
- this.in.close();
-
- this.out = null;
- this.in = null;
- }
-
- /**
- * Uses the OVER or XOVER command to get a list of message overviews that
- * may be unknown to this feeder and are about to be peered.
- * @param start
- * @param end
- * @return A list of message ids with potentially interesting messages.
- */
- private List over(int start, int end)
- throws IOException
- {
- this.out.print("OVER " + start + "-" + end + "\r\n");
- this.out.flush();
-
- String line = this.in.readLine();
- if(line.startsWith("500 ")) // OVER not supported
- {
- this.out.print("XOVER " + start + "-" + end + "\r\n");
- this.out.flush();
-
- line = this.in.readLine();
- }
-
- if(line.startsWith("224 "))
- {
- List messages = new ArrayList();
- line = this.in.readLine();
- while(!".".equals(line))
- {
- String mid = line.split("\t")[4]; // 5th should be the Message-ID
- messages.add(mid);
- line = this.in.readLine();
- }
- return messages;
- }
- else
- {
- throw new IOException("Server return for OVER/XOVER: " + line);
- }
- }
-
- @Override
- public void run()
- {
- while(isRunning())
- {
- int pullInterval = 1000 *
- Config.inst().get(Config.FEED_PULLINTERVAL, 3600);
- String host = "localhost";
- int port = 119;
-
- Log.get().info("Start PullFeeder run...");
-
- try
- {
- this.subscriptions.clear();
- List subsPull = StorageManager.current()
- .getSubscriptions(FeedManager.TYPE_PULL);
- for(Subscription sub : subsPull)
- {
- addSubscription(sub);
- }
- }
- catch(StorageBackendException ex)
- {
- Log.get().log(Level.SEVERE, host, ex);
- }
-
- try
- {
- for(Subscription sub : this.subscriptions)
- {
- host = sub.getHost();
- port = sub.getPort();
-
- try
- {
- Log.get().info("Feeding " + sub.getGroup() + " from " + sub.getHost());
- try
- {
- connectTo(host, port);
- }
- catch(SocketException ex)
- {
- Log.get().info("Skipping " + sub.getHost() + ": " + ex);
- continue;
- }
-
- int oldMark = this.highMarks.get(sub);
- int newMark = changeGroup(sub.getGroup());
-
- if(oldMark != newMark)
- {
- List messageIDs = over(oldMark, newMark);
-
- for(String messageID : messageIDs)
- {
- if(!StorageManager.current().isArticleExisting(messageID))
- {
- try
- {
- // Post the message via common socket connection
- ArticleReader aread =
- new ArticleReader(sub.getHost(), sub.getPort(), messageID);
- byte[] abuf = aread.getArticleData();
- if(abuf == null)
- {
- Log.get().warning("Could not feed " + messageID
- + " from " + sub.getHost());
- }
- else
- {
- Log.get().info("Feeding " + messageID);
- ArticleWriter awrite = new ArticleWriter(
- "localhost", Config.inst().get(Config.PORT, 119));
- awrite.writeArticle(abuf);
- awrite.close();
- }
- Stats.getInstance().mailFeeded(sub.getGroup());
- }
- catch(IOException ex)
- {
- // There may be a temporary network failure
- ex.printStackTrace();
- Log.get().warning("Skipping mail " + messageID + " due to exception.");
- }
- }
- } // for(;;)
- this.highMarks.put(sub, newMark);
- }
-
- disconnect();
- }
- catch(StorageBackendException ex)
- {
- ex.printStackTrace();
- }
- catch(IOException ex)
- {
- ex.printStackTrace();
- Log.get().severe("PullFeeder run stopped due to exception.");
- }
- } // for(Subscription sub : subscriptions)
-
- Log.get().info("PullFeeder run ended. Waiting " + pullInterval / 1000 + "s");
- Thread.sleep(pullInterval);
- }
- catch(InterruptedException ex)
- {
- Log.get().warning(ex.getMessage());
- }
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/feed/PushFeeder.java
--- a/org/sonews/feed/PushFeeder.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see articleQueue =
- new ConcurrentLinkedQueue();
-
- @Override
- public void run()
- {
- while(isRunning())
- {
- try
- {
- synchronized(this)
- {
- this.wait();
- }
-
- List subscriptions = StorageManager.current()
- .getSubscriptions(FeedManager.TYPE_PUSH);
-
- Article article = this.articleQueue.poll();
- String[] groups = article.getHeader(Headers.NEWSGROUPS)[0].split(",");
- Log.get().info("PushFeed: " + article.getMessageID());
- for(Subscription sub : subscriptions)
- {
- // Circle check
- if(article.getHeader(Headers.PATH)[0].contains(sub.getHost()))
- {
- Log.get().info(article.getMessageID() + " skipped for host "
- + sub.getHost());
- continue;
- }
-
- try
- {
- for(String group : groups)
- {
- if(sub.getGroup().equals(group))
- {
- // Delete headers that may cause problems
- article.removeHeader(Headers.NNTP_POSTING_DATE);
- article.removeHeader(Headers.NNTP_POSTING_HOST);
- article.removeHeader(Headers.X_COMPLAINTS_TO);
- article.removeHeader(Headers.X_TRACE);
- article.removeHeader(Headers.XREF);
-
- // POST the message to remote server
- ArticleWriter awriter = new ArticleWriter(sub.getHost(), sub.getPort());
- awriter.writeArticle(article);
- break;
- }
- }
- }
- catch(IOException ex)
- {
- Log.get().warning(ex.toString());
- }
- }
- }
- catch(StorageBackendException ex)
- {
- Log.get().severe(ex.toString());
- }
- catch(InterruptedException ex)
- {
- Log.get().warning("PushFeeder interrupted: " + ex);
- }
- }
- }
-
- public void queueForPush(Article article)
- {
- this.articleQueue.add(article);
- synchronized(this)
- {
- this.notifyAll();
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/feed/Subscription.java
--- a/org/sonews/feed/Subscription.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see "
- Pattern mailPattern = Pattern.compile("(\\w+[-|.])*\\w+@(\\w+.)+\\w+");
- Matcher mailMatcher = mailPattern.matcher(listPostValue);
- if(mailMatcher.find())
- {
- return listPostValue.substring(mailMatcher.start(), mailMatcher.end());
- }
- else
- {
- return null;
- }
- }
-
- /**
- * This method inspects the header of the given message, trying
- * to find the most appropriate recipient.
- * @param msg
- * @param fallback If this is false only List-Post and X-List-Post headers
- * are examined.
- * @return null or fitting group name for the given message.
- */
- private static List getGroupFor(final Message msg, final boolean fallback)
- throws MessagingException, StorageBackendException
- {
- List groups = null;
-
- // Is there a List-Post header?
- String[] listPost = msg.getHeader(Headers.LIST_POST);
- InternetAddress listPostAddr;
-
- if(listPost == null || listPost.length == 0 || "".equals(listPost[0]))
- {
- // Is there a X-List-Post header?
- listPost = msg.getHeader(Headers.X_LIST_POST);
- }
-
- if(listPost != null && listPost.length > 0
- && !"".equals(listPost[0]) && chunkListPost(listPost[0]) != null)
- {
- // listPost[0] is of form ""
- listPost[0] = chunkListPost(listPost[0]);
- listPostAddr = new InternetAddress(listPost[0], false);
- groups = StorageManager.current().getGroupsForList(listPostAddr.getAddress());
- }
- else if(fallback)
- {
- Log.get().info("Using fallback recipient discovery for: " + msg.getSubject());
- groups = new ArrayList();
- // Fallback to TO/CC/BCC addresses
- Address[] to = msg.getAllRecipients();
- for(Address toa : to) // Address can have '<' '>' around
- {
- if(toa instanceof InternetAddress)
- {
- List g = StorageManager.current()
- .getGroupsForList(((InternetAddress)toa).getAddress());
- groups.addAll(g);
- }
- }
- }
-
- return groups;
- }
-
- /**
- * Posts a message that was received from a mailing list to the
- * appropriate newsgroup.
- * If the message already exists in the storage, this message checks
- * if it must be posted in an additional group. This can happen for
- * crosspostings in different mailing lists.
- * @param msg
- */
- public static boolean toGroup(final Message msg)
- {
- try
- {
- // Create new Article object
- Article article = new Article(msg);
- boolean posted = false;
-
- // Check if this mail is already existing the storage
- boolean updateReq =
- StorageManager.current().isArticleExisting(article.getMessageID());
-
- List newsgroups = getGroupFor(msg, !updateReq);
- List oldgroups = new ArrayList();
- if(updateReq)
- {
- // Check for duplicate entries of the same group
- Article oldArticle = StorageManager.current().getArticle(article.getMessageID());
- List oldGroups = oldArticle.getGroups();
- for(Group oldGroup : oldGroups)
- {
- if(!newsgroups.contains(oldGroup.getName()))
- {
- oldgroups.add(oldGroup.getName());
- }
- }
- }
-
- if(newsgroups.size() > 0)
- {
- newsgroups.addAll(oldgroups);
- StringBuilder groups = new StringBuilder();
- for(int n = 0; n < newsgroups.size(); n++)
- {
- groups.append(newsgroups.get(n));
- if (n + 1 != newsgroups.size())
- {
- groups.append(',');
- }
- }
- Log.get().info("Posting to group " + groups.toString());
-
- article.setGroup(groups.toString());
- //article.removeHeader(Headers.REPLY_TO);
- //article.removeHeader(Headers.TO);
-
- // Write article to database
- if(updateReq)
- {
- Log.get().info("Updating " + article.getMessageID()
- + " with additional groups");
- StorageManager.current().delete(article.getMessageID());
- StorageManager.current().addArticle(article);
- }
- else
- {
- Log.get().info("Gatewaying " + article.getMessageID() + " to "
- + article.getHeader(Headers.NEWSGROUPS)[0]);
- StorageManager.current().addArticle(article);
- Stats.getInstance().mailGatewayed(
- article.getHeader(Headers.NEWSGROUPS)[0]);
- }
- posted = true;
- }
- else
- {
- StringBuilder buf = new StringBuilder();
- for (Address toa : msg.getAllRecipients())
- {
- buf.append(' ');
- buf.append(toa.toString());
- }
- buf.append(" " + article.getHeader(Headers.LIST_POST)[0]);
- Log.get().warning("No group for" + buf.toString());
- }
- return posted;
- }
- catch(Exception ex)
- {
- ex.printStackTrace();
- return false;
- }
- }
-
- /**
- * Mails a message received through NNTP to the appropriate mailing list.
- * This method MAY be called several times by PostCommand for the same
- * article.
- */
- public static void toList(Article article, String group)
- throws IOException, MessagingException, StorageBackendException
- {
- // Get mailing lists for the group of this article
- List rcptAddresses = StorageManager.current().getListsForGroup(group);
-
- if(rcptAddresses == null || rcptAddresses.size() == 0)
- {
- Log.get().warning("No ML-address for " + group + " found.");
- return;
- }
-
- for(String rcptAddress : rcptAddresses)
- {
- // Compose message and send it via given SMTP-Host
- String smtpHost = Config.inst().get(Config.MLSEND_HOST, "localhost");
- int smtpPort = Config.inst().get(Config.MLSEND_PORT, 25);
- String smtpUser = Config.inst().get(Config.MLSEND_USER, "user");
- String smtpPw = Config.inst().get(Config.MLSEND_PASSWORD, "mysecret");
- String smtpFrom = Config.inst().get(
- Config.MLSEND_ADDRESS, article.getHeader(Headers.FROM)[0]);
-
- // TODO: Make Article cloneable()
- article.getMessageID(); // Make sure an ID is existing
- article.removeHeader(Headers.NEWSGROUPS);
- article.removeHeader(Headers.PATH);
- article.removeHeader(Headers.LINES);
- article.removeHeader(Headers.BYTES);
-
- article.setHeader("To", rcptAddress);
- //article.setHeader("Reply-To", listAddress);
-
- if (Config.inst().get(Config.MLSEND_RW_SENDER, false))
- {
- rewriteSenderAddress(article); // Set the SENDER address
- }
-
- SMTPTransport smtpTransport = new SMTPTransport(smtpHost, smtpPort);
- smtpTransport.send(article, smtpFrom, rcptAddress);
- smtpTransport.close();
-
- Stats.getInstance().mailGatewayed(group);
- Log.get().info("MLGateway: Mail " + article.getHeader("Subject")[0]
- + " was delivered to " + rcptAddress + ".");
- }
- }
-
- /**
- * Sets the SENDER header of the given MimeMessage. This might be necessary
- * for moderated groups that does not allow the "normal" FROM sender.
- * @param msg
- * @throws javax.mail.MessagingException
- */
- private static void rewriteSenderAddress(Article msg)
- throws MessagingException
- {
- String mlAddress = Config.inst().get(Config.MLSEND_ADDRESS, null);
-
- if(mlAddress != null)
- {
- msg.setHeader(Headers.SENDER, mlAddress);
- }
- else
- {
- throw new MessagingException("Cannot rewrite SENDER header!");
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/mlgw/MailPoller.java
--- a/org/sonews/mlgw/MailPoller.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see getGroups()
- {
- String[] groupnames = getHeader(Headers.NEWSGROUPS)[0].split(",");
- ArrayList groups = new ArrayList();
-
- try
- {
- for(String newsgroup : groupnames)
- {
- newsgroup = newsgroup.trim();
- Group group = StorageManager.current().getGroup(newsgroup);
- if(group != null && // If the server does not provide the group, ignore it
- !groups.contains(group)) // Yes, there may be duplicates
- {
- groups.add(group);
- }
- }
- }
- catch(StorageBackendException ex)
- {
- ex.printStackTrace();
- return null;
- }
- return groups;
- }
-
- public void setBody(byte[] body)
- {
- this.body = body;
- }
-
- /**
- *
- * @param groupname Name(s) of newsgroups
- */
- public void setGroup(String groupname)
- {
- this.headers.setHeader(Headers.NEWSGROUPS, groupname);
- }
-
- /**
- * Returns the Message-ID of this Article. If the appropriate header
- * is empty, a new Message-ID is created.
- * @return Message-ID of this Article.
- */
- public String getMessageID()
- {
- String[] msgID = getHeader(Headers.MESSAGE_ID);
- return msgID[0].equals("") ? generateMessageID() : msgID[0];
- }
-
- /**
- * @return String containing the Message-ID.
- */
- @Override
- public String toString()
- {
- return getMessageID();
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/storage/ArticleHead.java
--- a/org/sonews/storage/ArticleHead.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see getAll()
- {
- List all = new ArrayList();
-
- /*List agroups = AggregatedGroup.getAll();
- if(agroups != null)
- {
- all.addAll(agroups);
- }*/
-
- List groups = Group.getAll();
- if(groups != null)
- {
- all.addAll(groups);
- }
-
- return all;
- }
-
- public static Channel getByName(String name)
- throws StorageBackendException
- {
- return StorageManager.current().getGroup(name);
- }
-
- public abstract Article getArticle(long idx)
- throws StorageBackendException;
-
- public abstract List> getArticleHeads(
- final long first, final long last)
- throws StorageBackendException;
-
- public abstract List getArticleNumbers()
- throws StorageBackendException;
-
- public abstract long getFirstArticleNumber()
- throws StorageBackendException;
-
- public abstract long getIndexOf(Article art)
- throws StorageBackendException;
-
- public abstract long getInternalID();
-
- public abstract long getLastArticleNumber()
- throws StorageBackendException;
-
- public abstract String getName();
-
- public abstract long getPostingsCount()
- throws StorageBackendException;
-
- public abstract boolean isDeleted();
-
- public abstract boolean isWriteable();
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/storage/Group.java
--- a/org/sonews/storage/Group.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see getAll()
- {
- try
- {
- return StorageManager.current().getGroups();
- }
- catch(StorageBackendException ex)
- {
- Log.get().severe(ex.getMessage());
- return null;
- }
- }
-
- /**
- * @param name
- * @param id
- */
- public Group(final String name, final long id, final int flags)
- {
- this.id = id;
- this.flags = flags;
- this.name = name;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if(obj instanceof Group)
- {
- return ((Group)obj).id == this.id;
- }
- else
- {
- return false;
- }
- }
-
- public Article getArticle(long idx)
- throws StorageBackendException
- {
- return StorageManager.current().getArticle(idx, this.id);
- }
-
- public List> getArticleHeads(final long first, final long last)
- throws StorageBackendException
- {
- return StorageManager.current().getArticleHeads(this, first, last);
- }
-
- public List getArticleNumbers()
- throws StorageBackendException
- {
- return StorageManager.current().getArticleNumbers(id);
- }
-
- public long getFirstArticleNumber()
- throws StorageBackendException
- {
- return StorageManager.current().getFirstArticleNumber(this);
- }
-
- public int getFlags()
- {
- return this.flags;
- }
-
- public long getIndexOf(Article art)
- throws StorageBackendException
- {
- return StorageManager.current().getArticleIndex(art, this);
- }
-
- /**
- * Returns the group id.
- */
- public long getInternalID()
- {
- assert id > 0;
-
- return id;
- }
-
- public boolean isDeleted()
- {
- return (this.flags & DELETED) != 0;
- }
-
- public boolean isMailingList()
- {
- return (this.flags & MAILINGLIST) != 0;
- }
-
- public boolean isWriteable()
- {
- return true;
- }
-
- public long getLastArticleNumber()
- throws StorageBackendException
- {
- return StorageManager.current().getLastArticleNumber(this);
- }
-
- public String getName()
- {
- return name;
- }
-
- /**
- * Performs this.flags |= flag to set a specified flag and updates the data
- * in the JDBCDatabase.
- * @param flag
- */
- public void setFlag(final int flag)
- {
- this.flags |= flag;
- }
-
- public void setName(final String name)
- {
- this.name = name;
- }
-
- /**
- * @return Number of posted articles in this group.
- * @throws java.sql.SQLException
- */
- public long getPostingsCount()
- throws StorageBackendException
- {
- return StorageManager.current().getPostingsCount(this.name);
- }
-
- /**
- * Updates flags and name in the backend.
- */
- public void update()
- throws StorageBackendException
- {
- StorageManager.current().update(this);
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/storage/Headers.java
--- a/org/sonews/storage/Headers.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see > getArticleHeads(Group group, long first, long last)
- throws StorageBackendException;
-
- List> getArticleHeaders(Channel channel, long start, long end,
- String header, String pattern)
- throws StorageBackendException;
-
- long getArticleIndex(Article art, Group group)
- throws StorageBackendException;
-
- List getArticleNumbers(long groupID)
- throws StorageBackendException;
-
- String getConfigValue(String key)
- throws StorageBackendException;
-
- int getEventsCount(int eventType, long startTimestamp, long endTimestamp,
- Channel channel)
- throws StorageBackendException;
-
- double getEventsPerHour(int key, long gid)
- throws StorageBackendException;
-
- int getFirstArticleNumber(Group group)
- throws StorageBackendException;
-
- Group getGroup(String name)
- throws StorageBackendException;
-
- List getGroups()
- throws StorageBackendException;
-
- /**
- * Retrieves the collection of groupnames that are associated with the
- * given list address.
- * @param inetaddress
- * @return
- * @throws StorageBackendException
- */
- List getGroupsForList(String listAddress)
- throws StorageBackendException;
-
- int getLastArticleNumber(Group group)
- throws StorageBackendException;
-
- /**
- * Returns a list of email addresses that are related to the given
- * groupname. In most cases the list may contain only one entry.
- * @param groupname
- * @return
- * @throws StorageBackendException
- */
- List getListsForGroup(String groupname)
- throws StorageBackendException;
-
- String getOldestArticle()
- throws StorageBackendException;
-
- int getPostingsCount(String groupname)
- throws StorageBackendException;
-
- List getSubscriptions(int type)
- throws StorageBackendException;
-
- boolean isArticleExisting(String messageID)
- throws StorageBackendException;
-
- boolean isGroupExisting(String groupname)
- throws StorageBackendException;
-
- void purgeGroup(Group group)
- throws StorageBackendException;
-
- void setConfigValue(String key, String value)
- throws StorageBackendException;
-
- /**
- * Updates headers and channel references of the given article.
- * @param article
- * @return
- * @throws StorageBackendException
- */
- boolean update(Article article)
- throws StorageBackendException;
-
- boolean update(Group group)
- throws StorageBackendException;
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/storage/StorageBackendException.java
--- a/org/sonews/storage/StorageBackendException.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see "),
- Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_USER, "root"),
- Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_PASSWORD, ""));
-
- this.conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
- if(this.conn.getTransactionIsolation() != Connection.TRANSACTION_SERIALIZABLE)
- {
- Log.get().warning("Database is NOT fully serializable!");
- }
-
- // Prepare statements for method addArticle()
- this.pstmtAddArticle1 = conn.prepareStatement(
- "INSERT INTO articles (article_id, body) VALUES(?, ?)");
- this.pstmtAddArticle2 = conn.prepareStatement(
- "INSERT INTO headers (article_id, header_key, header_value, header_index) " +
- "VALUES (?, ?, ?, ?)");
- this.pstmtAddArticle3 = conn.prepareStatement(
- "INSERT INTO postings (group_id, article_id, article_index)" +
- "VALUES (?, ?, ?)");
- this.pstmtAddArticle4 = conn.prepareStatement(
- "INSERT INTO article_ids (article_id, message_id) VALUES (?, ?)");
-
- // Prepare statement for method addStatValue()
- this.pstmtAddEvent = conn.prepareStatement(
- "INSERT INTO events VALUES (?, ?, ?)");
-
- // Prepare statement for method addGroup()
- this.pstmtAddGroup0 = conn.prepareStatement(
- "INSERT INTO groups (name, flags) VALUES (?, ?)");
-
- // Prepare statement for method countArticles()
- this.pstmtCountArticles = conn.prepareStatement(
- "SELECT Count(article_id) FROM article_ids");
-
- // Prepare statement for method countGroups()
- this.pstmtCountGroups = conn.prepareStatement(
- "SELECT Count(group_id) FROM groups WHERE " +
- "flags & " + Channel.DELETED + " = 0");
-
- // Prepare statements for method delete(article)
- this.pstmtDeleteArticle0 = conn.prepareStatement(
- "DELETE FROM articles WHERE article_id = " +
- "(SELECT article_id FROM article_ids WHERE message_id = ?)");
- this.pstmtDeleteArticle1 = conn.prepareStatement(
- "DELETE FROM headers WHERE article_id = " +
- "(SELECT article_id FROM article_ids WHERE message_id = ?)");
- this.pstmtDeleteArticle2 = conn.prepareStatement(
- "DELETE FROM postings WHERE article_id = " +
- "(SELECT article_id FROM article_ids WHERE message_id = ?)");
- this.pstmtDeleteArticle3 = conn.prepareStatement(
- "DELETE FROM article_ids WHERE message_id = ?");
-
- // Prepare statements for methods getArticle()
- this.pstmtGetArticle0 = conn.prepareStatement(
- "SELECT * FROM articles WHERE article_id = " +
- "(SELECT article_id FROM article_ids WHERE message_id = ?)");
- this.pstmtGetArticle1 = conn.prepareStatement(
- "SELECT * FROM articles WHERE article_id = " +
- "(SELECT article_id FROM postings WHERE " +
- "article_index = ? AND group_id = ?)");
-
- // Prepare statement for method getArticleHeaders()
- this.pstmtGetArticleHeaders0 = conn.prepareStatement(
- "SELECT header_key, header_value FROM headers WHERE article_id = ? " +
- "ORDER BY header_index ASC");
-
- // Prepare statement for method getArticleHeaders(regular expr pattern)
- this.pstmtGetArticleHeaders1 = conn.prepareStatement(
- "SELECT p.article_index, h.header_value FROM headers h " +
- "INNER JOIN postings p ON h.article_id = p.article_id " +
- "INNER JOIN groups g ON p.group_id = g.group_id " +
- "WHERE g.name = ? AND " +
- "h.header_key = ? AND " +
- "p.article_index >= ? " +
- "ORDER BY p.article_index ASC");
-
- this.pstmtGetArticleIDs = conn.prepareStatement(
- "SELECT article_index FROM postings WHERE group_id = ?");
-
- // Prepare statement for method getArticleIndex
- this.pstmtGetArticleIndex = conn.prepareStatement(
- "SELECT article_index FROM postings WHERE " +
- "article_id = (SELECT article_id FROM article_ids " +
- "WHERE message_id = ?) " +
- " AND group_id = ?");
-
- // Prepare statements for method getArticleHeads()
- this.pstmtGetArticleHeads = conn.prepareStatement(
- "SELECT article_id, article_index FROM postings WHERE " +
- "postings.group_id = ? AND article_index >= ? AND " +
- "article_index <= ?");
-
- // Prepare statements for method getConfigValue()
- this.pstmtGetConfigValue = conn.prepareStatement(
- "SELECT config_value FROM config WHERE config_key = ?");
-
- // Prepare statements for method getEventsCount()
- this.pstmtGetEventsCount0 = conn.prepareStatement(
- "SELECT Count(*) FROM events WHERE event_key = ? AND " +
- "event_time >= ? AND event_time < ?");
-
- this.pstmtGetEventsCount1 = conn.prepareStatement(
- "SELECT Count(*) FROM events WHERE event_key = ? AND " +
- "event_time >= ? AND event_time < ? AND group_id = ?");
-
- // Prepare statement for method getGroupForList()
- this.pstmtGetGroupForList = conn.prepareStatement(
- "SELECT name FROM groups INNER JOIN groups2list " +
- "ON groups.group_id = groups2list.group_id " +
- "WHERE groups2list.listaddress = ?");
-
- // Prepare statement for method getGroup()
- this.pstmtGetGroup0 = conn.prepareStatement(
- "SELECT group_id, flags FROM groups WHERE Name = ?");
- this.pstmtGetGroup1 = conn.prepareStatement(
- "SELECT name FROM groups WHERE group_id = ?");
-
- // Prepare statement for method getLastArticleNumber()
- this.pstmtGetLastArticleNumber = conn.prepareStatement(
- "SELECT Max(article_index) FROM postings WHERE group_id = ?");
-
- // Prepare statement for method getListForGroup()
- this.pstmtGetListForGroup = conn.prepareStatement(
- "SELECT listaddress FROM groups2list INNER JOIN groups " +
- "ON groups.group_id = groups2list.group_id WHERE name = ?");
-
- // Prepare statement for method getMaxArticleID()
- this.pstmtGetMaxArticleID = conn.prepareStatement(
- "SELECT Max(article_id) FROM articles");
-
- // Prepare statement for method getMaxArticleIndex()
- this.pstmtGetMaxArticleIndex = conn.prepareStatement(
- "SELECT Max(article_index) FROM postings WHERE group_id = ?");
-
- // Prepare statement for method getOldestArticle()
- this.pstmtGetOldestArticle = conn.prepareStatement(
- "SELECT message_id FROM article_ids WHERE article_id = " +
- "(SELECT Min(article_id) FROM article_ids)");
-
- // Prepare statement for method getFirstArticleNumber()
- this.pstmtGetFirstArticleNumber = conn.prepareStatement(
- "SELECT Min(article_index) FROM postings WHERE group_id = ?");
-
- // Prepare statement for method getPostingsCount()
- this.pstmtGetPostingsCount = conn.prepareStatement(
- "SELECT Count(*) FROM postings NATURAL JOIN groups " +
- "WHERE groups.name = ?");
-
- // Prepare statement for method getSubscriptions()
- this.pstmtGetSubscriptions = conn.prepareStatement(
- "SELECT host, port, name FROM peers NATURAL JOIN " +
- "peer_subscriptions NATURAL JOIN groups WHERE feedtype = ?");
-
- // Prepare statement for method isArticleExisting()
- this.pstmtIsArticleExisting = conn.prepareStatement(
- "SELECT Count(article_id) FROM article_ids WHERE message_id = ?");
-
- // Prepare statement for method isGroupExisting()
- this.pstmtIsGroupExisting = conn.prepareStatement(
- "SELECT * FROM groups WHERE name = ?");
-
- // Prepare statement for method setConfigValue()
- this.pstmtSetConfigValue0 = conn.prepareStatement(
- "DELETE FROM config WHERE config_key = ?");
- this.pstmtSetConfigValue1 = conn.prepareStatement(
- "INSERT INTO config VALUES(?, ?)");
-
- // Prepare statements for method purgeGroup()
- this.pstmtPurgeGroup0 = conn.prepareStatement(
- "DELETE FROM peer_subscriptions WHERE group_id = ?");
- this.pstmtPurgeGroup1 = conn.prepareStatement(
- "DELETE FROM groups WHERE group_id = ?");
-
- // Prepare statement for method update(Group)
- this.pstmtUpdateGroup = conn.prepareStatement(
- "UPDATE groups SET flags = ?, name = ? WHERE group_id = ?");
- }
- catch(ClassNotFoundException ex)
- {
- throw new Error("JDBC Driver not found!", ex);
- }
- }
-
- /**
- * Adds an article to the database.
- * @param article
- * @return
- * @throws java.sql.SQLException
- */
- @Override
- public void addArticle(final Article article)
- throws StorageBackendException
- {
- try
- {
- this.conn.setAutoCommit(false);
-
- int newArticleID = getMaxArticleID() + 1;
-
- // Fill prepared statement with values;
- // writes body to article table
- pstmtAddArticle1.setInt(1, newArticleID);
- pstmtAddArticle1.setBytes(2, article.getBody());
- pstmtAddArticle1.execute();
-
- // Add headers
- Enumeration headers = article.getAllHeaders();
- for(int n = 0; headers.hasMoreElements(); n++)
- {
- Header header = (Header)headers.nextElement();
- pstmtAddArticle2.setInt(1, newArticleID);
- pstmtAddArticle2.setString(2, header.getName().toLowerCase());
- pstmtAddArticle2.setString(3,
- header.getValue().replaceAll("[\r\n]", ""));
- pstmtAddArticle2.setInt(4, n);
- pstmtAddArticle2.execute();
- }
-
- // For each newsgroup add a reference
- List groups = article.getGroups();
- for(Group group : groups)
- {
- pstmtAddArticle3.setLong(1, group.getInternalID());
- pstmtAddArticle3.setInt(2, newArticleID);
- pstmtAddArticle3.setLong(3, getMaxArticleIndex(group.getInternalID()) + 1);
- pstmtAddArticle3.execute();
- }
-
- // Write message-id to article_ids table
- this.pstmtAddArticle4.setInt(1, newArticleID);
- this.pstmtAddArticle4.setString(2, article.getMessageID());
- this.pstmtAddArticle4.execute();
-
- this.conn.commit();
- this.conn.setAutoCommit(true);
-
- this.restarts = 0; // Reset error count
- }
- catch(SQLException ex)
- {
- try
- {
- this.conn.rollback(); // Rollback changes
- }
- catch(SQLException ex2)
- {
- Log.get().severe("Rollback of addArticle() failed: " + ex2);
- }
-
- try
- {
- this.conn.setAutoCommit(true); // and release locks
- }
- catch(SQLException ex2)
- {
- Log.get().severe("setAutoCommit(true) of addArticle() failed: " + ex2);
- }
-
- restartConnection(ex);
- addArticle(article);
- }
- }
-
- /**
- * Adds a group to the JDBCDatabase. This method is not accessible via NNTP.
- * @param name
- * @throws java.sql.SQLException
- */
- @Override
- public void addGroup(String name, int flags)
- throws StorageBackendException
- {
- try
- {
- this.conn.setAutoCommit(false);
- pstmtAddGroup0.setString(1, name);
- pstmtAddGroup0.setInt(2, flags);
-
- pstmtAddGroup0.executeUpdate();
- this.conn.commit();
- this.conn.setAutoCommit(true);
- this.restarts = 0; // Reset error count
- }
- catch(SQLException ex)
- {
- try
- {
- this.conn.rollback();
- this.conn.setAutoCommit(true);
- }
- catch(SQLException ex2)
- {
- ex2.printStackTrace();
- }
-
- restartConnection(ex);
- addGroup(name, flags);
- }
- }
-
- @Override
- public void addEvent(long time, int type, long gid)
- throws StorageBackendException
- {
- try
- {
- this.conn.setAutoCommit(false);
- this.pstmtAddEvent.setLong(1, time);
- this.pstmtAddEvent.setInt(2, type);
- this.pstmtAddEvent.setLong(3, gid);
- this.pstmtAddEvent.executeUpdate();
- this.conn.commit();
- this.conn.setAutoCommit(true);
- this.restarts = 0;
- }
- catch(SQLException ex)
- {
- try
- {
- this.conn.rollback();
- this.conn.setAutoCommit(true);
- }
- catch(SQLException ex2)
- {
- ex2.printStackTrace();
- }
-
- restartConnection(ex);
- addEvent(time, type, gid);
- }
- }
-
- @Override
- public int countArticles()
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- rs = this.pstmtCountArticles.executeQuery();
- if(rs.next())
- {
- return rs.getInt(1);
- }
- else
- {
- return -1;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return countArticles();
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- restarts = 0;
- }
- }
- }
-
- @Override
- public int countGroups()
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- rs = this.pstmtCountGroups.executeQuery();
- if(rs.next())
- {
- return rs.getInt(1);
- }
- else
- {
- return -1;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return countGroups();
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- restarts = 0;
- }
- }
- }
-
- @Override
- public void delete(final String messageID)
- throws StorageBackendException
- {
- try
- {
- this.conn.setAutoCommit(false);
-
- this.pstmtDeleteArticle0.setString(1, messageID);
- int rs = this.pstmtDeleteArticle0.executeUpdate();
-
- // We do not trust the ON DELETE CASCADE functionality to delete
- // orphaned references...
- this.pstmtDeleteArticle1.setString(1, messageID);
- rs = this.pstmtDeleteArticle1.executeUpdate();
-
- this.pstmtDeleteArticle2.setString(1, messageID);
- rs = this.pstmtDeleteArticle2.executeUpdate();
-
- this.pstmtDeleteArticle3.setString(1, messageID);
- rs = this.pstmtDeleteArticle3.executeUpdate();
-
- this.conn.commit();
- this.conn.setAutoCommit(true);
- }
- catch(SQLException ex)
- {
- throw new StorageBackendException(ex);
- }
- }
-
- @Override
- public Article getArticle(String messageID)
- throws StorageBackendException
- {
- ResultSet rs = null;
- try
- {
- pstmtGetArticle0.setString(1, messageID);
- rs = pstmtGetArticle0.executeQuery();
-
- if(!rs.next())
- {
- return null;
- }
- else
- {
- byte[] body = rs.getBytes("body");
- String headers = getArticleHeaders(rs.getInt("article_id"));
- return new Article(headers, body);
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticle(messageID);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- restarts = 0; // Reset error count
- }
- }
- }
-
- /**
- * Retrieves an article by its ID.
- * @param articleID
- * @return
- * @throws StorageBackendException
- */
- @Override
- public Article getArticle(long articleIndex, long gid)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetArticle1.setLong(1, articleIndex);
- this.pstmtGetArticle1.setLong(2, gid);
-
- rs = this.pstmtGetArticle1.executeQuery();
-
- if(rs.next())
- {
- byte[] body = rs.getBytes("body");
- String headers = getArticleHeaders(rs.getInt("article_id"));
- return new Article(headers, body);
- }
- else
- {
- return null;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticle(articleIndex, gid);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- restarts = 0;
- }
- }
- }
-
- /**
- * Searches for fitting header values using the given regular expression.
- * @param group
- * @param start
- * @param end
- * @param headerKey
- * @param pattern
- * @return
- * @throws StorageBackendException
- */
- @Override
- public List> getArticleHeaders(Channel group, long start,
- long end, String headerKey, String patStr)
- throws StorageBackendException, PatternSyntaxException
- {
- ResultSet rs = null;
- List> heads = new ArrayList>();
-
- try
- {
- this.pstmtGetArticleHeaders1.setString(1, group.getName());
- this.pstmtGetArticleHeaders1.setString(2, headerKey);
- this.pstmtGetArticleHeaders1.setLong(3, start);
-
- rs = this.pstmtGetArticleHeaders1.executeQuery();
-
- // Convert the "NNTP" regex to Java regex
- patStr = patStr.replace("*", ".*");
- Pattern pattern = Pattern.compile(patStr);
-
- while(rs.next())
- {
- Long articleIndex = rs.getLong(1);
- if(end < 0 || articleIndex <= end) // Match start is done via SQL
- {
- String headerValue = rs.getString(2);
- Matcher matcher = pattern.matcher(headerValue);
- if(matcher.matches())
- {
- heads.add(new Pair(articleIndex, headerValue));
- }
- }
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticleHeaders(group, start, end, headerKey, patStr);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
-
- return heads;
- }
-
- private String getArticleHeaders(long articleID)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetArticleHeaders0.setLong(1, articleID);
- rs = this.pstmtGetArticleHeaders0.executeQuery();
-
- StringBuilder buf = new StringBuilder();
- if(rs.next())
- {
- for(;;)
- {
- buf.append(rs.getString(1)); // key
- buf.append(": ");
- String foldedValue = MimeUtility.fold(0, rs.getString(2));
- buf.append(foldedValue); // value
- if(rs.next())
- {
- buf.append("\r\n");
- }
- else
- {
- break;
- }
- }
- }
-
- return buf.toString();
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticleHeaders(articleID);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public long getArticleIndex(Article article, Group group)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetArticleIndex.setString(1, article.getMessageID());
- this.pstmtGetArticleIndex.setLong(2, group.getInternalID());
-
- rs = this.pstmtGetArticleIndex.executeQuery();
- if(rs.next())
- {
- return rs.getLong(1);
- }
- else
- {
- return -1;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticleIndex(article, group);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Returns a list of Long/Article Pairs.
- * @throws java.sql.SQLException
- */
- @Override
- public List> getArticleHeads(Group group, long first,
- long last)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetArticleHeads.setLong(1, group.getInternalID());
- this.pstmtGetArticleHeads.setLong(2, first);
- this.pstmtGetArticleHeads.setLong(3, last);
- rs = pstmtGetArticleHeads.executeQuery();
-
- List> articles
- = new ArrayList>();
-
- while (rs.next())
- {
- long aid = rs.getLong("article_id");
- long aidx = rs.getLong("article_index");
- String headers = getArticleHeaders(aid);
- articles.add(new Pair(aidx,
- new ArticleHead(headers)));
- }
-
- return articles;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticleHeads(group, first, last);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public List getArticleNumbers(long gid)
- throws StorageBackendException
- {
- ResultSet rs = null;
- try
- {
- List ids = new ArrayList();
- this.pstmtGetArticleIDs.setLong(1, gid);
- rs = this.pstmtGetArticleIDs.executeQuery();
- while(rs.next())
- {
- ids.add(rs.getLong(1));
- }
- return ids;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getArticleNumbers(gid);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- restarts = 0; // Clear the restart count after successful request
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public String getConfigValue(String key)
- throws StorageBackendException
- {
- ResultSet rs = null;
- try
- {
- this.pstmtGetConfigValue.setString(1, key);
-
- rs = this.pstmtGetConfigValue.executeQuery();
- if(rs.next())
- {
- return rs.getString(1); // First data on index 1 not 0
- }
- else
- {
- return null;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getConfigValue(key);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- restarts = 0; // Clear the restart count after successful request
- }
- }
- }
-
- @Override
- public int getEventsCount(int type, long start, long end, Channel channel)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- if(channel == null)
- {
- this.pstmtGetEventsCount0.setInt(1, type);
- this.pstmtGetEventsCount0.setLong(2, start);
- this.pstmtGetEventsCount0.setLong(3, end);
- rs = this.pstmtGetEventsCount0.executeQuery();
- }
- else
- {
- this.pstmtGetEventsCount1.setInt(1, type);
- this.pstmtGetEventsCount1.setLong(2, start);
- this.pstmtGetEventsCount1.setLong(3, end);
- this.pstmtGetEventsCount1.setLong(4, channel.getInternalID());
- rs = this.pstmtGetEventsCount1.executeQuery();
- }
-
- if(rs.next())
- {
- return rs.getInt(1);
- }
- else
- {
- return -1;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getEventsCount(type, start, end, channel);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Reads all Groups from the JDBCDatabase.
- * @return
- * @throws StorageBackendException
- */
- @Override
- public List getGroups()
- throws StorageBackendException
- {
- ResultSet rs;
- List buffer = new ArrayList();
- Statement stmt = null;
-
- try
- {
- stmt = conn.createStatement();
- rs = stmt.executeQuery("SELECT * FROM groups ORDER BY name");
-
- while(rs.next())
- {
- String name = rs.getString("name");
- long id = rs.getLong("group_id");
- int flags = rs.getInt("flags");
-
- Group group = new Group(name, id, flags);
- buffer.add(group);
- }
-
- return buffer;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getGroups();
- }
- finally
- {
- if(stmt != null)
- {
- try
- {
- stmt.close(); // Implicitely closes ResultSets
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public List getGroupsForList(String listAddress)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetGroupForList.setString(1, listAddress);
-
- rs = this.pstmtGetGroupForList.executeQuery();
- List groups = new ArrayList();
- while(rs.next())
- {
- String group = rs.getString(1);
- groups.add(group);
- }
- return groups;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getGroupsForList(listAddress);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Returns the Group that is identified by the name.
- * @param name
- * @return
- * @throws StorageBackendException
- */
- @Override
- public Group getGroup(String name)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetGroup0.setString(1, name);
- rs = this.pstmtGetGroup0.executeQuery();
-
- if (!rs.next())
- {
- return null;
- }
- else
- {
- long id = rs.getLong("group_id");
- int flags = rs.getInt("flags");
- return new Group(name, id, flags);
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getGroup(name);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public List getListsForGroup(String group)
- throws StorageBackendException
- {
- ResultSet rs = null;
- List lists = new ArrayList();
-
- try
- {
- this.pstmtGetListForGroup.setString(1, group);
- rs = this.pstmtGetListForGroup.executeQuery();
-
- while(rs.next())
- {
- lists.add(rs.getString(1));
- }
- return lists;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getListsForGroup(group);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- private int getMaxArticleIndex(long groupID)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetMaxArticleIndex.setLong(1, groupID);
- rs = this.pstmtGetMaxArticleIndex.executeQuery();
-
- int maxIndex = 0;
- if (rs.next())
- {
- maxIndex = rs.getInt(1);
- }
-
- return maxIndex;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getMaxArticleIndex(groupID);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- private int getMaxArticleID()
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- rs = this.pstmtGetMaxArticleID.executeQuery();
-
- int maxIndex = 0;
- if (rs.next())
- {
- maxIndex = rs.getInt(1);
- }
-
- return maxIndex;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getMaxArticleID();
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public int getLastArticleNumber(Group group)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetLastArticleNumber.setLong(1, group.getInternalID());
- rs = this.pstmtGetLastArticleNumber.executeQuery();
- if (rs.next())
- {
- return rs.getInt(1);
- }
- else
- {
- return 0;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getLastArticleNumber(group);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public int getFirstArticleNumber(Group group)
- throws StorageBackendException
- {
- ResultSet rs = null;
- try
- {
- this.pstmtGetFirstArticleNumber.setLong(1, group.getInternalID());
- rs = this.pstmtGetFirstArticleNumber.executeQuery();
- if(rs.next())
- {
- return rs.getInt(1);
- }
- else
- {
- return 0;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getFirstArticleNumber(group);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Returns a group name identified by the given id.
- * @param id
- * @return
- * @throws StorageBackendException
- */
- public String getGroup(int id)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetGroup1.setInt(1, id);
- rs = this.pstmtGetGroup1.executeQuery();
-
- if (rs.next())
- {
- return rs.getString(1);
- }
- else
- {
- return null;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getGroup(id);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public double getEventsPerHour(int key, long gid)
- throws StorageBackendException
- {
- String gidquery = "";
- if(gid >= 0)
- {
- gidquery = " AND group_id = " + gid;
- }
-
- Statement stmt = null;
- ResultSet rs = null;
-
- try
- {
- stmt = this.conn.createStatement();
- rs = stmt.executeQuery("SELECT Count(*) / (Max(event_time) - Min(event_time))" +
- " * 1000 * 60 * 60 FROM events WHERE event_key = " + key + gidquery);
-
- if(rs.next())
- {
- restarts = 0; // reset error count
- return rs.getDouble(1);
- }
- else
- {
- return Double.NaN;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getEventsPerHour(key, gid);
- }
- finally
- {
- try
- {
- if(stmt != null)
- {
- stmt.close(); // Implicitely closes the result sets
- }
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
-
- @Override
- public String getOldestArticle()
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- rs = this.pstmtGetOldestArticle.executeQuery();
- if(rs.next())
- {
- return rs.getString(1);
- }
- else
- {
- return null;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getOldestArticle();
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public int getPostingsCount(String groupname)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtGetPostingsCount.setString(1, groupname);
- rs = this.pstmtGetPostingsCount.executeQuery();
- if(rs.next())
- {
- return rs.getInt(1);
- }
- else
- {
- Log.get().warning("Count on postings return nothing!");
- return 0;
- }
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getPostingsCount(groupname);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public List getSubscriptions(int feedtype)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- List subs = new ArrayList();
- this.pstmtGetSubscriptions.setInt(1, feedtype);
- rs = this.pstmtGetSubscriptions.executeQuery();
-
- while(rs.next())
- {
- String host = rs.getString("host");
- String group = rs.getString("name");
- int port = rs.getInt("port");
- subs.add(new Subscription(host, port, feedtype, group));
- }
-
- return subs;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return getSubscriptions(feedtype);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Checks if there is an article with the given messageid in the JDBCDatabase.
- * @param name
- * @return
- * @throws StorageBackendException
- */
- @Override
- public boolean isArticleExisting(String messageID)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtIsArticleExisting.setString(1, messageID);
- rs = this.pstmtIsArticleExisting.executeQuery();
- return rs.next() && rs.getInt(1) == 1;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return isArticleExisting(messageID);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Checks if there is a group with the given name in the JDBCDatabase.
- * @param name
- * @return
- * @throws StorageBackendException
- */
- @Override
- public boolean isGroupExisting(String name)
- throws StorageBackendException
- {
- ResultSet rs = null;
-
- try
- {
- this.pstmtIsGroupExisting.setString(1, name);
- rs = this.pstmtIsGroupExisting.executeQuery();
- return rs.next();
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return isGroupExisting(name);
- }
- finally
- {
- if(rs != null)
- {
- try
- {
- rs.close();
- }
- catch(SQLException ex)
- {
- ex.printStackTrace();
- }
- }
- }
- }
-
- @Override
- public void setConfigValue(String key, String value)
- throws StorageBackendException
- {
- try
- {
- conn.setAutoCommit(false);
- this.pstmtSetConfigValue0.setString(1, key);
- this.pstmtSetConfigValue0.execute();
- this.pstmtSetConfigValue1.setString(1, key);
- this.pstmtSetConfigValue1.setString(2, value);
- this.pstmtSetConfigValue1.execute();
- conn.commit();
- conn.setAutoCommit(true);
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- setConfigValue(key, value);
- }
- }
-
- /**
- * Closes the JDBCDatabase connection.
- */
- public void shutdown()
- throws StorageBackendException
- {
- try
- {
- if(this.conn != null)
- {
- this.conn.close();
- }
- }
- catch(SQLException ex)
- {
- throw new StorageBackendException(ex);
- }
- }
-
- @Override
- public void purgeGroup(Group group)
- throws StorageBackendException
- {
- try
- {
- this.pstmtPurgeGroup0.setLong(1, group.getInternalID());
- this.pstmtPurgeGroup0.executeUpdate();
-
- this.pstmtPurgeGroup1.setLong(1, group.getInternalID());
- this.pstmtPurgeGroup1.executeUpdate();
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- purgeGroup(group);
- }
- }
-
- private void restartConnection(SQLException cause)
- throws StorageBackendException
- {
- restarts++;
- Log.get().severe(Thread.currentThread()
- + ": Database connection was closed (restart " + restarts + ").");
-
- if(restarts >= MAX_RESTARTS)
- {
- // Delete the current, probably broken JDBCDatabase instance.
- // So no one can use the instance any more.
- JDBCDatabaseProvider.instances.remove(Thread.currentThread());
-
- // Throw the exception upwards
- throw new StorageBackendException(cause);
- }
-
- try
- {
- Thread.sleep(1500L * restarts);
- }
- catch(InterruptedException ex)
- {
- Log.get().warning("Interrupted: " + ex.getMessage());
- }
-
- // Try to properly close the old database connection
- try
- {
- if(this.conn != null)
- {
- this.conn.close();
- }
- }
- catch(SQLException ex)
- {
- Log.get().warning(ex.getMessage());
- }
-
- try
- {
- // Try to reinitialize database connection
- arise();
- }
- catch(SQLException ex)
- {
- Log.get().warning(ex.getMessage());
- restartConnection(ex);
- }
- }
-
- @Override
- public boolean update(Article article)
- throws StorageBackendException
- {
- // DELETE FROM headers WHERE article_id = ?
-
- // INSERT INTO headers ...
-
- // SELECT * FROM postings WHERE article_id = ? AND group_id = ?
- return false;
- }
-
- /**
- * Writes the flags and the name of the given group to the database.
- * @param group
- * @throws StorageBackendException
- */
- @Override
- public boolean update(Group group)
- throws StorageBackendException
- {
- try
- {
- this.pstmtUpdateGroup.setInt(1, group.getFlags());
- this.pstmtUpdateGroup.setString(2, group.getName());
- this.pstmtUpdateGroup.setLong(3, group.getInternalID());
- int rs = this.pstmtUpdateGroup.executeUpdate();
- return rs == 1;
- }
- catch(SQLException ex)
- {
- restartConnection(ex);
- return update(group);
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/storage/impl/JDBCDatabaseProvider.java
--- a/org/sonews/storage/impl/JDBCDatabaseProvider.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see instances
- = new ConcurrentHashMap();
-
- @Override
- public boolean isSupported(String uri)
- {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Storage storage(Thread thread)
- throws StorageBackendException
- {
- try
- {
- if(!instances.containsKey(Thread.currentThread()))
- {
- JDBCDatabase db = new JDBCDatabase();
- db.arise();
- instances.put(Thread.currentThread(), db);
- return db;
- }
- else
- {
- return instances.get(Thread.currentThread());
- }
- }
- catch(SQLException ex)
- {
- throw new StorageBackendException(ex);
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/storage/package.html
--- a/org/sonews/storage/package.html Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Contains classes of the storage backend and the Group and Article
-abstraction.
\ No newline at end of file
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/DatabaseSetup.java
--- a/org/sonews/util/DatabaseSetup.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see templateMap
- = new HashMap();
- private static final Map urlMap
- = new HashMap();
- private static final Map driverMap
- = new HashMap();
-
- static
- {
- templateMap.put("1", "helpers/database_mysql5_tmpl.sql");
- templateMap.put("2", "helpers/database_postgresql8_tmpl.sql");
-
- urlMap.put("1", new StringTemplate("jdbc:mysql://%HOSTNAME/%DB"));
- urlMap.put("2", new StringTemplate("jdbc:postgresql://%HOSTNAME/%DB"));
-
- driverMap.put("1", "com.mysql.jdbc.Driver");
- driverMap.put("2", "org.postgresql.Driver");
- }
-
- public static void main(String[] args)
- throws Exception
- {
- System.out.println("sonews Database setup helper");
- System.out.println("This program will create a initial database table structure");
- System.out.println("for the sonews Newsserver.");
- System.out.println("You need to create a database and a db user manually before!");
-
- System.out.println("Select DBMS type:");
- System.out.println("[1] MySQL 5.x or higher");
- System.out.println("[2] PostgreSQL 8.x or higher");
- System.out.print("Your choice: ");
-
- BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
- String dbmsType = in.readLine();
- String tmplName = templateMap.get(dbmsType);
- if(tmplName == null)
- {
- System.err.println("Invalid choice. Try again you fool!");
- main(args);
- return;
- }
-
- // Load JDBC Driver class
- Class.forName(driverMap.get(dbmsType));
-
- String tmpl = Resource.getAsString(tmplName, true);
-
- System.out.print("Database server hostname (e.g. localhost): ");
- String dbHostname = in.readLine();
-
- System.out.print("Database name: ");
- String dbName = in.readLine();
-
- System.out.print("Give name of DB user that can create tables: ");
- String dbUser = in.readLine();
-
- System.out.print("Password: ");
- String dbPassword = in.readLine();
-
- String url = urlMap.get(dbmsType)
- .set("HOSTNAME", dbHostname)
- .set("DB", dbName).toString();
-
- Connection conn =
- DriverManager.getConnection(url, dbUser, dbPassword);
- conn.setAutoCommit(false);
-
- String[] tmplChunks = tmpl.split(";");
-
- for(String chunk : tmplChunks)
- {
- if(chunk.trim().equals(""))
- {
- continue;
- }
-
- Statement stmt = conn.createStatement();
- stmt.execute(chunk);
- }
-
- conn.commit();
- conn.setAutoCommit(true);
-
- // Create config file
-
- System.out.println("Ok");
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/Log.java
--- a/org/sonews/util/Log.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
-{
-
- private T1 a;
- private T2 b;
-
- public Pair(T1 a, T2 b)
- {
- this.a = a;
- this.b = b;
- }
-
- public T1 getA()
- {
- return a;
- }
-
- public T2 getB()
- {
- return b;
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/Purger.java
--- a/org/sonews/util/Purger.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see groups = StorageManager.current().getGroups();
- for(Channel channel : groups)
- {
- if(!(channel instanceof Group))
- continue;
-
- Group group = (Group)channel;
- // Look for groups that are marked as deleted
- if(group.isDeleted())
- {
- List ids = StorageManager.current().getArticleNumbers(group.getInternalID());
- if(ids.size() == 0)
- {
- StorageManager.current().purgeGroup(group);
- Log.get().info("Group " + group.getName() + " purged.");
- }
-
- for(int n = 0; n < ids.size() && n < 10; n++)
- {
- Article art = StorageManager.current().getArticle(ids.get(n), group.getInternalID());
- StorageManager.current().delete(art.getMessageID());
- Log.get().info("Article " + art.getMessageID() + " purged.");
- }
- }
- }
- }
-
- private void purgeOutdated()
- throws InterruptedException, StorageBackendException
- {
- long articleMaximum =
- Config.inst().get("sonews.article.maxnum", Long.MAX_VALUE);
- long lifetime =
- Config.inst().get("sonews.article.lifetime", -1);
-
- if(lifetime > 0 || articleMaximum < Stats.getInstance().getNumberOfNews())
- {
- Log.get().info("Purging old messages...");
- String mid = StorageManager.current().getOldestArticle();
- if (mid == null) // No articles in the database
- {
- return;
- }
-
- Article art = StorageManager.current().getArticle(mid);
- long artDate = 0;
- String dateStr = art.getHeader(Headers.DATE)[0];
- try
- {
- artDate = Date.parse(dateStr) / 1000 / 60 / 60 / 24;
- }
- catch (IllegalArgumentException ex)
- {
- Log.get().warning("Could not parse date string: " + dateStr + " " + ex);
- }
-
- // Should we delete the message because of its age or because the
- // article maximum was reached?
- if (lifetime < 0 || artDate < (new Date().getTime() + lifetime))
- {
- StorageManager.current().delete(mid);
- System.out.println("Deleted: " + mid);
- }
- else
- {
- Thread.sleep(1000 * 60); // Wait 60 seconds
- return;
- }
- }
- else
- {
- Log.get().info("Lifetime purger is disabled");
- Thread.sleep(1000 * 60 * 30); // Wait 30 minutes
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/Stats.java
--- a/org/sonews/util/Stats.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see templateValues = new HashMap();
-
- public StringTemplate(String str, final String templateDelimiter)
- {
- if(str == null || templateDelimiter == null)
- {
- throw new IllegalArgumentException("null arguments not allowed");
- }
-
- this.str = str;
- this.templateDelimiter = templateDelimiter;
- }
-
- public StringTemplate(String str)
- {
- this(str, "%");
- }
-
- public StringTemplate set(String template, String value)
- {
- if(template == null || value == null)
- {
- throw new IllegalArgumentException("null arguments not allowed");
- }
-
- this.templateValues.put(template, value);
- return this;
- }
-
- public StringTemplate set(String template, long value)
- {
- return set(template, Long.toString(value));
- }
-
- public StringTemplate set(String template, double value)
- {
- return set(template, Double.toString(value));
- }
-
- public StringTemplate set(String template, Object obj)
- {
- if(template == null || obj == null)
- {
- throw new IllegalArgumentException("null arguments not allowed");
- }
-
- return set(template, obj.toString());
- }
-
- @Override
- public String toString()
- {
- String ret = str;
-
- for(String key : this.templateValues.keySet())
- {
- String value = this.templateValues.get(key);
- ret = ret.replace(templateDelimiter + key, value);
- }
-
- return ret;
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/TimeoutMap.java
--- a/org/sonews/util/TimeoutMap.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see extends ConcurrentHashMap
-{
-
- private static final long serialVersionUID = 453453467700345L;
-
- private int timeout = 60000; // 60 sec
- private transient Map timeoutMap = new HashMap();
-
- /**
- * Constructor.
- * @param timeout Timeout in milliseconds
- */
- public TimeoutMap(final int timeout)
- {
- this.timeout = timeout;
- }
-
- /**
- * Uses default timeout (60 sec).
- */
- public TimeoutMap()
- {
- }
-
- /**
- *
- * @param key
- * @return true if key is still valid.
- */
- protected boolean checkTimeOut(Object key)
- {
- synchronized(this.timeoutMap)
- {
- if(this.timeoutMap.containsKey(key))
- {
- long keytime = this.timeoutMap.get(key);
- if((System.currentTimeMillis() - keytime) < this.timeout)
- {
- return true;
- }
- else
- {
- remove(key);
- return false;
- }
- }
- else
- {
- return false;
- }
- }
- }
-
- @Override
- public boolean containsKey(Object key)
- {
- return checkTimeOut(key);
- }
-
- @Override
- public synchronized V get(Object key)
- {
- if(checkTimeOut(key))
- {
- return super.get(key);
- }
- else
- {
- return null;
- }
- }
-
- @Override
- public V put(K key, V value)
- {
- synchronized(this.timeoutMap)
- {
- removeStaleKeys();
- this.timeoutMap.put(key, System.currentTimeMillis());
- return super.put(key, value);
- }
- }
-
- /**
- * @param arg0
- * @return
- */
- @Override
- public V remove(Object arg0)
- {
- synchronized(this.timeoutMap)
- {
- this.timeoutMap.remove(arg0);
- V val = super.remove(arg0);
- return val;
- }
- }
-
- protected void removeStaleKeys()
- {
- synchronized(this.timeoutMap)
- {
- Set keySet = new HashSet(this.timeoutMap.keySet());
- for(Object key : keySet)
- {
- // The key/value is removed by the checkTimeOut() method if true
- checkTimeOut(key);
- }
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/io/ArticleInputStream.java
--- a/org/sonews/util/io/ArticleInputStream.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see pos
- * counter is advanced to the next byte to be read. The byte read is
- * returned as an int in the range of 0-255. If the stream position
- * is already at the end of the buffer, no byte is read and a -1 is
- * returned in order to indicate the end of the stream.
- *
- * @return The byte read, or -1 if end of stream
- */
- @Override
- public synchronized int read()
- {
- if(pos < buf.length)
- {
- return ((int)buf[pos++]) & 0xFF;
- }
- else
- {
- return -1;
- }
- }
-
-}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b org/sonews/util/io/ArticleReader.java
--- a/org/sonews/util/io/ArticleReader.java Sun Aug 29 17:04:25 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
- * SONEWS News Server
- * see AUTHORS for the list of contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see drvs = DriverManager.getDrivers();
+ while(drvs.hasMoreElements())
+ {
+ System.out.println(drvs.nextElement());
+ }
+ return;
+ }
+ else if(args[n].equals("-feed"))
+ {
+ feed = true;
+ }
+ else if(args[n].equals("-h") || args[n].equals("-help"))
+ {
+ printArguments();
+ return;
+ }
+ else if(args[n].equals("-mlgw"))
+ {
+ mlgw = true;
+ }
+ else if(args[n].equals("-p"))
+ {
+ port = Integer.parseInt(args[++n]);
+ }
+ else if(args[n].equals("-plugin"))
+ {
+ System.out.println("Warning: -plugin-storage is not implemented!");
+ }
+ else if(args[n].equals("-plugin-command"))
+ {
+ try
+ {
+ CommandSelector.addCommandHandler(args[++n]);
+ }
+ catch(Exception ex)
+ {
+ Log.get().warning("Could not load command plugin: " + args[n]);
+ Log.get().log(Level.INFO, "Main.java", ex);
+ }
+ }
+ else if(args[n].equals("-plugin-storage"))
+ {
+ System.out.println("Warning: -plugin-storage is not implemented!");
+ }
+ else if(args[n].equals("-v") || args[n].equals("-version"))
+ {
+ // Simply return as the version info is already printed above
+ return;
+ }
+ }
+
+ // Try to load the JDBCDatabase;
+ // Do NOT USE BackendConfig or Log classes before this point because they require
+ // a working JDBCDatabase connection.
+ try
+ {
+ StorageProvider sprov =
+ StorageManager.loadProvider("org.sonews.storage.impl.JDBCDatabaseProvider");
+ StorageManager.enableProvider(sprov);
+
+ // Make sure some elementary groups are existing
+ if(!StorageManager.current().isGroupExisting("control"))
+ {
+ StorageManager.current().addGroup("control", 0);
+ Log.get().info("Group 'control' created.");
+ }
+ }
+ catch(StorageBackendException ex)
+ {
+ ex.printStackTrace();
+ System.err.println("Database initialization failed with " + ex.toString());
+ System.err.println("Make sure you have specified the correct database" +
+ " settings in sonews.conf!");
+ return;
+ }
+
+ ChannelLineBuffers.allocateDirect();
+
+ // Add shutdown hook
+ Runtime.getRuntime().addShutdownHook(new ShutdownHook());
+
+ // Start the listening daemon
+ if(port <= 0)
+ {
+ port = Config.inst().get(Config.PORT, 119);
+ }
+ final NNTPDaemon daemon = NNTPDaemon.createInstance(port);
+ daemon.start();
+
+ // Start Connections purger thread...
+ Connections.getInstance().start();
+
+ // Start mailinglist gateway...
+ if(mlgw)
+ {
+ new MailPoller().start();
+ }
+
+ // Start feeds
+ if(feed)
+ {
+ FeedManager.startFeeding();
+ }
+
+ Purger purger = new Purger();
+ purger.start();
+
+ // Wait for main thread to exit (setDaemon(false))
+ daemon.join();
+ }
+
+ private static void printArguments()
+ {
+ String usage = Resource.getAsString("helpers/usage", true);
+ System.out.println(usage);
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/ShutdownHook.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/ShutdownHook.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,84 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see threadsMap = Thread.getAllStackTraces();
+ for(Thread thread : threadsMap.keySet())
+ {
+ // Interrupt the thread if it's a AbstractDaemon
+ AbstractDaemon daemon;
+ if(thread instanceof AbstractDaemon && thread.isAlive())
+ {
+ try
+ {
+ daemon = (AbstractDaemon)thread;
+ daemon.shutdownNow();
+ }
+ catch(SQLException ex)
+ {
+ System.out.println("sonews: " + ex);
+ }
+ }
+ }
+
+ for(Thread thread : threadsMap.keySet())
+ {
+ AbstractDaemon daemon;
+ if(thread instanceof AbstractDaemon && thread.isAlive())
+ {
+ daemon = (AbstractDaemon)thread;
+ System.out.println("sonews: Waiting for " + daemon + " to exit...");
+ try
+ {
+ daemon.join(500);
+ }
+ catch(InterruptedException ex)
+ {
+ System.out.println(ex.getLocalizedMessage());
+ }
+ }
+ }
+
+ // We have notified all not-sleeping AbstractDaemons of the shutdown;
+ // all other threads can be simply purged on VM shutdown
+
+ System.out.println("sonews: Clean shutdown.");
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/acl/AccessControl.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/acl/AccessControl.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,31 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see values
+ = new TimeoutMap();
+
+ private BackendConfig()
+ {
+ super();
+ }
+
+ /**
+ * Returns the config value for the given key or the defaultValue if the
+ * key is not found in config.
+ * @param key
+ * @param defaultValue
+ * @return
+ */
+ @Override
+ public String get(String key, String defaultValue)
+ {
+ try
+ {
+ String configValue = values.get(key);
+ if(configValue == null)
+ {
+ if(StorageManager.current() == null)
+ {
+ Log.get().warning("BackendConfig not available, using default.");
+ return defaultValue;
+ }
+
+ configValue = StorageManager.current().getConfigValue(key);
+ if(configValue == null)
+ {
+ return defaultValue;
+ }
+ else
+ {
+ values.put(key, configValue);
+ return configValue;
+ }
+ }
+ else
+ {
+ return configValue;
+ }
+ }
+ catch(StorageBackendException ex)
+ {
+ Log.get().log(Level.SEVERE, "Storage backend problem", ex);
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Sets the config value which is identified by the given key.
+ * @param key
+ * @param value
+ */
+ public void set(String key, String value)
+ {
+ values.put(key, value);
+
+ try
+ {
+ // Write values to database
+ StorageManager.current().setConfigValue(key, value);
+ }
+ catch(StorageBackendException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/config/CommandLineConfig.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/config/CommandLineConfig.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,64 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see values = new HashMap();
+
+ private CommandLineConfig() {}
+
+ @Override
+ public String get(String key, String def)
+ {
+ synchronized(this.values)
+ {
+ if(this.values.containsKey(key))
+ {
+ def = this.values.get(key);
+ }
+ }
+ return def;
+ }
+
+ @Override
+ public void set(String key, String val)
+ {
+ synchronized(this.values)
+ {
+ this.values.put(key, val);
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/config/Config.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/config/Config.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,175 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see freeSmallBuffers
+ = new ArrayList(maxCachedBuffers);
+
+ /**
+ * Allocates a predefined number of direct ByteBuffers (allocated via
+ * ByteBuffer.allocateDirect()). This method is Thread-safe, but should only
+ * called at startup.
+ */
+ public static void allocateDirect()
+ {
+ synchronized(freeSmallBuffers)
+ {
+ for(int n = 0; n < maxCachedBuffers; n++)
+ {
+ ByteBuffer buffer = ByteBuffer.allocateDirect(BUFFER_SIZE);
+ freeSmallBuffers.add(buffer);
+ }
+ }
+ }
+
+ private ByteBuffer inputBuffer = newLineBuffer();
+ private List outputBuffers = new ArrayList();
+
+ /**
+ * Add the given ByteBuffer to the list of buffers to be send to the client.
+ * This method is Thread-safe.
+ * @param buffer
+ * @throws java.nio.channels.ClosedChannelException If the client channel was
+ * already closed.
+ */
+ public void addOutputBuffer(ByteBuffer buffer)
+ throws ClosedChannelException
+ {
+ if(outputBuffers == null)
+ {
+ throw new ClosedChannelException();
+ }
+
+ synchronized(outputBuffers)
+ {
+ outputBuffers.add(buffer);
+ }
+ }
+
+ /**
+ * Currently a channel has only one input buffer. This *may* be a bottleneck
+ * and should investigated in the future.
+ * @param channel
+ * @return The input buffer associated with given channel.
+ */
+ public ByteBuffer getInputBuffer()
+ {
+ return inputBuffer;
+ }
+
+ /**
+ * Returns the current output buffer for writing(!) to SocketChannel.
+ * @param channel
+ * @return The next input buffer that contains unprocessed data or null
+ * if the connection was closed or there are no more unprocessed buffers.
+ */
+ public ByteBuffer getOutputBuffer()
+ {
+ synchronized(outputBuffers)
+ {
+ if(outputBuffers == null || outputBuffers.isEmpty())
+ {
+ return null;
+ }
+ else
+ {
+ ByteBuffer buffer = outputBuffers.get(0);
+ if(buffer.remaining() == 0)
+ {
+ outputBuffers.remove(0);
+ // Add old buffers to the list of free buffers
+ recycleBuffer(buffer);
+ buffer = getOutputBuffer();
+ }
+ return buffer;
+ }
+ }
+ }
+
+ /**
+ * @return false if there are output buffers pending to be written to the
+ * client.
+ */
+ boolean isOutputBufferEmpty()
+ {
+ synchronized(outputBuffers)
+ {
+ return outputBuffers.isEmpty();
+ }
+ }
+
+ /**
+ * Goes through the input buffer of the given channel and searches
+ * for next line terminator. If a '\n' is found, the bytes up to the
+ * line terminator are returned as array of bytes (the line terminator
+ * is omitted). If none is found the method returns null.
+ * @param channel
+ * @return A ByteBuffer wrapping the line.
+ */
+ ByteBuffer nextInputLine()
+ {
+ if(inputBuffer == null)
+ {
+ return null;
+ }
+
+ synchronized(inputBuffer)
+ {
+ ByteBuffer buffer = inputBuffer;
+
+ // Mark the current write position
+ int mark = buffer.position();
+
+ // Set position to 0 and limit to current position
+ buffer.flip();
+
+ ByteBuffer lineBuffer = newLineBuffer();
+
+ while (buffer.position() < buffer.limit())
+ {
+ byte b = buffer.get();
+ if (b == 10) // '\n'
+ {
+ // The bytes between the buffer's current position and its limit,
+ // if any, are copied to the beginning of the buffer. That is, the
+ // byte at index p = position() is copied to index zero, the byte at
+ // index p + 1 is copied to index one, and so forth until the byte
+ // at index limit() - 1 is copied to index n = limit() - 1 - p.
+ // The buffer's position is then set to n+1 and its limit is set to
+ // its capacity.
+ buffer.compact();
+
+ lineBuffer.flip(); // limit to position, position to 0
+ return lineBuffer;
+ }
+ else
+ {
+ lineBuffer.put(b);
+ }
+ }
+
+ buffer.limit(BUFFER_SIZE);
+ buffer.position(mark);
+
+ if(buffer.hasRemaining())
+ {
+ return null;
+ }
+ else
+ {
+ // In the first 512 was no newline found, so the input is not standard
+ // compliant. We return the current buffer as new line and add a space
+ // to the beginning of the next line which corrects some overlong header
+ // lines.
+ inputBuffer = newLineBuffer();
+ inputBuffer.put((byte)' ');
+ buffer.flip();
+ return buffer;
+ }
+ }
+ }
+
+ /**
+ * Returns a at least 512 bytes long ByteBuffer ready for usage.
+ * The method first try to reuse an already allocated (cached) buffer but
+ * if that fails returns a newly allocated direct buffer.
+ * Use recycleBuffer() method when you do not longer use the allocated buffer.
+ */
+ static ByteBuffer newLineBuffer()
+ {
+ ByteBuffer buf = null;
+ synchronized(freeSmallBuffers)
+ {
+ if(!freeSmallBuffers.isEmpty())
+ {
+ buf = freeSmallBuffers.remove(0);
+ }
+ }
+
+ if(buf == null)
+ {
+ // Allocate a non-direct buffer
+ buf = ByteBuffer.allocate(BUFFER_SIZE);
+ }
+
+ assert buf.position() == 0;
+ assert buf.limit() >= BUFFER_SIZE;
+
+ return buf;
+ }
+
+ /**
+ * Adds the given buffer to the list of free buffers if it is a valuable
+ * direct allocated buffer.
+ * @param buffer
+ */
+ public static void recycleBuffer(ByteBuffer buffer)
+ {
+ assert buffer != null;
+
+ if(buffer.isDirect())
+ {
+ assert buffer.capacity() >= BUFFER_SIZE;
+
+ // Add old buffers to the list of free buffers
+ synchronized(freeSmallBuffers)
+ {
+ buffer.clear(); // Set position to 0 and limit to capacity
+ freeSmallBuffers.add(buffer);
+ }
+ } // if(buffer.isDirect())
+ }
+
+ /**
+ * Recycles all buffers of this ChannelLineBuffers object.
+ */
+ public void recycleBuffers()
+ {
+ synchronized(inputBuffer)
+ {
+ recycleBuffer(inputBuffer);
+ this.inputBuffer = null;
+ }
+
+ synchronized(outputBuffers)
+ {
+ for(ByteBuffer buf : outputBuffers)
+ {
+ recycleBuffer(buf);
+ }
+ outputBuffers = null;
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/ChannelReader.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/ChannelReader.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,202 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see selKeys = selector.selectedKeys();
+ SelectionKey selKey = null;
+
+ synchronized (selKeys)
+ {
+ Iterator it = selKeys.iterator();
+
+ // Process the first pending event
+ while (it.hasNext())
+ {
+ selKey = (SelectionKey) it.next();
+ channel = (SocketChannel) selKey.channel();
+ conn = Connections.getInstance().get(channel);
+
+ // Because we cannot lock the selKey as that would cause a deadlock
+ // we lock the connection. To preserve the order of the received
+ // byte blocks a selection key for a connection that has pending
+ // read events is skipped.
+ if (conn == null || conn.tryReadLock())
+ {
+ // Remove from set to indicate that it's being processed
+ it.remove();
+ if (conn != null)
+ {
+ break; // End while loop
+ }
+ }
+ else
+ {
+ selKey = null;
+ channel = null;
+ conn = null;
+ }
+ }
+ }
+
+ // Do not lock the selKeys while processing because this causes
+ // a deadlock in sun.nio.ch.SelectorImpl.lockAndDoSelect()
+ if (selKey != null && channel != null && conn != null)
+ {
+ processSelectionKey(conn, channel, selKey);
+ conn.unlockReadLock();
+ }
+
+ }
+ catch(CancelledKeyException ex)
+ {
+ Log.get().warning("ChannelReader.run(): " + ex);
+ Log.get().log(Level.INFO, "", ex);
+ }
+ catch(Exception ex)
+ {
+ ex.printStackTrace();
+ }
+
+ // Eventually wait for a register operation
+ synchronized (NNTPDaemon.RegisterGate)
+ {
+ // Do nothing; FindBugs may warn about an empty synchronized
+ // statement, but we cannot use a wait()/notify() mechanism here.
+ // If we used something like RegisterGate.wait() we block here
+ // until the NNTPDaemon calls notify(). But the daemon only
+ // calls notify() if itself is NOT blocked in the listening socket.
+ }
+ } // while(isRunning())
+ }
+
+ private void processSelectionKey(final NNTPConnection connection,
+ final SocketChannel socketChannel, final SelectionKey selKey)
+ throws InterruptedException, IOException
+ {
+ assert selKey != null;
+ assert selKey.isReadable();
+
+ // Some bytes are available for reading
+ if(selKey.isValid())
+ {
+ // Lock the channel
+ //synchronized(socketChannel)
+ {
+ // Read the data into the appropriate buffer
+ ByteBuffer buf = connection.getInputBuffer();
+ int read = -1;
+ try
+ {
+ read = socketChannel.read(buf);
+ }
+ catch(IOException ex)
+ {
+ // The connection was probably closed by the remote host
+ // in a non-clean fashion
+ Log.get().info("ChannelReader.processSelectionKey(): " + ex);
+ }
+ catch(Exception ex)
+ {
+ Log.get().warning("ChannelReader.processSelectionKey(): " + ex);
+ }
+
+ if(read == -1) // End of stream
+ {
+ selKey.cancel();
+ }
+ else if(read > 0) // If some data was read
+ {
+ ConnectionWorker.addChannel(socketChannel);
+ }
+ }
+ }
+ else
+ {
+ // Should not happen
+ Log.get().severe("Should not happen: " + selKey.toString());
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/ChannelWriter.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/ChannelWriter.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,210 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see instances
+ = new ConcurrentHashMap();
+ private static Map> commandClassesMapping
+ = new ConcurrentHashMap>();
+
+ static
+ {
+ String[] classes = Resource.getAsString("helpers/commands.list", true).split("\n");
+ for(String className : classes)
+ {
+ if(className.charAt(0) == '#')
+ {
+ // Skip comments
+ continue;
+ }
+
+ try
+ {
+ addCommandHandler(className);
+ }
+ catch(ClassNotFoundException ex)
+ {
+ Log.get().warning("Could not load command class: " + ex);
+ }
+ catch(InstantiationException ex)
+ {
+ Log.get().severe("Could not instantiate command class: " + ex);
+ }
+ catch(IllegalAccessException ex)
+ {
+ Log.get().severe("Could not access command class: " + ex);
+ }
+ }
+ }
+
+ public static void addCommandHandler(String className)
+ throws ClassNotFoundException, InstantiationException, IllegalAccessException
+ {
+ Class clazz = Class.forName(className);
+ Command cmd = (Command)clazz.newInstance();
+ String[] cmdStrs = cmd.getSupportedCommandStrings();
+ for (String cmdStr : cmdStrs)
+ {
+ commandClassesMapping.put(cmdStr, clazz);
+ }
+ }
+
+ public static Set getCommandNames()
+ {
+ return commandClassesMapping.keySet();
+ }
+
+ public static CommandSelector getInstance()
+ {
+ CommandSelector csel = instances.get(Thread.currentThread());
+ if(csel == null)
+ {
+ csel = new CommandSelector();
+ instances.put(Thread.currentThread(), csel);
+ }
+ return csel;
+ }
+
+ private Map commandMapping = new HashMap();
+ private Command unsupportedCmd = new UnsupportedCommand();
+
+ private CommandSelector()
+ {}
+
+ public Command get(String commandName)
+ {
+ try
+ {
+ commandName = commandName.toUpperCase();
+ Command cmd = this.commandMapping.get(commandName);
+
+ if(cmd == null)
+ {
+ Class clazz = commandClassesMapping.get(commandName);
+ if(clazz == null)
+ {
+ cmd = this.unsupportedCmd;
+ }
+ else
+ {
+ cmd = (Command)clazz.newInstance();
+ this.commandMapping.put(commandName, cmd);
+ }
+ }
+ else if(cmd.isStateful())
+ {
+ cmd = cmd.getClass().newInstance();
+ }
+
+ return cmd;
+ }
+ catch(Exception ex)
+ {
+ ex.printStackTrace();
+ return this.unsupportedCmd;
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/ConnectionWorker.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/ConnectionWorker.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,102 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see pendingChannels
+ = new ArrayBlockingQueue(256, true);
+
+ /**
+ * Registers the given channel for further event processing.
+ * @param channel
+ */
+ public static void addChannel(SocketChannel channel)
+ throws InterruptedException
+ {
+ pendingChannels.put(channel);
+ }
+
+ /**
+ * Processing loop.
+ */
+ @Override
+ public void run()
+ {
+ while(isRunning())
+ {
+ try
+ {
+ // Retrieve and remove if available, otherwise wait.
+ SocketChannel channel = pendingChannels.take();
+
+ if(channel != null)
+ {
+ // Connections.getInstance().get() MAY return null
+ NNTPConnection conn = Connections.getInstance().get(channel);
+
+ // Try to lock the connection object
+ if(conn != null && conn.tryReadLock())
+ {
+ ByteBuffer buf = conn.getBuffers().nextInputLine();
+ while(buf != null) // Complete line was received
+ {
+ final byte[] line = new byte[buf.limit()];
+ buf.get(line);
+ ChannelLineBuffers.recycleBuffer(buf);
+
+ // Here is the actual work done
+ conn.lineReceived(line);
+
+ // Read next line as we could have already received the next line
+ buf = conn.getBuffers().nextInputLine();
+ }
+ conn.unlockReadLock();
+ }
+ else
+ {
+ addChannel(channel);
+ }
+ }
+ }
+ catch(InterruptedException ex)
+ {
+ Log.get().info("ConnectionWorker interrupted: " + ex);
+ }
+ catch(Exception ex)
+ {
+ Log.get().severe("Exception in ConnectionWorker: " + ex);
+ ex.printStackTrace();
+ }
+ } // end while(isRunning())
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/Connections.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/Connections.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,181 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see connections
+ = new ArrayList();
+ private final Map connByChannel
+ = new HashMap();
+
+ private Connections()
+ {
+ setName("Connections");
+ }
+
+ /**
+ * Adds the given NNTPConnection to the Connections management.
+ * @param conn
+ * @see org.sonews.daemon.NNTPConnection
+ */
+ public void add(final NNTPConnection conn)
+ {
+ synchronized(this.connections)
+ {
+ this.connections.add(conn);
+ this.connByChannel.put(conn.getSocketChannel(), conn);
+ }
+ }
+
+ /**
+ * @param channel
+ * @return NNTPConnection instance that is associated with the given
+ * SocketChannel.
+ */
+ public NNTPConnection get(final SocketChannel channel)
+ {
+ synchronized(this.connections)
+ {
+ return this.connByChannel.get(channel);
+ }
+ }
+
+ int getConnectionCount(String remote)
+ {
+ int cnt = 0;
+ synchronized(this.connections)
+ {
+ for(NNTPConnection conn : this.connections)
+ {
+ assert conn != null;
+ assert conn.getSocketChannel() != null;
+
+ Socket socket = conn.getSocketChannel().socket();
+ if(socket != null)
+ {
+ InetSocketAddress sockAddr = (InetSocketAddress)socket.getRemoteSocketAddress();
+ if(sockAddr != null)
+ {
+ if(sockAddr.getHostName().equals(remote))
+ {
+ cnt++;
+ }
+ }
+ } // if(socket != null)
+ }
+ }
+ return cnt;
+ }
+
+ /**
+ * Run loops. Checks periodically for timed out connections and purged them
+ * from the lists.
+ */
+ @Override
+ public void run()
+ {
+ while(isRunning())
+ {
+ int timeoutMillis = 1000 * Config.inst().get(Config.TIMEOUT, 180);
+
+ synchronized (this.connections)
+ {
+ final ListIterator iter = this.connections.listIterator();
+ NNTPConnection conn;
+
+ while (iter.hasNext())
+ {
+ conn = iter.next();
+ if((System.currentTimeMillis() - conn.getLastActivity()) > timeoutMillis
+ && conn.getBuffers().isOutputBufferEmpty())
+ {
+ // A connection timeout has occurred so purge the connection
+ iter.remove();
+
+ // Close and remove the channel
+ SocketChannel channel = conn.getSocketChannel();
+ connByChannel.remove(channel);
+
+ try
+ {
+ assert channel != null;
+ assert channel.socket() != null;
+
+ // Close the channel; implicitely cancels all selectionkeys
+ channel.close();
+ Log.get().info("Disconnected: " + channel.socket().getRemoteSocketAddress() +
+ " (timeout)");
+ }
+ catch(IOException ex)
+ {
+ Log.get().warning("Connections.run(): " + ex);
+ }
+
+ // Recycle the used buffers
+ conn.getBuffers().recycleBuffers();
+
+ Stats.getInstance().clientDisconnect();
+ }
+ }
+ }
+
+ try
+ {
+ Thread.sleep(10000); // Sleep ten seconds
+ }
+ catch(InterruptedException ex)
+ {
+ Log.get().warning("Connections Thread was interrupted: " + ex.getMessage());
+ }
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/LineEncoder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/LineEncoder.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,80 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * The CAPABILITIES command allows a client to determine the
+ * capabilities of the server at any given time.
+ *
+ * This command MAY be issued at any time; the server MUST NOT require
+ * it to be issued in order to make use of any capability. The response
+ * generated by this command MAY change during a session because of
+ * other state information (which, in turn, may be changed by the
+ * effects of other commands or by external events). An NNTP client is
+ * only able to get the current and correct information concerning
+ * available capabilities at any point during a session by issuing a
+ * CAPABILITIES command at that point of that session and processing the
+ * response.
+ *
+ * @author Christian Lins
+ * @since sonews/0.5.0
+ */
+public class CapabilitiesCommand implements Command
+{
+
+ static final String[] CAPABILITIES = new String[]
+ {
+ "VERSION 2", // MUST be the first one; VERSION 2 refers to RFC3977
+ "READER", // Server implements commands for reading
+ "POST", // Server implements POST command
+ "OVER" // Server implements OVER command
+ };
+
+ @Override
+ public String[] getSupportedCommandStrings()
+ {
+ return new String[] {"CAPABILITIES"};
+ }
+
+ /**
+ * First called after one call to processLine().
+ * @return
+ */
+ @Override
+ public boolean hasFinished()
+ {
+ return true;
+ }
+
+ @Override
+ public String impliedCapability()
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isStateful()
+ {
+ return false;
+ }
+
+ @Override
+ public void processLine(NNTPConnection conn, final String line, byte[] raw)
+ throws IOException
+ {
+ conn.println("101 Capabilities list:");
+ for(String cap : CAPABILITIES)
+ {
+ conn.println(cap);
+ }
+ conn.println(".");
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/Command.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/Command.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,51 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * Syntax
+ * GROUP group
+ *
+ * Responses
+ * 211 number low high group Group successfully selected
+ * 411 No such newsgroup
+ *
+ * Parameters
+ * group Name of newsgroup
+ * number Estimated number of articles in the group
+ * low Reported low water mark
+ * high Reported high water mark
+ *
+ * (from RFC 3977)
+ *
+ * @author Christian Lins
+ * @author Dennis Schwerdel
+ * @since n3tpd/0.1
+ */
+public class GroupCommand implements Command
+{
+
+ @Override
+ public String[] getSupportedCommandStrings()
+ {
+ return new String[]{"GROUP"};
+ }
+
+ @Override
+ public boolean hasFinished()
+ {
+ return true;
+ }
+
+ @Override
+ public String impliedCapability()
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isStateful()
+ {
+ return true;
+ }
+
+ @Override
+ public void processLine(NNTPConnection conn, final String line, byte[] raw)
+ throws IOException, StorageBackendException
+ {
+ final String[] command = line.split(" ");
+
+ Channel group;
+ if(command.length >= 2)
+ {
+ group = Channel.getByName(command[1]);
+ if(group == null || group.isDeleted())
+ {
+ conn.println("411 no such news group");
+ }
+ else
+ {
+ conn.setCurrentGroup(group);
+ conn.println("211 " + group.getPostingsCount() + " " + group.getFirstArticleNumber()
+ + " " + group.getLastArticleNumber() + " " + group.getName() + " group selected");
+ }
+ }
+ else
+ {
+ conn.println("500 no group name given");
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/HelpCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/HelpCommand.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,100 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see commandNames = CommandSelector.getCommandNames();
+ for(String cmdName : commandNames)
+ {
+ conn.println(cmdName);
+ }
+ }
+ else
+ {
+ Command cmd = CommandSelector.getInstance().get(command[1]);
+ if(cmd instanceof HelpfulCommand)
+ {
+ conn.println(((HelpfulCommand)cmd).getHelpString());
+ }
+ else
+ {
+ conn.println("No further help information available.");
+ }
+ }
+
+ conn.println(".");
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/HelpfulCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/HelpfulCommand.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,35 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see list = Channel.getAll();
+ for (Channel g : list)
+ {
+ conn.println(g.getName() + "\t" + "-");
+ }
+ conn.println(".");
+ }
+ else if(command[1].equalsIgnoreCase("SUBSCRIPTIONS"))
+ {
+ conn.println("215 information follows");
+ conn.println(".");
+ }
+ else if(command[1].equalsIgnoreCase("EXTENSIONS"))
+ {
+ conn.println("202 Supported NNTP extensions.");
+ conn.println("LISTGROUP");
+ conn.println("XDAEMON");
+ conn.println("XPAT");
+ conn.println(".");
+ }
+ else if(command[1].equalsIgnoreCase("ACTIVE"))
+ {
+ String pattern = command.length == 2
+ ? null : command[2].replace("*", "\\w*");
+ printGroupInfo(conn, pattern);
+ }
+ else
+ {
+ conn.println("500 unknown argument to LIST command");
+ }
+ }
+ else
+ {
+ printGroupInfo(conn, null);
+ }
+ }
+
+ private void printGroupInfo(NNTPConnection conn, String pattern)
+ throws IOException, StorageBackendException
+ {
+ final List groups = Channel.getAll();
+ if(groups != null)
+ {
+ conn.println("215 list of newsgroups follows");
+ for(Channel g : groups)
+ {
+ try
+ {
+ Matcher matcher = pattern == null ?
+ null : Pattern.compile(pattern).matcher(g.getName());
+ if(!g.isDeleted() &&
+ (matcher == null || matcher.find()))
+ {
+ String writeable = g.isWriteable() ? " y" : " n";
+ // Indeed first the higher article number then the lower
+ conn.println(g.getName() + " " + g.getLastArticleNumber() + " "
+ + g.getFirstArticleNumber() + writeable);
+ }
+ }
+ catch(PatternSyntaxException ex)
+ {
+ Log.get().info(ex.toString());
+ }
+ }
+ conn.println(".");
+ }
+ else
+ {
+ conn.println("500 server backend malfunction");
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/ListGroupCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/ListGroupCommand.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,94 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see command");
+ return;
+ }
+
+ List ids = group.getArticleNumbers();
+ conn.println("211 " + ids.size() + " " +
+ group.getFirstArticleNumber() + " " +
+ group.getLastArticleNumber() + " list of article numbers follow");
+ for(long id : ids)
+ {
+ // One index number per line
+ conn.println(Long.toString(id));
+ }
+ conn.println(".");
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/ModeReaderCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/ModeReaderCommand.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,72 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * XOVER [range]
+ *
+ * The XOVER command returns information from the overview
+ * database for the article(s) specified.
+ *
+ * The optional range argument may be any of the following:
+ * an article number
+ * an article number followed by a dash to indicate
+ * all following
+ * an article number followed by a dash followed by
+ * another article number
+ *
+ * If no argument is specified, then information from the
+ * current article is displayed. Successful responses start
+ * with a 224 response followed by the overview information
+ * for all matched messages. Once the output is complete, a
+ * period is sent on a line by itself. If no argument is
+ * specified, the information for the current article is
+ * returned. A news group must have been selected earlier,
+ * else a 412 error response is returned. If no articles are
+ * in the range specified, a 420 error response is returned
+ * by the server. A 502 response will be returned if the
+ * client only has permission to transfer articles.
+ *
+ * Each line of output will be formatted with the article number,
+ * followed by each of the headers in the overview database or the
+ * article itself (when the data is not available in the overview
+ * database) for that article separated by a tab character. The
+ * sequence of fields must be in this order: subject, author,
+ * date, message-id, references, byte count, and line count. Other
+ * optional fields may follow line count. Other optional fields may
+ * follow line count. These fields are specified by examining the
+ * response to the LIST OVERVIEW.FMT command. Where no data exists,
+ * a null field must be provided (i.e. the output will have two tab
+ * characters adjacent to each other). Servers should not output
+ * fields for articles that have been removed since the XOVER database
+ * was created.
+ *
+ * The LIST OVERVIEW.FMT command should be implemented if XOVER
+ * is implemented. A client can use LIST OVERVIEW.FMT to determine
+ * what optional fields and in which order all fields will be
+ * supplied by the XOVER command.
+ *
+ * Note that any tab and end-of-line characters in any header
+ * data that is returned will be converted to a space character.
+ *
+ * Responses:
+ *
+ * 224 Overview information follows
+ * 412 No news group current selected
+ * 420 No article(s) selected
+ * 502 no permission
+ *
+ * OVER defines additional responses:
+ *
+ * First form (message-id specified)
+ * 224 Overview information follows (multi-line)
+ * 430 No article with that message-id
+ *
+ * Second form (range specified)
+ * 224 Overview information follows (multi-line)
+ * 412 No newsgroup selected
+ * 423 No articles in that range
+ *
+ * Third form (current article number used)
+ * 224 Overview information follows (multi-line)
+ * 412 No newsgroup selected
+ * 420 Current article number is invalid
+ *
+ *
+ * @author Christian Lins
+ * @since sonews/0.5.0
+ */
+public class OverCommand implements Command
+{
+
+ public static final int MAX_LINES_PER_DBREQUEST = 200;
+
+ @Override
+ public String[] getSupportedCommandStrings()
+ {
+ return new String[]{"OVER", "XOVER"};
+ }
+
+ @Override
+ public boolean hasFinished()
+ {
+ return true;
+ }
+
+ @Override
+ public String impliedCapability()
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isStateful()
+ {
+ return false;
+ }
+
+ @Override
+ public void processLine(NNTPConnection conn, final String line, byte[] raw)
+ throws IOException, StorageBackendException
+ {
+ if(conn.getCurrentChannel() == null)
+ {
+ conn.println("412 no newsgroup selected");
+ }
+ else
+ {
+ String[] command = line.split(" ");
+
+ // If no parameter was specified, show information about
+ // the currently selected article(s)
+ if(command.length == 1)
+ {
+ final Article art = conn.getCurrentArticle();
+ if(art == null)
+ {
+ conn.println("420 no article(s) selected");
+ return;
+ }
+
+ conn.println(buildOverview(art, -1));
+ }
+ // otherwise print information about the specified range
+ else
+ {
+ long artStart;
+ long artEnd = conn.getCurrentChannel().getLastArticleNumber();
+ String[] nums = command[1].split("-");
+ if(nums.length >= 1)
+ {
+ try
+ {
+ artStart = Integer.parseInt(nums[0]);
+ }
+ catch(NumberFormatException e)
+ {
+ Log.get().info(e.getMessage());
+ artStart = Integer.parseInt(command[1]);
+ }
+ }
+ else
+ {
+ artStart = conn.getCurrentChannel().getFirstArticleNumber();
+ }
+
+ if(nums.length >=2)
+ {
+ try
+ {
+ artEnd = Integer.parseInt(nums[1]);
+ }
+ catch(NumberFormatException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ if(artStart > artEnd)
+ {
+ if(command[0].equalsIgnoreCase("OVER"))
+ {
+ conn.println("423 no articles in that range");
+ }
+ else
+ {
+ conn.println("224 (empty) overview information follows:");
+ conn.println(".");
+ }
+ }
+ else
+ {
+ for(long n = artStart; n <= artEnd; n += MAX_LINES_PER_DBREQUEST)
+ {
+ long nEnd = Math.min(n + MAX_LINES_PER_DBREQUEST - 1, artEnd);
+ List> articleHeads = conn.getCurrentChannel()
+ .getArticleHeads(n, nEnd);
+ if(articleHeads.isEmpty() && n == artStart
+ && command[0].equalsIgnoreCase("OVER"))
+ {
+ // This reply is only valid for OVER, not for XOVER command
+ conn.println("423 no articles in that range");
+ return;
+ }
+ else if(n == artStart)
+ {
+ // XOVER replies this although there is no data available
+ conn.println("224 overview information follows");
+ }
+
+ for(Pair article : articleHeads)
+ {
+ String overview = buildOverview(article.getB(), article.getA());
+ conn.println(overview);
+ }
+ } // for
+ conn.println(".");
+ }
+ }
+ }
+ }
+
+ private String buildOverview(ArticleHead art, long nr)
+ {
+ StringBuilder overview = new StringBuilder();
+ overview.append(nr);
+ overview.append('\t');
+
+ String subject = art.getHeader(Headers.SUBJECT)[0];
+ if("".equals(subject))
+ {
+ subject = "";
+ }
+ overview.append(escapeString(subject));
+ overview.append('\t');
+
+ overview.append(escapeString(art.getHeader(Headers.FROM)[0]));
+ overview.append('\t');
+ overview.append(escapeString(art.getHeader(Headers.DATE)[0]));
+ overview.append('\t');
+ overview.append(escapeString(art.getHeader(Headers.MESSAGE_ID)[0]));
+ overview.append('\t');
+ overview.append(escapeString(art.getHeader(Headers.REFERENCES)[0]));
+ overview.append('\t');
+
+ String bytes = art.getHeader(Headers.BYTES)[0];
+ if("".equals(bytes))
+ {
+ bytes = "0";
+ }
+ overview.append(escapeString(bytes));
+ overview.append('\t');
+
+ String lines = art.getHeader(Headers.LINES)[0];
+ if("".equals(lines))
+ {
+ lines = "0";
+ }
+ overview.append(escapeString(lines));
+ overview.append('\t');
+ overview.append(escapeString(art.getHeader(Headers.XREF)[0]));
+
+ // Remove trailing tabs if some data is empty
+ return overview.toString().trim();
+ }
+
+ private String escapeString(String str)
+ {
+ String nstr = str.replace("\r", "");
+ nstr = nstr.replace('\n', ' ');
+ nstr = nstr.replace('\t', ' ');
+ return nstr.trim();
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/PostCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/PostCommand.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,332 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .");
+ state = PostState.ReadingHeaders;
+ }
+ else
+ {
+ conn.println("500 invalid command usage");
+ }
+ break;
+ }
+ case ReadingHeaders:
+ {
+ strHead.append(line);
+ strHead.append(NNTPConnection.NEWLINE);
+
+ if("".equals(line) || ".".equals(line))
+ {
+ // we finally met the blank line
+ // separating headers from body
+
+ try
+ {
+ // Parse the header using the InternetHeader class from JavaMail API
+ headers = new InternetHeaders(
+ new ByteArrayInputStream(strHead.toString().trim()
+ .getBytes(conn.getCurrentCharset())));
+
+ // add the header entries for the article
+ article.setHeaders(headers);
+ }
+ catch (MessagingException e)
+ {
+ e.printStackTrace();
+ conn.println("500 posting failed - invalid header");
+ state = PostState.Finished;
+ break;
+ }
+
+ // Change charset for reading body;
+ // for multipart messages UTF-8 is returned
+ //conn.setCurrentCharset(article.getBodyCharset());
+
+ state = PostState.ReadingBody;
+
+ if(".".equals(line))
+ {
+ // Post an article without body
+ postArticle(conn, article);
+ state = PostState.Finished;
+ }
+ }
+ break;
+ }
+ case ReadingBody:
+ {
+ if(".".equals(line))
+ {
+ // Set some headers needed for Over command
+ headers.setHeader(Headers.LINES, Integer.toString(lineCount));
+ headers.setHeader(Headers.BYTES, Long.toString(bodySize));
+
+ byte[] body = bufBody.toByteArray();
+ if(body.length >= 2)
+ {
+ // Remove trailing CRLF
+ body = Arrays.copyOf(body, body.length - 2);
+ }
+ article.setBody(body); // set the article body
+
+ postArticle(conn, article);
+ state = PostState.Finished;
+ }
+ else
+ {
+ bodySize += line.length() + 1;
+ lineCount++;
+
+ // Add line to body buffer
+ bufBody.write(raw, 0, raw.length);
+ bufBody.write(NNTPConnection.NEWLINE.getBytes());
+
+ if(bodySize > maxBodySize)
+ {
+ conn.println("500 article is too long");
+ state = PostState.Finished;
+ break;
+ }
+ }
+ break;
+ }
+ default:
+ {
+ // Should never happen
+ Log.get().severe("PostCommand::processLine(): already finished...");
+ }
+ }
+ }
+
+ /**
+ * Article is a control message and needs special handling.
+ * @param article
+ */
+ private void controlMessage(NNTPConnection conn, Article article)
+ throws IOException
+ {
+ String[] ctrl = article.getHeader(Headers.CONTROL)[0].split(" ");
+ if(ctrl.length == 2) // "cancel "
+ {
+ try
+ {
+ StorageManager.current().delete(ctrl[1]);
+
+ // Move cancel message to "control" group
+ article.setHeader(Headers.NEWSGROUPS, "control");
+ StorageManager.current().addArticle(article);
+ conn.println("240 article cancelled");
+ }
+ catch(StorageBackendException ex)
+ {
+ Log.get().severe(ex.toString());
+ conn.println("500 internal server error");
+ }
+ }
+ else
+ {
+ conn.println("441 unknown control header");
+ }
+ }
+
+ private void supersedeMessage(NNTPConnection conn, Article article)
+ throws IOException
+ {
+ try
+ {
+ String oldMsg = article.getHeader(Headers.SUPERSEDES)[0];
+ StorageManager.current().delete(oldMsg);
+ StorageManager.current().addArticle(article);
+ conn.println("240 article replaced");
+ }
+ catch(StorageBackendException ex)
+ {
+ Log.get().severe(ex.toString());
+ conn.println("500 internal server error");
+ }
+ }
+
+ private void postArticle(NNTPConnection conn, Article article)
+ throws IOException
+ {
+ if(article.getHeader(Headers.CONTROL)[0].length() > 0)
+ {
+ controlMessage(conn, article);
+ }
+ else if(article.getHeader(Headers.SUPERSEDES)[0].length() > 0)
+ {
+ supersedeMessage(conn, article);
+ }
+ else // Post the article regularily
+ {
+ // Circle check; note that Path can already contain the hostname here
+ String host = Config.inst().get(Config.HOSTNAME, "localhost");
+ if(article.getHeader(Headers.PATH)[0].indexOf(host + "!", 1) > 0)
+ {
+ Log.get().info(article.getMessageID() + " skipped for host " + host);
+ conn.println("441 I know this article already");
+ return;
+ }
+
+ // Try to create the article in the database or post it to
+ // appropriate mailing list
+ try
+ {
+ boolean success = false;
+ String[] groupnames = article.getHeader(Headers.NEWSGROUPS)[0].split(",");
+ for(String groupname : groupnames)
+ {
+ Group group = StorageManager.current().getGroup(groupname);
+ if(group != null && !group.isDeleted())
+ {
+ if(group.isMailingList() && !conn.isLocalConnection())
+ {
+ // Send to mailing list; the Dispatcher writes
+ // statistics to database
+ Dispatcher.toList(article, group.getName());
+ success = true;
+ }
+ else
+ {
+ // Store in database
+ if(!StorageManager.current().isArticleExisting(article.getMessageID()))
+ {
+ StorageManager.current().addArticle(article);
+
+ // Log this posting to statistics
+ Stats.getInstance().mailPosted(
+ article.getHeader(Headers.NEWSGROUPS)[0]);
+ }
+ success = true;
+ }
+ }
+ } // end for
+
+ if(success)
+ {
+ conn.println("240 article posted ok");
+ FeedManager.queueForPush(article);
+ }
+ else
+ {
+ conn.println("441 newsgroup not found");
+ }
+ }
+ catch(AddressException ex)
+ {
+ Log.get().warning(ex.getMessage());
+ conn.println("441 invalid sender address");
+ }
+ catch(MessagingException ex)
+ {
+ // A MessageException is thrown when the sender email address is
+ // invalid or something is wrong with the SMTP server.
+ System.err.println(ex.getLocalizedMessage());
+ conn.println("441 " + ex.getClass().getCanonicalName() + ": " + ex.getLocalizedMessage());
+ }
+ catch(StorageBackendException ex)
+ {
+ ex.printStackTrace();
+ conn.println("500 internal server error");
+ }
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/PostState.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/PostState.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,29 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see pull =
+ StorageManager.current().getSubscriptions(FeedManager.TYPE_PULL);
+ List push =
+ StorageManager.current().getSubscriptions(FeedManager.TYPE_PUSH);
+ conn.println("100 list of peering rules follows");
+ for(Subscription sub : pull)
+ {
+ conn.println("PULL " + sub.getHost() + ":" + sub.getPort()
+ + " " + sub.getGroup());
+ }
+ for(Subscription sub : push)
+ {
+ conn.println("PUSH " + sub.getHost() + ":" + sub.getPort()
+ + " " + sub.getGroup());
+ }
+ conn.println(".");
+ }
+ else
+ {
+ conn.println("401 unknown sub command");
+ }
+ }
+ else if(commands.length == 3 && commands[1].equalsIgnoreCase("DELETE"))
+ {
+ StorageManager.current().delete(commands[2]);
+ conn.println("200 article " + commands[2] + " deleted");
+ }
+ else if(commands.length == 4 && commands[1].equalsIgnoreCase("GROUPADD"))
+ {
+ channelAdd(commands, conn);
+ }
+ else if(commands.length == 3 && commands[1].equalsIgnoreCase("GROUPDEL"))
+ {
+ Group group = StorageManager.current().getGroup(commands[2]);
+ if(group == null)
+ {
+ conn.println("400 group not found");
+ }
+ else
+ {
+ group.setFlag(Group.DELETED);
+ group.update();
+ conn.println("200 group " + commands[2] + " marked as deleted");
+ }
+ }
+ else if(commands.length == 4 && commands[1].equalsIgnoreCase("SET"))
+ {
+ String key = commands[2];
+ String val = commands[3];
+ Config.inst().set(key, val);
+ conn.println("200 new config value set");
+ }
+ else if(commands.length == 3 && commands[1].equalsIgnoreCase("GET"))
+ {
+ String key = commands[2];
+ String val = Config.inst().get(key, null);
+ if(val != null)
+ {
+ conn.println("100 config value for " + key + " follows");
+ conn.println(val);
+ conn.println(".");
+ }
+ else
+ {
+ conn.println("400 config value not set");
+ }
+ }
+ else if(commands.length >= 3 && commands[1].equalsIgnoreCase("LOG"))
+ {
+ Group group = null;
+ if(commands.length > 3)
+ {
+ group = (Group)Channel.getByName(commands[3]);
+ }
+
+ if(commands[2].equalsIgnoreCase("CONNECTED_CLIENTS"))
+ {
+ conn.println("100 number of connections follow");
+ conn.println(Integer.toString(Stats.getInstance().connectedClients()));
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("POSTED_NEWS"))
+ {
+ conn.println("100 hourly numbers of posted news yesterday");
+ for(int n = 0; n < 24; n++)
+ {
+ conn.println(n + " " + Stats.getInstance()
+ .getYesterdaysEvents(Stats.POSTED_NEWS, n, group));
+ }
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("GATEWAYED_NEWS"))
+ {
+ conn.println("100 hourly numbers of gatewayed news yesterday");
+ for(int n = 0; n < 24; n++)
+ {
+ conn.println(n + " " + Stats.getInstance()
+ .getYesterdaysEvents(Stats.GATEWAYED_NEWS, n, group));
+ }
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("TRANSMITTED_NEWS"))
+ {
+ conn.println("100 hourly numbers of news transmitted to peers yesterday");
+ for(int n = 0; n < 24; n++)
+ {
+ conn.println(n + " " + Stats.getInstance()
+ .getYesterdaysEvents(Stats.FEEDED_NEWS, n, group));
+ }
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("HOSTED_NEWS"))
+ {
+ conn.println("100 number of overall hosted news");
+ conn.println(Integer.toString(Stats.getInstance().getNumberOfNews()));
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("HOSTED_GROUPS"))
+ {
+ conn.println("100 number of hosted groups");
+ conn.println(Integer.toString(Stats.getInstance().getNumberOfGroups()));
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("POSTED_NEWS_PER_HOUR"))
+ {
+ conn.println("100 posted news per hour");
+ conn.println(Double.toString(Stats.getInstance().postedPerHour(-1)));
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("FEEDED_NEWS_PER_HOUR"))
+ {
+ conn.println("100 feeded news per hour");
+ conn.println(Double.toString(Stats.getInstance().feededPerHour(-1)));
+ conn.println(".");
+ }
+ else if(commands[2].equalsIgnoreCase("GATEWAYED_NEWS_PER_HOUR"))
+ {
+ conn.println("100 gatewayed news per hour");
+ conn.println(Double.toString(Stats.getInstance().gatewayedPerHour(-1)));
+ conn.println(".");
+ }
+ else
+ {
+ conn.println("401 unknown sub command");
+ }
+ }
+ else if(commands.length >= 3 && commands[1].equalsIgnoreCase("PLUGIN"))
+ {
+
+ }
+ else
+ {
+ conn.println("400 invalid command usage");
+ }
+ }
+ else
+ {
+ conn.println("501 not allowed");
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/XPatCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/XPatCommand.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,170 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * XPAT header range| pat [pat...]
+ *
+ * The XPAT command is used to retrieve specific headers from
+ * specific articles, based on pattern matching on the contents of
+ * the header. This command was first available in INN.
+ *
+ * The required header parameter is the name of a header line (e.g.
+ * "subject") in a news group article. See RFC-1036 for a list
+ * of valid header lines. The required range argument may be
+ * any of the following:
+ * an article number
+ * an article number followed by a dash to indicate
+ * all following
+ * an article number followed by a dash followed by
+ * another article number
+ *
+ * The required message-id argument indicates a specific
+ * article. The range and message-id arguments are mutually
+ * exclusive. At least one pattern in wildmat must be specified
+ * as well. If there are additional arguments the are joined
+ * together separated by a single space to form one complete
+ * pattern. Successful responses start with a 221 response
+ * followed by a the headers from all messages in which the
+ * pattern matched the contents of the specified header line. This
+ * includes an empty list. Once the output is complete, a period
+ * is sent on a line by itself. If the optional argument is a
+ * message-id and no such article exists, the 430 error response
+ * is returned. A 502 response will be returned if the client only
+ * has permission to transfer articles.
+ *
+ * Responses
+ *
+ * 221 Header follows
+ * 430 no such article
+ * 502 no permission
+ *
+ * Response Data:
+ *
+ * art_nr fitting_header_value
+ *
+ *
+ * [Source:"draft-ietf-nntp-imp-02.txt"] [Copyright: 1998 S. Barber]
+ *
+ * @author Christian Lins
+ * @since sonews/0.5.0
+ */
+public class XPatCommand implements Command
+{
+
+ @Override
+ public String[] getSupportedCommandStrings()
+ {
+ return new String[]{"XPAT"};
+ }
+
+ @Override
+ public boolean hasFinished()
+ {
+ return true;
+ }
+
+ @Override
+ public String impliedCapability()
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isStateful()
+ {
+ return false;
+ }
+
+ @Override
+ public void processLine(NNTPConnection conn, final String line, byte[] raw)
+ throws IOException, StorageBackendException
+ {
+ if(conn.getCurrentChannel() == null)
+ {
+ conn.println("430 no group selected");
+ return;
+ }
+
+ String[] command = line.split("\\p{Space}+");
+
+ // There may be multiple patterns and Thunderbird produces
+ // additional spaces between range and pattern
+ if(command.length >= 4)
+ {
+ String header = command[1].toLowerCase(Locale.US);
+ String range = command[2];
+ String pattern = command[3];
+
+ long start = -1;
+ long end = -1;
+ if(range.contains("-"))
+ {
+ String[] rsplit = range.split("-", 2);
+ start = Long.parseLong(rsplit[0]);
+ if(rsplit[1].length() > 0)
+ {
+ end = Long.parseLong(rsplit[1]);
+ }
+ }
+ else // TODO: Handle Message-IDs
+ {
+ start = Long.parseLong(range);
+ }
+
+ try
+ {
+ List> heads = StorageManager.current().
+ getArticleHeaders(conn.getCurrentChannel(), start, end, header, pattern);
+
+ conn.println("221 header follows");
+ for(Pair head : heads)
+ {
+ conn.println(head.getA() + " " + head.getB());
+ }
+ conn.println(".");
+ }
+ catch(PatternSyntaxException ex)
+ {
+ ex.printStackTrace();
+ conn.println("500 invalid pattern syntax");
+ }
+ catch(StorageBackendException ex)
+ {
+ ex.printStackTrace();
+ conn.println("500 internal server error");
+ }
+ }
+ else
+ {
+ conn.println("430 invalid command usage");
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/command/package.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/command/package.html Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,1 @@
+Contains a class for every NNTP command.
\ No newline at end of file
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/daemon/package.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/daemon/package.html Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,1 @@
+Contains basic classes of the daemon.
\ No newline at end of file
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/feed/FeedManager.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/feed/FeedManager.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,54 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see highMarks = new HashMap();
+ private BufferedReader in;
+ private PrintWriter out;
+ private Set subscriptions = new HashSet();
+
+ private void addSubscription(final Subscription sub)
+ {
+ subscriptions.add(sub);
+
+ if(!highMarks.containsKey(sub))
+ {
+ // Set a initial highMark
+ this.highMarks.put(sub, 0);
+ }
+ }
+
+ /**
+ * Changes to the given group and returns its high mark.
+ * @param groupName
+ * @return
+ */
+ private int changeGroup(String groupName)
+ throws IOException
+ {
+ this.out.print("GROUP " + groupName + "\r\n");
+ this.out.flush();
+
+ String line = this.in.readLine();
+ if(line.startsWith("211 "))
+ {
+ int highmark = Integer.parseInt(line.split(" ")[3]);
+ return highmark;
+ }
+ else
+ {
+ throw new IOException("GROUP " + groupName + " returned: " + line);
+ }
+ }
+
+ private void connectTo(final String host, final int port)
+ throws IOException, UnknownHostException
+ {
+ Socket socket = new Socket(host, port);
+ this.out = new PrintWriter(socket.getOutputStream());
+ this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+
+ String line = in.readLine();
+ if(!(line.charAt(0) == '2')) // Could be 200 or 2xx if posting is not allowed
+ {
+ throw new IOException(line);
+ }
+
+ // Send MODE READER to peer, some newsservers are friendlier then
+ this.out.println("MODE READER\r\n");
+ this.out.flush();
+ line = this.in.readLine();
+ }
+
+ private void disconnect()
+ throws IOException
+ {
+ this.out.print("QUIT\r\n");
+ this.out.flush();
+ this.out.close();
+ this.in.close();
+
+ this.out = null;
+ this.in = null;
+ }
+
+ /**
+ * Uses the OVER or XOVER command to get a list of message overviews that
+ * may be unknown to this feeder and are about to be peered.
+ * @param start
+ * @param end
+ * @return A list of message ids with potentially interesting messages.
+ */
+ private List over(int start, int end)
+ throws IOException
+ {
+ this.out.print("OVER " + start + "-" + end + "\r\n");
+ this.out.flush();
+
+ String line = this.in.readLine();
+ if(line.startsWith("500 ")) // OVER not supported
+ {
+ this.out.print("XOVER " + start + "-" + end + "\r\n");
+ this.out.flush();
+
+ line = this.in.readLine();
+ }
+
+ if(line.startsWith("224 "))
+ {
+ List messages = new ArrayList();
+ line = this.in.readLine();
+ while(!".".equals(line))
+ {
+ String mid = line.split("\t")[4]; // 5th should be the Message-ID
+ messages.add(mid);
+ line = this.in.readLine();
+ }
+ return messages;
+ }
+ else
+ {
+ throw new IOException("Server return for OVER/XOVER: " + line);
+ }
+ }
+
+ @Override
+ public void run()
+ {
+ while(isRunning())
+ {
+ int pullInterval = 1000 *
+ Config.inst().get(Config.FEED_PULLINTERVAL, 3600);
+ String host = "localhost";
+ int port = 119;
+
+ Log.get().info("Start PullFeeder run...");
+
+ try
+ {
+ this.subscriptions.clear();
+ List subsPull = StorageManager.current()
+ .getSubscriptions(FeedManager.TYPE_PULL);
+ for(Subscription sub : subsPull)
+ {
+ addSubscription(sub);
+ }
+ }
+ catch(StorageBackendException ex)
+ {
+ Log.get().log(Level.SEVERE, host, ex);
+ }
+
+ try
+ {
+ for(Subscription sub : this.subscriptions)
+ {
+ host = sub.getHost();
+ port = sub.getPort();
+
+ try
+ {
+ Log.get().info("Feeding " + sub.getGroup() + " from " + sub.getHost());
+ try
+ {
+ connectTo(host, port);
+ }
+ catch(SocketException ex)
+ {
+ Log.get().info("Skipping " + sub.getHost() + ": " + ex);
+ continue;
+ }
+
+ int oldMark = this.highMarks.get(sub);
+ int newMark = changeGroup(sub.getGroup());
+
+ if(oldMark != newMark)
+ {
+ List messageIDs = over(oldMark, newMark);
+
+ for(String messageID : messageIDs)
+ {
+ if(!StorageManager.current().isArticleExisting(messageID))
+ {
+ try
+ {
+ // Post the message via common socket connection
+ ArticleReader aread =
+ new ArticleReader(sub.getHost(), sub.getPort(), messageID);
+ byte[] abuf = aread.getArticleData();
+ if(abuf == null)
+ {
+ Log.get().warning("Could not feed " + messageID
+ + " from " + sub.getHost());
+ }
+ else
+ {
+ Log.get().info("Feeding " + messageID);
+ ArticleWriter awrite = new ArticleWriter(
+ "localhost", Config.inst().get(Config.PORT, 119));
+ awrite.writeArticle(abuf);
+ awrite.close();
+ }
+ Stats.getInstance().mailFeeded(sub.getGroup());
+ }
+ catch(IOException ex)
+ {
+ // There may be a temporary network failure
+ ex.printStackTrace();
+ Log.get().warning("Skipping mail " + messageID + " due to exception.");
+ }
+ }
+ } // for(;;)
+ this.highMarks.put(sub, newMark);
+ }
+
+ disconnect();
+ }
+ catch(StorageBackendException ex)
+ {
+ ex.printStackTrace();
+ }
+ catch(IOException ex)
+ {
+ ex.printStackTrace();
+ Log.get().severe("PullFeeder run stopped due to exception.");
+ }
+ } // for(Subscription sub : subscriptions)
+
+ Log.get().info("PullFeeder run ended. Waiting " + pullInterval / 1000 + "s");
+ Thread.sleep(pullInterval);
+ }
+ catch(InterruptedException ex)
+ {
+ Log.get().warning(ex.getMessage());
+ }
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/feed/PushFeeder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/feed/PushFeeder.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,118 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see articleQueue =
+ new ConcurrentLinkedQueue();
+
+ @Override
+ public void run()
+ {
+ while(isRunning())
+ {
+ try
+ {
+ synchronized(this)
+ {
+ this.wait();
+ }
+
+ List subscriptions = StorageManager.current()
+ .getSubscriptions(FeedManager.TYPE_PUSH);
+
+ Article article = this.articleQueue.poll();
+ String[] groups = article.getHeader(Headers.NEWSGROUPS)[0].split(",");
+ Log.get().info("PushFeed: " + article.getMessageID());
+ for(Subscription sub : subscriptions)
+ {
+ // Circle check
+ if(article.getHeader(Headers.PATH)[0].contains(sub.getHost()))
+ {
+ Log.get().info(article.getMessageID() + " skipped for host "
+ + sub.getHost());
+ continue;
+ }
+
+ try
+ {
+ for(String group : groups)
+ {
+ if(sub.getGroup().equals(group))
+ {
+ // Delete headers that may cause problems
+ article.removeHeader(Headers.NNTP_POSTING_DATE);
+ article.removeHeader(Headers.NNTP_POSTING_HOST);
+ article.removeHeader(Headers.X_COMPLAINTS_TO);
+ article.removeHeader(Headers.X_TRACE);
+ article.removeHeader(Headers.XREF);
+
+ // POST the message to remote server
+ ArticleWriter awriter = new ArticleWriter(sub.getHost(), sub.getPort());
+ awriter.writeArticle(article);
+ break;
+ }
+ }
+ }
+ catch(IOException ex)
+ {
+ Log.get().warning(ex.toString());
+ }
+ }
+ }
+ catch(StorageBackendException ex)
+ {
+ Log.get().severe(ex.toString());
+ }
+ catch(InterruptedException ex)
+ {
+ Log.get().warning("PushFeeder interrupted: " + ex);
+ }
+ }
+ }
+
+ public void queueForPush(Article article)
+ {
+ this.articleQueue.add(article);
+ synchronized(this)
+ {
+ this.notifyAll();
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/feed/Subscription.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/feed/Subscription.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,84 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see "
+ Pattern mailPattern = Pattern.compile("(\\w+[-|.])*\\w+@(\\w+.)+\\w+");
+ Matcher mailMatcher = mailPattern.matcher(listPostValue);
+ if(mailMatcher.find())
+ {
+ return listPostValue.substring(mailMatcher.start(), mailMatcher.end());
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * This method inspects the header of the given message, trying
+ * to find the most appropriate recipient.
+ * @param msg
+ * @param fallback If this is false only List-Post and X-List-Post headers
+ * are examined.
+ * @return null or fitting group name for the given message.
+ */
+ private static List getGroupFor(final Message msg, final boolean fallback)
+ throws MessagingException, StorageBackendException
+ {
+ List groups = null;
+
+ // Is there a List-Post header?
+ String[] listPost = msg.getHeader(Headers.LIST_POST);
+ InternetAddress listPostAddr;
+
+ if(listPost == null || listPost.length == 0 || "".equals(listPost[0]))
+ {
+ // Is there a X-List-Post header?
+ listPost = msg.getHeader(Headers.X_LIST_POST);
+ }
+
+ if(listPost != null && listPost.length > 0
+ && !"".equals(listPost[0]) && chunkListPost(listPost[0]) != null)
+ {
+ // listPost[0] is of form ""
+ listPost[0] = chunkListPost(listPost[0]);
+ listPostAddr = new InternetAddress(listPost[0], false);
+ groups = StorageManager.current().getGroupsForList(listPostAddr.getAddress());
+ }
+ else if(fallback)
+ {
+ Log.get().info("Using fallback recipient discovery for: " + msg.getSubject());
+ groups = new ArrayList();
+ // Fallback to TO/CC/BCC addresses
+ Address[] to = msg.getAllRecipients();
+ for(Address toa : to) // Address can have '<' '>' around
+ {
+ if(toa instanceof InternetAddress)
+ {
+ List g = StorageManager.current()
+ .getGroupsForList(((InternetAddress)toa).getAddress());
+ groups.addAll(g);
+ }
+ }
+ }
+
+ return groups;
+ }
+
+ /**
+ * Posts a message that was received from a mailing list to the
+ * appropriate newsgroup.
+ * If the message already exists in the storage, this message checks
+ * if it must be posted in an additional group. This can happen for
+ * crosspostings in different mailing lists.
+ * @param msg
+ */
+ public static boolean toGroup(final Message msg)
+ {
+ try
+ {
+ // Create new Article object
+ Article article = new Article(msg);
+ boolean posted = false;
+
+ // Check if this mail is already existing the storage
+ boolean updateReq =
+ StorageManager.current().isArticleExisting(article.getMessageID());
+
+ List newsgroups = getGroupFor(msg, !updateReq);
+ List oldgroups = new ArrayList();
+ if(updateReq)
+ {
+ // Check for duplicate entries of the same group
+ Article oldArticle = StorageManager.current().getArticle(article.getMessageID());
+ List oldGroups = oldArticle.getGroups();
+ for(Group oldGroup : oldGroups)
+ {
+ if(!newsgroups.contains(oldGroup.getName()))
+ {
+ oldgroups.add(oldGroup.getName());
+ }
+ }
+ }
+
+ if(newsgroups.size() > 0)
+ {
+ newsgroups.addAll(oldgroups);
+ StringBuilder groups = new StringBuilder();
+ for(int n = 0; n < newsgroups.size(); n++)
+ {
+ groups.append(newsgroups.get(n));
+ if (n + 1 != newsgroups.size())
+ {
+ groups.append(',');
+ }
+ }
+ Log.get().info("Posting to group " + groups.toString());
+
+ article.setGroup(groups.toString());
+ //article.removeHeader(Headers.REPLY_TO);
+ //article.removeHeader(Headers.TO);
+
+ // Write article to database
+ if(updateReq)
+ {
+ Log.get().info("Updating " + article.getMessageID()
+ + " with additional groups");
+ StorageManager.current().delete(article.getMessageID());
+ StorageManager.current().addArticle(article);
+ }
+ else
+ {
+ Log.get().info("Gatewaying " + article.getMessageID() + " to "
+ + article.getHeader(Headers.NEWSGROUPS)[0]);
+ StorageManager.current().addArticle(article);
+ Stats.getInstance().mailGatewayed(
+ article.getHeader(Headers.NEWSGROUPS)[0]);
+ }
+ posted = true;
+ }
+ else
+ {
+ StringBuilder buf = new StringBuilder();
+ for (Address toa : msg.getAllRecipients())
+ {
+ buf.append(' ');
+ buf.append(toa.toString());
+ }
+ buf.append(" " + article.getHeader(Headers.LIST_POST)[0]);
+ Log.get().warning("No group for" + buf.toString());
+ }
+ return posted;
+ }
+ catch(Exception ex)
+ {
+ ex.printStackTrace();
+ return false;
+ }
+ }
+
+ /**
+ * Mails a message received through NNTP to the appropriate mailing list.
+ * This method MAY be called several times by PostCommand for the same
+ * article.
+ */
+ public static void toList(Article article, String group)
+ throws IOException, MessagingException, StorageBackendException
+ {
+ // Get mailing lists for the group of this article
+ List rcptAddresses = StorageManager.current().getListsForGroup(group);
+
+ if(rcptAddresses == null || rcptAddresses.size() == 0)
+ {
+ Log.get().warning("No ML-address for " + group + " found.");
+ return;
+ }
+
+ for(String rcptAddress : rcptAddresses)
+ {
+ // Compose message and send it via given SMTP-Host
+ String smtpHost = Config.inst().get(Config.MLSEND_HOST, "localhost");
+ int smtpPort = Config.inst().get(Config.MLSEND_PORT, 25);
+ String smtpUser = Config.inst().get(Config.MLSEND_USER, "user");
+ String smtpPw = Config.inst().get(Config.MLSEND_PASSWORD, "mysecret");
+ String smtpFrom = Config.inst().get(
+ Config.MLSEND_ADDRESS, article.getHeader(Headers.FROM)[0]);
+
+ // TODO: Make Article cloneable()
+ article.getMessageID(); // Make sure an ID is existing
+ article.removeHeader(Headers.NEWSGROUPS);
+ article.removeHeader(Headers.PATH);
+ article.removeHeader(Headers.LINES);
+ article.removeHeader(Headers.BYTES);
+
+ article.setHeader("To", rcptAddress);
+ //article.setHeader("Reply-To", listAddress);
+
+ if (Config.inst().get(Config.MLSEND_RW_SENDER, false))
+ {
+ rewriteSenderAddress(article); // Set the SENDER address
+ }
+
+ SMTPTransport smtpTransport = new SMTPTransport(smtpHost, smtpPort);
+ smtpTransport.send(article, smtpFrom, rcptAddress);
+ smtpTransport.close();
+
+ Stats.getInstance().mailGatewayed(group);
+ Log.get().info("MLGateway: Mail " + article.getHeader("Subject")[0]
+ + " was delivered to " + rcptAddress + ".");
+ }
+ }
+
+ /**
+ * Sets the SENDER header of the given MimeMessage. This might be necessary
+ * for moderated groups that does not allow the "normal" FROM sender.
+ * @param msg
+ * @throws javax.mail.MessagingException
+ */
+ private static void rewriteSenderAddress(Article msg)
+ throws MessagingException
+ {
+ String mlAddress = Config.inst().get(Config.MLSEND_ADDRESS, null);
+
+ if(mlAddress != null)
+ {
+ msg.setHeader(Headers.SENDER, mlAddress);
+ }
+ else
+ {
+ throw new MessagingException("Cannot rewrite SENDER header!");
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/mlgw/MailPoller.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/mlgw/MailPoller.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,151 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see getGroups()
+ {
+ String[] groupnames = getHeader(Headers.NEWSGROUPS)[0].split(",");
+ ArrayList groups = new ArrayList();
+
+ try
+ {
+ for(String newsgroup : groupnames)
+ {
+ newsgroup = newsgroup.trim();
+ Group group = StorageManager.current().getGroup(newsgroup);
+ if(group != null && // If the server does not provide the group, ignore it
+ !groups.contains(group)) // Yes, there may be duplicates
+ {
+ groups.add(group);
+ }
+ }
+ }
+ catch(StorageBackendException ex)
+ {
+ ex.printStackTrace();
+ return null;
+ }
+ return groups;
+ }
+
+ public void setBody(byte[] body)
+ {
+ this.body = body;
+ }
+
+ /**
+ *
+ * @param groupname Name(s) of newsgroups
+ */
+ public void setGroup(String groupname)
+ {
+ this.headers.setHeader(Headers.NEWSGROUPS, groupname);
+ }
+
+ /**
+ * Returns the Message-ID of this Article. If the appropriate header
+ * is empty, a new Message-ID is created.
+ * @return Message-ID of this Article.
+ */
+ public String getMessageID()
+ {
+ String[] msgID = getHeader(Headers.MESSAGE_ID);
+ return msgID[0].equals("") ? generateMessageID() : msgID[0];
+ }
+
+ /**
+ * @return String containing the Message-ID.
+ */
+ @Override
+ public String toString()
+ {
+ return getMessageID();
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/storage/ArticleHead.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/storage/ArticleHead.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,161 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see getAll()
+ {
+ List all = new ArrayList();
+
+ /*List agroups = AggregatedGroup.getAll();
+ if(agroups != null)
+ {
+ all.addAll(agroups);
+ }*/
+
+ List groups = Group.getAll();
+ if(groups != null)
+ {
+ all.addAll(groups);
+ }
+
+ return all;
+ }
+
+ public static Channel getByName(String name)
+ throws StorageBackendException
+ {
+ return StorageManager.current().getGroup(name);
+ }
+
+ public abstract Article getArticle(long idx)
+ throws StorageBackendException;
+
+ public abstract List> getArticleHeads(
+ final long first, final long last)
+ throws StorageBackendException;
+
+ public abstract List getArticleNumbers()
+ throws StorageBackendException;
+
+ public abstract long getFirstArticleNumber()
+ throws StorageBackendException;
+
+ public abstract long getIndexOf(Article art)
+ throws StorageBackendException;
+
+ public abstract long getInternalID();
+
+ public abstract long getLastArticleNumber()
+ throws StorageBackendException;
+
+ public abstract String getName();
+
+ public abstract long getPostingsCount()
+ throws StorageBackendException;
+
+ public abstract boolean isDeleted();
+
+ public abstract boolean isWriteable();
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/storage/Group.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/storage/Group.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,184 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see getAll()
+ {
+ try
+ {
+ return StorageManager.current().getGroups();
+ }
+ catch(StorageBackendException ex)
+ {
+ Log.get().severe(ex.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * @param name
+ * @param id
+ */
+ public Group(final String name, final long id, final int flags)
+ {
+ this.id = id;
+ this.flags = flags;
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if(obj instanceof Group)
+ {
+ return ((Group)obj).id == this.id;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ public Article getArticle(long idx)
+ throws StorageBackendException
+ {
+ return StorageManager.current().getArticle(idx, this.id);
+ }
+
+ public List> getArticleHeads(final long first, final long last)
+ throws StorageBackendException
+ {
+ return StorageManager.current().getArticleHeads(this, first, last);
+ }
+
+ public List getArticleNumbers()
+ throws StorageBackendException
+ {
+ return StorageManager.current().getArticleNumbers(id);
+ }
+
+ public long getFirstArticleNumber()
+ throws StorageBackendException
+ {
+ return StorageManager.current().getFirstArticleNumber(this);
+ }
+
+ public int getFlags()
+ {
+ return this.flags;
+ }
+
+ public long getIndexOf(Article art)
+ throws StorageBackendException
+ {
+ return StorageManager.current().getArticleIndex(art, this);
+ }
+
+ /**
+ * Returns the group id.
+ */
+ public long getInternalID()
+ {
+ assert id > 0;
+
+ return id;
+ }
+
+ public boolean isDeleted()
+ {
+ return (this.flags & DELETED) != 0;
+ }
+
+ public boolean isMailingList()
+ {
+ return (this.flags & MAILINGLIST) != 0;
+ }
+
+ public boolean isWriteable()
+ {
+ return true;
+ }
+
+ public long getLastArticleNumber()
+ throws StorageBackendException
+ {
+ return StorageManager.current().getLastArticleNumber(this);
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Performs this.flags |= flag to set a specified flag and updates the data
+ * in the JDBCDatabase.
+ * @param flag
+ */
+ public void setFlag(final int flag)
+ {
+ this.flags |= flag;
+ }
+
+ public void setName(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * @return Number of posted articles in this group.
+ * @throws java.sql.SQLException
+ */
+ public long getPostingsCount()
+ throws StorageBackendException
+ {
+ return StorageManager.current().getPostingsCount(this.name);
+ }
+
+ /**
+ * Updates flags and name in the backend.
+ */
+ public void update()
+ throws StorageBackendException
+ {
+ StorageManager.current().update(this);
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/storage/Headers.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/storage/Headers.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,56 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > getArticleHeads(Group group, long first, long last)
+ throws StorageBackendException;
+
+ List> getArticleHeaders(Channel channel, long start, long end,
+ String header, String pattern)
+ throws StorageBackendException;
+
+ long getArticleIndex(Article art, Group group)
+ throws StorageBackendException;
+
+ List getArticleNumbers(long groupID)
+ throws StorageBackendException;
+
+ String getConfigValue(String key)
+ throws StorageBackendException;
+
+ int getEventsCount(int eventType, long startTimestamp, long endTimestamp,
+ Channel channel)
+ throws StorageBackendException;
+
+ double getEventsPerHour(int key, long gid)
+ throws StorageBackendException;
+
+ int getFirstArticleNumber(Group group)
+ throws StorageBackendException;
+
+ Group getGroup(String name)
+ throws StorageBackendException;
+
+ List getGroups()
+ throws StorageBackendException;
+
+ /**
+ * Retrieves the collection of groupnames that are associated with the
+ * given list address.
+ * @param inetaddress
+ * @return
+ * @throws StorageBackendException
+ */
+ List getGroupsForList(String listAddress)
+ throws StorageBackendException;
+
+ int getLastArticleNumber(Group group)
+ throws StorageBackendException;
+
+ /**
+ * Returns a list of email addresses that are related to the given
+ * groupname. In most cases the list may contain only one entry.
+ * @param groupname
+ * @return
+ * @throws StorageBackendException
+ */
+ List getListsForGroup(String groupname)
+ throws StorageBackendException;
+
+ String getOldestArticle()
+ throws StorageBackendException;
+
+ int getPostingsCount(String groupname)
+ throws StorageBackendException;
+
+ List getSubscriptions(int type)
+ throws StorageBackendException;
+
+ boolean isArticleExisting(String messageID)
+ throws StorageBackendException;
+
+ boolean isGroupExisting(String groupname)
+ throws StorageBackendException;
+
+ void purgeGroup(Group group)
+ throws StorageBackendException;
+
+ void setConfigValue(String key, String value)
+ throws StorageBackendException;
+
+ /**
+ * Updates headers and channel references of the given article.
+ * @param article
+ * @return
+ * @throws StorageBackendException
+ */
+ boolean update(Article article)
+ throws StorageBackendException;
+
+ boolean update(Group group)
+ throws StorageBackendException;
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/storage/StorageBackendException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/storage/StorageBackendException.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,39 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see "),
+ Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_USER, "root"),
+ Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_PASSWORD, ""));
+
+ this.conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+ if(this.conn.getTransactionIsolation() != Connection.TRANSACTION_SERIALIZABLE)
+ {
+ Log.get().warning("Database is NOT fully serializable!");
+ }
+
+ // Prepare statements for method addArticle()
+ this.pstmtAddArticle1 = conn.prepareStatement(
+ "INSERT INTO articles (article_id, body) VALUES(?, ?)");
+ this.pstmtAddArticle2 = conn.prepareStatement(
+ "INSERT INTO headers (article_id, header_key, header_value, header_index) " +
+ "VALUES (?, ?, ?, ?)");
+ this.pstmtAddArticle3 = conn.prepareStatement(
+ "INSERT INTO postings (group_id, article_id, article_index)" +
+ "VALUES (?, ?, ?)");
+ this.pstmtAddArticle4 = conn.prepareStatement(
+ "INSERT INTO article_ids (article_id, message_id) VALUES (?, ?)");
+
+ // Prepare statement for method addStatValue()
+ this.pstmtAddEvent = conn.prepareStatement(
+ "INSERT INTO events VALUES (?, ?, ?)");
+
+ // Prepare statement for method addGroup()
+ this.pstmtAddGroup0 = conn.prepareStatement(
+ "INSERT INTO groups (name, flags) VALUES (?, ?)");
+
+ // Prepare statement for method countArticles()
+ this.pstmtCountArticles = conn.prepareStatement(
+ "SELECT Count(article_id) FROM article_ids");
+
+ // Prepare statement for method countGroups()
+ this.pstmtCountGroups = conn.prepareStatement(
+ "SELECT Count(group_id) FROM groups WHERE " +
+ "flags & " + Channel.DELETED + " = 0");
+
+ // Prepare statements for method delete(article)
+ this.pstmtDeleteArticle0 = conn.prepareStatement(
+ "DELETE FROM articles WHERE article_id = " +
+ "(SELECT article_id FROM article_ids WHERE message_id = ?)");
+ this.pstmtDeleteArticle1 = conn.prepareStatement(
+ "DELETE FROM headers WHERE article_id = " +
+ "(SELECT article_id FROM article_ids WHERE message_id = ?)");
+ this.pstmtDeleteArticle2 = conn.prepareStatement(
+ "DELETE FROM postings WHERE article_id = " +
+ "(SELECT article_id FROM article_ids WHERE message_id = ?)");
+ this.pstmtDeleteArticle3 = conn.prepareStatement(
+ "DELETE FROM article_ids WHERE message_id = ?");
+
+ // Prepare statements for methods getArticle()
+ this.pstmtGetArticle0 = conn.prepareStatement(
+ "SELECT * FROM articles WHERE article_id = " +
+ "(SELECT article_id FROM article_ids WHERE message_id = ?)");
+ this.pstmtGetArticle1 = conn.prepareStatement(
+ "SELECT * FROM articles WHERE article_id = " +
+ "(SELECT article_id FROM postings WHERE " +
+ "article_index = ? AND group_id = ?)");
+
+ // Prepare statement for method getArticleHeaders()
+ this.pstmtGetArticleHeaders0 = conn.prepareStatement(
+ "SELECT header_key, header_value FROM headers WHERE article_id = ? " +
+ "ORDER BY header_index ASC");
+
+ // Prepare statement for method getArticleHeaders(regular expr pattern)
+ this.pstmtGetArticleHeaders1 = conn.prepareStatement(
+ "SELECT p.article_index, h.header_value FROM headers h " +
+ "INNER JOIN postings p ON h.article_id = p.article_id " +
+ "INNER JOIN groups g ON p.group_id = g.group_id " +
+ "WHERE g.name = ? AND " +
+ "h.header_key = ? AND " +
+ "p.article_index >= ? " +
+ "ORDER BY p.article_index ASC");
+
+ this.pstmtGetArticleIDs = conn.prepareStatement(
+ "SELECT article_index FROM postings WHERE group_id = ?");
+
+ // Prepare statement for method getArticleIndex
+ this.pstmtGetArticleIndex = conn.prepareStatement(
+ "SELECT article_index FROM postings WHERE " +
+ "article_id = (SELECT article_id FROM article_ids " +
+ "WHERE message_id = ?) " +
+ " AND group_id = ?");
+
+ // Prepare statements for method getArticleHeads()
+ this.pstmtGetArticleHeads = conn.prepareStatement(
+ "SELECT article_id, article_index FROM postings WHERE " +
+ "postings.group_id = ? AND article_index >= ? AND " +
+ "article_index <= ?");
+
+ // Prepare statements for method getConfigValue()
+ this.pstmtGetConfigValue = conn.prepareStatement(
+ "SELECT config_value FROM config WHERE config_key = ?");
+
+ // Prepare statements for method getEventsCount()
+ this.pstmtGetEventsCount0 = conn.prepareStatement(
+ "SELECT Count(*) FROM events WHERE event_key = ? AND " +
+ "event_time >= ? AND event_time < ?");
+
+ this.pstmtGetEventsCount1 = conn.prepareStatement(
+ "SELECT Count(*) FROM events WHERE event_key = ? AND " +
+ "event_time >= ? AND event_time < ? AND group_id = ?");
+
+ // Prepare statement for method getGroupForList()
+ this.pstmtGetGroupForList = conn.prepareStatement(
+ "SELECT name FROM groups INNER JOIN groups2list " +
+ "ON groups.group_id = groups2list.group_id " +
+ "WHERE groups2list.listaddress = ?");
+
+ // Prepare statement for method getGroup()
+ this.pstmtGetGroup0 = conn.prepareStatement(
+ "SELECT group_id, flags FROM groups WHERE Name = ?");
+ this.pstmtGetGroup1 = conn.prepareStatement(
+ "SELECT name FROM groups WHERE group_id = ?");
+
+ // Prepare statement for method getLastArticleNumber()
+ this.pstmtGetLastArticleNumber = conn.prepareStatement(
+ "SELECT Max(article_index) FROM postings WHERE group_id = ?");
+
+ // Prepare statement for method getListForGroup()
+ this.pstmtGetListForGroup = conn.prepareStatement(
+ "SELECT listaddress FROM groups2list INNER JOIN groups " +
+ "ON groups.group_id = groups2list.group_id WHERE name = ?");
+
+ // Prepare statement for method getMaxArticleID()
+ this.pstmtGetMaxArticleID = conn.prepareStatement(
+ "SELECT Max(article_id) FROM articles");
+
+ // Prepare statement for method getMaxArticleIndex()
+ this.pstmtGetMaxArticleIndex = conn.prepareStatement(
+ "SELECT Max(article_index) FROM postings WHERE group_id = ?");
+
+ // Prepare statement for method getOldestArticle()
+ this.pstmtGetOldestArticle = conn.prepareStatement(
+ "SELECT message_id FROM article_ids WHERE article_id = " +
+ "(SELECT Min(article_id) FROM article_ids)");
+
+ // Prepare statement for method getFirstArticleNumber()
+ this.pstmtGetFirstArticleNumber = conn.prepareStatement(
+ "SELECT Min(article_index) FROM postings WHERE group_id = ?");
+
+ // Prepare statement for method getPostingsCount()
+ this.pstmtGetPostingsCount = conn.prepareStatement(
+ "SELECT Count(*) FROM postings NATURAL JOIN groups " +
+ "WHERE groups.name = ?");
+
+ // Prepare statement for method getSubscriptions()
+ this.pstmtGetSubscriptions = conn.prepareStatement(
+ "SELECT host, port, name FROM peers NATURAL JOIN " +
+ "peer_subscriptions NATURAL JOIN groups WHERE feedtype = ?");
+
+ // Prepare statement for method isArticleExisting()
+ this.pstmtIsArticleExisting = conn.prepareStatement(
+ "SELECT Count(article_id) FROM article_ids WHERE message_id = ?");
+
+ // Prepare statement for method isGroupExisting()
+ this.pstmtIsGroupExisting = conn.prepareStatement(
+ "SELECT * FROM groups WHERE name = ?");
+
+ // Prepare statement for method setConfigValue()
+ this.pstmtSetConfigValue0 = conn.prepareStatement(
+ "DELETE FROM config WHERE config_key = ?");
+ this.pstmtSetConfigValue1 = conn.prepareStatement(
+ "INSERT INTO config VALUES(?, ?)");
+
+ // Prepare statements for method purgeGroup()
+ this.pstmtPurgeGroup0 = conn.prepareStatement(
+ "DELETE FROM peer_subscriptions WHERE group_id = ?");
+ this.pstmtPurgeGroup1 = conn.prepareStatement(
+ "DELETE FROM groups WHERE group_id = ?");
+
+ // Prepare statement for method update(Group)
+ this.pstmtUpdateGroup = conn.prepareStatement(
+ "UPDATE groups SET flags = ?, name = ? WHERE group_id = ?");
+ }
+ catch(ClassNotFoundException ex)
+ {
+ throw new Error("JDBC Driver not found!", ex);
+ }
+ }
+
+ /**
+ * Adds an article to the database.
+ * @param article
+ * @return
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public void addArticle(final Article article)
+ throws StorageBackendException
+ {
+ try
+ {
+ this.conn.setAutoCommit(false);
+
+ int newArticleID = getMaxArticleID() + 1;
+
+ // Fill prepared statement with values;
+ // writes body to article table
+ pstmtAddArticle1.setInt(1, newArticleID);
+ pstmtAddArticle1.setBytes(2, article.getBody());
+ pstmtAddArticle1.execute();
+
+ // Add headers
+ Enumeration headers = article.getAllHeaders();
+ for(int n = 0; headers.hasMoreElements(); n++)
+ {
+ Header header = (Header)headers.nextElement();
+ pstmtAddArticle2.setInt(1, newArticleID);
+ pstmtAddArticle2.setString(2, header.getName().toLowerCase());
+ pstmtAddArticle2.setString(3,
+ header.getValue().replaceAll("[\r\n]", ""));
+ pstmtAddArticle2.setInt(4, n);
+ pstmtAddArticle2.execute();
+ }
+
+ // For each newsgroup add a reference
+ List groups = article.getGroups();
+ for(Group group : groups)
+ {
+ pstmtAddArticle3.setLong(1, group.getInternalID());
+ pstmtAddArticle3.setInt(2, newArticleID);
+ pstmtAddArticle3.setLong(3, getMaxArticleIndex(group.getInternalID()) + 1);
+ pstmtAddArticle3.execute();
+ }
+
+ // Write message-id to article_ids table
+ this.pstmtAddArticle4.setInt(1, newArticleID);
+ this.pstmtAddArticle4.setString(2, article.getMessageID());
+ this.pstmtAddArticle4.execute();
+
+ this.conn.commit();
+ this.conn.setAutoCommit(true);
+
+ this.restarts = 0; // Reset error count
+ }
+ catch(SQLException ex)
+ {
+ try
+ {
+ this.conn.rollback(); // Rollback changes
+ }
+ catch(SQLException ex2)
+ {
+ Log.get().severe("Rollback of addArticle() failed: " + ex2);
+ }
+
+ try
+ {
+ this.conn.setAutoCommit(true); // and release locks
+ }
+ catch(SQLException ex2)
+ {
+ Log.get().severe("setAutoCommit(true) of addArticle() failed: " + ex2);
+ }
+
+ restartConnection(ex);
+ addArticle(article);
+ }
+ }
+
+ /**
+ * Adds a group to the JDBCDatabase. This method is not accessible via NNTP.
+ * @param name
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public void addGroup(String name, int flags)
+ throws StorageBackendException
+ {
+ try
+ {
+ this.conn.setAutoCommit(false);
+ pstmtAddGroup0.setString(1, name);
+ pstmtAddGroup0.setInt(2, flags);
+
+ pstmtAddGroup0.executeUpdate();
+ this.conn.commit();
+ this.conn.setAutoCommit(true);
+ this.restarts = 0; // Reset error count
+ }
+ catch(SQLException ex)
+ {
+ try
+ {
+ this.conn.rollback();
+ this.conn.setAutoCommit(true);
+ }
+ catch(SQLException ex2)
+ {
+ ex2.printStackTrace();
+ }
+
+ restartConnection(ex);
+ addGroup(name, flags);
+ }
+ }
+
+ @Override
+ public void addEvent(long time, int type, long gid)
+ throws StorageBackendException
+ {
+ try
+ {
+ this.conn.setAutoCommit(false);
+ this.pstmtAddEvent.setLong(1, time);
+ this.pstmtAddEvent.setInt(2, type);
+ this.pstmtAddEvent.setLong(3, gid);
+ this.pstmtAddEvent.executeUpdate();
+ this.conn.commit();
+ this.conn.setAutoCommit(true);
+ this.restarts = 0;
+ }
+ catch(SQLException ex)
+ {
+ try
+ {
+ this.conn.rollback();
+ this.conn.setAutoCommit(true);
+ }
+ catch(SQLException ex2)
+ {
+ ex2.printStackTrace();
+ }
+
+ restartConnection(ex);
+ addEvent(time, type, gid);
+ }
+ }
+
+ @Override
+ public int countArticles()
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ rs = this.pstmtCountArticles.executeQuery();
+ if(rs.next())
+ {
+ return rs.getInt(1);
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return countArticles();
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ restarts = 0;
+ }
+ }
+ }
+
+ @Override
+ public int countGroups()
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ rs = this.pstmtCountGroups.executeQuery();
+ if(rs.next())
+ {
+ return rs.getInt(1);
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return countGroups();
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ restarts = 0;
+ }
+ }
+ }
+
+ @Override
+ public void delete(final String messageID)
+ throws StorageBackendException
+ {
+ try
+ {
+ this.conn.setAutoCommit(false);
+
+ this.pstmtDeleteArticle0.setString(1, messageID);
+ int rs = this.pstmtDeleteArticle0.executeUpdate();
+
+ // We do not trust the ON DELETE CASCADE functionality to delete
+ // orphaned references...
+ this.pstmtDeleteArticle1.setString(1, messageID);
+ rs = this.pstmtDeleteArticle1.executeUpdate();
+
+ this.pstmtDeleteArticle2.setString(1, messageID);
+ rs = this.pstmtDeleteArticle2.executeUpdate();
+
+ this.pstmtDeleteArticle3.setString(1, messageID);
+ rs = this.pstmtDeleteArticle3.executeUpdate();
+
+ this.conn.commit();
+ this.conn.setAutoCommit(true);
+ }
+ catch(SQLException ex)
+ {
+ throw new StorageBackendException(ex);
+ }
+ }
+
+ @Override
+ public Article getArticle(String messageID)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+ try
+ {
+ pstmtGetArticle0.setString(1, messageID);
+ rs = pstmtGetArticle0.executeQuery();
+
+ if(!rs.next())
+ {
+ return null;
+ }
+ else
+ {
+ byte[] body = rs.getBytes("body");
+ String headers = getArticleHeaders(rs.getInt("article_id"));
+ return new Article(headers, body);
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticle(messageID);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ restarts = 0; // Reset error count
+ }
+ }
+ }
+
+ /**
+ * Retrieves an article by its ID.
+ * @param articleID
+ * @return
+ * @throws StorageBackendException
+ */
+ @Override
+ public Article getArticle(long articleIndex, long gid)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetArticle1.setLong(1, articleIndex);
+ this.pstmtGetArticle1.setLong(2, gid);
+
+ rs = this.pstmtGetArticle1.executeQuery();
+
+ if(rs.next())
+ {
+ byte[] body = rs.getBytes("body");
+ String headers = getArticleHeaders(rs.getInt("article_id"));
+ return new Article(headers, body);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticle(articleIndex, gid);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ restarts = 0;
+ }
+ }
+ }
+
+ /**
+ * Searches for fitting header values using the given regular expression.
+ * @param group
+ * @param start
+ * @param end
+ * @param headerKey
+ * @param pattern
+ * @return
+ * @throws StorageBackendException
+ */
+ @Override
+ public List> getArticleHeaders(Channel group, long start,
+ long end, String headerKey, String patStr)
+ throws StorageBackendException, PatternSyntaxException
+ {
+ ResultSet rs = null;
+ List> heads = new ArrayList>();
+
+ try
+ {
+ this.pstmtGetArticleHeaders1.setString(1, group.getName());
+ this.pstmtGetArticleHeaders1.setString(2, headerKey);
+ this.pstmtGetArticleHeaders1.setLong(3, start);
+
+ rs = this.pstmtGetArticleHeaders1.executeQuery();
+
+ // Convert the "NNTP" regex to Java regex
+ patStr = patStr.replace("*", ".*");
+ Pattern pattern = Pattern.compile(patStr);
+
+ while(rs.next())
+ {
+ Long articleIndex = rs.getLong(1);
+ if(end < 0 || articleIndex <= end) // Match start is done via SQL
+ {
+ String headerValue = rs.getString(2);
+ Matcher matcher = pattern.matcher(headerValue);
+ if(matcher.matches())
+ {
+ heads.add(new Pair(articleIndex, headerValue));
+ }
+ }
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticleHeaders(group, start, end, headerKey, patStr);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ return heads;
+ }
+
+ private String getArticleHeaders(long articleID)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetArticleHeaders0.setLong(1, articleID);
+ rs = this.pstmtGetArticleHeaders0.executeQuery();
+
+ StringBuilder buf = new StringBuilder();
+ if(rs.next())
+ {
+ for(;;)
+ {
+ buf.append(rs.getString(1)); // key
+ buf.append(": ");
+ String foldedValue = MimeUtility.fold(0, rs.getString(2));
+ buf.append(foldedValue); // value
+ if(rs.next())
+ {
+ buf.append("\r\n");
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ return buf.toString();
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticleHeaders(articleID);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public long getArticleIndex(Article article, Group group)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetArticleIndex.setString(1, article.getMessageID());
+ this.pstmtGetArticleIndex.setLong(2, group.getInternalID());
+
+ rs = this.pstmtGetArticleIndex.executeQuery();
+ if(rs.next())
+ {
+ return rs.getLong(1);
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticleIndex(article, group);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns a list of Long/Article Pairs.
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public List> getArticleHeads(Group group, long first,
+ long last)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetArticleHeads.setLong(1, group.getInternalID());
+ this.pstmtGetArticleHeads.setLong(2, first);
+ this.pstmtGetArticleHeads.setLong(3, last);
+ rs = pstmtGetArticleHeads.executeQuery();
+
+ List> articles
+ = new ArrayList>();
+
+ while (rs.next())
+ {
+ long aid = rs.getLong("article_id");
+ long aidx = rs.getLong("article_index");
+ String headers = getArticleHeaders(aid);
+ articles.add(new Pair(aidx,
+ new ArticleHead(headers)));
+ }
+
+ return articles;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticleHeads(group, first, last);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public List getArticleNumbers(long gid)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+ try
+ {
+ List ids = new ArrayList();
+ this.pstmtGetArticleIDs.setLong(1, gid);
+ rs = this.pstmtGetArticleIDs.executeQuery();
+ while(rs.next())
+ {
+ ids.add(rs.getLong(1));
+ }
+ return ids;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getArticleNumbers(gid);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ restarts = 0; // Clear the restart count after successful request
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public String getConfigValue(String key)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+ try
+ {
+ this.pstmtGetConfigValue.setString(1, key);
+
+ rs = this.pstmtGetConfigValue.executeQuery();
+ if(rs.next())
+ {
+ return rs.getString(1); // First data on index 1 not 0
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getConfigValue(key);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ restarts = 0; // Clear the restart count after successful request
+ }
+ }
+ }
+
+ @Override
+ public int getEventsCount(int type, long start, long end, Channel channel)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ if(channel == null)
+ {
+ this.pstmtGetEventsCount0.setInt(1, type);
+ this.pstmtGetEventsCount0.setLong(2, start);
+ this.pstmtGetEventsCount0.setLong(3, end);
+ rs = this.pstmtGetEventsCount0.executeQuery();
+ }
+ else
+ {
+ this.pstmtGetEventsCount1.setInt(1, type);
+ this.pstmtGetEventsCount1.setLong(2, start);
+ this.pstmtGetEventsCount1.setLong(3, end);
+ this.pstmtGetEventsCount1.setLong(4, channel.getInternalID());
+ rs = this.pstmtGetEventsCount1.executeQuery();
+ }
+
+ if(rs.next())
+ {
+ return rs.getInt(1);
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getEventsCount(type, start, end, channel);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * Reads all Groups from the JDBCDatabase.
+ * @return
+ * @throws StorageBackendException
+ */
+ @Override
+ public List getGroups()
+ throws StorageBackendException
+ {
+ ResultSet rs;
+ List buffer = new ArrayList();
+ Statement stmt = null;
+
+ try
+ {
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("SELECT * FROM groups ORDER BY name");
+
+ while(rs.next())
+ {
+ String name = rs.getString("name");
+ long id = rs.getLong("group_id");
+ int flags = rs.getInt("flags");
+
+ Group group = new Group(name, id, flags);
+ buffer.add(group);
+ }
+
+ return buffer;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getGroups();
+ }
+ finally
+ {
+ if(stmt != null)
+ {
+ try
+ {
+ stmt.close(); // Implicitely closes ResultSets
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public List getGroupsForList(String listAddress)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetGroupForList.setString(1, listAddress);
+
+ rs = this.pstmtGetGroupForList.executeQuery();
+ List groups = new ArrayList();
+ while(rs.next())
+ {
+ String group = rs.getString(1);
+ groups.add(group);
+ }
+ return groups;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getGroupsForList(listAddress);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the Group that is identified by the name.
+ * @param name
+ * @return
+ * @throws StorageBackendException
+ */
+ @Override
+ public Group getGroup(String name)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetGroup0.setString(1, name);
+ rs = this.pstmtGetGroup0.executeQuery();
+
+ if (!rs.next())
+ {
+ return null;
+ }
+ else
+ {
+ long id = rs.getLong("group_id");
+ int flags = rs.getInt("flags");
+ return new Group(name, id, flags);
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getGroup(name);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public List getListsForGroup(String group)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+ List lists = new ArrayList();
+
+ try
+ {
+ this.pstmtGetListForGroup.setString(1, group);
+ rs = this.pstmtGetListForGroup.executeQuery();
+
+ while(rs.next())
+ {
+ lists.add(rs.getString(1));
+ }
+ return lists;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getListsForGroup(group);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private int getMaxArticleIndex(long groupID)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetMaxArticleIndex.setLong(1, groupID);
+ rs = this.pstmtGetMaxArticleIndex.executeQuery();
+
+ int maxIndex = 0;
+ if (rs.next())
+ {
+ maxIndex = rs.getInt(1);
+ }
+
+ return maxIndex;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getMaxArticleIndex(groupID);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private int getMaxArticleID()
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ rs = this.pstmtGetMaxArticleID.executeQuery();
+
+ int maxIndex = 0;
+ if (rs.next())
+ {
+ maxIndex = rs.getInt(1);
+ }
+
+ return maxIndex;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getMaxArticleID();
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public int getLastArticleNumber(Group group)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetLastArticleNumber.setLong(1, group.getInternalID());
+ rs = this.pstmtGetLastArticleNumber.executeQuery();
+ if (rs.next())
+ {
+ return rs.getInt(1);
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getLastArticleNumber(group);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public int getFirstArticleNumber(Group group)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+ try
+ {
+ this.pstmtGetFirstArticleNumber.setLong(1, group.getInternalID());
+ rs = this.pstmtGetFirstArticleNumber.executeQuery();
+ if(rs.next())
+ {
+ return rs.getInt(1);
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getFirstArticleNumber(group);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns a group name identified by the given id.
+ * @param id
+ * @return
+ * @throws StorageBackendException
+ */
+ public String getGroup(int id)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetGroup1.setInt(1, id);
+ rs = this.pstmtGetGroup1.executeQuery();
+
+ if (rs.next())
+ {
+ return rs.getString(1);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getGroup(id);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public double getEventsPerHour(int key, long gid)
+ throws StorageBackendException
+ {
+ String gidquery = "";
+ if(gid >= 0)
+ {
+ gidquery = " AND group_id = " + gid;
+ }
+
+ Statement stmt = null;
+ ResultSet rs = null;
+
+ try
+ {
+ stmt = this.conn.createStatement();
+ rs = stmt.executeQuery("SELECT Count(*) / (Max(event_time) - Min(event_time))" +
+ " * 1000 * 60 * 60 FROM events WHERE event_key = " + key + gidquery);
+
+ if(rs.next())
+ {
+ restarts = 0; // reset error count
+ return rs.getDouble(1);
+ }
+ else
+ {
+ return Double.NaN;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getEventsPerHour(key, gid);
+ }
+ finally
+ {
+ try
+ {
+ if(stmt != null)
+ {
+ stmt.close(); // Implicitely closes the result sets
+ }
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ @Override
+ public String getOldestArticle()
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ rs = this.pstmtGetOldestArticle.executeQuery();
+ if(rs.next())
+ {
+ return rs.getString(1);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getOldestArticle();
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public int getPostingsCount(String groupname)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtGetPostingsCount.setString(1, groupname);
+ rs = this.pstmtGetPostingsCount.executeQuery();
+ if(rs.next())
+ {
+ return rs.getInt(1);
+ }
+ else
+ {
+ Log.get().warning("Count on postings return nothing!");
+ return 0;
+ }
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getPostingsCount(groupname);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public List getSubscriptions(int feedtype)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ List subs = new ArrayList();
+ this.pstmtGetSubscriptions.setInt(1, feedtype);
+ rs = this.pstmtGetSubscriptions.executeQuery();
+
+ while(rs.next())
+ {
+ String host = rs.getString("host");
+ String group = rs.getString("name");
+ int port = rs.getInt("port");
+ subs.add(new Subscription(host, port, feedtype, group));
+ }
+
+ return subs;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return getSubscriptions(feedtype);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks if there is an article with the given messageid in the JDBCDatabase.
+ * @param name
+ * @return
+ * @throws StorageBackendException
+ */
+ @Override
+ public boolean isArticleExisting(String messageID)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtIsArticleExisting.setString(1, messageID);
+ rs = this.pstmtIsArticleExisting.executeQuery();
+ return rs.next() && rs.getInt(1) == 1;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return isArticleExisting(messageID);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks if there is a group with the given name in the JDBCDatabase.
+ * @param name
+ * @return
+ * @throws StorageBackendException
+ */
+ @Override
+ public boolean isGroupExisting(String name)
+ throws StorageBackendException
+ {
+ ResultSet rs = null;
+
+ try
+ {
+ this.pstmtIsGroupExisting.setString(1, name);
+ rs = this.pstmtIsGroupExisting.executeQuery();
+ return rs.next();
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return isGroupExisting(name);
+ }
+ finally
+ {
+ if(rs != null)
+ {
+ try
+ {
+ rs.close();
+ }
+ catch(SQLException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ public void setConfigValue(String key, String value)
+ throws StorageBackendException
+ {
+ try
+ {
+ conn.setAutoCommit(false);
+ this.pstmtSetConfigValue0.setString(1, key);
+ this.pstmtSetConfigValue0.execute();
+ this.pstmtSetConfigValue1.setString(1, key);
+ this.pstmtSetConfigValue1.setString(2, value);
+ this.pstmtSetConfigValue1.execute();
+ conn.commit();
+ conn.setAutoCommit(true);
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ setConfigValue(key, value);
+ }
+ }
+
+ /**
+ * Closes the JDBCDatabase connection.
+ */
+ public void shutdown()
+ throws StorageBackendException
+ {
+ try
+ {
+ if(this.conn != null)
+ {
+ this.conn.close();
+ }
+ }
+ catch(SQLException ex)
+ {
+ throw new StorageBackendException(ex);
+ }
+ }
+
+ @Override
+ public void purgeGroup(Group group)
+ throws StorageBackendException
+ {
+ try
+ {
+ this.pstmtPurgeGroup0.setLong(1, group.getInternalID());
+ this.pstmtPurgeGroup0.executeUpdate();
+
+ this.pstmtPurgeGroup1.setLong(1, group.getInternalID());
+ this.pstmtPurgeGroup1.executeUpdate();
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ purgeGroup(group);
+ }
+ }
+
+ private void restartConnection(SQLException cause)
+ throws StorageBackendException
+ {
+ restarts++;
+ Log.get().severe(Thread.currentThread()
+ + ": Database connection was closed (restart " + restarts + ").");
+
+ if(restarts >= MAX_RESTARTS)
+ {
+ // Delete the current, probably broken JDBCDatabase instance.
+ // So no one can use the instance any more.
+ JDBCDatabaseProvider.instances.remove(Thread.currentThread());
+
+ // Throw the exception upwards
+ throw new StorageBackendException(cause);
+ }
+
+ try
+ {
+ Thread.sleep(1500L * restarts);
+ }
+ catch(InterruptedException ex)
+ {
+ Log.get().warning("Interrupted: " + ex.getMessage());
+ }
+
+ // Try to properly close the old database connection
+ try
+ {
+ if(this.conn != null)
+ {
+ this.conn.close();
+ }
+ }
+ catch(SQLException ex)
+ {
+ Log.get().warning(ex.getMessage());
+ }
+
+ try
+ {
+ // Try to reinitialize database connection
+ arise();
+ }
+ catch(SQLException ex)
+ {
+ Log.get().warning(ex.getMessage());
+ restartConnection(ex);
+ }
+ }
+
+ @Override
+ public boolean update(Article article)
+ throws StorageBackendException
+ {
+ // DELETE FROM headers WHERE article_id = ?
+
+ // INSERT INTO headers ...
+
+ // SELECT * FROM postings WHERE article_id = ? AND group_id = ?
+ return false;
+ }
+
+ /**
+ * Writes the flags and the name of the given group to the database.
+ * @param group
+ * @throws StorageBackendException
+ */
+ @Override
+ public boolean update(Group group)
+ throws StorageBackendException
+ {
+ try
+ {
+ this.pstmtUpdateGroup.setInt(1, group.getFlags());
+ this.pstmtUpdateGroup.setString(2, group.getName());
+ this.pstmtUpdateGroup.setLong(3, group.getInternalID());
+ int rs = this.pstmtUpdateGroup.executeUpdate();
+ return rs == 1;
+ }
+ catch(SQLException ex)
+ {
+ restartConnection(ex);
+ return update(group);
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/storage/impl/JDBCDatabaseProvider.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/storage/impl/JDBCDatabaseProvider.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,69 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see instances
+ = new ConcurrentHashMap();
+
+ @Override
+ public boolean isSupported(String uri)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Storage storage(Thread thread)
+ throws StorageBackendException
+ {
+ try
+ {
+ if(!instances.containsKey(Thread.currentThread()))
+ {
+ JDBCDatabase db = new JDBCDatabase();
+ db.arise();
+ instances.put(Thread.currentThread(), db);
+ return db;
+ }
+ else
+ {
+ return instances.get(Thread.currentThread());
+ }
+ }
+ catch(SQLException ex)
+ {
+ throw new StorageBackendException(ex);
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/storage/package.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/storage/package.html Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,2 @@
+Contains classes of the storage backend and the Group and Article
+abstraction.
\ No newline at end of file
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/util/DatabaseSetup.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/util/DatabaseSetup.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,127 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see templateMap
+ = new HashMap();
+ private static final Map urlMap
+ = new HashMap();
+ private static final Map driverMap
+ = new HashMap();
+
+ static
+ {
+ templateMap.put("1", "helpers/database_mysql5_tmpl.sql");
+ templateMap.put("2", "helpers/database_postgresql8_tmpl.sql");
+
+ urlMap.put("1", new StringTemplate("jdbc:mysql://%HOSTNAME/%DB"));
+ urlMap.put("2", new StringTemplate("jdbc:postgresql://%HOSTNAME/%DB"));
+
+ driverMap.put("1", "com.mysql.jdbc.Driver");
+ driverMap.put("2", "org.postgresql.Driver");
+ }
+
+ public static void main(String[] args)
+ throws Exception
+ {
+ System.out.println("sonews Database setup helper");
+ System.out.println("This program will create a initial database table structure");
+ System.out.println("for the sonews Newsserver.");
+ System.out.println("You need to create a database and a db user manually before!");
+
+ System.out.println("Select DBMS type:");
+ System.out.println("[1] MySQL 5.x or higher");
+ System.out.println("[2] PostgreSQL 8.x or higher");
+ System.out.print("Your choice: ");
+
+ BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ String dbmsType = in.readLine();
+ String tmplName = templateMap.get(dbmsType);
+ if(tmplName == null)
+ {
+ System.err.println("Invalid choice. Try again you fool!");
+ main(args);
+ return;
+ }
+
+ // Load JDBC Driver class
+ Class.forName(driverMap.get(dbmsType));
+
+ String tmpl = Resource.getAsString(tmplName, true);
+
+ System.out.print("Database server hostname (e.g. localhost): ");
+ String dbHostname = in.readLine();
+
+ System.out.print("Database name: ");
+ String dbName = in.readLine();
+
+ System.out.print("Give name of DB user that can create tables: ");
+ String dbUser = in.readLine();
+
+ System.out.print("Password: ");
+ String dbPassword = in.readLine();
+
+ String url = urlMap.get(dbmsType)
+ .set("HOSTNAME", dbHostname)
+ .set("DB", dbName).toString();
+
+ Connection conn =
+ DriverManager.getConnection(url, dbUser, dbPassword);
+ conn.setAutoCommit(false);
+
+ String[] tmplChunks = tmpl.split(";");
+
+ for(String chunk : tmplChunks)
+ {
+ if(chunk.trim().equals(""))
+ {
+ continue;
+ }
+
+ Statement stmt = conn.createStatement();
+ stmt.execute(chunk);
+ }
+
+ conn.commit();
+ conn.setAutoCommit(true);
+
+ // Create config file
+
+ System.out.println("Ok");
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/util/Log.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/util/Log.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,57 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+{
+
+ private T1 a;
+ private T2 b;
+
+ public Pair(T1 a, T2 b)
+ {
+ this.a = a;
+ this.b = b;
+ }
+
+ public T1 getA()
+ {
+ return a;
+ }
+
+ public T2 getB()
+ {
+ return b;
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/util/Purger.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/util/Purger.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,149 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see groups = StorageManager.current().getGroups();
+ for(Channel channel : groups)
+ {
+ if(!(channel instanceof Group))
+ continue;
+
+ Group group = (Group)channel;
+ // Look for groups that are marked as deleted
+ if(group.isDeleted())
+ {
+ List ids = StorageManager.current().getArticleNumbers(group.getInternalID());
+ if(ids.size() == 0)
+ {
+ StorageManager.current().purgeGroup(group);
+ Log.get().info("Group " + group.getName() + " purged.");
+ }
+
+ for(int n = 0; n < ids.size() && n < 10; n++)
+ {
+ Article art = StorageManager.current().getArticle(ids.get(n), group.getInternalID());
+ StorageManager.current().delete(art.getMessageID());
+ Log.get().info("Article " + art.getMessageID() + " purged.");
+ }
+ }
+ }
+ }
+
+ private void purgeOutdated()
+ throws InterruptedException, StorageBackendException
+ {
+ long articleMaximum =
+ Config.inst().get("sonews.article.maxnum", Long.MAX_VALUE);
+ long lifetime =
+ Config.inst().get("sonews.article.lifetime", -1);
+
+ if(lifetime > 0 || articleMaximum < Stats.getInstance().getNumberOfNews())
+ {
+ Log.get().info("Purging old messages...");
+ String mid = StorageManager.current().getOldestArticle();
+ if (mid == null) // No articles in the database
+ {
+ return;
+ }
+
+ Article art = StorageManager.current().getArticle(mid);
+ long artDate = 0;
+ String dateStr = art.getHeader(Headers.DATE)[0];
+ try
+ {
+ artDate = Date.parse(dateStr) / 1000 / 60 / 60 / 24;
+ }
+ catch (IllegalArgumentException ex)
+ {
+ Log.get().warning("Could not parse date string: " + dateStr + " " + ex);
+ }
+
+ // Should we delete the message because of its age or because the
+ // article maximum was reached?
+ if (lifetime < 0 || artDate < (new Date().getTime() + lifetime))
+ {
+ StorageManager.current().delete(mid);
+ System.out.println("Deleted: " + mid);
+ }
+ else
+ {
+ Thread.sleep(1000 * 60); // Wait 60 seconds
+ return;
+ }
+ }
+ else
+ {
+ Log.get().info("Lifetime purger is disabled");
+ Thread.sleep(1000 * 60 * 30); // Wait 30 minutes
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/util/Stats.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/util/Stats.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,206 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see templateValues = new HashMap();
+
+ public StringTemplate(String str, final String templateDelimiter)
+ {
+ if(str == null || templateDelimiter == null)
+ {
+ throw new IllegalArgumentException("null arguments not allowed");
+ }
+
+ this.str = str;
+ this.templateDelimiter = templateDelimiter;
+ }
+
+ public StringTemplate(String str)
+ {
+ this(str, "%");
+ }
+
+ public StringTemplate set(String template, String value)
+ {
+ if(template == null || value == null)
+ {
+ throw new IllegalArgumentException("null arguments not allowed");
+ }
+
+ this.templateValues.put(template, value);
+ return this;
+ }
+
+ public StringTemplate set(String template, long value)
+ {
+ return set(template, Long.toString(value));
+ }
+
+ public StringTemplate set(String template, double value)
+ {
+ return set(template, Double.toString(value));
+ }
+
+ public StringTemplate set(String template, Object obj)
+ {
+ if(template == null || obj == null)
+ {
+ throw new IllegalArgumentException("null arguments not allowed");
+ }
+
+ return set(template, obj.toString());
+ }
+
+ @Override
+ public String toString()
+ {
+ String ret = str;
+
+ for(String key : this.templateValues.keySet())
+ {
+ String value = this.templateValues.get(key);
+ ret = ret.replace(templateDelimiter + key, value);
+ }
+
+ return ret;
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/util/TimeoutMap.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/util/TimeoutMap.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,145 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see extends ConcurrentHashMap
+{
+
+ private static final long serialVersionUID = 453453467700345L;
+
+ private int timeout = 60000; // 60 sec
+ private transient Map timeoutMap = new HashMap();
+
+ /**
+ * Constructor.
+ * @param timeout Timeout in milliseconds
+ */
+ public TimeoutMap(final int timeout)
+ {
+ this.timeout = timeout;
+ }
+
+ /**
+ * Uses default timeout (60 sec).
+ */
+ public TimeoutMap()
+ {
+ }
+
+ /**
+ *
+ * @param key
+ * @return true if key is still valid.
+ */
+ protected boolean checkTimeOut(Object key)
+ {
+ synchronized(this.timeoutMap)
+ {
+ if(this.timeoutMap.containsKey(key))
+ {
+ long keytime = this.timeoutMap.get(key);
+ if((System.currentTimeMillis() - keytime) < this.timeout)
+ {
+ return true;
+ }
+ else
+ {
+ remove(key);
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+
+ @Override
+ public boolean containsKey(Object key)
+ {
+ return checkTimeOut(key);
+ }
+
+ @Override
+ public synchronized V get(Object key)
+ {
+ if(checkTimeOut(key))
+ {
+ return super.get(key);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ @Override
+ public V put(K key, V value)
+ {
+ synchronized(this.timeoutMap)
+ {
+ removeStaleKeys();
+ this.timeoutMap.put(key, System.currentTimeMillis());
+ return super.put(key, value);
+ }
+ }
+
+ /**
+ * @param arg0
+ * @return
+ */
+ @Override
+ public V remove(Object arg0)
+ {
+ synchronized(this.timeoutMap)
+ {
+ this.timeoutMap.remove(arg0);
+ V val = super.remove(arg0);
+ return val;
+ }
+ }
+
+ protected void removeStaleKeys()
+ {
+ synchronized(this.timeoutMap)
+ {
+ Set keySet = new HashSet(this.timeoutMap.keySet());
+ for(Object key : keySet)
+ {
+ // The key/value is removed by the checkTimeOut() method if true
+ checkTimeOut(key);
+ }
+ }
+ }
+
+}
diff -r 9f0b95aafaa3 -r ed84c8bdd87b src/org/sonews/util/io/ArticleInputStream.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/sonews/util/io/ArticleInputStream.java Sun Aug 29 17:28:58 2010 +0200
@@ -0,0 +1,71 @@
+/*
+ * SONEWS News Server
+ * see AUTHORS for the list of contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see