/// Thrown by built-in 'exit' command
struct ExitException {};
+ /// Executor policy function
+ typedef boost::function<void (DirectoryNode &,std::string const &)> SecurityPolicy;
+
+ /// Thrown by the SecurityPolicy to silently ignore a command
+ struct IgnoreCommandException {};
+
///////////////////////////////////////////////////////////////////////////
//\/name Structors and default members
///\{
Same as execute(). */
DirectoryNode & cwd() const; ///< Current working directory
+ bool autocd() const; ///< Get current autocd status
+ /**< if autocd is enabled, specifying a directory name as
+ command will cd to that directory. Disabled by
+ default (but enabled automatically by the interactive
+ console). */
+ Executor & autocd(bool v); ///< Set autocd status
+ /**< \see autocd() */
+
+ bool autocomplete() const; ///< Get current autocomplete status
+ /**< if autocomplete is enabled, path components which can
+ be uniquely completed will be completed
+ automatically. Disabled by default (but enabled
+ automatically by the interactive console) void
+ autocomplete(bool v). */
+
+ Executor & autocomplete(bool v); ///< Set autocomplete status
+ /**< \see autocomplete() */
+
+ DirectoryNode & chroot() const; ///< Get root node
+ /**< The root node defaults to senf::console::root(). If
+ changed, all path references are relative to this node
+ and objects outside that tree cannot be accessed. */
+ Executor & chroot(DirectoryNode & node); ///< chroot into given directory
+ /**< After this call, all path's are interpreted relative to
+ \a node and only nodes in the tree rooted at \a node
+ are accessible via the executor. This value defaults to
+ senf::console::root(). */
+
+ Executor & policy(SecurityPolicy policy = SecurityPolicy()); ///< Set security policy
+ /**< The security policy is called before traversing a node
+ to validate that access. */
+
protected:
private:
- GenericNode & traverseNode(ParseCommandInfo::argument_value_type const & path);
- DirectoryNode & traverseDirectory(ParseCommandInfo::argument_value_type const & path);
- CommandNode & traverseCommand(ParseCommandInfo::CommandPathRange const & path);
+ GenericNode & traverseNode(ParseCommandInfo::TokensRange const & path);
+ DirectoryNode & traverseDirectory(ParseCommandInfo::TokensRange const & path);
+
+ template <class ForwardRange>
+ GenericNode & traverse(DirectoryNode & dir, ForwardRange const & range);
struct InvalidPathException {};
struct InvalidDirectoryException {};
struct InvalidCommandException {};
-
+
+ DirectoryNode::ptr root_;
+ SecurityPolicy policy_;
DirectoryNode::weak_ptr cwd_;
DirectoryNode::weak_ptr oldCwd_;
- typedef std::vector<DirectoryNode::weak_ptr> DirStack;
+ struct DirEntry {
+ DirEntry(DirectoryNode::weak_ptr dir_, bool skip_) : dir(dir_), skip(skip_) {}
+ DirectoryNode::weak_ptr dir;
+ bool skip;
+ };
+ typedef std::vector<DirEntry> DirStack;
DirStack dirstack_;
+
+ bool autocd_;
+ bool autocomplete_;
+
+ bool skipping_;
};
///////////////////////////////hh.e////////////////////////////////////////
#include "Executor.cci"
-//#include "Executor.ct"
+#include "Executor.ct"
//#include "Executor.cti"
#endif