+/*
+ * Copyright (c) 2011-2014, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+*/
using Gee;
#if GNOME_KEYRING
public void add_card(IdCard card) {
id_card_list.add(card);
- store_id_cards ();
+ store_id_cards();
}
- public void update_card(IdCard card) {
+ public IdCard? update_card(IdCard card) {
id_card_list.remove(card);
id_card_list.add(card);
- store_id_cards ();
+ store_id_cards();
+ foreach (IdCard idcard in id_card_list) {
+ if (idcard.display_name == card.display_name) {
+ return idcard;
+ }
+ }
+ return null;
}
- public void remove_card(IdCard card) {
- id_card_list.remove(card);
- store_id_cards ();
+ public bool remove_card(IdCard card) {
+ bool retval = id_card_list.remove(card);
+ if (retval)
+ store_id_cards();
+ return retval;
}
public IIdentityCardStore.StoreType get_store_type() {
/* clear all keyring-stored ids (in preparation to store current list) */
private void clear_keyring() {
- GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
- match.append_string(keyring_store_attribute, keyring_store_version);
- GLib.List<GnomeKeyring.Found> items;
+ GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
+ match.append_string(keyring_store_attribute, keyring_store_version);
+ GLib.List<GnomeKeyring.Found> items;
GnomeKeyring.find_items_sync(item_type, match, out items);
foreach(unowned GnomeKeyring.Found entry in items) {
GnomeKeyring.Result result = GnomeKeyring.item_delete_sync(null, entry.item_id);
private void load_id_cards() {
id_card_list.clear();
- GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
- match.append_string(keyring_store_attribute, keyring_store_version);
- GLib.List<GnomeKeyring.Found> items;
+ GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
+ match.append_string(keyring_store_attribute, keyring_store_version);
+ GLib.List<GnomeKeyring.Found> items;
GnomeKeyring.find_items_sync(item_type, match, out items);
foreach(unowned GnomeKeyring.Found entry in items) {
- IdCard id_card = new IdCard ();
+ IdCard id_card = new IdCard();
int i;
int rules_patterns_index = -1;
int rules_always_confirm_index = -1;
string store_password = null;
- for (i=0; i<entry.attributes.len; i++) {
+ for (i = 0; i < entry.attributes.len; i++) {
var attribute = ((GnomeKeyring.Attribute *) entry.attributes.data)[i];
- string value = attribute.string_value;
- if (attribute.name == "Issuer") {
+ string value = attribute.string_value;
+ if (attribute.name == "Issuer") {
id_card.issuer = value;
- } else if (attribute.name == "Username") {
+ } else if (attribute.name == "Username") {
id_card.username = value;
- } else if (attribute.name == "DisplayName") {
+ } else if (attribute.name == "DisplayName") {
id_card.display_name = value;
- } else if (attribute.name == "Services") {
+ } else if (attribute.name == "Services") {
id_card.services = value.split(";");
} else if (attribute.name == "Rules-Pattern") {
rules_patterns_index = i;
} else if (attribute.name == "Rules-AlwaysConfirm") {
rules_always_confirm_index = i;
} else if (attribute.name == "CA-Cert") {
- id_card.trust_anchor.ca_cert = value;
+ id_card.trust_anchor.ca_cert = value.strip();
} else if (attribute.name == "Server-Cert") {
id_card.trust_anchor.server_cert = value;
} else if (attribute.name == "Subject") {
string [] rules_always_confirm = rules_always_confirm_all.split(";");
string [] rules_patterns = rules_patterns_all.split(";");
if (rules_patterns.length == rules_always_confirm.length) {
- Rule[] rules = new Rule[rules_patterns.length];
- for (int j=0; j<rules_patterns.length; j++) {
- rules[j].pattern = rules_patterns[j];
- rules[j].always_confirm = rules_always_confirm[j];
- }
- id_card.rules = rules;
+ Rule[] rules = new Rule[rules_patterns.length];
+ for (int j = 0; j < rules_patterns.length; j++) {
+ rules[j].pattern = rules_patterns[j];
+ rules[j].always_confirm = rules_always_confirm[j];
+ }
+ id_card.rules = rules;
}
}
}
}
- public void store_id_cards () {
+ public void store_id_cards() {
clear_keyring();
foreach (IdCard id_card in this.id_card_list) {
- string[] rules_patterns = new string[id_card.rules.length];
- string[] rules_always_conf = new string[id_card.rules.length];
+ /* workaround for Centos vala array property bug: use temp array */
+ var rules = id_card.rules;
+ var services_array = id_card.services;
+ string[] rules_patterns = new string[rules.length];
+ string[] rules_always_conf = new string[rules.length];
- for (int i=0; i<id_card.rules.length; i++) {
- rules_patterns[i] = id_card.rules[i].pattern;
- rules_always_conf[i] = id_card.rules[i].always_confirm;
+ for (int i = 0; i < rules.length; i++) {
+ rules_patterns[i] = rules[i].pattern;
+ rules_always_conf[i] = rules[i].always_confirm;
}
string patterns = string.joinv(";", rules_patterns);
string always_conf = string.joinv(";", rules_always_conf);
- string services = string.joinv(";", id_card.services);
+ string services = string.joinv(";", services_array);
GnomeKeyring.AttributeList attributes = new GnomeKeyring.AttributeList();
uint32 item_id;
attributes.append_string(keyring_store_attribute, keyring_store_version);
attributes.append_string("StorePassword", id_card.store_password ? "yes" : "no");
GnomeKeyring.Result result = GnomeKeyring.item_create_sync(null,
- item_type, id_card.display_name, attributes,
- id_card.store_password ? id_card.password : "",
- true, out item_id);
+ item_type, id_card.display_name, attributes,
+ id_card.store_password ? id_card.password : "",
+ true, out item_id);
if (result != GnomeKeyring.Result.OK) {
stdout.printf("GnomeKeyring.item_create_sync() failed. result: %d", result);
}
load_id_cards();
}
- public KeyringStore () {
+ public KeyringStore() {
id_card_list = new LinkedList<IdCard>();
load_id_cards();
}
projects / moonshot-ui.git / blobdiff