Changeset 4a212dd

Timestamp:

Dec 2, 2013, 3:57:31 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

ebc6f77 (diff), ebcdf4d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge ebcdf4d1d62cb8a947fa244068de37c0f8ad7dde into ebc6f77fe018701fba1cb7d0a39bd9f487516835

Files:

• tester.c (modified) (3 diffs)
• zephyr.c (modified) (1 diff)

tester.c

@@ -25 +25 @@
 int owl_history_regtest(void);
 int call_filter_regtest(void);
+int owl_smartstrip_regtest(void);
 
 extern void owl_perl_xs_init(pTHX);
@@ -116 +117 @@
   numfailures += owl_history_regtest();
   numfailures += call_filter_regtest();
+  numfailures += owl_smartstrip_regtest();
   if (numfailures) {
       fprintf(stderr, "# *** WARNING: %d failures total\n", numfailures);
@@ -1018 +1020 @@
   return numfailed;
 }
+
+int owl_smartstrip_regtest(void)
+{
+  int numfailed = 0;
+
+  printf("# BEGIN testing owl_zephyr_smartstripped_user\n");
+
+#define CHECK_SMARTSTRIP(in, expected)                  \
+  do {                                                  \
+    char *__value = owl_zephyr_smartstripped_user(in);  \
+    FAIL_UNLESS("owl_zephyr_smartstripped_user " in,    \
+                strcmp((expected), __value) == 0);      \
+    g_free(__value);                                    \
+  } while (0)
+
+  CHECK_SMARTSTRIP("foo", "foo");
+  CHECK_SMARTSTRIP("foo.bar", "foo");
+  CHECK_SMARTSTRIP("foo/bar", "foo");
+  CHECK_SMARTSTRIP("host/bar", "host/bar");
+  CHECK_SMARTSTRIP("rcmd.bar", "rcmd.bar");
+  CHECK_SMARTSTRIP("daemon/bar", "daemon/bar");
+  CHECK_SMARTSTRIP("daemon.bar", "daemon.bar");
+
+  CHECK_SMARTSTRIP("foo@ATHENA.MIT.EDU", "foo@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("foo.bar@ATHENA.MIT.EDU", "foo@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("foo/bar@ATHENA.MIT.EDU", "foo@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("host/bar@ATHENA.MIT.EDU", "host/bar@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("rcmd.bar@ATHENA.MIT.EDU", "rcmd.bar@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("daemon/bar@ATHENA.MIT.EDU", "daemon/bar@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("daemon.bar@ATHENA.MIT.EDU", "daemon.bar@ATHENA.MIT.EDU");
+
+  printf("# END testing owl_zephyr_smartstripped_user\n");
+
+  return numfailed;
+}

zephyr.c

@@ -1319 +1319 @@
 CALLER_OWN char *owl_zephyr_smartstripped_user(const char *in)
 {
-  char *slash, *dot, *realm, *out;
-
-  out = g_strdup(in);
-
-  /* bail immeaditly if we don't have to do any work */
-  slash = strchr(out, '/');
-  dot = strchr(out, '.');
-  if (!slash && !dot) {
-    return(out);
-  }
-
-  if (!strncasecmp(out, OWL_ZEPHYR_NOSTRIP_HOST, strlen(OWL_ZEPHYR_NOSTRIP_HOST)) ||
-      !strncasecmp(out, OWL_ZEPHYR_NOSTRIP_RCMD, strlen(OWL_ZEPHYR_NOSTRIP_RCMD)) ||
-      !strncasecmp(out, OWL_ZEPHYR_NOSTRIP_DAEMON5, strlen(OWL_ZEPHYR_NOSTRIP_DAEMON5)) ||
-      !strncasecmp(out, OWL_ZEPHYR_NOSTRIP_DAEMON4, strlen(OWL_ZEPHYR_NOSTRIP_DAEMON4))) {
-    return(out);
-  }
-
-  realm = strchr(out, '@');
-  if (!slash && dot && realm && (dot > realm)) {
-    /* There's no '/', and the first '.' is in the realm */
-    return(out);
-  }
-
-  /* remove the realm from out, but hold on to it */
-  if (realm) realm[0]='\0';
-
-  /* strip */
-  if (slash) slash[0] = '\0';  /* krb5 style user/instance */
-  else if (dot) dot[0] = '\0'; /* krb4 style user.instance */
-
-  /* reattach the realm if we had one */
-  if (realm) {
-    strcat(out, "@");
-    strcat(out, realm+1);
-  }
-
-  return(out);
+  int n = strcspn(in, "./");
+  char *realm = strchrnul(in, '@');
+
+  if (in + n >= realm ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_HOST) ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_RCMD) ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_DAEMON5) ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_DAEMON4))
+    return g_strdup(in);
+  else
+    return g_strdup_printf("%.*s%s", n, in, realm);
 }