EDK: Add handle rights checking to the various entrypoints.

mojo/edk/system/core.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_CORE_H_
 #define MOJO_EDK_SYSTEM_CORE_H_
 
 #include <stdint.h>
 
 #include <functional>
 
+#include "mojo/edk/system/entrypoint_class.h"
 #include "mojo/edk/system/handle.h"
 #include "mojo/edk/system/handle_table.h"
 #include "mojo/edk/system/mapping_table.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/handle.h"
@@ skipping 26 matching lines @@
 
   // |*platform_support| must outlive this object.
   explicit Core(embedder::PlatformSupport* platform_support);
   virtual ~Core();
 
   // Adds |handle| (which must have a dispatcher) to the handle table, returning
   // the handle value for it. Returns |MOJO_HANDLE_INVALID| on failure, namely
   // if the handle table is full.
   MojoHandle AddHandle(Handle&& h);
 
-  // Looks up the dispatcher for the given handle value. On success, gets the
-  // dispatcher for a given handle value. On failure, returns an appropriate
-  // result and leaves |dispatcher| alone), namely
-  // |MOJO_RESULT_INVALID_ARGUMENT| if the handle value is invalid or
-  // |MOJO_RESULT_BUSY| if the handle is marked as busy.
+  // Gets the handle for the given handle value. On success, returns
+  // |MOJO_RESULT_OK| (and sets |*h|). On failure, returns an appropriate result
+  // (and leaves |*h| alone), namely |MOJO_RESULT_INVALID_ARGUMENT| if the
+  // handle value is invalid or |MOJO_RESULT_BUSY| if the handle is marked as
+  // busy.
+  MojoResult GetHandle(MojoHandle handle, Handle* h);
+  // TODO(vtl): Remove this.
   MojoResult GetDispatcher(MojoHandle handle,
                            util::RefPtr<Dispatcher>* dispatcher);
 
+  // TODO(vtl): Convert this to |GetAndRemoveHandle()|.
   // Like |GetDispatcher()|, but on success also removes the handle from the
   // handle table.
   MojoResult GetAndRemoveDispatcher(MojoHandle handle,
                                     util::RefPtr<Dispatcher>* dispatcher);
 
+  // Gets the dispatcher for the given handle value, which must have (all of)
+  // the rights in |required_handle_rights|.
+  //
+  // On success, returns |MOJO_RESULT_OK| and sets |*dispatcher| appropriately.
+  // On failure, returns:
+  //   - |MOJO_RESULT_INVALID_ARGUMENT| if there's no handle for the given
+  //     handle value (or the handle value was |MOJO_HANDLE_INVALID|),
+  //   - |MOJO_RESULT_BUSY| if the handle is marked as busy,
+  //   - |MOJO_RESULT_PERMISSION_DENIED| if the handle does not have the
+  //     required rights *and* the dispatcher supports the specified
+  //     |entrypoint_class|, or
+  //   - |MOJO_RESULT_INVALID_ARGUMENT| if the handle does not have the required
+  //     rights *but* the dispatcher does not support |entrypoint_class|.
+  // (Warning: if the handle has the required rights, then its dispatcher will
+  // be returned even if the dispatcher does not support |entrypoint_class|.)
+  MojoResult GetDispatcherAndCheckRights(
+      MojoHandle handle_value,
+      MojoHandleRights required_handle_rights,
+      EntrypointClass entrypoint_class,
+      util::RefPtr<Dispatcher>* dispatcher);
+
   // Watches on the given handle for the given signals, calling |callback| when
   // a signal is satisfied or when all signals become unsatisfiable. |callback|
   // must satisfy stringent requirements -- see |Awakable::Awake()| in
   // awakable.h. In particular, it must not call any Mojo system functions.
   MojoResult AsyncWait(MojoHandle handle,
                        MojoHandleSignals signals,
                        const std::function<void(MojoResult)>& callback);
 
   embedder::PlatformSupport* platform_support() const {
     return platform_support_;
@@ skipping 133 matching lines @@
   util::Mutex mapping_table_mutex_;
   MappingTable mapping_table_ MOJO_GUARDED_BY(mapping_table_mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CORE_H_