X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmoonshot-identity-dialog.vala;h=ccec92c5f31368d06b3389f9110ad8177354955e;hb=3483be3d73af11f2bf7ce3318514c4fce50bebf4;hp=0ae737a2d49c3d6e30060f52e353968057e9690b;hpb=9e70ca46454122515d5af2daf10d7577732ed9b2;p=moonshot-ui.git diff --git a/src/moonshot-identity-dialog.vala b/src/moonshot-identity-dialog.vala index 0ae737a..ccec92c 100644 --- a/src/moonshot-identity-dialog.vala +++ b/src/moonshot-identity-dialog.vala @@ -29,6 +29,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +using Gee; using Gtk; @@ -40,21 +42,13 @@ static const string CANCEL = STOCK_CANCEL; #endif +// For use when exporting certificates. +static string export_directory = null; + class IdentityDialog : Dialog { private static Gdk.Color white = make_color(65535, 65535, 65535); private static Gdk.Color selected_color = make_color(0xd9 << 8, 0xf7 << 8, 65535); - private static Gdk.Color alt_color = make_color(0xf2 << 8, 0xf2 << 8, 0xf2 << 8); - - private static Gdk.Color make_color(uint16 red, uint16 green, uint16 blue) - { - Gdk.Color color = Gdk.Color(); - color.red = red; - color.green = green; - color.blue = blue; - - return color; - } private static MoonshotLogger logger = get_logger("IdentityDialog"); @@ -63,7 +57,6 @@ class IdentityDialog : Dialog static const string username_labeltext = _("Username"); static const string password_labeltext = _("Password"); - private IdentityManagerView parent; private Entry displayname_entry; private Label displayname_label; private Entry realm_entry; @@ -79,6 +72,9 @@ class IdentityDialog : Dialog private Label selected_item = null; + // Whether to clear the card's TrustAnchor after the user selects OK + internal bool clear_trust_anchor = false; + public string display_name { get { return displayname_entry.get_text(); } } @@ -99,7 +95,7 @@ class IdentityDialog : Dialog get { return remember_checkbutton.active; } } - internal string[] get_services() + internal ArrayList get_services() { return card.services; } @@ -121,7 +117,6 @@ class IdentityDialog : Dialog this.set_title(title); this.set_modal(true); this.set_transient_for(parent); - this.parent = parent; this.add_buttons(_("OK"), ResponseType.OK, CANCEL, ResponseType.CANCEL); Box content_area = (Box) this.get_content_area(); @@ -146,20 +141,23 @@ class IdentityDialog : Dialog password_label = new Label(@"$password_labeltext:"); password_label.set_alignment(0, (float) 0.5); + + remember_checkbutton = new CheckButton.with_label(_("Remember password")); + remember_checkbutton.active = card.store_password; + password_entry = new Entry(); password_entry.set_invisible_char('*'); password_entry.set_visibility(false); - password_entry.set_text(card.password); password_entry.set_width_chars(40); + password_entry.set_text(card.password); - remember_checkbutton = new CheckButton.with_label(_("Remember password")); message_label = new Label(""); message_label.set_visible(false); set_atk_relation(displayname_label, displayname_entry, Atk.RelationType.LABEL_FOR); set_atk_relation(realm_label, realm_entry, Atk.RelationType.LABEL_FOR); set_atk_relation(username_label, username_entry, Atk.RelationType.LABEL_FOR); - set_atk_relation(password_entry, password_entry, Atk.RelationType.LABEL_FOR); + set_atk_relation(password_label, password_entry, Atk.RelationType.LABEL_FOR); content_area.pack_start(message_label, false, false, 6); add_as_vbox(content_area, displayname_label, displayname_entry); @@ -185,16 +183,99 @@ class IdentityDialog : Dialog if (!is_new_card) { + Widget trust_anchor_box = make_trust_anchor_box(card); + content_area.pack_start(trust_anchor_box, false, false, 15); + var services_vbox = make_services_vbox(); content_area.pack_start(services_vbox); } + if (card.is_no_identity()) + { + displayname_entry.set_sensitive(false); + realm_entry.set_sensitive(false); + username_entry.set_sensitive(false); + password_entry.set_sensitive(false); + remember_checkbutton.set_sensitive(false); + } + this.set_border_width(6); this.set_resizable(false); this.modify_bg(StateType.NORMAL, white); this.show_all(); } + private Widget make_trust_anchor_box(IdCard id) + { + + Label ta_label = new Label(_("Trust anchor: ") + + (id.trust_anchor.is_empty() ? _("None") : _("Enterprise provisioned"))); + ta_label.set_alignment(0, 0.5f); + + if (id.trust_anchor.is_empty()) { + return ta_label; + } + + + AttachOptions opts = AttachOptions.EXPAND | AttachOptions.FILL; + AttachOptions fill = AttachOptions.FILL; + + Table ta_table = new Table(6, 2, false); + int row = 0; + + var ta_clear_button = new Button.with_label(_("Clear Trust Anchor")); + ta_clear_button.clicked.connect((w) => { + clear_trust_anchor = true; + ta_table.set_sensitive(false); + } + ); + + ta_table.attach(ta_label, 0, 1, row, row + 1, opts, opts, 0, 0); + ta_table.attach(ta_clear_button, 1, 2, row, row + 1, fill, fill, 0, 0); + row++; + + Label added_label = new Label(_("Added : " + id.trust_anchor.datetime_added)); + added_label.set_alignment(0, 0.5f); + ta_table.attach(added_label, 0, 1, row, row + 1, opts, opts, 20, 5); + row++; + + if (id.trust_anchor.get_anchor_type() == TrustAnchor.TrustAnchorType.SERVER_CERT) { + Widget fingerprint = make_ta_fingerprint_widget(id.trust_anchor); + ta_table.attach(fingerprint, 0, 2, row, row + 2, opts, opts, 20, 5); + } + else { + Label ca_cert_label = new Label(_("CA Certificate:")); + ca_cert_label.set_alignment(0, 0.5f); + var export_button = new Button.with_label(_("Export Certificate")); + //!!TODO! + export_button.clicked.connect((w) => {export_certificate(id);}); + + ta_table.attach(ca_cert_label, 0, 1, row, row + 1, opts, opts, 20, 0); + ta_table.attach(export_button, 1, 2, row, row + 1, fill, fill, 0, 0); + row++; + + //!!TODO: When to show Subject, and when (if ever) show Subject-Altname here? + Label subject_label = new Label(_("Subject: ") + id.trust_anchor.subject); + subject_label.set_alignment(0, 0.5f); + ta_table.attach(subject_label, 0, 1, row, row + 1, opts, opts, 40, 5); + row++; + + Label expiration_label = new Label(_("Expiration date: ") + id.trust_anchor.get_expiration_date()); + expiration_label.set_alignment(0, 0.5f); + ta_table.attach(expiration_label, 0, 1, row, row + 1, opts, opts, 40, 5); + row++; + + //!!TODO: What *is* this? + Label constraint_label = new Label(_("Constraint: ")); + constraint_label.set_alignment(0, 0.5f); + ta_table.attach(constraint_label, 0, 1, row, row + 1, opts, opts, 20, 0); + row++; + } + + return ta_table; + + } + private static void add_as_vbox(Box content_area, Label label, Entry entry) { VBox vbox = new VBox(false, 2); @@ -241,10 +322,13 @@ class IdentityDialog : Dialog string preamble = ""; string message = ""; string password_test = store_password ? password : "not required"; - check_field(display_name, displayname_label, displayname_labeltext, ref preamble, ref message); - check_field(username, username_label, username_labeltext, ref preamble, ref message); - check_field(issuer, realm_label, realm_labeltext, ref preamble, ref message); - check_field(password_test, password_label, password_labeltext, ref preamble, ref message); + if (!card.is_no_identity()) + { + check_field(display_name, displayname_label, displayname_labeltext, ref preamble, ref message); + check_field(username, username_label, username_labeltext, ref preamble, ref message); + check_field(issuer, realm_label, realm_labeltext, ref preamble, ref message); + check_field(password_test, password_label, password_labeltext, ref preamble, ref message); + } if (message != "") { message_label.set_visible(true); message_label.set_markup(@"$preamble$message"); @@ -265,14 +349,6 @@ class IdentityDialog : Dialog } } - private void set_atk_relation(Widget widget, Widget target_widget, Atk.RelationType relationship) - { - var atk_widget = widget.get_accessible(); - var atk_target_widget = target_widget.get_accessible(); - - atk_widget.add_relationship(relationship, atk_target_widget); - } - private static void label_make_bold(Label label) { var font_desc = new Pango.FontDescription(); @@ -291,7 +367,7 @@ class IdentityDialog : Dialog { logger.trace("make_services_vbox"); - var services_vbox_alignment = new Alignment(0, 0, 0, 1); + var services_vbox_alignment = new Alignment(0, 0, 1, 0); var services_vscroll = new ScrolledWindow(null, null); services_vscroll.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC); services_vscroll.set_shadow_type(ShadowType.IN); @@ -306,7 +382,7 @@ class IdentityDialog : Dialog remove_button.set_sensitive(false); - var services_table = new Table(card.services.length, 1, false); + var services_table = new Table(card.services.size, 1, false); services_table.set_row_spacings(1); services_table.set_col_spacings(0); services_table.modify_bg(StateType.NORMAL, white); @@ -317,7 +393,7 @@ class IdentityDialog : Dialog // Hack to prevent the button from growing vertically VBox fixed_height = new VBox(false, 0); fixed_height.pack_start(remove_button, false, false, 0); - table_button_hbox.pack_start(fixed_height, false, false, 6); + table_button_hbox.pack_start(fixed_height, false, false, 0); // A table doesn't have a background color, so put it in an EventBox, and // set the EventBox's background color instead. @@ -328,17 +404,18 @@ class IdentityDialog : Dialog var services_vbox_title = new Label(_("Services:")); label_make_bold(services_vbox_title); - services_vbox_title.set_alignment(0, (float) 0.5); + services_vbox_title.set_alignment(0, 0.5f); var services_vbox = new VBox(false, 6); - services_vbox.pack_start(services_vbox_title, false, false, 6); - services_vbox.pack_start(table_button_hbox, true, true, 6); + services_vbox.pack_start(services_vbox_title, false, false, 0); + services_vbox.pack_start(table_button_hbox, true, true, 0); int i = 0; foreach (string service in card.services) { var label = new Label(service); label.set_alignment((float) 0, (float) 0); + label.xpad = 3; EventBox event_box = new EventBox(); event_box.modify_bg(StateType.NORMAL, white); @@ -372,39 +449,23 @@ class IdentityDialog : Dialog return false; }); - AttachOptions opts = AttachOptions.EXPAND | AttachOptions.FILL; - services_table.attach(event_box, 0, 1, i, i+1, opts, opts, 3, 0); + services_table.attach_defaults(event_box, 0, 1, i, i+1); i++; } remove_button.clicked.connect((remove_button) => { - var dialog = new Gtk.MessageDialog(this, - Gtk.DialogFlags.DESTROY_WITH_PARENT, - Gtk.MessageType.QUESTION, - Gtk.ButtonsType.YES_NO, - _("You are about to remove the service '%s'. Are you sure you want to do this?"), - selected_item.label); - var ret = dialog.run(); - dialog.destroy(); - - if (ret == Gtk.ResponseType.YES) + var result = WarningDialog.confirm(this, + Markup.printf_escaped( + "You are about to remove the service '%s'.", + selected_item.label) + + "\n\nAre you sure you want to do this?", + "delete_service"); + + if (result) { if (card != null) { - SList services = new SList(); - - foreach (string srv in card.services) - { - if (srv != selected_item.label) - services.append(srv); - } - - card.services = new string[services.length()]; - for (int j = 0; j < card.services.length; j++) - { - card.services[j] = services.nth_data(j); - } - + card.services.remove(selected_item.label); services_table.remove(selected_item.parent); selected_item = null; remove_button.set_sensitive(false); @@ -416,5 +477,52 @@ class IdentityDialog : Dialog return services_vbox; } - + private void export_certificate(IdCard id) + { + var dialog = new FileChooserDialog("Save File", + this, + FileChooserAction.SAVE, + _("Cancel"),ResponseType.CANCEL, + _("Save"), ResponseType.ACCEPT, + null); + dialog.set_do_overwrite_confirmation(true); + if (export_directory != null) { + dialog.set_current_folder(export_directory); + } + // Remove slashes from the default filename. + string default_filename = + (id.display_name + ".pem").replace(Path.DIR_SEPARATOR_S, "_"); + dialog.set_current_name(default_filename); + if (dialog.run() == ResponseType.ACCEPT) + { + // Export the certificate in PEM format. + + const string CERT_HEADER = "-----BEGIN CERTIFICATE-----\n"; + const string CERT_FOOTER = "\n-----END CERTIFICATE-----\n"; + + // Strip any embedded newlines in the certificate... + string cert = id.trust_anchor.ca_cert.replace("\n", ""); + + // Re-embed newlines every 64 chars. + string newcert = CERT_HEADER; + while (cert.length > 63) { + newcert += cert[0:64]; + newcert += "\n"; + cert = cert[64:cert.length]; + } + if (cert.length > 0) { + newcert += cert; + } + newcert += CERT_FOOTER; + + string filename = dialog.get_filename(); + var file = File.new_for_path(filename); + var stream = file.replace(null, false, FileCreateFlags.PRIVATE); + stream.write(newcert.data); + + // Save the parent directory to use as default for next save + export_directory = file.get_parent().get_path(); + } + dialog.destroy(); + } }