File open association works, but crashes if you choose not to import the card

diff --git a/Makefile.am b/Makefile.am
index c9a64a1..d90b7b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,10 +47,12 @@ src_moonshot_SOURCES = \
         src/moonshot-identity-request.vala \
         src/moonshot-server.vala \
         src/moonshot-password-dialog.vala \
+        src/moonshot-provisioning-common.vala \
         src/moonshot-utils.vala
 
 src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
+        src/moonshot-provisioning-common.vala \
         src/moonshot-id.vala
 
 src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0 $(AM_VALAFLAGS)

diff --git a/mac/moonshot-ui.bundle b/mac/moonshot-ui.bundle
index ae0b2e7..923dd91 100644 (file)
--- a/mac/moonshot-ui.bundle
+++ b/mac/moonshot-ui.bundle
@@ -26,7 +26,7 @@
     </image>
 
     <!-- Comment this out to keep the install names in binaries -->
-    <run-install-name-tool/>
+    <!--<run-install-name-tool/>-->
  
     <!-- Optionally specify a launcher script to use. If the
          application sets up everything needed itself, like
@@ -36,10 +36,6 @@
     -->
     <launcher-script>${project}/launcher.sh</launcher-script >
 
-    <!-- Not implemented: Optional runtime, could be python or mono
-         for example.
-    -->
-    <!-- runtime copy="yes">/usr/bin/python</runtime -->
     <!-- Indicate the active gtk version to use. This is needed only
          for gtk+-3.0 projects. -->
     <gtk>gtk+-2.0</gtk>

diff --git a/mac/moonshot-ui.plist b/mac/moonshot-ui.plist
index 516af0a..40b27da 100644 (file)
--- a/mac/moonshot-ui.plist
+++ b/mac/moonshot-ui.plist
@@ -7,23 +7,23 @@
        <key>CFBundleExecutable</key>
        <string>moonshot-ui</string>
        <key>CFBundleGetInfoString</key>
-       <string>0.3, Copyright 2006-2007 Imendio AB</string>
+       <string>Copyright (c) 2011, JANET(UK)</string>
        <key>CFBundleIconFile</key>
-       <string>Giggle.icns</string>
+       <string>moonshot-ui.icns</string>
        <key>CFBundleIdentifier</key>
-       <string>com.imendio.Giggle</string>
+       <string>net.ja.moonshot-ui</string>
        <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
+       <string>0.1</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.3</string>
+       <string>0.1</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>0.3</string>
+       <string>0.1</string>
        <key>NSHumanReadableCopyright</key>
-       <string>Copyright 2006-2007 Imendio AB, GNU General Public License.</string>
+       <string>Copyright (c) 2011, JANET(UK)</string>
        <key>LSMinimumSystemVersion</key>
        <string>10.4</string>
 <key>CFBundleDisplayName</key>
@@ -40,13 +40,13 @@
             <string>msht</string>
             <string>msht</string>
         </array>
-        <key>CFBundleTypeRole</key>
-        <string>Editor</string>
         <key>CFBundleTypeMIMETypes</key>
         <array>
             <string>application/msht</string>
             <string>application/msht</string>
         </array>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
     </dict>
 </array>
 </dict>

diff --git a/src/moonshot-identity-manager-app.vala b/src/moonshot-identity-manager-app.vala
index 13b17a7..db0b08e 100644 (file)
--- a/src/moonshot-identity-manager-app.vala
+++ b/src/moonshot-identity-manager-app.vala
@@ -19,6 +19,7 @@ class IdentityManagerApp : Window {
         init_ipc_server ();
 #if OS_MACOS
                osxApp = OSXApplication.get_instance();
+               osxApp.ns_application_open_file.connect(ipc_server.install_from_file);
 #endif
         view.show();
     }   

diff --git a/src/moonshot-server.vala b/src/moonshot-server.vala
index abae433..681d0dd 100644 (file)
--- a/src/moonshot-server.vala
+++ b/src/moonshot-server.vala
@@ -150,8 +150,50 @@ public class MoonshotServer : Object {
 
       return this.main_window.add_identity (idcard);
     }
+
+
+    public bool install_from_file (string file_name)
+    {
+    var webp = new WebProvisioning.Parser (file_name);
+    webp.parse();
+    bool result = false;
+    
+    foreach (IdCard card in WebProvisioning.cards)
+    {
+      string[] rules_patterns = {};
+      string[] rules_always_confirm = {};
+        
+      if (card.rules.length > 0)
+      {
+        int i = 0;
+        rules_patterns = new string[card.rules.length];
+        rules_always_confirm = new string[card.rules.length];
+        foreach (Rule r in card.rules)
+        {
+          rules_patterns[i] = r.pattern;
+          rules_always_confirm[i] = r.always_confirm;
+          i++;
+        }
+      } 
+      result = install_id_card (card.display_name,
+                                card.username,
+                                card.password,
+                                card.issuer,
+                                rules_patterns,
+                                rules_always_confirm,
+                                card.services,
+                                card.trust_anchor.ca_cert,
+                                card.trust_anchor.subject,
+                                card.trust_anchor.subject_alt,
+                                card.trust_anchor.server_cert);
+       }
+
+    return true;
+    }
+
 }
 
+
 #elif IPC_MSRPC
 
 using Rpc;
@@ -371,6 +413,8 @@ public class MoonshotServer : Object {
 
         return success;
     }
+
 }
 
+
 #endif

diff --git a/src/moonshot-webp-parser.vala b/src/moonshot-webp-parser.vala
index 94b8e52..5d9775f 100644 (file)
--- a/src/moonshot-webp-parser.vala
+++ b/src/moonshot-webp-parser.vala
@@ -2,242 +2,7 @@ using Moonshot;
 
 namespace WebProvisioning
 { 
-  IdCard card;
-  IdCard[] cards;
 
-  bool
-  check_stack (SList<string> stack, string[] reference)
-  {
-    if (stack.length () < reference.length)
-      return false;
-    
-    for (int i = 0; i<reference.length; i++)
-    {
-      if (stack.nth_data(i) != reference[i])
-        return false;
-    }
-
-    return true;
-  }
-
-  bool
-  always_confirm_handler (SList<string> stack)
-  {
-    string[] always_confirm_path = {"always-confirm", "rule", "selection-rules", "identity", "identities"};
-    
-    return check_stack (stack, always_confirm_path);
-  }
-  
-  bool
-  pattern_handler (SList<string> stack)
-  {
-    string[] pattern_path = {"pattern", "rule", "selection-rules", "identity", "identities"};
-    
-    return check_stack (stack, pattern_path);
-  }
-
-  bool
-  server_cert_handler (SList<string> stack)
-  {
-    string[] server_cert_path = {"server-cert", "trust-anchor", "identity", "identities"};
-    
-    return check_stack (stack, server_cert_path);
-  }
-
-  bool
-  subject_alt_handler (SList<string> stack)
-  {
-    string[] subject_alt_path = {"subject-alt", "trust-anchor", "identity", "identities"};
-    
-    return check_stack (stack, subject_alt_path);
-  }
-
-  bool
-  subject_handler (SList<string> stack)
-  {
-    string[] subject_path = {"subject", "trust-anchor", "identity", "identities"};
-    
-    return check_stack (stack, subject_path);
-  }
-  
-  bool
-  ca_cert_handler (SList<string> stack)
-  {
-    string[] ca_path = {"ca-cert", "trust-anchor", "identity", "identities"};
-    
-    return check_stack (stack, ca_path);
-  }
-
-  bool
-  realm_handler (SList<string> stack)
-  {
-    string[] realm_path = {"realm", "identity", "identities"};
-    
-    return check_stack (stack, realm_path);
-  }
-
-  bool
-  password_handler (SList<string> stack)
-  {
-    string[] password_path = {"password", "identity", "identities"};
-    
-    return check_stack (stack, password_path);
-  }
-
-  bool
-  user_handler (SList<string> stack)
-  {
-    string[] user_path = {"user", "identity", "identities"};
-    
-    return check_stack (stack, user_path);
-  }
-
-  bool
-  display_name_handler (SList<string> stack)
-  {
-    string[] display_name_path = {"display-name", "identity", "identities"};
-    
-    return check_stack (stack, display_name_path);
-  }
-  
-  public void
-  start_element_func (MarkupParseContext context,
-                      string element_name,
-                      string[] attribute_names,
-                      string[] attribute_values) throws MarkupError
-  {
-    if (element_name == "identity")
-    {
-      IdCard[] tmp_cards = cards;
-
-      cards = new IdCard[tmp_cards.length + 1];
-      for (int i=0; i<tmp_cards.length; i++)
-      {
-        cards[i] = tmp_cards[i];
-      }
-      card = new IdCard();
-      cards[tmp_cards.length] = card;
-    }
-    else if (element_name == "rule")
-    {
-      Rule[] tmp_rules = card.rules;
-      card.rules = new Rule[tmp_rules.length + 1];
-      for (int i=0; i<tmp_rules.length; i++)
-      {
-        card.rules[i] = tmp_rules[i];
-      }
-      
-      card.rules[tmp_rules.length] = Rule();
-    }
-  }
-
-  public void
-  text_element_func (MarkupParseContext context,
-                     string             text,
-                     size_t             text_len) throws MarkupError
-  {
-    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" && user_handler (stack))
-    {
-      card.username = text;
-    }
-    else if (stack.nth_data(0) == "password" && password_handler (stack))
-    {
-      card.password = text;
-    }
-    else if (stack.nth_data(0) == "realm" && realm_handler (stack))
-    {
-      card.issuer = text;
-    }
-    else if (stack.nth_data(0) == "service")
-    {
-      string[] services = card.services;
-      card.services = new string[services.length + 1];
-      for (int i = 0; i<services.length; i++)
-      {
-        card.services[i] = services[i];
-      }
-      card.services[services.length] = text;
-    }
-    /* Rules */
-    else if (stack.nth_data(0) == "pattern" && pattern_handler (stack))
-    {
-      card.rules[card.rules.length - 1].pattern = text;
-    }
-    else if (stack.nth_data(0) == "always-confirm" && always_confirm_handler (stack))
-    {
-      if (text == "true" || text == "false")
-        card.rules[card.rules.length - 1].always_confirm = text;
-    }
-    /*Trust anchor*/
-    else if (stack.nth_data(0) == "ca-cert" && ca_cert_handler (stack))
-    {
-      card.trust_anchor.ca_cert = text;
-    }
-    else if (stack.nth_data(0) == "subject" && subject_handler (stack))
-    {
-      card.trust_anchor.subject = text;
-    }
-    else if (stack.nth_data(0) == "subject-alt" && subject_alt_handler (stack))
-    {
-      card.trust_anchor.subject_alt = text;
-    }
-    else if (stack.nth_data(0) == "server-cert" && server_cert_handler (stack))
-    {
-      card.trust_anchor.server_cert = text;
-    }
-  }
-
-  class Parser
-  {
-    private MarkupParser parser;
-    private string       text;
-    private string       path;
-    public Parser (string path)
-    {
-      text = "";
-      this.path = path;
-
-      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 (GLib.Error e)
-      {
-        error ("Could not retreive file size");
-      }
-      
-      parser = {start_element_func, null, text_element_func, null, null};
-    }
-    
-    public void
-    parse ()
-    {
-      var ctx = new MarkupParseContext(parser, 0, null, null);
-      
-      try
-      {
-        ctx.parse (text, text.length);
-      }
-      catch (GLib.Error e)
-      {
-        error ("Could not parse %s, invalid content", path);
-      } 
-    }
-  }
 
   public static int main (string[] args)
   {

diff --git a/vapi/gtk-mac-integration.vapi b/vapi/gtk-mac-integration.vapi
index d4da637..dcc7b54 100644 (file)
--- a/vapi/gtk-mac-integration.vapi
+++ b/vapi/gtk-mac-integration.vapi
@@ -38,6 +38,10 @@
        
            [CCode(cname="gtk_osxapplication_use_quartz_accelerators")]
            public bool use_quartz_accelerators();
-       
+
+    /* Signals */
+
+       [CCode(cname="NSApplicationOpenFile")]
+        public signal bool ns_application_open_file(string file_name);
     }