From 91e3a7968dd7168343ac182f3f8a3d42f68ccf44 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 17 Jul 2012 17:49:47 +0200
Subject: [PATCH] Linux file watcher: IDEA-87821; don't follow symlinks;
 cleanup

---
 bin/linux/fsnotifier                 | Bin 22510 -> 22484 bytes
 bin/linux/fsnotifier64               | Bin 24728 -> 24694 bytes
 native/fsNotifier/linux/fsnotifier.h |   2 +-
 native/fsNotifier/linux/inotify.c    | 105 +++++++++++++--------------
 native/fsNotifier/linux/main.c       |  44 ++++++++---
 5 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/bin/linux/fsnotifier b/bin/linux/fsnotifier
index 715b78f2d45fadecb37bb98741bfb23b28b2498e..6075b42a38a8cef81fd4ecf307a0b55701e3bc52 100755
GIT binary patch
delta 7760
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
GasLnI*pc7>

delta 7607
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
QADQjG=l+V-6GtWg7g~){DF6Tf

diff --git a/bin/linux/fsnotifier64 b/bin/linux/fsnotifier64
index 13dfd34a954923b1cb87f54ab51042a68de4f113..ed0854873662120916e4c24a738f9cdd9f1b3f01 100755
GIT binary patch
delta 7857
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

delta 7728
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
NyLd@`*PkjP{tt5!M!Nt2

diff --git a/native/fsNotifier/linux/fsnotifier.h b/native/fsNotifier/linux/fsnotifier.h
index f3234e2fde9d..b8dd17b38831 100644
--- a/native/fsNotifier/linux/fsnotifier.h
+++ b/native/fsNotifier/linux/fsnotifier.h
@@ -61,7 +61,7 @@ void set_inotify_callback(void (* callback)(char*, int));
 int get_inotify_fd();
 int get_watch_count();
 bool watch_limit_reached();
-int watch(const char* root, array* ignores);
+int watch(const char* root);
 void unwatch(int id);
 bool process_inotify_input();
 void close_inotify();
diff --git a/native/fsNotifier/linux/inotify.c b/native/fsNotifier/linux/inotify.c
index 04d749e48d83..d71737fee507 100644
--- a/native/fsNotifier/linux/inotify.c
+++ b/native/fsNotifier/linux/inotify.c
@@ -117,8 +117,10 @@ inline bool watch_limit_reached() {
 }
 
 
+#define EVENT_MASK IN_MODIFY | IN_ATTRIB | IN_CREATE | IN_DELETE | IN_MOVE | IN_DELETE_SELF
+
 static int add_watch(const char* path, watch_node* parent) {
-  int wd = inotify_add_watch(inotify_fd, path, IN_MODIFY | IN_ATTRIB | IN_CREATE | IN_DELETE | IN_MOVE | IN_DELETE_SELF);
+  int wd = inotify_add_watch(inotify_fd, path, EVENT_MASK);
   if (wd < 0) {
     if (errno == ENOSPC) {
       limit_reached = true;
@@ -132,7 +134,11 @@ static int add_watch(const char* path, watch_node* parent) {
 
   watch_node* node = table_get(watches, wd);
   if (node != NULL) {
-    if (node->wd != wd || strcmp(node->name, path) != 0) {
+    if (node->wd != wd) {
+      userlog(LOG_ERR, "table error: corruption at %d:%s / %d:%s)", wd, path, node->wd, node->name);
+      return ERR_ABORT;
+    }
+    else if (strcmp(node->name, path) != 0) {
       char buf1[PATH_MAX], buf2[PATH_MAX];
       const char* normalized1 = realpath(node->name, buf1);
       const char* normalized2 = realpath(path, buf2);
@@ -141,7 +147,7 @@ static int add_watch(const char* path, watch_node* parent) {
         return ERR_ABORT;
       }
       else {
-        userlog(LOG_WARNING, "intersection at %d: (new %s, existing %s, real %s)", wd, path, node->name, normalized1);
+        userlog(LOG_INFO, "intersection at %d: (new %s, existing %s, real %s)", wd, path, node->name, normalized1);
         return ERR_IGNORE;
       }
     }
@@ -210,54 +216,24 @@ static void rm_watch(int wd, bool update_parent) {
 }
 
 
-static bool is_directory(struct dirent* entry, const char* path) {
-  if (entry->d_type == DT_DIR) {
-    return true;
-  }
-  else if (entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK) {
-    struct stat st;
-    return (stat(path, &st) == 0 && S_ISDIR(st.st_mode));
-  }
-  return false;
-}
-
-static bool is_ignored(const char* path, array* ignores) {
-  if (ignores != NULL) {
-    int pl = strlen(path);
-    for (int i=0; i<array_size(ignores); i++) {
-      const char* ignore = array_get(ignores, i);
-      int il = strlen(ignore);
-      if (pl >= il && strncmp(path, ignore, il) == 0) {
-        userlog(LOG_DEBUG, "path %s is under unwatchable %s - ignoring", path, ignore);
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-static int walk_tree(const char* path, watch_node* parent, array* ignores, bool recursive) {
-  if (is_ignored(path, ignores)) {
-    return ERR_IGNORE;
-  }
-
+static int walk_tree(const char* path, watch_node* parent, bool recursive) {
   DIR* dir;
   if (recursive) {
-    dir = opendir(path);
-    if (dir == NULL) {
-      if (errno == EACCES) {
+    if ((dir = opendir(path)) == NULL) {
+      if (errno == EACCES || errno == ENOENT) {
+        userlog(LOG_DEBUG, "opendir(%s): %d", path, errno);
         return ERR_IGNORE;
       }
-      else if (errno == ENOTDIR) {  // "future" root
-        return add_watch(path, parent);
+      else {
+        userlog(LOG_ERR, "opendir(%s): %s", path, strerror(errno));
+        return ERR_CONTINUE;
       }
-      userlog(LOG_ERR, "opendir(%s): %s", path, strerror(errno));
-      return ERR_CONTINUE;
     }
   }
 
   int id = add_watch(path, parent);
-  if (!recursive) {
+
+  if (dir == NULL) {
     return id;
   }
   else if (id < 0) {
@@ -265,7 +241,6 @@ static int walk_tree(const char* path, watch_node* parent, array* ignores, bool
     return id;
   }
 
-  struct dirent* entry;
   char subdir[PATH_MAX];
   strcpy(subdir, path);
   if (subdir[strlen(subdir) - 1] != '/') {
@@ -273,17 +248,16 @@ static int walk_tree(const char* path, watch_node* parent, array* ignores, bool
   }
   char* p = subdir + strlen(subdir);
 
+  struct dirent* entry;
   while ((entry = readdir(dir)) != NULL) {
-    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
+    if (entry->d_type != DT_DIR ||
+        strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
       continue;
     }
 
     strcpy(p, entry->d_name);
-    if (!is_directory(entry, subdir)) {
-      continue;
-    }
 
-    int subdir_id = walk_tree(subdir, table_get(watches, id), ignores, recursive);
+    int subdir_id = walk_tree(subdir, table_get(watches, id), recursive);
     if (subdir_id < 0 && subdir_id != ERR_IGNORE) {
       rm_watch(id, true);
       id = subdir_id;
@@ -296,16 +270,34 @@ static int walk_tree(const char* path, watch_node* parent, array* ignores, bool
 }
 
 
-int watch(const char* root, array* ignores) {
+int watch(const char* root) {
   bool recursive = true;
   if (root[0] == '|') {
     root++;
     recursive = false;
   }
 
-  char buf[PATH_MAX];
-  const char* normalized = realpath(root, buf);
-  return walk_tree((normalized != NULL ? normalized : root), NULL, ignores, recursive);
+  struct stat st;
+  if (stat(root, &st) != 0) {
+    if (errno == EACCES) {
+      return ERR_IGNORE;
+    }
+    else if (errno == ENOENT) {
+      return ERR_CONTINUE;
+    }
+    userlog(LOG_ERR, "stat(%s): %s", root, strerror(errno));
+    return ERR_ABORT;
+  }
+
+  if (S_ISREG(st.st_mode)) {
+    recursive = false;
+  }
+  else if (!S_ISDIR(st.st_mode)) {
+    userlog(LOG_WARNING, "unexpected node type: %s, %d", root, st.st_mode);
+    return ERR_IGNORE;
+  }
+
+  return walk_tree(root, NULL, recursive);
 }
 
 
@@ -320,8 +312,9 @@ static bool process_inotify_event(struct inotify_event* event) {
     return true;
   }
 
+  bool is_dir = (event->mask & IN_ISDIR) == IN_ISDIR;
   userlog(LOG_DEBUG, "inotify: wd=%d mask=%d dir=%d name=%s",
-      event->wd, event->mask & (~IN_ISDIR), (event->mask & IN_ISDIR) != 0, node->name);
+      event->wd, event->mask & (~IN_ISDIR), is_dir, node->name);
 
   char path[PATH_MAX];
   strcpy(path, node->name);
@@ -332,14 +325,14 @@ static bool process_inotify_event(struct inotify_event* event) {
     strcat(path, event->name);
   }
 
-  if ((event->mask & IN_CREATE || event->mask & IN_MOVED_TO) && event->mask & IN_ISDIR) {
-    int result = walk_tree(path, node, NULL, true);
+  if (is_dir && ((event->mask & IN_CREATE) == IN_CREATE || (event->mask & IN_MOVED_TO) == IN_MOVED_TO)) {
+    int result = walk_tree(path, node, true);
     if (result < 0 && result != ERR_IGNORE) {
       return false;
     }
   }
 
-  if ((event->mask & IN_DELETE || event->mask & IN_MOVED_FROM) && event->mask & IN_ISDIR) {
+  if (is_dir && ((event->mask & IN_DELETE) == IN_DELETE || (event->mask & IN_MOVED_FROM) == IN_MOVED_FROM)) {
     for (int i=0; i<array_size(node->kids); i++) {
       watch_node* kid = array_get(node->kids, i);
       if (kid != NULL && strcmp(kid->name, path) == 0) {
diff --git a/native/fsNotifier/linux/main.c b/native/fsNotifier/linux/main.c
index ce9d6c275ea7..180140b344f7 100644
--- a/native/fsNotifier/linux/main.c
+++ b/native/fsNotifier/linux/main.c
@@ -33,7 +33,7 @@
 #define LOG_ENV_ERROR "error"
 #define LOG_ENV_OFF "off"
 
-#define VERSION "1.1"
+#define VERSION "1.2"
 #define VERSION_MSG "fsnotifier " VERSION "\n"
 
 #define USAGE_MSG \
@@ -215,6 +215,7 @@ static bool read_input() {
   userlog(LOG_DEBUG, "input: %s", (line ? line : "<null>"));
 
   if (line == NULL || strcmp(line, "EXIT") == 0) {
+    userlog(LOG_INFO, "exiting: %s", line);
     return false;
   }
 
@@ -241,6 +242,12 @@ static bool read_input() {
     return update_roots(new_roots);
   }
 
+  if (strcmp(line, "VERSION") == 0) {
+    output(VERSION "\n");
+    return true;
+  }
+
+  userlog(LOG_INFO, "unrecognised command: %s", line);
   return true;
 }
 
@@ -302,15 +309,22 @@ static void unregister_roots() {
 static bool register_roots(array* new_roots, array* unwatchable, array* mounts) {
   for (int i=0; i<array_size(new_roots); i++) {
     char* new_root = array_get(new_roots, i);
+    char* unflattened = new_root;
+    if (unflattened[0] == '|') ++unflattened;
     userlog(LOG_INFO, "registering root: %s", new_root);
 
-    char* root = new_root;
-    if (*root == '|') ++root;
+    if (unflattened[0] != '/') {
+      userlog(LOG_WARNING, "  ... not valid, skipped");
+      free(new_root);
+      continue;
+    }
+
     char* skip = NULL;
     for (int j=0; j<array_size(mounts); j++) {
       char* mount = array_get(mounts, j);
-      if (strncmp(mount, root, strlen(mount)) == 0) {
-        skip = root;
+      if (strncmp(mount, unflattened, strlen(mount)) == 0) {
+        userlog(LOG_DEBUG, "path %s is under unwatchable %s - ignoring", unflattened, mount);
+        skip = unflattened;
         break;
       }
     }
@@ -319,19 +333,22 @@ static bool register_roots(array* new_roots, array* unwatchable, array* mounts)
       continue;
     }
 
-    // todo: consider a mount point under a watch root
-    int id = watch(new_root, unwatchable);
+    // todo: consider a mount point under a watch root?
+    int id = watch(new_root);
 
-    if (id == ERR_ABORT) {
-      return false;
-    }
-    else if (id >= 0) {
+    if (id >= 0) {
       watch_root* root = malloc(sizeof(watch_root));
       CHECK_NULL(root, false);
       root->id = id;
       root->name = new_root;
       CHECK_NULL(array_push(roots, root), false);
     }
+    else if (id == ERR_ABORT) {
+      return false;
+    }
+    else if (id == ERR_IGNORE) {
+      free(new_root);
+    }
     else {
       if (show_warning && watch_limit_reached()) {
         int limit = get_watch_count();
@@ -339,7 +356,10 @@ static bool register_roots(array* new_roots, array* unwatchable, array* mounts)
         output("MESSAGE\n" INOTIFY_LIMIT_MSG, limit);
         show_warning = false;  // warn only once
       }
-      CHECK_NULL(array_push(unwatchable, new_root), false);
+      char* copy = strdup(unflattened);
+      CHECK_NULL(copy, false);
+      CHECK_NULL(array_push(unwatchable, copy), false);
+      free(new_root);
     }
   }