[simias-svn] SF.net SVN: simias:[7565] trunk/src/core
Brought to you by:
srinidhi_bs
Menu
▾
▴
[simias-svn] SF.net SVN: simias:[7565] trunk/src/core
|
From: <mv...@us...> - 2011-01-27 12:36:30
|
Revision: 7565
http://simias.svn.sourceforge.net/simias/?rev=7565&view=rev
Author: mvikash
Date: 2011-01-27 12:36:19 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
ID:#667616
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Warning removal
Modified Paths:
--------------
trunk/src/core/CollectionStore/BaseFileNode.cs
trunk/src/core/CollectionStore/Collection.cs
trunk/src/core/CollectionStore/CryptoKey.cs
trunk/src/core/CollectionStore/Domain.cs
trunk/src/core/CollectionStore/HostNode.cs
trunk/src/core/CollectionStore/ICSEnumerator.cs
trunk/src/core/CollectionStore/Identity.cs
trunk/src/core/CollectionStore/Member.cs
trunk/src/core/CollectionStore/Policy.cs
trunk/src/core/CollectionStore/PropertyList.cs
trunk/src/core/CollectionStore/Store.cs
trunk/src/core/Common/CertificateStore.cs
trunk/src/core/Common/Configuration.cs
trunk/src/core/Common/SimiasLog.cs
trunk/src/core/Common/WebState.cs
trunk/src/core/Discovery/Discovery.cs
trunk/src/core/Discovery/DiscoveryFramework.cs
trunk/src/core/Domain/DomainAgent.cs
trunk/src/core/Domain/WSInspection.cs
trunk/src/core/DomainProvider/DomainProvider.cs
trunk/src/core/DomainProvider/EnterpriseProvider.cs
trunk/src/core/DomainProvider/LocalProvider.cs
trunk/src/core/Encryption/Blowfish.cs
trunk/src/core/FlaimProvider/FlaimResultSet.cs
trunk/src/core/FlaimProvider/FlaimServer.cs
trunk/src/core/HttpAuthentication/AuthHandler.cs
trunk/src/core/HttpAuthentication/HttpAuth.cs
trunk/src/core/HttpAuthentication/IAuthService.cs
trunk/src/core/Journal/Journal.cs
trunk/src/core/POBox/POBox.cs
trunk/src/core/Policy/SecurityState.cs
trunk/src/core/Policy/Sharing.cs
trunk/src/core/Service/IThreadService.cs
trunk/src/core/Simias.Web/SharedCollection.cs
trunk/src/core/Simias.Web/SimiasBrowser.asmx.cs
trunk/src/core/SimiasClient/SimiasService.cs
trunk/src/core/Storage/PropertyTags.cs
trunk/src/core/StoreProvider/IResultSet.cs
trunk/src/core/Sync/ClientFile.cs
trunk/src/core/Sync/FileMonitor.cs
trunk/src/core/Sync/HashMap.cs
trunk/src/core/Sync/Http.cs
trunk/src/core/Sync/StartSyncInfo.cs
trunk/src/core/Sync/StreamStream.cs
trunk/src/core/Sync/StrongWeakHashtable.cs
trunk/src/core/Sync/SyncClient.cs
trunk/src/core/Sync/SyncFile.cs
trunk/src/core/Sync/SyncNode.cs
trunk/src/core/Sync/SyncPolicy.cs
trunk/src/core/Sync/SyncService.cs
trunk/src/core/WebService/Global.asax.cs
trunk/src/core/WebService/Simias.asmx.cs
Modified: trunk/src/core/CollectionStore/BaseFileNode.cs
===================================================================
--- trunk/src/core/CollectionStore/BaseFileNode.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/BaseFileNode.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -315,6 +315,12 @@
return infoChanged;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="collection"></param>
+ /// <param name="length"></param>
+ /// <returns></returns>
public bool UpdateWebFileInfo( Collection collection, long length)
{
bool infoChanged = false;
Modified: trunk/src/core/CollectionStore/Collection.cs
===================================================================
--- trunk/src/core/CollectionStore/Collection.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Collection.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -61,14 +61,32 @@
/// </summary>
public enum SecurityStatus : int
{
+ /// <summary>
+ ///
+ /// </summary>
Encryption = 0x0001,
+ /// <summary>
+ ///
+ /// </summary>
SSL = 0x0002,
+ /// <summary>
+ ///
+ /// </summary>
UNSET = 0x0000
};
+ /// <summary>
+ ///
+ /// </summary>
public enum SecurityStatusMask : int
{
+ /// <summary>
+ ///
+ /// </summary>
Encryption = 0x0001, // yet to be set
+ /// <summary>
+ ///
+ /// </summary>
SSL = 0xfffd
};
@@ -77,28 +95,50 @@
/// </summary>
public class SearchPropertyList
{
+
+ /// <summary>
+ ///
+ /// </summary>
public ArrayList PropList;
+ /// <summary>
+ ///
+ /// </summary>
public ArrayList SearchOpList;
+ /// <summary>
+ ///
+ /// </summary>
public SearchPropertyList()
{
PropList = new ArrayList();
SearchOpList = new ArrayList();
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="propertyName"></param>
+ /// <param name="propertyValue"></param>
+ /// <param name="searchOperator"></param>
public void Add(string propertyName, string propertyValue, SearchOp searchOperator)
{
Property prop = new Property(propertyName, propertyValue );
PropList.Add(prop);
SearchOpList.Add(searchOperator);
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="propertyName"></param>
+ /// <param name="propertyValue"></param>
+ /// <param name="searchOperator"></param>
public void Add(string propertyName, int propertyValue, SearchOp searchOperator)
{
Property prop = new Property(propertyName, propertyValue );
PropList.Add(prop);
SearchOpList.Add(searchOperator);
}
-
+ /// <summary>
+ ///
+ /// </summary>
public void Clean()
{
PropList.Clear();
@@ -182,7 +222,7 @@
///<summary>
/// Enable
///</summary>
- private bool disabled;
+ //private bool disabled;
private static AutoResetEvent syncEvent = new AutoResetEvent(false);
@@ -374,7 +414,9 @@
}
}
-
+ /// <summary>
+ /// Return information about, count of file restored.
+ /// </summary>
public int RestoredFileCount
{
get
@@ -874,6 +916,8 @@
/// <param name="storeObject">Store object that this collection belongs to.</param>
/// <param name="collectionName">This is the friendly name that is used by applications to describe the collection.</param>
/// <param name="domainID">The domain that this object is stored in.</param>
+ /// <param name="domainID">The domain that this object is stored in.</param>
+ /// <param name="encryptionKey">encryption key.</param>
public Collection( Store storeObject, string collectionName, string domainID, byte[] encryptionKey ) :
this ( storeObject, collectionName, Guid.NewGuid().ToString(), domainID )
{
@@ -938,8 +982,17 @@
lockString = collection.lockString;
createManagedPath = collection.createManagedPath;
}
-
- //TODO: add comment
+
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="storeObject">Store object that this collection belongs to.</param>
+ /// <param name="collectionName">This is the friendly name that is used by applications to describe this object.</param>
+ /// <param name="domainID">The domain that this object is stored in.</param>
+ /// <param name="ssl">whether connection is SSL enabled or not.</param>
+ /// <param name="encryptionAlgorithm">Encryption algorithm used.</param>
+ /// <param name="passphrase">passphrase used for encryption.</param>
+ /// <param name="raPublicKey">public key of RA Agent.</param>
public Collection( Store storeObject, string collectionName, string domainID, bool ssl, string encryptionAlgorithm, string passphrase, string raPublicKey ) :
this ( storeObject, collectionName, Guid.NewGuid().ToString(), domainID, ssl, encryptionAlgorithm, passphrase, raPublicKey)
{
@@ -1097,13 +1150,13 @@
#endregion
#region Private Methods
+ /*
/// <summary>
/// A member node object has been added to a collection. Look up the POBox for
/// the new member and create a subscription object letting the new member know
/// that the collection has been shared with them.
/// </summary>
/// <param name="args">The member node that was added to this collection.</param>
- /*
private void AddSubscription( Member member )
{
// Get the current domain for the collection.
@@ -1481,7 +1534,6 @@
/// this node has been committed to disk.
/// </summary>
/// <param name="node">Node object that contains the local incarnation value.</param>
- /// <param name="commitTime">The time of the commit operation.</param>
public void DecrementLocalIncarnation( Node node)
{
ulong incarnationValue = node.LocalIncarnation - 1;
@@ -1492,7 +1544,14 @@
// Update the local incarnation value to the specified value.
node.Properties.ModifyNodeProperty( PropertyTags.LocalIncarnation, incarnationValue);
}
-
+ /// <summary>
+ /// Setting Encryption properties.
+ /// </summary>
+ /// <param name="eKey">Key</param>
+ /// <param name="eBlob">Blob</param>
+ /// <param name="eAlgorithm">Algorithm</param>
+ /// <param name="rKey">recovery Key</param>
+ /// <returns>Collection</returns>
public Collection SetEncryptionProperties(string eKey, string eBlob, string eAlgorithm, string rKey)
{
//Set the Encryption status of the collection. This needs to be used for all reporting
@@ -3545,7 +3604,7 @@
/// <summary>
/// Gets the Member's all parent group id's
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="userID">Member ID</param>
/// <returns>Returns all Members parent group id's
/// </returns>
public string[] GetMemberFamilyList( string userID )
@@ -3589,7 +3648,7 @@
/// <summary>
/// Gets the Member's all parent group DN List
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="DN">Distinguesh Name</param>
/// <returns>Returns all Members parent group DN's
/// </returns>
public string[] GetMemberFamilyDNList( string DN )
@@ -3632,7 +3691,7 @@
/// Gets the groupids of a deleted member i.e. groups which he belonged to before deletion
/// this method is useful after deleted user is disabled in ifolder domain and all his group belonging informations are removed
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="userID">Member ID</param>
/// <returns>Returns all Members old group id's (old group ids means that the user might be a member of a group but user was deleted, so we store it in temp property as e-dir does not give this information)
/// </returns>
public string[] GetDeletedMembersGroupList( string userID )
@@ -3677,7 +3736,7 @@
/// <summary>
/// Gets the Groups Member list
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="userID">Member ID</param>
/// <returns>Returns all Groups Members id list
/// </returns>
public string[] GetGroupsMemberList( string userID )
@@ -3723,7 +3782,7 @@
/// <summary>
/// Gets the Groups subgroup DN list
/// </summary>
- /// <param name="dn">Parent group DN</param>
+ /// <param name="DN">Parent group DN</param>
/// <returns>Returns all Groups subgroup DN list
/// </returns>
public string[] GetGroupsSubgroupList( string DN)
@@ -3836,7 +3895,12 @@
return node;
}
-
+
+ /// <summary>
+ /// Get Node by given path
+ /// </summary>
+ /// <param name="entryPath">entry Path for which node to be found</param>
+ /// <returns>Node object.</returns>
public Node GetNodeByPath( string entryPath)
{
ICSList children = this.Search(PropertyTags.FileSystemPath, entryPath, SearchOp.Equal);
@@ -4551,7 +4615,7 @@
/// Searches the collection for the specified properties. An enumerator is returned that
/// returns all of the ShallowNode objects that match the query criteria.
/// </summary>
- /// <param name="property">Property objects list containing the value to search for.</param>
+ /// <param name="PropList">Property objects list containing the value to search for.</param>
/// <returns>An ICSList object that contains the results of the search.</returns>
public ICSList Search( SearchPropertyList PropList)
{
@@ -4678,7 +4742,7 @@
/// Constructor for the NodeEnumerator object.
/// </summary>
/// <param name="collection">Collection object that this enumerator belongs to.</param>
- /// <param name="property">Property objects list containing the data to search for.</param>
+ /// <param name="PropList">Property objects list containing the data to search for.</param>
public NodeEnumerator( Collection collection, SearchPropertyList PropList)
{
this.collection = collection;
@@ -4956,6 +5020,8 @@
/// <param name="MemberUserID">User ID</param>
/// <param name="colMemberNodeID">Collection's member node ID</param>
/// <param name="iFolderLocalPath">Path of Local iFolder</param>
+ /// <param name="sourceFileCount">source File count</param>
+ /// <param name="sourceDirCount">source Directory count</param>
/// <returns></returns>
public static bool DownloadCollection(string iFolderID, string iFolderName, string DomainID, string HostID, string DirNodeID, string MemberUserID, string colMemberNodeID, string iFolderLocalPath, int sourceFileCount, int sourceDirCount)
{
@@ -4994,6 +5060,8 @@
/// <param name="MemberUserID">Member user id</param>
/// <param name="colMemberNodeID">ID of collection member node</param>
/// <param name="iFolderLocalPath">Path of iFolder</param>
+ /// <param name="oldHomeFileCount">File Count</param>
+ /// <param name="oldHomeDirCount">Dir Count</param>
/// <returns></returns>
public static bool DownloadCollectionLocally(string iFolderID, string iFolderName, string DomainID, string HostID, string DirNodeID, string MemberUserID, string colMemberNodeID, string iFolderLocalPath, int oldHomeFileCount, int oldHomeDirCount)
{
@@ -5146,6 +5214,19 @@
}
// moved the creating proxy collection part to a seperate methos since it was called from 2 places
+ /// <summary>
+ /// Creating Proxy collection
+ /// </summary>
+ /// <param name="store">Store</param>
+ /// <param name="iFolderName">iFolder name</param>
+ /// <param name="iFolderID">ifolder id</param>
+ /// <param name="DomainID">domain id</param>
+ /// <param name="HostID">hostid</param>
+ /// <param name="newOwnerMember">new owner member</param>
+ /// <param name="newDomainMember">new domain member</param>
+ /// <param name="iFolderLocalPath">local path</param>
+ /// <param name="DirNodeID">dir node id</param>
+ /// <returns>proxy collection</returns>
public static Collection CreateProxyCollection(Store store, string iFolderName, string iFolderID, string DomainID, string HostID, Member newOwnerMember, Member newDomainMember, string iFolderLocalPath, string DirNodeID)
{
log.Debug("CreateProxyCollection: Entered");
@@ -5175,6 +5256,10 @@
// add the collectionID into MovingCollections Hashtable used in catalog.cs so that delete event for those ifolders will be ignored which
// fail to sync full in one cycle.
+ /// <summary>
+ /// Function add given ifolderid to catalog table
+ /// </summary>
+ /// <param name="iFolderID">ifolder id to be added on catalog.</param>
public static void AddToCatalogTable( string iFolderID)
{
string titleClass = "Simias.Server.Catalog";
@@ -5195,6 +5280,10 @@
// remove the collectionID into MovingCollections Hashtable used in catalog.cs so that delete event for those ifolders will be ignored which
// fail to sync full in one cycle.
+ /// <summary>
+ /// Function remove given ifolder id entry from catalog table
+ /// </summary>
+ /// <param name="iFolderID">ifolder id to be removed from catalog table</param>
public static void RemoveFromCatalogTable( string iFolderID)
{
string titleClass = "Simias.Server.Catalog";
@@ -5214,6 +5303,12 @@
}
// count total no of files and dirs in this collection (goto actual storage and count)
+ /// <summary>
+ /// Retrive directory and file count for given DirectoryInfo
+ /// </summary>
+ /// <param name="d">directory infor</param>
+ /// <param name="filecount">filecount</param>
+ /// <param name="dircount">directory count</param>
public static void GetDirAndFileCount(DirectoryInfo d, ref int filecount, ref int dircount)
{
FileInfo[] fis = d.GetFiles();
Modified: trunk/src/core/CollectionStore/CryptoKey.cs
===================================================================
--- trunk/src/core/CollectionStore/CryptoKey.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/CryptoKey.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -44,7 +44,9 @@
using System.Threading;
using System.Xml;
using Simias.Storage;
-
+/// <summary>
+///
+/// </summary>
namespace Simias.CryptoKey
{
[Serializable]
@@ -84,10 +86,22 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
public enum EncType : int
{
+ /// <summary>
+ ///
+ /// </summary>
X509 = 0x00000001,
+ /// <summary>
+ ///
+ /// </summary>
RSA = 0x00000010,
+ /// <summary>
+ ///
+ /// </summary>
PGP = 0x00000100
};
/// <summary>
@@ -121,6 +135,10 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="RAData"></param>
public RecoveryAgent(RSACryptoServiceProvider RAData)
{
RSAData = RAData;
Modified: trunk/src/core/CollectionStore/Domain.cs
===================================================================
--- trunk/src/core/CollectionStore/Domain.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Domain.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -83,7 +83,13 @@
/// Configuration section name where enterprise key value pairs are stored.
/// </summary>
static public string SectionName = "Domain";
+ /// <summary>
+ /// Admin DN Tag
+ /// </summary>
static public string AdminDNTag = "AdminDN";
+ /// <summary>
+ /// Encoding Tag
+ /// </summary>
static public string Encoding = "Encoding";
/// <summary>
@@ -308,7 +314,7 @@
/// <summary>
/// Returns if the specified user's login is disabled.
/// </summary>
- /// <param name="userID">User ID for the member to check.</param>
+ /// <param name="member">Member for which login information to be retrived.</param>
/// <returns>True if the login for the specified user is disabled.</returns>
public bool IsLoginDisabledForUser( Member member )
{
Modified: trunk/src/core/CollectionStore/HostNode.cs
===================================================================
--- trunk/src/core/CollectionStore/HostNode.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/HostNode.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -48,10 +48,16 @@
public class HostNode : Member
{
#region Class Members
+ /// <summary>
+ ///
+ /// </summary>
public const string HostNodeType = "Host";
const string LocalHostTag = "LocalHost";
#endregion
+ /// <summary>
+ ///
+ /// </summary>
public enum changeMasterStates
{
/// <summary>
@@ -129,7 +135,6 @@
Properties.ModifyNodeProperty(new Property(PropertyTags.MasterUrl, value));
}
}
- /// <summary>
/// <summary>
/// Gets/Sets if HostNode is the Master Host.
@@ -254,15 +259,21 @@
/// <summary>
///
/// </summary>
- /// <param name="name"></param>
- /// <param name="nodeID"></param>
- /// <param name="userId"></param>
+ /// <param name="hInfo"></param>
/// <param name="publicAddress"></param>
public HostNode(HostInfo hInfo, string publicAddress) :
this(hInfo.Name, hInfo.ID, hInfo.MemberID, publicAddress, publicAddress, null)
{
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="nodeID"></param>
+ /// <param name="userId"></param>
+ /// <param name="publicUrl"></param>
+ /// <param name="privateUrl"></param>
+ /// <param name="publicKey"></param>
public HostNode(string name, string nodeID, string userId, string publicUrl, string privateUrl, RSACryptoServiceProvider publicKey):
base(name, nodeID, userId, Access.Rights.ReadOnly, publicKey)
{
@@ -398,9 +409,9 @@
{
Store store = Store.GetStore();
Domain domain = null;
- /// this might given an exception if the Default Domain is not set up.
- /// this is true when the entire iFolder store is restored - so the try/catch
- /// Need to find a better way to fix this without try/catch - FIXME
+ // this might given an exception if the Default Domain is not set up.
+ // this is true when the entire iFolder store is restored - so the try/catch
+ // Need to find a better way to fix this without try/catch - FIXME
try
{
domain = store.GetDomain(store.DefaultDomain);
Modified: trunk/src/core/CollectionStore/ICSEnumerator.cs
===================================================================
--- trunk/src/core/CollectionStore/ICSEnumerator.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/ICSEnumerator.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -182,8 +182,7 @@
/// <summary>
/// Constructs the object.
/// </summary>
- /// <param name="iEnumerator">Enumerator from the ICSList object.</param>
- /// <param name="count">Number of objects contained in the enumerator.</param>
+ /// <param name="list">Array list of ICSList object.</param>
public ICSListEnumerator( ArrayList list )
{
this.list = list;
Modified: trunk/src/core/CollectionStore/Identity.cs
===================================================================
--- trunk/src/core/CollectionStore/Identity.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Identity.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -574,8 +574,6 @@
/// Gets the user identifier and pass-phrase for the specified domain.
/// </summary>
/// <param name="domainID">The identifier for the domain.</param>
- /// <param name="userID">Gets the userID of the user associated with the specified domain.</param>
- /// <param name="credentials">Gets the credentials for the user.</param>
/// <returns>CredentialType enumerated object.</returns>
internal bool GetRememberOption( string domainID)
{
@@ -600,8 +598,6 @@
/// Gets the user identifier and pass-phrase for the specified domain.
/// </summary>
/// <param name="domainID">The identifier for the domain.</param>
- /// <param name="userID">Gets the userID of the user associated with the specified domain.</param>
- /// <param name="credentials">Gets the credentials for the user.</param>
/// <returns>CredentialType enumerated object.</returns>
internal string GetPassPhrase( string domainID)
{
@@ -685,6 +681,7 @@
/// <param name="domainID">The domain to store the passphrase for.</param>
/// <param name="passPhrase">The domain passphrase.</param>
/// <param name="type">Type of credentials.</param>
+ /// <param name="rememberPassPhrase"></param>
/// <returns>The modified identity object.</returns>
internal Identity StorePassPhrase( string domainID, string passPhrase, CredentialType type, bool rememberPassPhrase)
{
@@ -722,7 +719,11 @@
p.SetPropertyValue( mapDoc );
return this;
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="domainID"></param>
+ /// <returns></returns>
public RSACryptoServiceProvider GetDomainCredential(string domainID)
{
RSACryptoServiceProvider credential = null;
Modified: trunk/src/core/CollectionStore/Member.cs
===================================================================
--- trunk/src/core/CollectionStore/Member.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Member.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -49,6 +49,9 @@
namespace Simias.Storage
{
+ /// <summary>
+ /// Encryption version
+ /// </summary>
public enum EncVersion
{
/// <summary>
@@ -72,7 +75,8 @@
#endregion
/// <summary>
-
+ /// Simias log
+ /// </summary>
private static readonly ISimiasLog log = SimiasLogManager.GetLogger(typeof(Member));
private SimiasAccessLogger accessLog = new SimiasAccessLogger("Passphrase",null);
@@ -86,7 +90,9 @@
BlobFlag = 32
};
-
+ /// <summary>
+ ///
+ /// </summary>
public enum userMoveStates
{
/// <summary>
@@ -136,7 +142,6 @@
};
- /// </summary>
/// <summary>
/// Get/Set the encryption key
/// </summary>
@@ -156,7 +161,6 @@
}
}
- /// </summary>
/// <summary>
/// Get/Set the encryption version
/// </summary>
@@ -176,7 +180,6 @@
}
}
- /// </summary>
/// <summary>
/// Get/Set the encryption key
/// </summary>
@@ -569,7 +572,8 @@
set
{
- if ( ! String.IsNullOrEmpty( value) )
+ //if ( ! String.IsNullOrEmpty( value) )
+ if ( value != null && value != "")
{
properties.ModifyNodeProperty( PropertyTags.OldDN, value );
}
@@ -936,7 +940,7 @@
Property Groupproperty = member.Properties.GetSingleProperty( "GroupType" );
if( Groupproperty == null)
{
- /// Member node.
+ // Member node.
groupadmins = domain.GetMemberFamilyList(groupid);
}
else
@@ -1108,7 +1112,7 @@
Property Groupproperty = member.Properties.GetSingleProperty( "GroupType" );
if( Groupproperty == null)
{
- /// Member node.
+ // Member node.
return IsGroupAdmin(nodeid, 0);
}
else
@@ -1124,7 +1128,7 @@
{
if( membertype == 0)
{
- /// Member node. Get all the groups.
+ // Member node. Get all the groups.
Store store = Store.GetStore();
Domain domain = store.GetDomain(store.DefaultDomain);
string[] groupids = domain.GetMemberFamilyList(nodeid);
@@ -1132,7 +1136,7 @@
}
else
{
- /// Group node.
+ // Group node.
string[] groupids = new string[1];
groupids[0] = nodeid;
return IsGroupAdmin(groupids);
@@ -1147,7 +1151,7 @@
{
string[] groupadmins = GetGroupListValues(true);
- /// Checks whether the given member is admin for any of the groups mentioned above...
+ // Checks whether the given member is admin for any of the groups mentioned above...
if( groupids == null || groupadmins == null)
return false;
@@ -1581,7 +1585,7 @@
SetEncryptionBlobFlag(store);
//making it local variable for faster disposal
- CollectionSyncClient syncClient = null;
+ //CollectionSyncClient syncClient = null;
// commit encryption related values locally on client for faster access. it will be overwritten in
// next fomain sync
@@ -2720,7 +2724,14 @@
if(FilePath != null)
ImportiFoldersCryptoKeys(null, NewPassphrase, OneTimePassword, true, FilePath);
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="RAName"></param>
+ /// <param name="isRSA"></param>
+ /// <param name="keyDocument"></param>
+ /// <param name="oneTimePP"></param>
+ /// <param name="decryptedKeyDoc"></param>
public void RecoverKeys(string RAName, bool isRSA, XmlDocument keyDocument, string oneTimePP, out XmlDocument decryptedKeyDoc)
{
string titleTag = "CryptoKeyRecovery";
@@ -2792,7 +2803,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultRSAFromServer()
{
@@ -2817,7 +2827,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultPublicKeyFromServer()
{
@@ -2845,7 +2854,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultRSAKey()
{
@@ -2858,7 +2866,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultPublicKey()
{
@@ -2876,9 +2883,17 @@
/// </summary>
public class PassphraseHash
{
+ /// <summary>
+ ///
+ /// </summary>
public PassphraseHash()
{
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="Passphrase"></param>
+ /// <returns></returns>
public byte[] HashPassPhrase(string Passphrase)
{
/*change to PasswordDeriveBytes.CryptDeriveKey once the implementation is done mono
Modified: trunk/src/core/CollectionStore/Policy.cs
===================================================================
--- trunk/src/core/CollectionStore/Policy.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Policy.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -55,7 +55,7 @@
/// <summary>
/// Used to log messages.
/// </summary>
- static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
+ //static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
/// <summary>
/// Property names to store rules and time condition on the policy Node.
@@ -435,11 +435,16 @@
}
}
+ /// <summary>
+ /// Function for adding user rules
+ /// </summary>
+ /// <param name="rule">rule to be added</param>
+ /// <param name="policyID">policy for which rule to be added</param>
public void AddUserRule( Rule rule , string policyID)
{
// Make sure the rule doesn't already exist.
- Property property = null;
+// Property property = null;
// See if the rule already exists.
MultiValuedList mvl = properties.GetProperties( policyID );
@@ -453,10 +458,14 @@
properties.AddNodeProperty( policyID, rule.ToXml() );
}
-
+ /// <summary>
+ /// Deletes user rules
+ /// </summary>
+ /// <param name="rule">rule to be deleted</param>
+ /// <param name="policyID">policy id for which rule to be deleted</param>
public void DeleteUserRule( Rule rule , string policyID)
{
- Property property = null;
+// Property property = null;
// See if the rule exists.
MultiValuedList mvl = properties.GetProperties( policyID );
@@ -605,7 +614,7 @@
/// <summary>
/// Used to log messages.
/// </summary>
- static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
+ //static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
/// <summary>
/// Store handle.
@@ -687,7 +696,7 @@
/// The caller must possess Admin rights in order to commit a Policy.
/// </summary>
/// <param name="policyID">Policy identifier to be saved.</param>
- /// <param name='ruleList">Rules to be added to the Policy identifier</param>
+ /// <param name="ruleList">Rules to be added to the Policy identifier</param>
/// <param name="member">Member to associate the Policy identifier with.</param>
public void CommitPolicy( string policyID, ICSList ruleList, Member member)
{
@@ -717,7 +726,7 @@
/// Saves and associates the Policy with the user.
/// The caller must possess Admin rights in order to commit a Policy.
/// </summary>
- /// <param name="policy">Policy to be saved.</param>
+ /// <param name="policyID">Policy to be saved.</param>
/// <param name="member">Member to associate the Policy with.</param>
public void CommitPolicy( string policyID, object value, Member member)
{
@@ -1325,7 +1334,7 @@
/// <summary>
/// Used to log messages.
/// </summary>
- static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
+ //static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
/// <summary>
/// Result of applying input value to policy rule.
Modified: trunk/src/core/CollectionStore/PropertyList.cs
===================================================================
--- trunk/src/core/CollectionStore/PropertyList.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/PropertyList.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -827,6 +827,7 @@
/// Removes all properties from the specified document that are marked as non-transient.
/// </summary>
/// <param name="document">Xml document that describes the Node object's properties.</param>
+ /// <param name="LoggedInMember"></param>
internal void StripLocalNServerLocalProperties( XmlDocument document, bool LoggedInMember )
{
XmlNodeList nonTransList = document.DocumentElement.SelectNodes( "//" + XmlTags.PropertyTag + "[@" + XmlTags.FlagsAttr + "]" );
@@ -1388,8 +1389,8 @@
/// <summary>
/// Converts the PropertyList to a string representation, and strips local as well as client specific info.
/// </summary>
- /// <param name="stripLocalProperties">Always, the local properties will be stripped
- /// <param name="LoggedInMember">If this is a member node and the member is currently logged in, then its true ,
+ /// <param name="stripLocalProperties">Always, the local properties will be stripped.</param>
+ /// <param name="LoggedInMember">If this is a member node and the member is currently logged in, then its true.</param>
/// <returns>A string containing the contents of the property list.</returns>
public string ToString( bool stripLocalProperties, bool LoggedInMember )
{
Modified: trunk/src/core/CollectionStore/Store.cs
===================================================================
--- trunk/src/core/CollectionStore/Store.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Store.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -357,7 +357,9 @@
return ( p != null ) ? p.ToString() : "Unknown version";
}
}
-
+ /// <summary>
+ ///
+ /// </summary>
public static string storeversion
{
get
@@ -375,6 +377,9 @@
get { return shuttingDown; }
}
+ /// <summary>
+ ///
+ /// </summary>
public RSACryptoServiceProvider DefaultRSARA
{
get{
@@ -815,7 +820,7 @@
/// <summary>
/// Gets a path to where the store unmanaged files for the specified collection should be created.
/// </summary>
- /// <param name="collectionID">Collection identifier that files will be associated with.</param>
+ /// <param name="StoreVersion">Collection identifier that files will be associated with.</param>
/// <returns>A path string that represents the store unmanaged path.</returns>
internal string GetStoreUnmanagedPrefix(string StoreVersion)
{
@@ -1106,7 +1111,14 @@
log.Debug("CID {0}\n Blob {1}\n", collectionID,c.EncryptionBlob);
return c.EncryptionBlob;
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="userID"></param>
+ /// <param name="domainID"></param>
+ /// <param name="cKey"></param>
+ /// <returns></returns>
public bool SetCollectionCryptoKeysByOwner( string userID, string domainID, CollectionKey cKey)
{
accessLog.LogAccess("ImportiFoldersCryptoKeys","Importing CryptoKeys","Starting",userID);
@@ -1349,8 +1361,6 @@
/// Gets the passphrasefor the specified domain.
/// </summary>
/// <param name="domainID">Identifier of the domain to get the credentials from.</param>
- /// <param name="userID">Gets the identifier of the domain user.</param>
- /// <param name="passPhrase">Gets the passPhrase for the domain.</param>
/// <returns>The type of credentials.</returns>
public string GetPassPhrase( string domainID)
{
@@ -1361,8 +1371,6 @@
/// Gets the passphrasefor the specified domain.
/// </summary>
/// <param name="domainID">Identifier of the domain to get the credentials from.</param>
- /// <param name="userID">Gets the identifier of the domain user.</param>
- /// <param name="passPhrase">Gets the passPhrase for the domain.</param>
/// <returns>The type of credentials.</returns>
public bool GetRememberOption( string domainID )
{
@@ -1510,10 +1518,11 @@
/// <param name="domainID">The domain ID to store the passphrase for.</param>
/// <param name="passPhrase">Credentials for the domain.</param>
/// <param name="credType">Type of credentials being stored.</param>
+ /// <param name="rememberPassPhrase"></param>
public void StorePassPhrase( string domainID, string passPhrase, CredentialType credType, bool rememberPassPhrase )
{
LocalDb.Commit( CurrentUser.StorePassPhrase( domainID.ToLower(), passPhrase, credType, rememberPassPhrase ) );
- /// Schedule all encrypted iFolders for sync...
+ // Schedule all encrypted iFolders for sync...
if( credType == CredentialType.Basic )
SyncClient.RescheduleAllEncryptedColSync(domainID);
}
@@ -1792,7 +1801,11 @@
#endregion
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <returns></returns>
public static int ResetRootNode(string ifolderid)
{
try{
@@ -1831,6 +1844,16 @@
return 0;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <param name="nodeid"></param>
+ /// <param name="relativepath"></param>
+ /// <param name="basepath"></param>
+ /// <param name="filetype"></param>
+ /// <param name="length"></param>
+ /// <returns></returns>
public int RestoreData(string ifolderid, string nodeid, string relativepath, string basepath, string filetype, long length)
{
log.Info("Entered RestoreData.");
@@ -1850,16 +1873,23 @@
{
return RestoreDirectory( ifolderid, relativepath, nodeid, basepath);
}
- return 0;
+ //return 0;
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <param name="relativepath"></param>
+ /// <param name="nodeid"></param>
+ /// <param name="basepath"></param>
+ /// <returns></returns>
public int RestoreDirectory(string ifolderid, string relativepath, string nodeid, string basepath)
{
string backedpath = Path.Combine( basepath, relativepath);
log.Debug("backedpath: {0}", backedpath);
- /// Check whether the directory present on the target. If not create. else return;
+ // Check whether the directory present on the target. If not create. else return;
Store store = Store.GetStore();
if(store == null)
return 1000;
@@ -1922,6 +1952,15 @@
return 0;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <param name="relativepath"></param>
+ /// <param name="nodeid"></param>
+ /// <param name="basepath"></param>
+ /// <param name="length"></param>
+ /// <returns></returns>
public int RestoreFile(string ifolderid, string relativepath, string nodeid, string basepath, long length)
{
log.Debug("Entered RestoreFile.");
@@ -1931,12 +1970,12 @@
// string nodeid = "d081e003-23b9-404a-8bb7-9832bb2cdc7113";
// string basepath = "/home/banderso/ifolder/recovery/recoverytool/testrecovery"; /// TODO: Add base path of the iFolder of the backed up data in xml file...
string backedpath = Path.Combine( basepath, relativepath);
- bool encrypted = false;
+ //bool encrypted = false;
FileInfo fi = new FileInfo( backedpath);
long nodelength = fi.Length;
log.Info("Starting with datamove from {0}--{1}.", backedpath, nodelength);
if( !File.Exists(backedpath) && !Directory.Exists(backedpath))
- return 2; /// Path does not exist...
+ return 2; // Path does not exist...
Store store = Store.GetStore();
if( store == null)
return 1000;
@@ -1958,32 +1997,32 @@
node = new FileNode(n1);
if( node == null)
{
- /// This is a new file. Direct copy and create node.
+ // This is a new file. Direct copy and create node.
newpath = Path.Combine(newbasepath, relativepath);
log.Info("newpath: {0}", newpath);
if( File.Exists(newpath))
{
- /// File with same name but different nodeID already exists.
- /// may be a delet and upload of a file with same name has happened after backup is taken. skipping for now.
+ // File with same name but different nodeID already exists.
+ // may be a delet and upload of a file with same name has happened after backup is taken. skipping for now.
return 3;
}
}
else
{
- /// The file is renamed after taking backup. so the file name is different but node id is same.
- /// Get current file name with the node ID and overwrite this content with the backedup data.
+ // The file is renamed after taking backup. so the file name is different but node id is same.
+ // Get current file name with the node ID and overwrite this content with the backedup data.
newpath = node.GetFullPath(col);
log.Debug("newpath in else: {0}", newpath);
}
- /// Check for the existence of the directory...
+ // Check for the existence of the directory...
if( !Directory.Exists( Path.GetDirectoryName(newpath)))
{
log.Info("new path directory does not exist. {0}", Path.GetDirectoryName(newpath));
return 4;
}
log.Info("fetching parent dir node. {0}", Path.GetDirectoryName(relativepath));
- /// Get the dirnode for the parent directory...
+ // Get the dirnode for the parent directory...
DirNode parentnode = new DirNode( col.GetNodeByPath(Path.GetDirectoryName(relativepath)));
if( parentnode == null)
return 6;
@@ -1997,7 +2036,7 @@
return 5;
}
- /// Create the file node...
+ // Create the file node...
if( node == null)
{
log.Debug("Creating file node. parent ID: {0}", parentnode.ID);
@@ -2095,6 +2134,8 @@
/// <summary>
/// Encrypt the key in the instance and returns
/// </summary>
+ /// <param name="PassPhrase"></param>
+ /// <param name="EncryptedKey"></param>
public void EncrypytKey(string PassPhrase, out string EncryptedKey)
{
this.CryptoKeySize = (PassPhrase.Length)*8;
@@ -2113,6 +2154,12 @@
EncryptedKey = Convert.ToBase64String(output);
m_des.Clear();
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="PassPhrase"></param>
+ /// <param name="EncryptedKey"></param>
public void EncrypytKey(byte[] PassPhrase, out string EncryptedKey)
{
this.CryptoKeySize = (PassPhrase.Length)*8;
@@ -2135,6 +2182,8 @@
/// <summary>
/// Decrypt the key in the instance and returns
/// </summary>
+ /// <param name="PassPhrase"></param>
+ /// <param name="DecryptedKey"></param>
public void DecrypytKey(string PassPhrase, out string DecryptedKey)
{
this.CryptoKeySize = (PassPhrase.Length)*8;
Modified: trunk/src/core/Common/CertificateStore.cs
===================================================================
--- trunk/src/core/Common/CertificateStore.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/CertificateStore.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -42,7 +42,9 @@
namespace Simias.Security
{
-
+ /// <summary>
+ ///
+ /// </summary>
public class SecurityStore
{
const string certificateProperty = "Certificate";
@@ -55,10 +57,12 @@
/// <summary>
/// Store the PPKData with the specified property.
/// </summary>
- /// <param name="PPK">The PPK to store.</param>
- /// <param name="Property">The property PPK belongs to.</param>
+ /// <param name="ppkData">The PPK to store.</param>
+ /// <param name="prop">The property PPK belongs to.</param>
/// <param name="persist">If true save in store.</param>
/// <param name="inTable">If true save in Policy HashTable.</param>
+ /// <param name="isRA">.</param>
+ /// <param name="PPKtype">.</param>
public static void StorePPKData(byte[] ppkData, string prop, bool persist, bool inTable, bool isRA, string PPKtype)
{
Domain domain;
@@ -169,6 +173,7 @@
/// Get the Certificate for the specified store along with Problem.
/// </summary>
/// <param name="host">The host who owns the certificate.</param>
+ /// <param name="Problem"></param>
/// <returns>The certificate as a byte array.</returns>
public static byte[] GetCertificate(string host, out CertPolicy.CertificateProblem Problem)
{
@@ -351,7 +356,7 @@
/// <summary>
/// Get the Certificate for the specified store.
/// </summary>
- /// <param name="host">The host who owns the certificate.</param>
+ /// <param name="recoveryAgnt">The host who owns the certificate.</param>
/// <returns>The certificate as a byte array.</returns>
public static byte[] GetRACertificate(string recoveryAgnt)
{
@@ -368,7 +373,7 @@
/// Store the certificate for the specified RA.
/// </summary>
/// <param name="certificate">The certificate to store.</param>
- /// <param name="host">The host the certificate belongs to.</param>
+ /// <param name="recoveryAgnt">The host the certificate belongs to.</param>
/// <param name="persist">If true save in store.</param>
public static void StoreRACertificate(byte[] certificate, string recoveryAgnt, bool persist)
{
@@ -558,6 +563,9 @@
const string certificateProperty = "Certificate";
const string raProperty = "RecoveryAgent";
const string RSAType = "RSA";
+ /// <summary>
+ ///
+ /// </summary>
static public RSACryptoServiceProvider Default_RA = null;
static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
@@ -565,8 +573,8 @@
/// <summary>
/// Store the RSA for the specified RA.
/// </summary>
- /// <param name="certificate">The certificate to store.</param>
- /// <param name="host">The host the certificate belongs to.</param>
+ /// <param name="rsa">The certificate to store.</param>
+ /// <param name="recoveryAgnt">The host the certificate belongs to.</param>
/// <param name="persist">If true save in store.</param>
public static void StoreRARSA(string rsa, string recoveryAgnt, bool persist)
{
@@ -575,12 +583,21 @@
byte[] rsabytes = utf8.GetBytes(rsa);
SecurityStore.StorePPKData(rsabytes, recoveryAgnt, persist, true, true, RSAType);
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public static RSACryptoServiceProvider GetRARSA()
{
return Default_RA;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="rsa"></param>
+ /// <param name="recoveryAgnt"></param>
+ /// <param name="persist"></param>
public static void CheckAndStoreRSA(string rsa, string recoveryAgnt, bool persist)
{
bool toStore = true;
@@ -617,7 +634,10 @@
StoreRARSA(rsa, recoveryAgnt, persist);
}
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public static void LoadRSAFromStore()
{
Store store = Store.GetStore();
Modified: trunk/src/core/Common/Configuration.cs
===================================================================
--- trunk/src/core/Common/Configuration.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/Configuration.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -47,7 +47,13 @@
public sealed class Configuration
{
#region Class Members
+ /// <summary>
+ ///
+ /// </summary>
public const string DefaultConfigFileName = "Simias.config";
+ /// <summary>
+ ///
+ /// </summary>
public const string RenamedConfigFileName = "Simiasconfig.removed";
@@ -56,10 +62,16 @@
private const string NameAttr = "name";
private const string ValueAttr = "value";
private const string DefaultSection = "SimiasDefault";
+ /// <summary>
+ ///
+ /// </summary>
public string ConfigPath;
private static string defaultConfigPath;
private XmlDocument configDoc;
+ /// <summary>
+ ///
+ /// </summary>
public static string DefaultPath
{
get
@@ -67,7 +79,10 @@
return defaultConfigPath;
}
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public static string DefaultFilePath
{
get
Modified: trunk/src/core/Common/SimiasLog.cs
===================================================================
--- trunk/src/core/Common/SimiasLog.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/SimiasLog.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -192,6 +192,9 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
public class SimiasAccessLogger
{
private static readonly string AccessLoggerName = "AccessLogger";
@@ -202,6 +205,12 @@
string user;
string collectionId;
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="user"></param>
+ /// <param name="collectionId"></param>
public SimiasAccessLogger(string user, string collectionId)
{
this.user = user;
@@ -268,6 +277,13 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="method"></param>
+ /// <param name="uri"></param>
+ /// <param name="id"></param>
+ /// <param name="status"></param>
public void LogAccess(string method, string uri, string id, string status)
{
if (logger.IsInfoEnabled)
@@ -277,6 +293,13 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="method"></param>
+ /// <param name="uri"></param>
+ /// <param name="id"></param>
+ /// <param name="status"></param>
public void LogAccessDebug(string method, string uri, string id, string status)
{
if (logger.IsInfoEnabled)
Modified: trunk/src/core/Common/WebState.cs
===================================================================
--- trunk/src/core/Common/WebState.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/WebState.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -239,8 +239,8 @@
/// <summary>
/// Get a WebState object for the specified domain and collection.
/// </summary>
- /// <param name="domainID">The domain ID.</param>
- /// <param name="collectionID">The collection associated with the domain</param>
+ /// <param name="DomainID">The domain ID.</param>
+ /// <param name="CollectionID">The collection associated with the domain</param>
public WebState(string DomainID, string CollectionID) :
this(DomainID, CollectionID, null)
{
@@ -249,9 +249,9 @@
/// <summary>
/// Get a WebState object for the specified domain.
/// </summary>
- /// <param name="domainID">The domain ID.</param>
- /// <param name="collectionID">The collection ID.</param>
- /// <param name="userID">User ID of a member in the domain.</param>
+ /// <param name="DomainID">The domain ID.</param>
+ /// <param name="CollectionID">The collection ID.</param>
+ /// <param name="UserID">User ID of a member in the domain.</param>
public WebState(string DomainID, string CollectionID, string UserID) :
this( DomainID, CollectionID, UserID, SimiasConnection.AuthType.BASIC )
{
@@ -315,7 +315,7 @@
/// <summary>
/// Get a WebState with the specified credential.
/// </summary>
- /// <param name="domainID">The identifier for the domain.</param>
+ /// <param name="DomainID">The identifier for the domain.</param>
public WebState( string DomainID )
{
lock( cookieHash )
@@ -490,7 +490,7 @@
}
// finally
// {
- /// ssl = this.HostSSL;
+ // ssl = this.HostSSL;
// }
}
if (sslInitialized == false && ssl == true)
@@ -515,9 +515,9 @@
/// Get a connection that can be used to access the host of specified collection.
/// </summary>
/// <param name="domainID">The domain ID</param>
- /// <param name="collection">The collection to be accessed</param>
/// <param name="userID">The user to authenticate as.</param>
/// <param name="authType">The type of authentication.</param>
+ /// <param name="collection">The collection to be accessed</param>
/// <returns>Connection</returns>
internal static HostConnection GetConnection( string domainID, string userID, SimiasConnection.AuthType authType, Collection collection )
{
@@ -549,9 +549,9 @@
/// Get a connection to the home server of the specified member
/// </summary>
/// <param name="domainID">The domain ID</param>
- /// <param name="member">The member</param>
/// <param name="userID">The user to authenticate as.</param>
/// <param name="authType">The authentication type.</param>
+ /// <param name="member">The member</param>
/// <returns>a connection.</returns>
internal static HostConnection GetConnection(string domainID, string userID, SimiasConnection.AuthType authType, Member member )
{
@@ -582,9 +582,9 @@
/// Get a connection to the home server of the specified member
/// </summary>
/// <param name="domainID">The domain ID</param>
- /// <param name="member">The member</param>
/// <param name="userID">The user to authenticate as.</param>
/// <param name="authType">The authentication type.</param>
+ /// <param name="host">Host information against which authentication has to be done.</param>
/// <returns>a connection.</returns>
internal static HostConnection GetConnection( string domainID, string userID, SimiasConnection.AuthType authType, HostNode host )
{
@@ -744,12 +744,24 @@
}
#endregion
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public class SimiasConnection
{
+ /// <summary>
+ ///
+ /// </summary>
public enum AuthType
{
+ /// <summary>
+ ///
+ /// </summary>
BASIC,
+ /// <summary>
+ ///
+ /// </summary>
PPK,
}
Modified: trunk/src/core/Discovery/Discovery.cs
===================================================================
--- trunk/src/core/Discovery/Discovery.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Discovery/Discovery.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -52,6 +52,9 @@
namespace Simias.Discovery
{
+ /// <summary>
+ ///
+ /// </summary>
public class CollectionList
{
private static readonly ISimiasLog log =
@@ -80,6 +83,9 @@
/// Atleast one domain should be processed for shared collection display.
/// </summary>
private bool processedOne = false;
+ /// <summary>
+ ///
+ /// </summary>
public bool processed = false;
@@ -91,6 +97,10 @@
//TODO - we need to ensure collectionList has latest data when a Refresh is triggered
// now the collectionList gets populated every 60 secs - even this should be configurable from user end.
// we need to expose a function that will trigger the listEvent, so that the timer expires and the list is generated.
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
static public ArrayList GetCollectionList()
{
lock(collectionList)
Modified: trunk/src/core/Discovery/DiscoveryFramework.cs
===================================================================
--- trunk/src/core/Discovery/DiscoveryFramework.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Discovery/DiscoveryFramework.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -50,6 +50,9 @@
namespace Simias.Discovery
{
+ /// <summary>
+ ///
+ /// </summary>
public class DiscoveryFramework
{
private static ArrayList collList;
Modified: trunk/src/core/Domain/DomainAgent.cs
===================================================================
--- trunk/src/core/Domain/DomainAgent.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Domain/DomainAgent.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -84,8 +84,14 @@
private Store store = Store.GetStore();
private static Hashtable domainTable = new Hashtable();
private static string domainID;
+ /// <summary>
+ /// Hashtable representing blockedIP list
+ /// </summary>
public static Hashtable blockedIPs = new Hashtable();
+ /// <summary>
+ /// string representing currentDomainID
+ /// </summary>
public static string currentDomainID = null;
#endregion
@@ -485,7 +491,7 @@
Uri domainServiceUrl = null;
string homeServerURL = null;
Simias.Authentication.Status status = null;
- Simias.Authentication.Status status2 = null;
+ //Simias.Authentication.Status status2 = null;
#if WS_INSPECTION
try
{
@@ -528,15 +534,15 @@
else
tempUri = new UriBuilder(host);
log.Debug("The temp uri is: {0}", tempUri );
- /// There was a failure in obtaining the service url. Try a hard coded one.
+ // There was a failure in obtaining the service url. Try a hard coded one.
if (tempUri.Scheme.Equals(Uri.UriSchemeHttp))
{
- /// change to SSL
+ // change to SSL
tempUri.Scheme = Uri.UriSchemeHttps;
- /// changing to default port - this needs to be fixed once we change the client UI to have the SSL port
+ // changing to default port - this needs to be fixed once we change the client UI to have the SSL port
tempUri.Port = 443;
}
- /// al...
[truncated message content] |
