geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NSL Support, expose Create and Modify Timestamp info thru miCASAWrapper.

Browse Source
This commit is contained in:
Jim Norman 2007-01-05 11:01:07 +00:00
parent f2b89108b9
commit d81e894996
8 changed files with 241 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CASA/adlib/miCASAEngine.cs
View File

@ -119,35 +119,34 @@ namespace Novell.CASA.DataEngines
value1 = doc.CreateElement(ConstStrings.CCF_VALUE); value1 = doc.CreateElement(ConstStrings.CCF_VALUE);
value1.InnerText = sValue; value1.InnerText = sValue;
key1.AppendChild(value1); key1.AppendChild(value1);
mi_secret.AppendChild(key1); mi_secret.AppendChild(key1);
} }
/*
//Time //Time
XmlElement Time1 = doc.CreateElement(ConstStrings.CCF_TIME); XmlElement Time1 = doc.CreateElement(ConstStrings.CCF_TIME);
XmlElement zone1 = doc.CreateElement(ConstStrings.CCF_ZONE); XmlElement zone1 = doc.CreateElement(ConstStrings.CCF_ZONE);
zone1.InnerText = "IST"; zone1.InnerText = DateTime.Today.ToString();
XmlElement cr1 = doc.CreateElement(ConstStrings.CCF_CRTIME); XmlElement cr1 = doc.CreateElement(ConstStrings.CCF_CRTIME);
cr1.InnerText = null; cr1.InnerText = secret.GetCreateTime().Ticks.ToString();
XmlElement mod1 = doc.CreateElement(ConstStrings.CCF_MDTIME); XmlElement mod1 = doc.CreateElement(ConstStrings.CCF_MDTIME);
mod1.InnerText = null; mod1.InnerText = secret.GetModifiedTime().Ticks.ToString();
XmlElement acc1 = doc.CreateElement(ConstStrings.CCF_ACTIME); //XmlElement acc1 = doc.CreateElement(ConstStrings.CCF_ACTIME);
acc1.InnerText = null; //acc1.InnerText = null;
Time1.AppendChild(zone1); Time1.AppendChild(zone1);
Time1.AppendChild(cr1); Time1.AppendChild(cr1);
Time1.AppendChild(mod1); Time1.AppendChild(mod1);
Time1.AppendChild(acc1); //Time1.AppendChild(acc1);
mi_secret.AppendChild(Time1); mi_secret.AppendChild(Time1);
*/
//Finally Add Secret to Elem //Finally Add Secret to Elem
keychain.AppendChild(mi_secret); keychain.AppendChild(mi_secret);

43
CASA/gui/MiCasa.cs
View File

@ -148,14 +148,16 @@ public class MiCasa : Store
m_config = config; m_config = config;
/// SecretID TreeStore /// SecretID TreeStore
tvSecretIDMiCasa = (Gtk.TreeView)CasaMain.gxmlMain.GetWidget("tvSecretIDMiCasa"); tvSecretIDMiCasa = (Gtk.TreeView)CasaMain.gxmlMain.GetWidget("tvSecretIDMiCasa");
tsSecretIDMiCasa = new TreeStore(typeof(string), typeof(string[]), typeof(string[]), typeof(string), typeof(string[]), typeof(string[])); tsSecretIDMiCasa = new TreeStore(typeof(string), typeof(string[]), typeof(string[]), typeof(string), typeof(string[]), typeof(string[]));
tvSecretIDMiCasa.AppendColumn("Secret ID",new CellRendererText(),"text",0); tvSecretIDMiCasa.AppendColumn("Secret ID",new CellRendererText(),"text",0);
tvSecretIDMiCasa.Model = tsSecretIDMiCasa; tvSecretIDMiCasa.Model = tsSecretIDMiCasa;
tsSecretIDMiCasa.SetSortColumnId(0, Gtk.SortType.Ascending); tsSecretIDMiCasa.SetSortColumnId(0, Gtk.SortType.Ascending);
tvSecretIDMiCasa.RowActivated += new RowActivatedHandler(OntvSecretIDMiCasaRowActivated); tvSecretIDMiCasa.RowActivated += new RowActivatedHandler(OntvSecretIDMiCasaRowActivated);
tvSecretIDMiCasa.ButtonReleaseEvent += new ButtonReleaseEventHandler(OnRightClicked); tvSecretIDMiCasa.ButtonReleaseEvent += new ButtonReleaseEventHandler(OnRightClicked);
tvSecretIDMiCasa.CursorChanged += new EventHandler(OnCursorChanged); tvSecretIDMiCasa.CursorChanged += new EventHandler(OnCursorChanged);
/// NativeInfo TreeStore /// NativeInfo TreeStore
tvNativeInfoMiCasa = (Gtk.TreeView)CasaMain.gxmlMain.GetWidget("tvNativeInfoMiCasa"); tvNativeInfoMiCasa = (Gtk.TreeView)CasaMain.gxmlMain.GetWidget("tvNativeInfoMiCasa");
tsNativeInfoMiCasa = new TreeStore(typeof(string), typeof(string)); tsNativeInfoMiCasa = new TreeStore(typeof(string), typeof(string));
@ -309,11 +311,14 @@ public class MiCasa : Store
cellEditable = new CellRendererText(); cellEditable = new CellRendererText();
cellEditable.Editable = true; cellEditable.Editable = true;
cellEditable.Edited += new EditedHandler(OnKeyValueEdited); cellEditable.Edited += new EditedHandler(OnKeyValueEdited);
/// KEY:0 VALUE:1 VALUE-DUP:2 DIRTY-BIT:3 LINK:4 /// KEY:0 VALUE:1 VALUE-DUP:2 DIRTY-BIT:3 LINK:4
tsKeyValue = new TreeStore(typeof(string),typeof(string), typeof(string), typeof(bool), typeof(string)); tsKeyValue = new TreeStore(typeof(string), typeof(string), typeof(string), typeof(bool), typeof(string), typeof(string), typeof(string));
tvKeyValue.AppendColumn("Key",new CellRendererText(),"text",0); tvKeyValue.AppendColumn("Key",new CellRendererText(),"text",0);
tvKeyValue.AppendColumn("Value",cellEditable,"text",2); tvKeyValue.AppendColumn("Value",cellEditable,"text",2);
tvKeyValue.AppendColumn("Linked", new CellRendererText(), "text", 4); tvKeyValue.AppendColumn("Linked", new CellRendererText(), "text", 4);
tvKeyValue.AppendColumn("Created", new CellRendererText(), "text", 5);
tvKeyValue.AppendColumn("Modified", new CellRendererText(), "text", 6);
tvKeyValue.RowActivated += new RowActivatedHandler(tvKeyValue_RowActivated); tvKeyValue.RowActivated += new RowActivatedHandler(tvKeyValue_RowActivated);
@ -325,8 +330,13 @@ public class MiCasa : Store
for( int i=0; i< keys.Length; i++ ) for( int i=0; i< keys.Length; i++ )
{ {
Secret secret = ss.getSecret(selected); Secret secret = ss.getSecret(selected);
Hashtable ht = secret.GetLinkedKeys(keys[i]);
Hashtable ht = secret.GetLinkedKeys(keys[i]);
DateTime dtCreated = secret.GetCreateTimeForKey(keys[i]);
DateTime dtModified = secret.GetModifiedTimeForKey(keys[i]);
if (ht != null && ht.Count > 0) if (ht != null && ht.Count > 0)
bHasLinks = true; bHasLinks = true;
else else
@ -335,12 +345,23 @@ public class MiCasa : Store
if( (null != keys[i]) && (null != values[i]) ) if( (null != keys[i]) && (null != values[i]) )
if( bHasLinks ) if( bHasLinks )
{ {
tsKeyValue.AppendValues(keys[i], values[i], "********", false, "Yes"); tsKeyValue.AppendValues(keys[i],
values[i],
"********",
false,
"Yes",
dtCreated.ToShortDateString() + " " + dtCreated.ToShortTimeString(),
dtModified.ToShortDateString() + " " + dtModified.ToShortTimeString());
} }
else else
{ {
tsKeyValue.AppendValues(keys[i], values[i], "********", false, "No"); tsKeyValue.AppendValues(keys[i],
values[i],
"********",
false,
"No",
dtCreated.ToShortDateString() + " " + dtCreated.ToShortTimeString(),
dtModified.ToShortDateString() + " " + dtModified.ToShortTimeString());
} }
} }

51
CASA/gui/StoreDataInterface.cs
View File

@ -316,11 +316,21 @@ namespace Novell.CASA.GUI {
{ {
while( secIter.MoveNext() ) while( secIter.MoveNext() )
{//Enumerate the Time Nodes of this secret {//Enumerate the Time Nodes of this secret
if( secIter.Current.Name.Equals(CCFXML_ELEMENT_TIME_MODIFIED) ) if( secIter.Current.Name.Equals(CCFXML_ELEMENT_TIME_MODIFIED) )
{//miCASA-KeyChain-Secret-Key-Value-Time-modified
//miCASA-KeyChain-Secret-Key-Value-Time-modified
modifiedTime = secIter.Current.Value; {
string sTicks = secIter.Current.Value;
try
{
DateTime dt = new DateTime(long.Parse(sTicks));
modifiedTime = secIter.Current.Value;
}
catch (Exception)
{
modifiedTime = "unknown";
}
} }
} }
} }
@ -402,11 +412,32 @@ namespace Novell.CASA.GUI {
strNativeValueArray[Common.INDEX_NATIVEINFO_SYNC] = synch; strNativeValueArray[Common.INDEX_NATIVEINFO_SYNC] = synch;
strNativeValueArray[Common.INDEX_NATIVEINFO_SYNCTYPE] = synchType; strNativeValueArray[Common.INDEX_NATIVEINFO_SYNCTYPE] = synchType;
strNativeValueArray[Common.INDEX_NATIVEINFO_MODIFIEDTIME] = modifiedTime; strNativeValueArray[Common.INDEX_NATIVEINFO_MODIFIEDTIME] = modifiedTime;
//Console.WriteLine("folderName="+folderName+"\n"+"typeID="+typeID+"\n"+"synch="+synch+"\n"+"synchType="+synchType+"\n"+"modifiedTime="+modifiedTime); //Console.WriteLine("folderName="+folderName+"\n"+"typeID="+typeID+"\n"+"synch="+synch+"\n"+"synchType="+synchType+"\n"+"modifiedTime="+modifiedTime);
if ( storeIDentifier == Common.STORE_FIREFOX) if (storeIDentifier == Common.STORE_FIREFOX)
ls.AppendValues(secretID,strKeyArray,strValueArray,storeID,strNativeKeyArray,strNativeValueArray,boolIsPassArray); {
else ls.AppendValues(secretID, strKeyArray, strValueArray, storeID, strNativeKeyArray, strNativeValueArray, boolIsPassArray);
ls.AppendValues(secretID,strKeyArray,strValueArray,storeID,strNativeKeyArray,strNativeValueArray); }
else if (storeIDentifier == Common.STORE_MICASA)
{
// convert modifiedTime to human readable
DateTime dt;
try
{
dt = new DateTime(long.Parse(modifiedTime));
strNativeValueArray[Common.INDEX_NATIVEINFO_MODIFIEDTIME] = dt.ToShortDateString() + " " + dt.ToShortTimeString();
}
catch
{
strNativeValueArray[Common.INDEX_NATIVEINFO_MODIFIEDTIME] = modifiedTime;
}
ls.AppendValues(secretID, strKeyArray, strValueArray, storeID, strNativeKeyArray, strNativeValueArray);
}
else
{
ls.AppendValues(secretID, strKeyArray, strValueArray, storeID, strNativeKeyArray, strNativeValueArray);
}
//Re-Initialize for next iteration //Re-Initialize for next iteration
secretID = ""; secretID = "";

13
CASA/micasad/cache/Secret.cs vendored
View File

@ -194,9 +194,14 @@ namespace sscs.cache
public string GetKey() public string GetKey()
{ {
return secretID; return secretID;
}
public void SetKeyValue(string key, string value)
{
SetKeyValue(key, value, true);
} }
public void SetKeyValue(string key, string value) public void SetKeyValue(string key, string value, bool bUpdateSecretModifiedTime)
{ {
KeyValue kv; KeyValue kv;
if (htKeyValues.Contains(key)) if (htKeyValues.Contains(key))
@ -208,8 +213,12 @@ namespace sscs.cache
{ {
kv = new KeyValue(key, value); kv = new KeyValue(key, value);
htKeyValues.Add(key, kv); htKeyValues.Add(key, kv);
}
if (bUpdateSecretModifiedTime)
{
this.ModifiedTime = DateTime.Now;
} }
this.ModifiedTime = DateTime.Now;
} }
public void SetKeyValue(string key, byte[] baValue) public void SetKeyValue(string key, byte[] baValue)

4
CASA/micasad/lib/communication/MiCasaRequestReply.cs
View File

@ -59,7 +59,9 @@ namespace Novell.CASA.MiCasa.Communication
public const int VERB_EXPORT_SECRETS = 21; public const int VERB_EXPORT_SECRETS = 21;
public const int VERB_ADD_XML_SECRETS = 22; public const int VERB_ADD_XML_SECRETS = 22;
public const int VERB_CHANGE_PERSIST_DIR = 23; public const int VERB_CHANGE_PERSIST_DIR = 23;
public const int VERB_CREATE_POLICY_DIR = 24; public const int VERB_CREATE_POLICY_DIR = 24;
public const int VERB_GET_CREATE_TIME = 25;
public const int VERB_GET_MODIFIED_TIME = 26;
public const int VERB_DUMP_LINKED_KEYS = 96; public const int VERB_DUMP_LINKED_KEYS = 96;
public const int VERB_CREATE_TEST_SECRETS = 97; public const int VERB_CREATE_TEST_SECRETS = 97;

2
CASA/micasad/lss/LocalStorage.cs
View File

@ -490,7 +490,7 @@ namespace sscs.lss
xpath = "descendant::" + XmlConsts.keyValueNode; xpath = "descendant::" + XmlConsts.keyValueNode;
XmlNode keyValNode = keyNode.SelectSingleNode(xpath); XmlNode keyValNode = keyNode.SelectSingleNode(xpath);
string keyValue = keyValNode.InnerText; string keyValue = keyValNode.InnerText;
secret.SetKeyValue(key, keyValue); secret.SetKeyValue(key, keyValue, false);
// get time attributes on this key/value // get time attributes on this key/value
XmlNode timeNodeKey = keyNode.SelectSingleNode("descendant::" + XmlConsts.timeNode); XmlNode timeNodeKey = keyNode.SelectSingleNode("descendant::" + XmlConsts.timeNode);

88
CASA/micasad/verbs/ObjectSerialization.cs
View File

@ -234,7 +234,16 @@ namespace sscs.verbs
case MiCasaRequestReply.VERB_CREATE_POLICY_DIR: case MiCasaRequestReply.VERB_CREATE_POLICY_DIR:
{ {
return DoCreatePolicyDir(ssStore, wo); return DoCreatePolicyDir(ssStore, wo);
} }
case MiCasaRequestReply.VERB_GET_CREATE_TIME:
{
return DoGetCreateTime(ssStore, wo);
}
case MiCasaRequestReply.VERB_GET_MODIFIED_TIME:
{
return DoGetModifiedTime(ssStore, wo);
}
default: default:
{ {
@ -253,8 +262,81 @@ namespace sscs.verbs
} }
return wo; return wo;
} }
private WrappedObject DoGetModifiedTime(SecretStore ssStore, WrappedObject wo)
{
return DoGetTimeStamp(ssStore, wo, false);
}
private WrappedObject DoGetCreateTime(SecretStore ssStore, WrappedObject wo)
{
return DoGetTimeStamp(ssStore, wo, true);
}
private WrappedObject DoGetTimeStamp(SecretStore ssStore, WrappedObject wo, bool bGetCreateTime)
{
string keychainID = wo.GetKeychainID();
string secretID = wo.GetSecretID();
string keyID = wo.GetKeyID();
KeyChain keyChain;
if (keychainID != null)
keyChain = ssStore.GetKeyChain(keychainID);
else
keyChain = ssStore.GetKeyChainDefault();
Secret secret = null;
DateTime dt = new DateTime(0);
if (keyChain.CheckIfSecretExists(secretID) == false)
{
wo.SetError(constants.RetCodes.FAILURE, "Secret does not exist");
}
else
{
secret = keyChain.GetSecret(secretID);
if (keyID != null)
{
KeyValue kv = secret.GetKeyValue(keyID);
if (kv != null)
{
if (bGetCreateTime)
{
dt = kv.CreatedTime;
}
else
{
dt = kv.ModifiedTime;
}
}
else
{
wo.SetError(constants.RetCodes.FAILURE, "Secret does not exist");
}
}
else
{
if (bGetCreateTime)
{
dt = secret.CreatedTime;
}
else
{
dt = secret.ModifiedTime;
}
}
}
if (dt != null)
{
wo.SetObject(dt);
wo.SetError(constants.RetCodes.SUCCESS, null);
}
return wo;
}
private WrappedObject DoCreatePolicyDir(SecretStore ssStore, WrappedObject wo) private WrappedObject DoCreatePolicyDir(SecretStore ssStore, WrappedObject wo)
{ {

55
CASA/sharp/NSSCSWrapper/Secret.cs
View File

@ -185,17 +185,50 @@ namespace Novell.CASA
m_iAccessTime = uiAccessed; m_iAccessTime = uiAccessed;
} }
public uint getCreateTime() public DateTime GetCreateTime()
{ {
return m_iCreateTime; // send request for create time
DateTime dt = (DateTime)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_CREATE_TIME,
this.m_keyChainID,
this.m_secretID,
null,
null);
return dt;
} }
public uint getModifiedTime() public DateTime GetModifiedTime()
{ {
return m_iModifyTime; // send request for modified time
DateTime dt = (DateTime)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_MODIFIED_TIME,
this.m_keyChainID,
this.m_secretID,
null,
null);
return dt;
} }
public uint getAccessTime() public DateTime GetCreateTimeForKey(string sKey)
{
// send request for create time
DateTime dt = (DateTime)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_CREATE_TIME,
this.m_keyChainID,
this.m_secretID,
sKey,
null);
return dt;
}
public DateTime GetModifiedTimeForKey(string sKey)
{
// send request for modified time
DateTime dt = (DateTime)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_MODIFIED_TIME,
this.m_keyChainID,
this.m_secretID,
sKey,
null);
return dt;
}
private uint getAccessTime()
{ {
return m_iAccessTime; return m_iAccessTime;
} }
@ -212,5 +245,17 @@ namespace Novell.CASA
return htLinkedKeys; return htLinkedKeys;
} }
/*
public DateTime GetKeyModifiedTime(string sKey)
{
return null;
}
public DateTime GetKeyCreateTime(string sKey)
{
return null;
}
*/
} }
} }