Make sure we never return null in the DBus call

diff --git a/src/moonshot-id.vala b/src/moonshot-id.vala
index c372ad3..a2d59ac 100644 (file)
--- a/src/moonshot-id.vala
+++ b/src/moonshot-id.vala
@@ -1,9 +1,9 @@
 public class TrustAnchor : Object
 {
-  public string ca_cert {get; set; default = null;}
-  public string subject {get; set; default = null;}
-  public string subject_alt  {get; set; default = null;}
-  public string server_cert  {get; set; default = null;}
+  public string ca_cert {get; set; default = "";}
+  public string subject {get; set; default = "";}
+  public string subject_alt  {get; set; default = "";}
+  public string server_cert  {get; set; default = "";}
 }
 
 public struct Rule
@@ -16,19 +16,19 @@ public class IdCard : Object
 {
   private string _nai;
   
-  public string display_name { get; set; default = null; }
+  public string display_name { get; set; default = ""; }
   
-  public string username { get; set; default = null; }
+  public string username { get; set; default = ""; }
   public string password { get; set; default = null; }
 
-  public string issuer { get; set; default = null; }
+  public string issuer { get; set; default = ""; }
   
   public Rule[] rules {get; set; default = {};}
   public string[] services { get; set; default = {}; }
 
-
   public TrustAnchor trust_anchor  { get; set; default = new TrustAnchor (); }
   
-  //TODO: Set the getter and remove the setter/default
+  public Gdk.Pixbuf pixbuf { get; set; default = null; }    
+
   public unowned string nai { get {  _nai = username + "@" + password; return _nai;}}
 }

diff --git a/src/moonshot-server.vala b/src/moonshot-server.vala
index 75e64ec..c5cae18 100644 (file)
--- a/src/moonshot-server.vala
+++ b/src/moonshot-server.vala
@@ -41,11 +41,23 @@ public class MoonshotServer : Object {
             nai_out = id_card.nai;
             password_out = id_card.password;
 
-            server_certificate_hash = "certificate";
-
-            // User should have been prompted if there was no p/w.
-            return_if_fail (nai_out != null);
-            return_if_fail (password_out != null);
+            server_certificate_hash = id_card.trust_anchor.server_cert;
+            ca_certificate = id_card.trust_anchor.ca_cert;
+            subject_name_constraint = id_card.trust_anchor.subject;
+            subject_alt_name_constraint = id_card.trust_anchor.subject_alt;
+
+            if (nai_out == null)
+                nai_out = "";
+            if (password_out == null)
+                password_out = "";
+            if (server_certificate_hash == null)
+                server_certificate_hash = "";
+            if (ca_certificate == null)
+                ca_certificate = "";
+            if (subject_name_constraint == null)
+                subject_name_constraint = "";
+            if (subject_alt_name_constraint == null)
+                subject_alt_name_constraint = "";
 
             return true;
         }
@@ -77,11 +89,23 @@ public class MoonshotServer : Object {
             nai_out = request.id_card.nai;
             password_out = request.id_card.password;
 
-            server_certificate_hash = "certificate";
-
-            // User should have been prompted if there was no p/w.
-            return_val_if_fail (nai_out != null, false);
-            return_val_if_fail (password_out != null, false);
+            server_certificate_hash = request.id_card.trust_anchor.server_cert;
+            ca_certificate = request.id_card.trust_anchor.ca_cert;
+            subject_name_constraint = request.id_card.trust_anchor.subject;
+            subject_alt_name_constraint = request.id_card.trust_anchor.subject_alt;
+
+            if (nai_out == null)
+                nai_out = "";
+            if (password_out == null)
+                password_out = "";
+            if (server_certificate_hash == null)
+                server_certificate_hash = "";
+            if (ca_certificate == null)
+                ca_certificate = "";
+            if (subject_name_constraint == null)
+                subject_name_constraint = "";
+            if (subject_alt_name_constraint == null)
+                subject_alt_name_constraint = "";
 
             return true;
         }