Split secure command channel and untrusted application channel

src/trusted/sel_universal/sel_universal.cc

 /*
  * Copyright (c) 2012 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.
  */
 
 // Second generation sel_universal implemented in C++
 
 #include <stdio.h>
 
@@ skipping 43 matching lines @@
     "  --event_replay <file>\n"
     "  --debug\n"
     "  --abort_on_error\n"
     "  --silence_nexe\n"
     "  --command_prefix <prefix>\n"
     "  --command_file <file>\n"
     "  --var <tag> <value>\n"
     "  --url_alias <url> <filename>\n"
     "  --uses_reverse_service\n"
     "  --no_app_channel\n"
+    "  --untrusted\n"
     "  --irt <file>\n"
     "\n"
     "The following sel_ldr arguments might be useful:\n"
     "  -v                    increase verbosity\n"
     "  -E NACL_SRPC_DEBUG=1  even more verbosity for srpc debugging\n";
 
 
 // NOTE: this used to be stack allocated inside main which cause
 // problems on ARM (probably a tool chain bug).
 // NaClSrpcChannel is pretty big (> 256kB)
 static NaClSrpcChannel command_channel;
 static NaClSrpcChannel channel;
 
 // variables set via command line
 static map<string, string> initial_vars;
 static vector<string> initial_commands;
 static bool abort_on_error = false;
 static bool silence_nexe = false;
 static vector<string> command_prefix;
 static bool uses_reverse_service = false;
 static bool app_channel = true;
+static bool trusted = true;
 
 // When given argc and argv this function (a) extracts the nexe argument,
 // (b) populates sel_ldr_argv with sel_ldr arguments, and (c) populates
 // app_argv with nexe module args. Also see kUsage above for details.
 // It will call exit with codes 0 (help message) and 1 (incorrect args).
 static nacl::string ProcessArguments(int argc,
                                      char* argv[],
                                      nacl::string* irt_name,
                                      vector<nacl::string>* const sel_ldr_argv,
                                      vector<nacl::string>* const app_argv) {
@@ skipping 45 matching lines @@
       }
 
       const string tag = string(argv[i + 1]);
       const string val = string(argv[i + 2]);
       i += 2;
       initial_vars[tag] = val;
     } else if (flag == "--uses_reverse_service") {
       uses_reverse_service = true;
     } else if (flag == "--no_app_channel") {
       app_channel = false;
+    } else if (flag == "--untrusted") {
+      trusted = false;
     } else if (flag == "--irt") {
       if (argc <= i + 1) {
         NaClLog(LOG_FATAL, "not enough args for --irt option\n");
       }
       *irt_name = argv[++i];
     } else if (flag == "--") {
       // Done processing sel_ldr args.  The first argument after '--' is the
       // nexe.
       i++;
       if (app_name == "" && i < argc) {
@@ skipping 44 matching lines @@
     sel_ldr_argv.push_back(ss_stderr.str());
   }
   // Start sel_ldr with the given application and arguments.
   nacl::SelLdrLauncherStandalone launcher;
   nacl::DescWrapperFactory factory;  // DescWrapper "namespace"
 
   if (!launcher.StartViaCommandLine(command_prefix, sel_ldr_argv, app_argv)) {
     NaClLog(LOG_FATAL, "sel_universal: Failed to launch sel_ldr\n");
   }
 
-  if (!launcher.SetupCommand(&command_channel)) {
-    NaClLog(LOG_ERROR, "sel_universal: set up command failed\n");
-    exit(1);
+  if (trusted) {
+    if (!launcher.SetupCommand(&command_channel)) {
+      NaClLog(LOG_ERROR, "sel_universal: set up command failed\n");
+      exit(1);
+    }
+  } else {
+    if (!launcher.SetupUntrustedCommand(&command_channel)) {
+      NaClLog(LOG_ERROR, "sel_universal: set up untrusted command failed\n");
+      exit(1);
+    }
   }
 
   DescWrapper *host_file = factory.OpenHostFile(app_name.c_str(), O_RDONLY, 0);
   if (NULL == host_file) {
     NaClLog(LOG_ERROR, "Could not open %s\n", app_name.c_str());
     exit(1);
   }
 
   if (!launcher.LoadModule(&command_channel, host_file)) {
     NaClLog(LOG_ERROR, "sel_universal: load module failed\n");
@@ skipping 20 matching lines @@
   if (uses_reverse_service) {
     ReverseEmulateInit(&command_channel, &launcher);
   }
 
   if (!launcher.StartModule(&command_channel)) {
     NaClLog(LOG_ERROR,
             "sel_universal: start module failed\n");
     exit(1);
   }
 
-  if (app_channel) {
+  if (trusted && app_channel) {
     if (!launcher.SetupAppChannel(&channel)) {
       NaClLog(LOG_ERROR,
               "sel_universal: set up app channel failed\n");
       exit(1);
     }
   }
 
   NaClCommandLoop loop(channel.client,
                        &channel,
                        launcher.socket_addr()->desc());
@@ skipping 60 matching lines @@
   NaClSrpcModuleInit();
   NaClNrdAllModulesInit();
 
   int exit_status = raii_main(argc, argv);
 
   NaClSrpcModuleFini();
   NaClNrdAllModulesFini();
 
   return exit_status;
 }