Changeset eea7bed4 for logging.c

Timestamp:

Aug 16, 2017, 12:53:41 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

ff528e6

Parents:

da7341e

git-author:

Jason Gross <jgross@mit.edu> (07/12/11 14:42:39)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/16/17 12:53:41)

Message:

Moved log file name generation to perl

I don't think that the class/personal distinction is the best for
general protocols, but I don't know what should replace it.  I've made
class-logging default to only zephyr (a slight change from previous
behavior, where jabber MUC's would be logged to $classlogpath, as well
as all non-private non-login messages from other protocols), but made
logging path generation overridable.

TODO: Decide whether or not to filter out more 'bad' characters.
Perhaps we should remove '!' because it indicates history in some shells
and makes things obnoxious, or '~' becase it indicates homedirs in many
shells.
* '/' is for separating directories, and we don't want to accidentally
  make subdirectories

We first NFKC for zephyrs, and then apply lc.  The zephyr servers
apply case-folded NFKC (so says
http://zephyr.1ts.org/browser/zephyr/server/zstring.c).  We should
probably use Unicode::CaseFold instead of lc.  I'm also not sure what
the order case-adjustment and normalization should be.

We first NFKC, then apply lc, to jabbers, as per
http://xmpp.org/internet-drafts/attic/draft-ietf-xmpp-nodeprep-03.html
(though I can't actually find anything that specifies the case-folding
algorithm, nor the ordering).

We now use lc instead of g_utf8_strdown to normalize AIM screennames.

File:

• logging.c (modified) (3 diffs)

logging.c

@@ -36 +36 @@
   }
 
-  /* handle incmoing messages */
-  if (owl_message_is_direction_in(m)) {
-    owl_log_incoming(m);
-    owl_function_debugmsg("owl_log_message: leaving");
-    return;
-  }
-
-  /* handle outgoing messages */
-  owl_log_outgoing(m);
+  owl_log_perl(m);
 
   owl_function_debugmsg("owl_log_message: leaving");
@@ -316 +308 @@
 }
 
-void owl_log_outgoing(const owl_message *m)
-{
-  char *filename, *logpath;
-  char *to, *temp;
-  GList *cc;
-
-  /* expand ~ in path names */
-  logpath = owl_util_makepath(owl_global_get_logpath(&g));
-
-  /* Figure out what path to log to */
-  if (owl_message_is_type_zephyr(m)) {
-    /* If this has CC's, do all but the "recipient" which we'll do below */
-    cc = owl_message_get_cc_without_recipient(m);
-    while (cc != NULL) {
-      temp = short_zuser(cc->data);
-      filename = g_build_filename(logpath, temp, NULL);
-      owl_log_append(m, filename);
-
-      g_free(filename);
-      g_free(temp);
-      g_free(cc->data);
-      cc = g_list_delete_link(cc, cc);
-    }
-
-    to = short_zuser(owl_message_get_recipient(m));
-  } else if (owl_message_is_type_jabber(m)) {
-    to = g_strdup_printf("jabber:%s", owl_message_get_recipient(m));
-    g_strdelimit(to, "/", '_');
-  } else if (owl_message_is_type_aim(m)) {
-    char *temp2;
-    temp = owl_aim_normalize_screenname(owl_message_get_recipient(m));
-    temp2 = g_utf8_strdown(temp,-1);
-    to = g_strdup_printf("aim:%s", temp2);
-    g_free(temp2);
-    g_free(temp);
-  } else {
-    to = g_strdup("loopback");
-  }
-
-  filename = g_build_filename(logpath, to, NULL);
-  owl_log_append(m, filename);
-  g_free(to);
-  g_free(filename);
-
-  filename = g_build_filename(logpath, "all", NULL);
-  owl_log_append(m, filename);
-  g_free(logpath);
-  g_free(filename);
-}
-
-
 void owl_log_outgoing_zephyr_error(const owl_zwrite *zw, const char *text)
 {
@@ -414 +355 @@
 }
 
-void owl_log_incoming(const owl_message *m)
-{
-  char *filename, *allfilename, *logpath;
-  const char *from=NULL;
-  char *frombuff=NULL;
-  int len, ch, i, personal;
-
-  /* figure out if it's a "personal" message or not */
-  if (owl_message_is_type_zephyr(m)) {
-    if (owl_message_is_personal(m)) {
-      personal = 1;
-    } else {
-      personal = 0;
-    }
-  } else if (owl_message_is_type_jabber(m)) {
-    /* This needs to be fixed to handle groupchat */
-    const char* msgtype = owl_message_get_attribute_value(m,"jtype");
-    if (msgtype && !strcmp(msgtype,"groupchat")) {
-      personal = 0;
-    } else {
-      personal = 1;
-    }
-  } else {
-    if (owl_message_is_private(m) || owl_message_is_loginout(m)) {
-      personal = 1;
-    } else {
-      personal = 0;
-    }
-  }
-
-
-  if (owl_message_is_type_zephyr(m)) {
-    if (personal) {
-      from=frombuff=short_zuser(owl_message_get_sender(m));
-    } else {
-      from=frombuff=g_strdup(owl_message_get_class(m));
-    }
-  } else if (owl_message_is_type_aim(m)) {
-    /* we do not yet handle chat rooms */
-    char *normalto, *temp;
-    temp = owl_aim_normalize_screenname(owl_message_get_sender(m));
-    normalto = g_utf8_strdown(temp, -1);
-    from=frombuff=g_strdup_printf("aim:%s", normalto);
-    g_free(normalto);
-    g_free(temp);
-  } else if (owl_message_is_type_loopback(m)) {
-    from=frombuff=g_strdup("loopback");
-  } else if (owl_message_is_type_jabber(m)) {
-    if (personal) {
-      from=frombuff=g_strdup_printf("jabber:%s", 
-                                    owl_message_get_sender(m));
-    } else {
-      from=frombuff=g_strdup_printf("jabber:%s", 
-                                    owl_message_get_recipient(m));
-    }
-  } else {
-    from=frombuff=g_strdup("unknown");
-  }
-  
-  /* check for malicious sender formats */
-  len=strlen(frombuff);
-  if (len<1 || len>35) from="weird";
-  if (strchr(frombuff, '/')) from="weird";
-
-  ch=frombuff[0];
-  if (!g_ascii_isalnum(ch)) from="weird";
-
-  for (i=0; i<len; i++) {
-    if (frombuff[i]<'!' || frombuff[i]>='~') from="weird";
-  }
-
-  if (!strcmp(frombuff, ".") || !strcasecmp(frombuff, "..")) from="weird";
-
-  if (!personal) {
-    if (strcmp(from, "weird")) {
-      char* temp = g_utf8_strdown(frombuff, -1);
-      if (temp) {
-        g_free(frombuff);
-        from = frombuff = temp;
-      }
-    }
-  }
-
-  /* create the filename (expanding ~ in path names) */
-  if (personal) {
-    logpath = owl_util_makepath(owl_global_get_logpath(&g));
-    filename = g_build_filename(logpath, from, NULL);
-    allfilename = g_build_filename(logpath, "all", NULL);
-    owl_log_append(m, allfilename);
-    g_free(allfilename);
-  } else {
-    logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
-    filename = g_build_filename(logpath, from, NULL);
-  }
-
-  owl_log_append(m, filename);
-  g_free(filename);
-
-  if (personal && owl_message_is_type_zephyr(m)) {
-    /* We want to log to all of the CC'd people who were not us, or
-     * the sender, as well.
-     */
-    char *temp;
-    GList *cc;
-    cc = owl_message_get_cc_without_recipient(m);
-    while (cc != NULL) {
-      temp = short_zuser(cc->data);
-      if (strcasecmp(temp, frombuff) != 0) {
-        filename = g_build_filename(logpath, temp, NULL);
-        owl_log_append(m, filename);
-        g_free(filename);
-      }
-
-      g_free(temp);
-      g_free(cc->data);
-      cc = g_list_delete_link(cc, cc);
-    }
-  }
-
-  g_free(frombuff);
-  g_free(logpath);
+void owl_log_perl(const owl_message *m)
+{
+  char *filenames_string = owl_perlconfig_call_with_message("BarnOwl::Logging::get_filenames_as_string", m);
+  char **filenames = g_strsplit(filenames_string, "\n", 0);
+  char **filename_ptr;
+  g_free(filenames_string);
+
+  for (filename_ptr = filenames; *filename_ptr != NULL; filename_ptr++) {
+    owl_log_append(m, *filename_ptr);
+  }
+
+  g_strfreev(filenames);
 }