[or-cvs] Check for time skew on http headers; report date in respons...

[nickm@seul.org (Nick Mathewson)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv22003/src/or

Modified Files:
	directory.c 
Log Message:
Check for time skew on http headers; report date in response to "GET /".

Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- directory.c	7 Aug 2004 02:46:15 -0000	1.123
+++ directory.c	15 Aug 2004 20:30:15 -0000	1.124
@@ -45,6 +45,8 @@
 #define MAX_HEADERS_SIZE 50000
 #define MAX_BODY_SIZE 500000
 
+#define ALLOW_DIRECTORY_TIME_SKEW 30*60
+
 /********* END VARIABLES ************/
 
 /** Start a connection to every known directory server, using
@@ -281,12 +283,16 @@
  * If it's well-formed, assign *<b>code</b>, point *<b>message</b> to the first
  * non-space character after code if there is one and message is non-NULL
  * (else leave it alone), and return 0.
+ * If <b>date</b> is provided, set *date to the Date header in the
+ * http headers, or 0 if no such header is found.
  * Otherwise, return -1.
  */
 static int
-parse_http_response(char *headers, int *code, char **message)
+parse_http_response(char *headers, int *code, char **message, time_t *date)
 {
   int n1, n2;
+  const char *cp;
+  char datestr[RFC1123_TIME_LEN+1];
   tor_assert(headers && code);
 
   while(isspace((int)*headers)) headers++; /* tolerate leading whitespace */
@@ -301,6 +307,23 @@
   if(message) {
     /* XXX should set *message correctly */
   }
+  if (date) {
+    cp = headers;
+    *date = 0;
+    while (cp && (cp = strchr(cp, '\n'))) {
+      ++cp;
+      strlcpy(datestr, cp, 7);
+      if (strncmp(cp, "Date: ", 6) == 0) {
+        strlcpy(datestr, cp+6, sizeof(datestr));
+        /* This will do nothing on failure, so we don't need to check
+           the result.   We shouldn't warn, since there are many other valid
+           date formats besides the one we use. */
+        parse_rfc1123_time(datestr, date);
+        break;
+      }
+    }
+  }
+
   return 0;
 }
 
@@ -317,6 +340,8 @@
   char *headers;
   int body_len=0;
   int status_code;
+  time_t now, date_header=0;
+  int delta;
 
   switch(fetch_from_buf_http(conn->inbuf,
                              &headers, MAX_HEADERS_SIZE,
@@ -330,11 +355,22 @@
     /* case 1, fall through */
   }
 
-  if(parse_http_response(headers, &status_code, NULL) < 0) {
+  if(parse_http_response(headers, &status_code, NULL, &date_header) < 0) {
     log_fn(LOG_WARN,"Unparseable headers. Closing.");
     free(body); free(headers);
     return -1;
   }
+  if (date_header > 0) {
+    now = time(NULL);
+    delta = now-date_header;
+    if (abs(delta)>ALLOW_DIRECTORY_TIME_SKEW) {
+      log_fn(LOG_WARN, "Received directory with skewed time: we are %d minutes %s, or the directory is %d minutes %s.",
+             abs(delta)/60, delta>0 ? "ahead" : "behind",
+             abs(delta)/60, delta>0 ? "behind" : "ahead");
+    } else {
+      log_fn(LOG_INFO, "Time on received directory is within tolerance; we are %d seconds skewed.  (That's okay.)", delta);
+    }
+  }
 
   if(conn->purpose == DIR_PURPOSE_FETCH_DIR) {
     /* fetch/process the directory to learn about new routers. */
@@ -519,7 +555,9 @@
     }
 
     log_fn(LOG_DEBUG,"Dumping directory to client.");
-    snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: text/plain\r\n\r\n",
+    format_rfc1123_time(date, time(NULL));
+    snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nDate: %s\r\nContent-Length: %d\r\nContent-Type: text/plain\r\n\r\n",
+             date,
              (int)dlen);
     connection_write_to_buf(tmp, strlen(tmp), conn);
     connection_write_to_buf(cp, strlen(cp), conn);