More fixes for Centos vala array property bug

[moonshot-ui.git] / src / moonshot-webp-parser.vala

diff --git a/src/moonshot-webp-parser.vala b/src/moonshot-webp-parser.vala
index f1d3570..582ebbd 100644 (file)
--- a/src/moonshot-webp-parser.vala
+++ b/src/moonshot-webp-parser.vala
@@ -1,122 +1,91 @@
+using Moonshot;
+
 namespace WebProvisioning
 { 
-  public IdCard card;
 
-  
 
-  bool
-  display_name_handler (SList<string> stack)
-  {
-    string[] display_name_path = {"display-name", "identity", "identities"};
-    
-    if (stack.length () != display_name_path.length)
-      return false;
-    
-    for (int i = 0; i<display_name_path.length; i++)
-    {
-      if (stack.nth_data(i) != display_name_path[i])
-        return false;
-    }
-    
-    return true;
-  }
-
-  public void text_element_func (MarkupParseContext context,
-                                 string text,
-                                 size_t text_len) throws MarkupError
+  public static int main (string[] args)
   {
-    unowned SList<string> stack = context.get_element_stack ();
-    
-    if (text_len < 1)
-      return;
-    
-    if (stack.nth_data(0) == "display-name" && display_name_handler (stack))
-    {
-      card.display_name = text;
-    }
-    else if (stack.nth_data(0) == "user")
-    {
-    }
-    else if (stack.nth_data(0) == "password")
-    {
-    }
-    else if (stack.nth_data(0) == "realm")
-    {
-    }
-    else if (stack.nth_data(0) == "service")
-    {
-    }
-    else if (stack.nth_data(0) == "pattern")
-    {
+    int arg_index = -1;
+    int force_flat_file_store = 0;
+    bool bad_switch = false;
+    for (arg_index = 1; arg_index < args.length; arg_index++) {
+      string arg = args[arg_index];
+      unichar c = arg.get_char();
+      if (c=='-') {
+          arg = arg.next_char();
+          c = arg.get_char();
+          switch (c) {
+            case 'f':
+              force_flat_file_store = 1;
+              break;
+            default:
+              bad_switch = true;
+              break;
+          }
+      } else {
+        break; // arg is not a switch; presume it's the file
+      }
     }
-    else if (stack.nth_data(0) == "always_confirm")
+    if (bad_switch || (arg_index != args.length - 1))
     {
+      stdout.printf (_("Usage %s [-f] WEB_PROVISIONING_FILE\n -f: add identities to flat file store.\n"), args[0]);
+      return -1;
     }
+    string webp_file = args[arg_index];
     
-    /*Trust anchor*/
-    else if (stack.nth_data(0) == "ca-cert")
-    {
-    }
-    else if (stack.nth_data(0) == "subject")
+    if (!FileUtils.test (webp_file, FileTest.EXISTS | FileTest.IS_REGULAR))
     {
+      stdout.printf (_("%s does not exist\n"), webp_file);
+      return -1;
     }
-    else if (stack.nth_data(0) == "ca-cert")
-    {
-    }
-  }
-
-  class WebProvisionParser
-  {
-    public WebProvisionParser (string path)
-    {
-      string text = "";
-      var file = File.new_for_path (path);
     
-      try
-      {
-        var dis = new DataInputStream (file.read ());
-        string line;
-        while ((line = dis.read_line (null)) != null)
-          text += line;
-      }
-      catch (Error e)
+    var webp = new Parser (webp_file);
+    webp.parse();
+    
+    foreach (IdCard card in cards)
+    {
+      Moonshot.Error error;
+      string[] rules_patterns = {};
+      string[] rules_always_confirm = {};
+        
+      /* use temp arrays to workaround centos array property bug */
+      var rules = card.rules;
+      var services = card.services;
+      if (rules.length > 0)
       {
-        error ("Could not retreive file size");
+        int i = 0;
+        rules_patterns = new string[rules.length];
+        rules_always_confirm = new string[rules.length];
+        foreach (Rule r in rules)
+        {
+          rules_patterns[i] = r.pattern;
+          rules_always_confirm[i] = r.always_confirm;
+          i++;
+        }
       }
-      
-      MarkupParser parser = {null, null, text_element_func, null, null};
-      
-      var ctx = new MarkupParseContext(parser, 0, null, null);
-      
-      try
+
+      Moonshot.install_id_card (card.display_name,
+                                card.username,
+                                card.password,
+                                card.issuer,
+                                rules_patterns,
+                                rules_always_confirm,
+                                services,
+                                card.trust_anchor.ca_cert,
+                                card.trust_anchor.subject,
+                                card.trust_anchor.subject_alt,
+                                card.trust_anchor.server_cert,
+                                force_flat_file_store,
+                                out error);
+
+      if (error != null)
       {
-        ctx.parse (text, text.length);
+        stderr.printf ("Error: %s", error.message);
+        continue;
       }
-      catch (Error e)
-      {
-        error ("Could not parse %s, invalid content", path);
-      } 
-    }
-  }
-
-  public static int main (string[] args)
-  {
-    if (args.length < 2)
-    {
-      error ("Usage %s [-a] WEB_PROVISIONING_FILE", args[0]);
     }
     
-    if (!FileUtils.test (args[1], FileTest.EXISTS | FileTest.IS_REGULAR))
-    {
-      error ("%s does not exist", args[1]);
-    }
-    
-    card = new IdCard();
-    
-    var webp = new WebProvisionParser (args[1]);
-    
-    debug ("%s", card.display_name);
-
     return 0;
   }
 }