[PATCH 4/7] SlaveMachineXML: add security information

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

The slave machine XML files now contain security information used to
negotiate a secure channel.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/SlaveMachineParser.py | 31 +++++++++++++++++++++++++++++++
 schema-sm.rng                         | 29 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/lnst/Controller/SlaveMachineParser.py
b/lnst/Controller/SlaveMachineParser.py
index 1b87a89..3fee680 100644
--- a/lnst/Controller/SlaveMachineParser.py
+++ b/lnst/Controller/SlaveMachineParser.py
@@ -11,6 +11,7 @@ __author__ = """
 rpazdera(a)redhat.com (Radek Pazdera)
 """
 
+import os
 from lnst.Controller.XmlParser import XmlParser
 from lnst.Controller.XmlProcessing import XmlProcessingError, XmlData
 from lnst.Controller.XmlProcessing import XmlCollection
@@ -39,6 +40,8 @@ class SlaveMachineParser(XmlParser):
                 interface = self._process_interface(eth_tag)
                 sm["interfaces"].append(interface)
 
+        security_tag = sm_tag.find("security")
+        sm["security"] = self._process_security(security_tag)
         return sm
 
     def _process_params(self, params_tag):
@@ -64,3 +67,31 @@ class SlaveMachineParser(XmlParser):
             iface["params"] = params
 
         return iface
+
+    def _process_security(self, sec_tag):
+        sec = XmlData(sec_tag)
+
+        if sec_tag is None:
+            sec["auth_type"] = "none"
+            return sec
+
+        auth_type_tag = sec_tag.find("auth_type")
+        sec["auth_type"] = auth_type_tag.text
+
+        auth_passwd_tag = sec_tag.find("auth_password")
+        if auth_passwd_tag is not None:
+            sec["auth_passwd"] = auth_passwd_tag.text
+        else:
+            sec["auth_passwd"] = ""
+
+        key_tag = sec_tag.find("pubkey_path")
+        if key_tag is not None:
+            path = key_tag.text
+            exp_path = os.path.expanduser(path)
+            abs_path = os.path.join(os.path.dirname(self._path), exp_path)
+            norm_path = os.path.normpath(abs_path)
+            sec["pubkey_path"] = norm_path
+        else:
+            sec["pubkey_path"] = ""
+
+        return sec
diff --git a/schema-sm.rng b/schema-sm.rng
index f9d5a14..8bd6a35 100644
--- a/schema-sm.rng
+++ b/schema-sm.rng
@@ -7,6 +7,10 @@
                     <ref name="define"/>
                 </optional>
 
+                <optional>
+                    <ref name="security"/>
+                </optional>
+
                 <zeroOrMore>
                     <ref name="params"/>
                 </zeroOrMore>
@@ -79,4 +83,29 @@
             </interleave>
         </element>
     </define>
+
+    <define name="security">
+        <element name="security">
+            <element name="auth_type">
+                <choice>
+                    <value>none</value>
+                    <value>pubkey</value>
+                    <value>ssh</value>
+                    <value>password</value>
+                </choice>
+            </element>
+
+            <optional>
+                <element name="pubkey_path">
+                    <text/>
+                </element>
+            </optional>
+
+            <optional>
+                <element name="auth_password">
+                    <text/>
+                </element>
+            </optional>
+        </element>
+    </define>
 </grammar>
-- 
2.7.1