11 files changed, 487 insertions, 89 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0db1eb6..996c541 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@
 sbin_PROGRAMS=tagr
 
 tagr_SOURCES=\
+ apop.c\
  graph.c\
  grid.c\
  html.gram.y\
@@ -30,7 +31,9 @@ tagr_SOURCES=\
  report.h\
  server.c\
  stat.c\
- tagr.h
+ tagr.h\
+ udb.c\
+ xhostname.c
 
 noinst_HEADERS=html.gram.h
 
diff --git a/src/apop.c b/src/apop.c
new file mode 100644
index 0000000..ce423a5
--- /dev/null
+++ b/src/apop.c
@@ -0,0 +1,84 @@
+/* This file is part of tagr.
+   Copyright (C) 2009 Sergey Poznyakoff
+
+   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, 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 <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <tagr.h>
+
+#include <md5.h>
+
+static char *msg_id;
+
+const char *
+tagr_auth_init ()
+{
+  asprintf (&msg_id, "<%lu.%lu@%s>",
+            (unsigned long) getpid (),
+            (unsigned long) time (NULL),
+            hostname);
+  return msg_id;
+}
+
+static int
+verify_apop (const char *password, const char *user_digest)
+{
+  int i;
+  struct md5_ctx md5context;
+  unsigned char md5digest[16];
+  char buf[sizeof (md5digest) * 2 + 1];
+  char *p;
+
+  md5_init_ctx (&md5context);
+  md5_process_bytes (msg_id, strlen (msg_id), &md5context);
+  md5_process_bytes (password, strlen (password), &md5context);
+  md5_finish_ctx (&md5context, md5digest);
+
+  for (i = 0, p = buf; i < 16; i++, p += 2)
+    sprintf (p, "%02x", md5digest[i]);
+  return strcmp (user_digest, buf);
+}
+
+int
+tagr_auth (const char *username, const char *authstr)
+{
+  int rc = 1;
+  char *password;
+
+  rc = udb_get_password (username, &password);
+  if (rc == 1)
+    {
+      logmsg (L_ERR, _("no such user `%s'"), username);
+    }
+  else if (rc == 0)
+    {
+      rc = verify_apop (password, authstr);
+      if (rc) 
+        logmsg (L_ERR, _("authentication failed for `%s'"),
+                username);
+      else
+        verbose (1, _("%s authenticated"), username);
+      udb_free_password (password);
+    }
+  return rc;
+}
+
diff --git a/src/graph.c b/src/graph.c
index 1197a7d..02e0586 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -73,7 +73,7 @@ draw_vtext (gdImagePtr graph, int color, const char *text)
 int
 draw_graph (FILE *fp,
             struct monitor *mon,
-            queue_t *dataq, const struct avg_acc *avg, time_t now,
+            queue_t *dataq, const struct avg_acc *avg, time_t start,
             int xstep, unsigned long xmax, 
             int growright,
             struct grid_class *xgrid, struct grid_class *ygrid)
@@ -90,7 +90,6 @@ draw_graph (FILE *fp,
   int full_ysize = graph_ysize + graph_v_margin[0] + graph_v_margin[1];
   grid_t grid;
   unsigned long ymax = mon->max_rate;
-  time_t start;
   
   yscale = (double) graph_ysize / ymax;
   xscale = (double) graph_xsize / xmax;
@@ -143,13 +142,13 @@ draw_graph (FILE *fp,
   n = queue_count (dataq);
 
   /* Incoming traffic */
-  for (i = n - 1, start = 0; i > 0; i--)
+  for (i = n - 1; i > 0; i--)
     {
       struct traffic_history th, tnext;
       
       scale_sample (mon, queue_get_ptr (dataq, i), &th);
-      if (start == 0)
-        start = th.time;
+      if (th.time > start)
+        continue;
       scale_sample (mon, queue_get_ptr (dataq, i - 1), &tnext);
       if (start - tnext.time > xmax)
         break;
@@ -172,13 +171,13 @@ draw_graph (FILE *fp,
 
   /* Outgoing traffic */
   gdImageSetBrush (graph, brush_out);
-  for (i = n - 1, start = 0; i > 0; i--)
+  for (i = n - 1; i > 0; i--)
     {
       struct traffic_history th, tnext;
       
       scale_sample (mon, queue_get_ptr (dataq, i), &th);
-      if (start == 0)
-        start = th.time;
+      if (th.time > start)
+        continue;
       scale_sample (mon, queue_get_ptr (dataq, i - 1), &tnext);
       if (start - tnext.time > xmax)
         break;
@@ -245,7 +244,7 @@ draw_graph (FILE *fp,
       grid_destroy (grid);
     }
   
-  grid = grid_create (xgrid, dataq, 0, xmax, &now);
+  grid = grid_create (xgrid, dataq, 0, xmax, &start);
   if (grid)
     {
       unsigned long i;
diff --git a/src/main.c b/src/main.c
index 181e9d2..5fcb825 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,12 +57,12 @@ char *configfile = TAGR_CONFIGFILE;
 char *html_template = TAGR_TEMPLATE;
 char *user;
 char *basedir;
-int port;
-int sockfd;
+char *hostname;
 int foreground = 0;
 int single_process_option = 0;
 int verbose_level;
 static int rebuild_option;
+static int rebuild_last_option;
 
 static int import_option;
 static int read_option;
@@ -88,6 +88,7 @@ enum {
   OPT_DUMP_LEX_TRACE,
   OPT_CONFIG_HELP,
   OPT_READ,
+  OPT_REBUILD_LAST
 };
 
 static struct argp_option options[] = {
@@ -108,6 +109,8 @@ static struct argp_option options[] = {
    N_("read statistics from given FILEs or standard input") },
   {"rebuild", 'b', NULL, 0,
    N_("rebuild graphs using existing statistics"), GRID+1},
+  {"rebuild-last", OPT_REBUILD_LAST, NULL, 0,
+   N_("same as --rebuild, but refer to the last stored sample"), GRID+1},
   {"list",    'l', NULL, 0, N_("list contents of the rate database"), GRID+1},
   {"show-defaults", OPT_SHOW_DEFAULTS, NULL, 0,
    N_("Show configuration default values"), GRID+1},
@@ -276,6 +279,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case OPT_READ:
       read_option = 1;
       break;
+
+    case OPT_REBUILD_LAST:
+      rebuild_option = 1;
+      rebuild_last_option = 1;
+      break;
       
     case OPT_NO_PREPROCESSOR: