Changeset ebcdf4d for zephyr.c

Timestamp:

Dec 2, 2013, 3:56:28 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10

Children:

8a213ca, ba9a1be, 4a212dd

Parents:

21dc927

git-author:

Anders Kaseorg <andersk@mit.edu> (11/10/13 22:50:58)

git-committer:

Anders Kaseorg <andersk@mit.edu> (12/02/13 03:56:28)

Message:

owl_zephyr_smartstripped_user: Simplify, fixing overlapping strcat

Previously, the strcat(out, realm+1) call might read from the same
place it’s writing to, which is invalid and could break if strcat is
optimized in certain ways.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• zephyr.c (modified) (1 diff)

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);
 }