/*
- * Copyright (c) 2011-2014, JANET(UK)
+ * Copyright (c) 2011-2016, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
private HashTable<string, Password> password_table;
private static string ComputeHashKey(IdCard card, IIdentityCardStore store) {
- return "%s_store_%d".printf( card.display_name, store.get_store_type() );
+ return "%s_store_%d".printf( card.nai, store.get_store_type() );
}
public void CachePassword(IdCard card, IIdentityCardStore store) {
}
public class IdentityManagerModel : Object {
+ static MoonshotLogger logger = get_logger("IdentityManagerModel");
+
private const string FILE_NAME = "identities.txt";
private PasswordHashTable password_table;
private IIdentityCardStore store;
public LinkedList<IdCard> get_card_list() {
- var identities = store.get_card_list();
- identities.sort( (a, b) => {
- IdCard id_a = (IdCard )a;
- IdCard id_b = (IdCard )b;
- if (id_a.IsNoIdentity() && !id_b.IsNoIdentity()) {
- return -1;
- } else if (id_b.IsNoIdentity() && !id_a.IsNoIdentity()) {
- return 1;
- }
- return strcmp(id_a.display_name, id_b.display_name);
- });
- if (identities.is_empty || !identities[0].IsNoIdentity())
- identities.insert(0, IdCard.NewNoIdentity());
- foreach (IdCard id_card in identities) {
- if (!id_card.store_password) {
- password_table.RetrievePassword(id_card, store);
- }
- }
- return identities;
+ var identities = store.get_card_list();
+ identities.sort((a, b) => {
+ IdCard id_a = (IdCard )a;
+ IdCard id_b = (IdCard )b;
+ if (id_a.is_no_identity() && !id_b.is_no_identity()) {
+ return -1;
+ } else if (id_b.is_no_identity() && !id_a.is_no_identity()) {
+ return 1;
+ }
+ return strcmp(id_a.display_name, id_b.display_name);
+ });
+ if (identities.is_empty || !identities[0].is_no_identity())
+ identities.insert(0, IdCard.NewNoIdentity());
+ foreach (IdCard id_card in identities) {
+ if (!id_card.store_password) {
+ password_table.RetrievePassword(id_card, store);
+ }
+ }
+ return identities;
}
public signal void card_list_changed();
/* This method finds a valid display name */
- public bool display_name_is_valid (string name,
- out string? candidate)
+ public bool display_name_is_valid(string name,
+ out string? candidate)
{
if (&candidate != null)
- candidate = null;
+ candidate = null;
foreach (IdCard id_card in this.store.get_card_list())
{
- if (id_card.display_name == name)
- {
- if (&candidate != null)
+ if (id_card.display_name == name)
{
- for (int i=0; i<1000; i++)
- {
- string tmp = "%s %d".printf (name, i);
- if (display_name_is_valid (tmp, null))
+ if (&candidate != null)
{
- candidate = tmp;
- break;
+ for (int i = 0; i < 1000; i++)
+ {
+ string tmp = "%s %d".printf(name, i);
+ if (display_name_is_valid(tmp, null))
+ {
+ candidate = tmp;
+ break;
+ }
+ }
}
- }
+ return false;
}
- return false;
- }
}
return true;
}
- private bool remove_duplicates(IdCard card)
+ private bool remove_duplicates(IdCard new_card, out ArrayList<IdCard>? old_duplicates)
+ {
+ ArrayList<IdCard> dups = new ArrayList<IdCard>();
+ var cards = this.store.get_card_list();
+ foreach (IdCard id_card in cards) {
+ if ((new_card != id_card) && (id_card.nai == new_card.nai)) {
+ dups.add(id_card);
+ }
+ }
+
+ foreach (IdCard id_card in dups) {
+ logger.trace("removing duplicate id for '%s'\n".printf(new_card.nai));
+ remove_card_internal(id_card);
+
+ if (new_card.trust_anchor.Compare(id_card.trust_anchor) == 0) {
+ logger.trace("Old and new cards have same trust anchor. Re-using the datetime_added field from the old card.");
+ new_card.trust_anchor.set_datetime_added(id_card.trust_anchor.datetime_added);
+ }
+ }
+
+ if (&old_duplicates != null) {
+ old_duplicates = dups;
+ }
+
+ return (dups.size > 0);
+ }
+
+
+ public bool find_duplicate_nai_sets(out ArrayList<ArrayList<IdCard>> duplicates)
{
- bool duplicate_found = false;
+ var nais = new HashMap<string, ArrayList<IdCard>>();
+
+ duplicates = new ArrayList<ArrayList<IdCard>>();
+ LinkedList<IdCard> card_list = get_card_list() ;
+ if (card_list == null) {
+ return false;
+ }
+
bool found = false;
- do {
- var cards = this.store.get_card_list();
- found = false;
- foreach (IdCard id_card in cards) {
- if ((card != id_card) && (id_card.nai == card.nai)) {
- stdout.printf("removing duplicate id for '%s'\n", card.nai);
- remove_card_internal(id_card);
- found = duplicate_found = true;
- break;
- }
- }
- } while (found);
- return duplicate_found;
+ foreach (IdCard id_card in card_list) {
+ logger.trace(@"load_id_cards: Loading card with display name '$(id_card.display_name)' and nai '$(id_card.nai)'");
+
+ //!!TODO: This uniqueness check really belongs somewhere else -- like where we add
+ // IDs, and/or read them from storage. However, we should never hit this.
+
+ if (nais.has_key(id_card.nai)) {
+ ArrayList<IdCard> list = nais.get(id_card.nai);
+ list.add(id_card);
+ }
+ else {
+ ArrayList<IdCard> list = new ArrayList<IdCard>();
+ list.add(id_card);
+ nais.set(id_card.nai, list);
+ }
+ }
+
+ duplicates = new ArrayList<ArrayList<IdCard>>();
+ foreach (Map.Entry<string, ArrayList<IdCard>> entry in nais.entries) {
+ var list = entry.value;
+ if (list.size > 1) {
+ duplicates.add(list);
+ found = true;
+ }
+ }
+ return found;
}
+
public IdCard? find_id_card(string nai, bool force_flat_file_store) {
IdCard? retval = null;
IIdentityCardStore.StoreType saved_store_type = get_store_type();
return retval;
}
- public void add_card(IdCard card, bool force_flat_file_store) {
- if (card.temporary)
+ public void add_card(IdCard card, bool force_flat_file_store, out ArrayList<IdCard>? old_duplicates=null) {
+ if (card.temporary) {
+ logger.trace("add_card: card is temporary; returning.");
return;
+ }
string candidate;
IIdentityCardStore.StoreType saved_store_type = get_store_type();
if (force_flat_file_store)
set_store_type(IIdentityCardStore.StoreType.FLAT_FILE);
- remove_duplicates(card);
+ remove_duplicates(card, out old_duplicates);
- if (!display_name_is_valid (card.display_name, out candidate))
+ if (!display_name_is_valid(card.display_name, out candidate))
{
- card.display_name = candidate;
+ card.display_name = candidate;
}
if (!card.store_password)
password_table.CachePassword(card, store);
+
+ logger.trace("add_card: Adding card '%s' with services: '%s'"
+ .printf(card.display_name, card.get_services_string("; ")));
+
store.add_card(card);
set_store_type(saved_store_type);
card_list_changed();
- }
+ }
+
+ public IdCard update_card(IdCard card) {
+ logger.trace("update_card");
- public IdCard update_card(IdCard card) {
IdCard retval;
if (card.temporary) {
retval = card;
retval = store.update_card(card);
card_list_changed();
return retval;
- }
+ }
- private bool remove_card_internal(IdCard card) {
- if (card.temporary)
- return false;
- password_table.RemovePassword(card, store);
- return store.remove_card(card);
- }
+ private bool remove_card_internal(IdCard card) {
+ if (card.temporary)
+ return false;
+ password_table.RemovePassword(card, store);
+ return store.remove_card(card);
+ }
- public bool remove_card(IdCard card) {
- if (remove_card_internal(card)) {
+ public bool remove_card(IdCard card) {
+ if (remove_card_internal(card)) {
+ logger.trace(@"remove_card: Removed '$(card.display_name)'");
card_list_changed();
return true;
- }
- return false;
- }
-
- public void set_store_type(IIdentityCardStore.StoreType type) {
- if ((store != null) && (store.get_store_type() == type))
- return;
- switch (type) {
-#if GNOME_KEYRING
- case IIdentityCardStore.StoreType.KEYRING:
- store = new KeyringStore();
- break;
-#endif
- case IIdentityCardStore.StoreType.FLAT_FILE:
- default:
- store = new LocalFlatFileStore();
- break;
- }
- }
-
- public IIdentityCardStore.StoreType get_store_type() {
- return store.get_store_type();
- }
-
- public bool HasNonTrivialIdentities() {
- foreach (IdCard card in this.store.get_card_list()) {
- // The 'NoIdentity' card is non-trivial if it has services or rules.
- // All other cards are automatically non-trivial.
- if ((!card.IsNoIdentity()) ||
- (card.services.length > 0) ||
- (card.rules.length > 0)) {
- return true;
- }
- }
- return false;
- }
+ }
+ logger.warn(@"remove_card: Couldn't remove '$(card.display_name)'");
+ return false;
+ }
+
+ // The name is misleading: This not only sets the store type,
+ // it also creates a new store instance, which loads the card data.
+ public void set_store_type(IIdentityCardStore.StoreType type) {
+ if ((store != null) && (store.get_store_type() == type))
+ return;
+ switch (type) {
+ #if GNOME_KEYRING
+ case IIdentityCardStore.StoreType.KEYRING:
+ store = new KeyringStore();
+ break;
+ #endif
+ case IIdentityCardStore.StoreType.FLAT_FILE:
+ default:
+ store = new LocalFlatFileStore();
+ break;
+ }
+
+ // Loop through the loaded IDs. If any trust anchors are old enough that we didn't record
+ // the datetime_added, add it now.
+ string before_now = _("Before ") + TrustAnchor.format_datetime_now();
+ bool save_needed = false;
+ foreach (IdCard id in this.store.get_card_list()) {
+ if (!id.trust_anchor.is_empty() && id.trust_anchor.datetime_added == "") {
+ logger.trace("set_store_type : Set ta_datetime_added for old trust anchor on '%s' to '%s'".printf(id.display_name, before_now));
+ id.trust_anchor.set_datetime_added(before_now);
+ save_needed = true;
+ }
+ }
+ if (save_needed) {
+ this.store.store_id_cards();
+ }
+ }
+
+ public IIdentityCardStore.StoreType get_store_type() {
+ return store.get_store_type();
+ }
+
+ public bool HasNonTrivialIdentities() {
+ foreach (IdCard card in this.store.get_card_list()) {
+ // The 'NoIdentity' card is non-trivial if it has services or rules.
+ // All other cards are automatically non-trivial.
+ if ((!card.is_no_identity()) ||
+ (card.services.size > 0) ||
+ (card.rules.length > 0)) {
+ return true;
+ }
+ }
+ return false;
+ }
private IdentityManagerApp parent;
public IdentityManagerModel(IdentityManagerApp parent_app, IIdentityCardStore.StoreType store_type) {
+ logger.trace("IdentityManagerModel: store_type=" + store_type.to_string());
parent = parent_app;
password_table = new PasswordHashTable();
set_store_type(store_type);
projects / moonshot-ui.git / blobdiff