\brief Config non-inline non-template implementation */
#include "Config.hh"
-//#include "Config.ih"
+#include "Config.ih"
// Custom includes
+#include "../Utils/membind.hh"
//#include "Config.mpp"
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// senf::console::ConfigFile
+// senf::console::detail::RestrictedExecutor
-prefix_ void senf::console::ConfigFile::parse()
+prefix_ senf::console::detail::RestrictedExecutor::RestrictedExecutor(DirectoryNode & root)
{
- if (! parser_.parseFile(filename_, boost::bind<void>( boost::ref(executor_),
- boost::ref(std::cerr),
- _1 )) )
- throw SyntaxErrorException();
+ executor_
+ .chroot(root)
+ .policy(senf::membind(&RestrictedExecutor::policyCallback, this));
}
-prefix_ void senf::console::ConfigFile::parse(DirectoryNode & restrict)
+prefix_ void
+senf::console::detail::RestrictedExecutor::execute(std::ostream & output,
+ ParseCommandInfo const & command)
{
- restrict_ = restrict.thisptr();
- parse();
- parsedNodes_.push_back(restrict_);
- restrict_.reset();
+ executor_.execute(output, command);
+}
+
+prefix_ void
+senf::console::detail::RestrictedExecutor::operator()(std::ostream & output,
+ ParseCommandInfo const & command)
+{
+ execute(output, command);
+}
+
+prefix_ bool senf::console::detail::RestrictedExecutor::parsed(GenericNode & node)
+ const
+{
+ ParsedNodes::const_iterator i (parsedNodes_.begin());
+ ParsedNodes::const_iterator const i_end (parsedNodes_.end());
+ for (; i != i_end; ++i)
+ if ( ! i->expired() && node.isChildOf(*(i->lock())) )
+ return true;
+ return false;
+}
+
+prefix_ void senf::console::detail::RestrictedExecutor::policyCallback(DirectoryNode & dir,
+ std::string const & name)
+{
+ if (dir.hasChild(name)) {
+ GenericNode & item (dir.get(name));
+ if (restrict_ && ! item.isChildOf(*restrict_) && ! item.isDirectory())
+ throw Executor::IgnoreCommandException();
+ if (parsed(item))
+ throw Executor::IgnoreCommandException();
+ }
+ else if (restrict_ && ! dir.isChildOf(*restrict_))
+ throw Executor::IgnoreCommandException();
+}
+
+namespace {
+ struct RemoveNodesFn
+ {
+ RemoveNodesFn(senf::console::DirectoryNode::ptr newNode) : newNode_ (newNode) {}
+
+ bool operator()(senf::console::DirectoryNode::weak_ptr node) const
+ { return node.expired() || node.lock()->isChildOf(*newNode_); }
+
+ senf::console::DirectoryNode::ptr newNode_;
+ };
+}
+
+prefix_ void
+senf::console::detail::RestrictedExecutor::insertParsedNode(DirectoryNode & node)
+{
+ parsedNodes_.erase(
+ std::remove_if(parsedNodes_.begin(), parsedNodes_.end(), RemoveNodesFn(node.thisptr())),
+ parsedNodes_.end());
+ parsedNodes_.push_back(node.thisptr());
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ConfigBundle
+
+prefix_ void senf::console::ConfigBundle::parse()
+{
+ detail::RestrictedExecutor::RestrictGuard guard (executor_);
+ parseInternal();
+}
+
+prefix_ void senf::console::ConfigBundle::parse(DirectoryNode & restrict)
+{
+ detail::RestrictedExecutor::RestrictGuard guard (executor_, restrict);
+ parseInternal();
+}
+
+prefix_ void senf::console::ConfigBundle::parseInternal()
+{
+ Sources::const_iterator i (sources_.begin());
+ Sources::const_iterator const i_end (sources_.end());
+ for (; i != i_end; ++i)
+ (*i)->parse(executor_);
}
///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::RestrictedExecutor::RestrictGuard
-prefix_ void senf::console::readConfig(std::string const & filename)
+prefix_ senf::console::detail::RestrictedExecutor::RestrictGuard::
+RestrictGuard(RestrictedExecutor & executor)
+ : executor_ (executor)
{
- ConfigFile cfg (filename);
- cfg.parse();
+ // This MUST BE root() not chroot() since restriction does NOT follow symlinks.
+ // Therefore, if chroot() is a directory of symlinks, restricting to it will
+ // execute NOTHING.
+ executor_.restrict_ = senf::console::root().thisptr();
}
+prefix_ senf::console::detail::RestrictedExecutor::RestrictGuard::
+RestrictGuard(RestrictedExecutor & executor, DirectoryNode & restrict)
+ : executor_ (executor)
+{
+ executor_.restrict_ = restrict.thisptr();
+}
+
+prefix_ senf::console::detail::RestrictedExecutor::RestrictGuard::~RestrictGuard()
+{
+ if (! std::uncaught_exception())
+ executor_.insertParsedNode( *executor_.restrict_ );
+ executor_.restrict_ = senf::console::root().thisptr();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::ConfigSource
+
+prefix_ senf::console::detail::ConfigSource::~ConfigSource()
+{}
+
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "Config.mpp"