From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 2 Jul 2013 07:16:06 +0000 (+0200)
Subject: compat: Escape new-lines in commands.
X-Git-Tag: v0.0.2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=049fbcb3cbfae7f568ea2c176edc44be8ae5e793;p=icinga2

compat: Escape new-lines in commands.
---

diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index ba108d589..6cf8bb044 100644
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -266,10 +266,10 @@ void CompatComponent::DumpCommand(std::ostream& fp, const Command::Ptr& command)
 		String arg;
 		BOOST_FOREACH(arg, args) {
 			// This is obviously incorrect for non-trivial cases.
-			fp << " \"" << arg << "\"";
+			fp << " \"" << EscapeString(arg) << "\"";
 		}
 	} else if (!commandLine.IsEmpty()) {
-		fp << Convert::ToString(commandLine);
+		fp << EscapeString(Convert::ToString(commandLine));
 	} else {
 		fp << "<internal>";
 	}
@@ -391,6 +391,13 @@ void CompatComponent::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
 	   << "\n";
 }
 
+String CompatComponent::EscapeString(const String& str)
+{
+	String result = str;
+	boost::algorithm::replace_all(result, "\n", "\\n");
+	return result;
+}
+
 void CompatComponent::DumpServiceStatusAttrs(std::ostream& fp, const Service::Ptr& service, CompatObjectType type)
 {
 	ASSERT(service->OwnsLock());
@@ -428,7 +435,7 @@ void CompatComponent::DumpServiceStatusAttrs(std::ostream& fp, const Service::Pt
 
 		if (line_end > 0 && line_end != String::NPos) {
 			long_output = raw_output.SubStr(line_end+1, raw_output.GetLength());
-			boost::algorithm::replace_all(long_output, "\n", "\\n");
+			long_output = EscapeString(long_output);
 		}
 
 		boost::algorithm::replace_all(output, "\n", "\\n");
diff --git a/components/compat/compatcomponent.h b/components/compat/compatcomponent.h
index 39afaa4c6..e36ec079b 100644
--- a/components/compat/compatcomponent.h
+++ b/components/compat/compatcomponent.h
@@ -112,6 +112,8 @@ private:
 	void DumpCustomAttributes(std::ostream& fp, const DynamicObject::Ptr& object);
 
 	void StatusTimerHandler(void);
+
+	static String EscapeString(const String& str);
 };
 
 }