Run NaClEnvCleanser in standalone sel_ldr (in addition to sel_main_chrome). Add a couple of ld.so...

src/trusted/service_runtime/env_cleanser_test.c

 /*
- * Copyright 2009 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
+ * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 #include <stdio.h>
 #include <string.h>
 
 #include "native_client/src/include/portability.h"
 
 #include "native_client/src/trusted/service_runtime/env_cleanser.h"
 #include "native_client/src/trusted/service_runtime/env_cleanser_test.h"
 
@@ skipping 19 matching lines @@
   "FOOBAR",
   "LC_TIME=%a, %B %d, %Y",
   "QUUX",
   "USER=bsy",
   "LC_PAPER=en_US.UTF-8@legal",
   "HOME=/home/bsy",
   "PATH=/home/bsy/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
   "LANG=en_us.UTF-8",
   "LC_MEASUREMENT=en_US.UTF-8",
   "LD_LIBRARY_PATH=.:/usr/bsy/lib",
+  "NACLENV_LD_PRELOAD=libvalgrind.so",
+  "NACLENV_SHELL=/bin/sh",
   NULL,
 };
 
 static char const *const kFilteredEnv[] = {
   "LANG=en_us.UTF-8",
   "LC_MEASUREMENT=en_US.UTF-8",
   "LC_PAPER=en_US.UTF-8@legal",
   "LC_TIME=%a, %B %d, %Y",
+  "LD_PRELOAD=libvalgrind.so",
+  "SHELL=/bin/sh",
+  NULL,
+};
+
+static char const *const kFilteredEnvWithoutWhitelist[] = {
+  "LD_PRELOAD=libvalgrind.so",
+  "SHELL=/bin/sh",
   NULL,
 };
 
 int StrInStrTbl(char const *str, char const *const *tbl) {
   int i;
 
   for (i = 0; NULL != tbl[i]; ++i) {
     if (!strcmp(str, tbl[i])) {
       return 1;
     }
@@ skipping 81 matching lines @@
     printf("Checking %s\n", kValidEnvs[i]);
     if (0 == NaClEnvInWhitelist(kValidEnvs[i])) {
       ++errors;
       printf("ERROR\n");
     } else {
       printf("OK\n");
     }
   }
 
   printf("\nEnvironment Filtering\n");
-  NaClEnvCleanserCtor(&nec);
-  if (!NaClEnvCleanserInit(&nec, kMurkyEnv)) {
+  NaClEnvCleanserCtor(&nec, 1);
+  if (!NaClEnvCleanserInit(&nec, kMurkyEnv, NULL)) {
     printf("FAILED: NaClEnvCleanser Init failed\n");
     ++errors;
   } else {
     if (!StrTblsHaveSameEntries(NaClEnvCleanserEnvironment(&nec),
                                 kFilteredEnv)) {
       printf("ERROR: filtered env wrong\n");
       ++errors;
 
       PrintStrTbl("Original environment", kMurkyEnv);
       PrintStrTbl("Filtered environment", NaClEnvCleanserEnvironment(&nec));
       PrintStrTbl("Expected environment", kFilteredEnv);
     } else {
       printf("OK\n");
     }
   }
   NaClEnvCleanserDtor(&nec);
 
+  printf("\nEnvironment Filtering (without whitelist)\n");
+  NaClEnvCleanserCtor(&nec, 0);
+  if (!NaClEnvCleanserInit(&nec, kMurkyEnv, NULL)) {
+    printf("FAILED: NaClEnvCleanser Init failed\n");
+    ++errors;
+  } else {
+    if (!StrTblsHaveSameEntries(NaClEnvCleanserEnvironment(&nec),
+                                kFilteredEnvWithoutWhitelist)) {
+      printf("ERROR: filtered env wrong\n");
+      ++errors;
+
+      PrintStrTbl("Original environment", kMurkyEnv);
+      PrintStrTbl("Filtered environment", NaClEnvCleanserEnvironment(&nec));
+      PrintStrTbl("Expected environment", kFilteredEnvWithoutWhitelist);
+    } else {
+      printf("OK\n");
+    }
+  }
+  NaClEnvCleanserDtor(&nec);
+
   printf("%s\n", (0 == errors) ? "PASSED" : "FAILED");
   return 0 != errors;
 }