images/pic.png scripts/README.txt scripts/create_cert.js scripts/setup.cmd scripts/socialvpn scripts/stop_svpn.cmd src/SVPNTool.cs @@ -2,28 +2,18 @@ SocialVPN Building SocialVPN ================== -NAnt build tool is required +NAnt build tool is required. -For debian-based systems: -apt-get install nant uml-utilities +For Debian-based systems: +apt-get install nant uml-utilities resolvconf curl For RedHat-based systems: -yum install nant uml-utilities - -cd src/ +yum install nant uml-utilities curl To compile, run: nant -To run NUnit test, run: - -nant test - -To clean, run - -nant clean - Running SocialVPN ================= After compiling, all files to run SocialVPN are saved in bin directory. @@ -36,32 +26,22 @@ For Windows XP, run the start_win.cmd file For Windows Vista, right-click on start_win.cmd and "Run as administrator" -For Linux, see instructions below to run as normal user (much safer) - -To run SocialVPN as non-root on Linux -------------------------------------- +For Linux, run the following commands: -Run following commands as root: +whoami > user.txt -chmod 666 /dev/net/tun/ +su root -tunctl -u "your username" -t tapipop - -To find your username run the whoami command - -Then run: - -./start_linux.sh email pcid "name" +./start_linux.sh Accessing SocialVPN Web Interface ================================= -SocialVPN can be managed through a Web browser or the wget command line -utility. The start_win.cmd and the start_win.sh files contains the port -number used to access the interface. The default port number is 58888. +SocialVPN can be managed through a Web browser or the SVPNTool.exe command +line utility. The start_win.cmd and the start_win.sh files contains the +port number used to access the interface. The default port number is 58888. Point your browser to http://127.0.0.1:58888/ - Dependencies: ============= SocialVPN is built on top of two other projects: @@ -74,14 +54,6 @@ SocialVPN is built on top of two other projects: All packaged binaries found under lib and bin directories are compiled from these two projects. -Troubleshooting: -================ -The libtuntap.so and libtuntap.dll files are platform-dependent, they have to -be compiled for your platform. Under the bin directory there are two other -libtuntap.so files on for 32-bit systems (libtuntap.so_32) and another for -64-bit systems (libtuntap.so_64). Rename one of these files to libtuntap.so -depending on your architecture. Windows 64-bit will be available soon. - Questions/Comments: =================== Contact Pierre St Juste <ptony82@ufl.edu> for any questions. README lib/Brunet.Coordinate.dll lib/Brunet.Dht.dll lib/Brunet.IPAddresses.dll lib/Brunet.Security.dll lib/Brunet.XmlRpc.dll lib/Brunet.dll lib/ManagedIpopNode.dll @@ -11,7 +11,6 @@ <copy todir="./lib" failonerror="false"> <fileset basedir="${ipop.dir}/lib/"> <include name="*.dll" /> - <include name="libtuntap.so" /> </fileset> </copy> socialvpn.build @@ -129,7 +129,7 @@ namespace SocialVPN { public void Stop() { _running = false; _listener.Stop(); - _runner.Join(); + _runner.Abort(); } /** @@ -147,15 +147,14 @@ namespace SocialVPN { } Console.WriteLine(e); } - HttpListenerRequest request = context.Request; HttpListenerResponse response = context.Response; string responseString = String.Empty; + byte[] buffer = null; response.ContentType = "text/xml"; // Process api post request from the Javascript interface - if (request.RawUrl == "/api") - { + if (request.RawUrl == "/api") { StreamReader reader = new StreamReader(request.InputStream, request.ContentEncoding); @@ -167,37 +166,33 @@ namespace SocialVPN { DateTime.Now.TimeOfDay, postData)); responseString = Process(SocialUtils.DecodeUrl(postData)); } - else if (request.RawUrl.StartsWith("/getapi")) - { - if(request.RawUrl.Length > 9) { - string getData = request.RawUrl.Substring(8); - ProtocolLog.WriteIf(SocialLog.SVPNLog, String.Format( - "HTTP API: {0} {1}", - DateTime.Now.TimeOfDay, getData)); - responseString = Process(SocialUtils.DecodeUrl(getData)); - } - } // Cross-domain request made by Flash clients - else if (request.RawUrl == "/crossdomain.xml") - { + else if (request.RawUrl == "/crossdomain.xml") { responseString = CrossDomainXML; } - else if (request.RawUrl == "/socialvpn.js") - { - using (StreamReader text = new StreamReader("socialvpn.js")) - { + else if (request.RawUrl == "/socialvpn.js") { + using (StreamReader text = new StreamReader("socialvpn.js")) { responseString = text.ReadToEnd(); } response.ContentType = "text/javascript"; } - else if (request.RawUrl == "/socialvpn.css") - { - using (StreamReader text = new StreamReader("socialvpn.css")) - { + else if (request.RawUrl == "/socialvpn.css") { + using (StreamReader text = new StreamReader("socialvpn.css")) { responseString = text.ReadToEnd(); } response.ContentType = "text/css"; } + else if (request.RawUrl == "/pic.svg") { + using (StreamReader text = new StreamReader("pic.svg")) { + responseString = text.ReadToEnd(); + } + response.ContentType = "image/svg+xml"; + } + else if (request.RawUrl == "/pic.png") { + responseString = null; + buffer = SocialUtils.ReadFileBytes("pic.png"); + response.ContentType = "image/png"; + } // Return html content for page display else { @@ -205,7 +200,9 @@ namespace SocialVPN { response.ContentType = "text/html"; } - byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); + if ( buffer == null && responseString != null) { + buffer = System.Text.Encoding.UTF8.GetBytes(responseString); + } response.ContentLength64 = buffer.Length; response.AddHeader("Cache-Control", "No-cache"); System.IO.Stream output = response.OutputStream; src/HttpInterface.cs @@ -30,13 +30,19 @@ using NUnit.Framework; namespace SocialVPN { + /** + * Definition of QueueItem for Blocking Queue. + */ public class QueueItem { public enum Actions { - AddCert, + AddCertTrue, + AddCertFalse, + DhtAdd, Sync, Process, - HeartBeat + HeartBeat, + Publish } public Actions Action; @@ -56,6 +62,11 @@ namespace SocialVPN { public class SocialConnectionManager { /** + * The common delimiter for user input + */ + public const char DELIM = ','; + + /** * The node which accepts peers based on certificates. */ protected readonly SocialNode _snode; @@ -91,9 +102,14 @@ namespace SocialVPN { protected DateTime _last_update, _last_publish, _last_store, _last_ping; /** - * Interval for periodic operations + * Global Dht Access. */ - protected readonly TimeSpan _interval; + protected bool _global_access; + + /** + * The counter for heartbeat event. + */ + protected int _heartbeat_counter; /** * Constructor. @@ -115,11 +131,15 @@ namespace SocialVPN { _queue = queue; _main_thread = new Thread(Start); _main_thread.Start(); - _interval = new TimeSpan(0,5,0); - _last_update = DateTime.Now - _interval; + _last_update = DateTime.MinValue; _last_store = _last_update; _last_publish = _last_update; _last_ping = _last_update; + _heartbeat_counter = 0; + } + + public void SetGlobalAccess(string global_access) { + _global_access = (global_access == "on"); } public void Start() { @@ -128,11 +148,19 @@ namespace SocialVPN { } while(true) { - QueueItem item = (QueueItem)_queue.Dequeue(); try { + QueueItem item = (QueueItem)_queue.Dequeue(); switch(item.Action) { - case QueueItem.Actions.AddCert: - _snode.AddCertificate((byte[]) item.Obj); + case QueueItem.Actions.AddCertTrue: + _snode.AddCertificate((byte[]) item.Obj, true); + break; + + case QueueItem.Actions.AddCertFalse: + _snode.AddCertificate((byte[]) item.Obj, false); + break; + + case QueueItem.Actions.DhtAdd: + _snode.AddDhtFriend((string) item.Obj, _global_access); break; case QueueItem.Actions.Sync: @@ -147,25 +175,43 @@ namespace SocialVPN { HeartBeatAction(); break; + case QueueItem.Actions.Publish: + _snode.PublishCertificate(); + break; + default: break; } } catch (Exception e) { ProtocolLog.WriteIf(SocialLog.SVPNLog, e.Message); ProtocolLog.WriteIf(SocialLog.SVPNLog, - String.Format("HEARTBEAT ACTION FAILURE: {0}", + String.Format("QUEUE ACTION FAILURE: {0}", DateTime.Now.TimeOfDay)); } } } + public void Stop() { + _http.Stop(); + _main_thread.Abort(); + Environment.Exit(1); + } + /** * Heartbeat event handler. * @param obj the default object. * @param eargs the event arguments. */ public void HeartBeatHandler(Object obj, EventArgs eargs) { - _queue.Enqueue(new QueueItem(QueueItem.Actions.HeartBeat, obj)); + if( _heartbeat_counter % 60 == 0) { + if(!_snode.CertPublished) { + _queue.Enqueue(new QueueItem(QueueItem.Actions.Publish, null)); + } + else { + _queue.Enqueue(new QueueItem(QueueItem.Actions.HeartBeat, obj)); + } + } + _heartbeat_counter++; } /** @@ -173,23 +219,21 @@ namespace SocialVPN { * @param obj the default object. */ public void HeartBeatAction(){ - if(!_snode.Dht.Online) { - return; - } DateTime now = DateTime.Now; - if((now - _last_update).Minutes >= 5 ) { + DateTime min = DateTime.MinValue; + if(_last_update == min || (now - _last_update).Minutes >= 5 ) { UpdateFriends(null); _last_update = now; } - if((now - _last_store).Minutes >= 5 ) { + if(_last_store == min || (now - _last_store).Minutes >= 30 ) { _snp.StoreFingerprint(); _last_store = now; } - if((now - _last_publish).Minutes >= 5 ) { + if(_last_publish == min || (now - _last_publish).Minutes >= 30 ) { _snode.PublishCertificate(); _last_publish = now; } - if((now - _last_ping).Minutes >= 5 ) { + if(_last_ping == min || (now - _last_ping).Minutes >= 1 ) { _srh.PingFriends(); _last_ping = now; } @@ -201,7 +245,7 @@ namespace SocialVPN { * @param eargs the event arguments. */ public void ProcessHandler(Object obj, EventArgs eargs) { - ((Dictionary<string, string>)obj)["response"] = _snode.GetState(); + ((Dictionary<string, string>)obj)["response"] = _snode.GetState(false); // Allows main thread to run request, main thread does all the work _queue.Enqueue(new QueueItem(QueueItem.Actions.Process, obj)); } @@ -215,11 +259,11 @@ namespace SocialVPN { if(request.ContainsKey("m")) { switch(request["m"]) { case "add": - _snp.AddFriends(request["uids"]); + _snp.AddFriends(request["uids"].Split(DELIM)); break; case "addfpr": - _snp.AddFingerprints(request["fprs"]); + _snp.AddFingerprints(request["fprs"].Split(DELIM)); break; case "addcert": @@ -238,12 +282,22 @@ namespace SocialVPN { BlockFriends(request["fprs"]); break; + case "delete": + DeleteFriends(request["fprs"]); + break; + + case "global": + SetGlobalAccess(request["access"]); + break; + default: break; } if(request["m"] == "add" || request["m"] == "addfpr" || request["m"] == "addcert") { - UpdateFriends(null); + if(_snode.CertPublished) { + UpdateFriends(null); + } } } } @@ -266,7 +320,7 @@ namespace SocialVPN { * @param fprlist a list of fingerprints. */ protected void AllowFriends(string fprlist) { - string[] fprs = fprlist.Split('\n'); + string[] fprs = fprlist.Split(DELIM); foreach(string fpr in fprs) { _snode.AddFriend(fpr); } @@ -277,7 +331,7 @@ namespace SocialVPN { * @param fprlist a list of fingerprints. */ protected void BlockFriends(string fprlist) { - string[] fprs = fprlist.Split('\n'); + string[] fprs = fprlist.Split(DELIM); foreach(string fpr in fprs) { _snode.RemoveFriend(fpr); } @@ -290,11 +344,22 @@ namespace SocialVPN { protected void AddFriends(string[] uids) { List<byte[]> certificates = _snp.GetCertificates(uids); foreach(byte[] cert in certificates) { - _snode.AddCertificate(cert); + _snode.AddCertificate(cert, true); } List<string> fingerprints = _snp.GetFingerprints(uids); foreach(string fpr in fingerprints) { - _snode.AddDhtFriend(fpr); + _snode.AddDhtFriend(fpr, true); + } + } + + /** + * Delete a list of fingerprints seperated by newline. + * @param fprlist a list of fingerprints. + */ + protected void DeleteFriends(string fprlist) { + string[] fprs = fprlist.Split(DELIM); + foreach(string fpr in fprs) { + _snode.DeleteFriend(fpr); } } } src/SocialConnectionManager.cs @@ -17,7 +17,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ using System; +using System.Collections; using System.Collections.Generic; +using System.Text; using Brunet; using Brunet.DistributedServices; @@ -60,11 +62,6 @@ namespace SocialVPN { protected readonly Dictionary<string, ISocialNetwork> _networks; /** - * Location of the certificates directory. - */ - protected readonly string _cert_dir; - - /** * List of friends manually added. */ protected readonly List<string> _friends; @@ -85,19 +82,17 @@ namespace SocialVPN { * @param user the local user object. * @param certData the local certificate data. */ - public SocialNetworkProvider(IDht dht, SocialUser user, byte[] certData, - string certDir) { + public SocialNetworkProvider(IDht dht, SocialUser user, byte[] certData) { _local_user = user; _dht = dht; _providers = new Dictionary<string, IProvider>(); _networks = new Dictionary<string,ISocialNetwork>(); _local_cert_data = certData; - _cert_dir = certDir; _friends = new List<string>(); + _friends.Add(_local_user.Uid); _fingerprints = new List<string>(); _certificates = new List<byte[]>(); RegisterBackends(); - LoadCertificates(); } /** @@ -181,7 +176,7 @@ namespace SocialVPN { continue; } foreach(string fpr in tmp_fprs) { - if(fpr.Length > 45 || !fingerprints.Contains(fpr)) { + if(fpr.Length >= 45 || !fingerprints.Contains(fpr)) { fingerprints.Add(fpr); } } @@ -192,6 +187,21 @@ namespace SocialVPN { fingerprints.Add(fpr); } } + + // Get friends from DHT + foreach(string friend in _friends) { + byte[] key_bytes = Encoding.UTF8.GetBytes(friend); + MemBlock keyb = MemBlock.Reference(key_bytes); + Hashtable[] results = _dht.Get(keyb); + foreach(Hashtable result in results) { + byte[] fpr_data = (byte[]) result["value"]; + string fpr = Encoding.UTF8.GetString(fpr_data); + if(!fingerprints.Contains(fpr)) { + fingerprints.Add(fpr); + } + } + + } return fingerprints; } @@ -240,6 +250,25 @@ namespace SocialVPN { foreach(IProvider provider in _providers.Values) { success = (success || provider.StoreFingerprint()); } + // Store in the DHT by default + byte[] key_bytes = Encoding.UTF8.GetBytes(_local_user.Uid); + MemBlock keyb = MemBlock.Reference(key_bytes); + byte[] value_bytes = Encoding.UTF8.GetBytes(_local_user.DhtKey); + MemBlock valueb = MemBlock.Reference(value_bytes); + if(_dht.Put(keyb, valueb, SocialNode.DHTTTL)) { + ProtocolLog.WriteIf(SocialLog.SVPNLog, + String.Format("STORE UID SUCCESS: {0} {1} {2}", + DateTime.Now.TimeOfDay,_local_user.DhtKey, + _local_user.Uid)); + + } + else { + ProtocolLog.WriteIf(SocialLog.SVPNLog, + String.Format("STORE UID FAILURE: {0} {1} {2}", + DateTime.Now.TimeOfDay,_local_user.DhtKey, + _local_user.Uid)); + } + return success; } @@ -259,35 +288,13 @@ namespace SocialVPN { } /** - * Loads certificates from the file system. + * Adds a list of fingerprints. + * @param fprs a list of fingerprints. */ - protected void LoadCertificates() { - string[] cert_files = null; - try { - cert_files = System.IO.Directory.GetFiles(_cert_dir); - } catch (Exception e) { - ProtocolLog.WriteIf(SocialLog.SVPNLog, e.Message); - ProtocolLog.WriteIf(SocialLog.SVPNLog, "LOAD CERTIFICATES FAILURE"); - } - foreach(string cert_file in cert_files) { - byte[] cert_data = SocialUtils.ReadFileBytes(cert_file); - _certificates.Add(cert_data); - } - } - - /** - * Adds a list of fingerprints seperated by newline. - * @param fprlist a list of fingerprints. - */ - public void AddFingerprints(string fprlist) { - string[] fprs = fprlist.Split('\n'); + public void AddFingerprints(string[] fprs) { foreach(string fpr in fprs) { - string tmp_fpr = null; - if(!fpr.Contains("=")) { - tmp_fpr = fpr + "="; - } - if(!_fingerprints.Contains(tmp_fpr)) { - _fingerprints.Add(tmp_fpr); + if(!_fingerprints.Contains(fpr)) { + _fingerprints.Add(fpr); } } } @@ -305,11 +312,10 @@ namespace SocialVPN { } /** - * Adds a list of friends seperated by newline. - * @param friendlist a list of friends unique identifiers. + * Adds a list of friends. + * @param friends a list of friends unique identifiers. */ - public void AddFriends(string friendlist) { - string[] friends = friendlist.Split('\n'); + public void AddFriends(string[] friends) { foreach(string friend in friends) { if(!_friends.Contains(friend)) { _friends.Add(friend); @@ -317,6 +323,18 @@ namespace SocialVPN { } } + /** + * Remove a list of friends. + * @param fprs a list of friends unique identifiers. + */ + public void DeleteFingerprints(string[] fprs) { + foreach(string fpr in fprs) { + if(_fingerprints.Contains(fpr)) { + _fingerprints.Remove(fpr); + } + } + } + } #if SVPN_NUNIT [TestFixture] src/SocialNetworkProvider.cs @@ -58,9 +58,14 @@ namespace SocialVPN { public const string CERTFILENAME = "local.cert"; /** + * The path for the state file. + */ + public const string STATEPATH = "state.xml"; + + /** * The DHT TTL. */ - public const int DHTTTL = 600; + public const int DHTTTL = 3600; /** * Dictionary of friends indexed by alias. @@ -118,17 +123,33 @@ namespace SocialVPN { protected readonly BlockingQueue _queue; /** + * The http port. + */ + protected readonly string _http_port; + + /** + * Keeps track of published certificate. + */ + protected bool _cert_published; + + /** + * Access for published certificate status. + */ + public bool CertPublished { get { return _cert_published; } } + + /** * Constructor. * @param brunetConfig configuration file for Brunet P2P library. * @param ipopConfig configuration file for IP over P2P app. */ public SocialNode(NodeConfig brunetConfig, IpopConfig ipopConfig, - string certDir, string port) : + string certDir, string port, string global_access) : base(brunetConfig, ipopConfig) { _friends = new Dictionary<string, SocialUser>(); _aliases = new Dictionary<string, string>(); _addr_to_key = new Dictionary<string, string>(); _cert_dir = certDir; + _http_port = port; string cert_path = Path.Combine(certDir, CERTFILENAME); _local_cert = new Certificate(SocialUtils.ReadFileBytes(cert_path)); _local_user = new SocialUser(_local_cert); @@ -136,39 +157,36 @@ namespace SocialVPN { _bso.CertificateHandler.AddCACertificate(_local_cert.X509); _bso.CertificateHandler.AddSignedCertificate(_local_cert.X509); _snp = new SocialNetworkProvider(this.Dht, _local_user, - _local_cert.X509.RawData, certDir); + _local_cert.X509.RawData); _queue = new BlockingQueue(); _srh = new SocialRpcHandler(_node, _local_user, _friends, _queue); _scm = new SocialConnectionManager(this, _snp, _srh, port, _queue); + _cert_published = false; _node.ConnectionTable.ConnectionEvent += ConnectHandler; _node.HeartBeatEvent += _scm.HeartBeatHandler; + Shutdown.OnExit += _scm.Stop; _local_user.IP = _marad.LocalIP; - _local_user.Alias = CreateAlias(_local_user.Uid, _local_user.PCID, - _local_user.DhtKey); + CreateAlias(_local_user); _marad.MapLocalDNS(_local_user.Alias); + _scm.SetGlobalAccess(global_access); + LoadCertificates(); } /** * Create a unique alias for a user resource. - * @param uid the user unique identifier (email). - * @param pcid the pc identifier. - * @param dhtKey the friend's dht key. - * @return a unique user alias used for DNS naming. + * @param user the object representing the user. */ - protected virtual string CreateAlias(string uid, string pcid, - string dhtKey) { - uid = uid.Replace('@', '.'); - string alias = (pcid + "." + uid + DNSSUFFIX).ToLower(); - + protected virtual void CreateAlias(SocialUser friend) { + string user = friend.Uid.Split('@')[0]; + string alias = (friend.PCID + "." + user + DNSSUFFIX).ToLower(); + int counter = 1; // If alias already exists, remove old friend with alias - if(_aliases.ContainsKey(alias)) { - string dht_key = _aliases[alias]; - DeleteFriend(_friends[dht_key]); + while(_aliases.ContainsKey(alias)) { + alias = (friend.PCID + counter + "." + user + DNSSUFFIX).ToLower(); + counter++; } - else { - _aliases[alias] = dhtKey; - } - return alias; + _aliases[alias] = friend.DhtKey; + friend.Alias = alias; } /** @@ -194,7 +212,7 @@ namespace SocialVPN { public void PublishCertificate() { byte[] key_bytes = Encoding.UTF8.GetBytes(_local_user.DhtKey); MemBlock keyb = MemBlock.Reference(key_bytes); - MemBlock value = MemBlock.Reference(_local_cert.X509.RawData); + MemBlock valueb = MemBlock.Reference(_local_cert.X509.RawData); Channel q = new Channel(); q.CloseAfterEnqueue(); @@ -202,6 +220,7 @@ namespace SocialVPN { try { bool success = (bool) (q.Dequeue()); if(success) { + _cert_published = true; ProtocolLog.WriteIf(SocialLog.SVPNLog, String.Format("PUBLISH CERT SUCCESS: {0} {1}", DateTime.Now.TimeOfDay, _local_user.DhtKey)); @@ -213,14 +232,15 @@ namespace SocialVPN { DateTime.Now.TimeOfDay, _local_user.DhtKey)); } }; - this.Dht.AsyncPut(keyb, value, DHTTTL, q); + this.Dht.AsyncPut(keyb, valueb, DHTTTL, q); } /** * Add a friend to socialvpn from an X509 certificate. * @param certData the X509 certificate as a byte array. + * @param access determines to give user network access. */ - public void AddCertificate(byte[] certData) { + public void AddCertificate(byte[] certData, bool access) { Certificate cert = new Certificate(certData); SocialUser friend = new SocialUser(cert); @@ -232,7 +252,7 @@ namespace SocialVPN { DateTime.Now.TimeOfDay, friend.DhtKey)); } else if(_snp.ValidateCertificate(certData)) { - friend.Alias = CreateAlias(friend.Uid, friend.PCID, friend.DhtKey); + CreateAlias(friend); SocialUtils.SaveCertificate(cert, _cert_dir); _bso.CertificateHandler.AddCACertificate(cert.X509); _friends.Add(friend.DhtKey, friend); @@ -240,6 +260,11 @@ namespace SocialVPN { AddFriend(friend); _srh.PingFriend(friend); + // Block access + if(!access) { + RemoveFriend(friend); + } + ProtocolLog.WriteIf(SocialLog.SVPNLog, String.Format("ADD CERT KEY SUCCESS: {0} {1} {2}", DateTime.Now.TimeOfDay, friend.DhtKey, @@ -256,10 +281,11 @@ namespace SocialVPN { /** * Add friend by retreiving certificate from DHT. * @param key the DHT key for friend's certificate. + * @param access determines to give user network access. */ - public void AddDhtFriend(string key) { + public void AddDhtFriend(string key, bool access) { if(key != _local_user.DhtKey && !_friends.ContainsKey(key) && - key.Length >= 45) { + key.Length >= 45 ) { ProtocolLog.WriteIf(SocialLog.SVPNLog, String.Format("ADD DHT FETCH: {0} {1}", DateTime.Now.TimeOfDay, key)); @@ -269,11 +295,21 @@ namespace SocialVPN { try { Hashtable result = (Hashtable) q.Dequeue(); byte[] certData = (byte[]) result["value"]; - ProtocolLog.WriteIf(SocialLog.SVPNLog, - String.Format("ADD DHT SUCCESS: {0} {1}", - DateTime.Now.TimeOfDay, key)); - _queue.Enqueue(new QueueItem( - QueueItem.Actions.AddCert, certData)); + string tmp_key = SocialUser.DHTPREFIX + + SocialUtils.GetSHA256(certData); + if(tmp_key == key) { + ProtocolLog.WriteIf(SocialLog.SVPNLog, + String.Format("ADD DHT SUCCESS: {0} {1}", + DateTime.Now.TimeOfDay, key)); + if(access) { + _queue.Enqueue(new QueueItem( + QueueItem.Actions.AddCertTrue, certData)); + } + else { + _queue.Enqueue(new QueueItem( + QueueItem.Actions.AddCertFalse, certData)); + } + } } catch (Exception e) { ProtocolLog.WriteIf(SocialLog.SVPNLog,e.Message); ProtocolLog.WriteIf(SocialLog.SVPNLog, @@ -307,49 +343,104 @@ namespace SocialVPN { } } + /* + * Deletes a friend from socialvpn. + * @param fpr the friend's fingerprint to be removed. + */ + public void DeleteFriend(string fpr) { + if(_friends.ContainsKey(fpr)) { + DeleteFriend(_friends[fpr]); + } + } /* * Add a friend from socialvpn. * @param friend the friend to be added. */ - public void AddFriend(SocialUser friend) { + protected void AddFriend(SocialUser friend) { Address addr = AddressParser.Parse(friend.Address); friend.IP = _marad.RegisterMapping(friend.Alias, addr); _node.ManagedCO.AddAddress(addr); friend.Access = SocialUser.AccessTypes.Allow.ToString(); + _srh.PingFriend(friend); + GetState(true); } /** * Removes (block access) a friend from socialvpn. * @param friend the friend to be removed. */ - public void RemoveFriend(SocialUser friend) { + protected void RemoveFriend(SocialUser friend) { Address addr = AddressParser.Parse(friend.Address); _node.ManagedCO.RemoveAddress(addr); _marad.UnregisterMapping(friend.Alias); friend.Access = SocialUser.AccessTypes.Block.ToString(); + GetState(true); } /** * Delete (erase) a friend from socialvpn. * @param friend the friend to be deleted. */ - public void DeleteFriend(SocialUser friend) { + protected void DeleteFriend(SocialUser friend) { RemoveFriend(friend); - SocialUtils.DeleteCertificate(friend.Address, _cert_dir); _friends.Remove(friend.DhtKey); + _addr_to_key.Remove(friend.Address); + _aliases.Remove(friend.Alias); + SocialUtils.DeleteCertificate(friend.Address, _cert_dir); + GetState(true); + } + + /** + * Loads certificates from the file system. + */ + protected void LoadCertificates() { + string[] cert_files = null; + try { + cert_files = System.IO.Directory.GetFiles(_cert_dir); + SocialState state = Utils.ReadConfig<SocialState>(STATEPATH); + foreach(string cert_file in cert_files) { + byte[] cert_data = SocialUtils.ReadFileBytes(cert_file); + AddCertificate(cert_data, true); + } + SetState(state); + } catch (Exception e) { + ProtocolLog.WriteIf(SocialLog.SVPNLog, e.Message); + ProtocolLog.WriteIf(SocialLog.SVPNLog, "LOAD CERTIFICATES FAILURE"); + } + } + + /** + * Restores the previous state from the file system. + * @param state the social state to set. + */ + public void SetState(SocialState state) { + try { + foreach(SocialUser friend in state.Friends) { + if(friend.Access == SocialUser.AccessTypes.Block.ToString()) { + DeleteFriend(friend.DhtKey); + } + } + } catch(Exception e) { + ProtocolLog.WriteIf(SocialLog.SVPNLog, e.Message); + ProtocolLog.WriteIf(SocialLog.SVPNLog, "SET STATE FAILURE"); + } } /** * Generates an XML string representing state of the system. * @return a string represential the state. */ - public string GetState() { + public string GetState(bool write_to_file) { SocialState state = new SocialState(); state.Certificate = _local_cert_b64; state.LocalUser = _local_user; + //state.Deletes = _deletes; state.Friends = new SocialUser[_friends.Count]; _friends.Values.CopyTo(state.Friends, 0); + if(write_to_file) { + Utils.WriteConfig(STATEPATH, state); + } return SocialUtils.ObjectToXml<SocialState>(state); } @@ -358,33 +449,43 @@ namespace SocialVPN { */ public static new void Main(string[] args) { - if(args.Length < 3) { - Console.WriteLine("usage: SocialVPN.exe <brunet.config path> " + - "<ipop.config path> <http port> [email] [pcid] " + - "[\"name\"]"); - return; - } + NodeConfig node_config = null; + IpopConfig ipop_config = null; + string port, global_access; - NodeConfig node_config = Utils.ReadConfig<NodeConfig>(args[0]); - IpopConfig ipop_config = Utils.ReadConfig<IpopConfig>(args[1]); + if(args.Length < 4) { + try { + node_config = Utils.ReadConfig<NodeConfig>("brunet.config"); + ipop_config = Utils.ReadConfig<IpopConfig>("ipop.config"); + port = "58888"; + global_access = "on"; + } catch { + Console.WriteLine("usage: SocialVPN.exe <brunet.config path> " + + "<ipop.config path> <http port> " + + "<global_access(on/off)>" + + "[email] [pcid] [\"name\"]"); + return; + } + } + else { + node_config = Utils.ReadConfig<NodeConfig>(args[0]); + ipop_config = Utils.ReadConfig<IpopConfig>(args[1]); + port = args[2]; + global_access = args[3]; + } if(!System.IO.Directory.Exists(node_config.Security.CertificatePath)) { string name, uid, pcid, version, country; - if(args.Length >= 6) { - uid = args[3]; - pcid = args[4]; - name = args[5]; + if(args.Length >= 7) { + uid = args[4]; + pcid = args[5]; + name = args[6]; } else { - Console.Write("Enter Name (First Last): "); - name = Console.ReadLine(); - Console.Write("Enter Email Address: "); - uid = Console.ReadLine(); - Console.Write("Enter a unique name for this machine: "); - pcid = Console.ReadLine(); - } - - if(uid.Length < 1 || pcid.Length < 1 || name.Length < 1) { + Console.WriteLine("usage (on first run): SocialVPN.exe " + + "<brunet.config path> <ipop.config path>" + + "<http port> <global_access(on/off)> " + + "<email> <pcid> <\"name\">"); return; } @@ -400,7 +501,7 @@ namespace SocialVPN { SocialNode node = new SocialNode(node_config, ipop_config, node_config.Security.CertificatePath, - args[2]); + port, global_access); node.Run(); } } src/SocialNode.cs @@ -171,6 +171,7 @@ namespace SocialVPN { String.Format("FIRE SYNC: {0} {1} {2}", DateTime.Now.TimeOfDay, dhtKey, uid)); + _queue.Enqueue(new QueueItem(QueueItem.Actions.DhtAdd, dhtKey)); _queue.Enqueue(new QueueItem(QueueItem.Actions.Sync, uid)); } return _local_user.DhtKey + DELIM + response; @@ -215,7 +216,7 @@ namespace SocialVPN { ISender sender = new AHExactSender(_node, addr); _rpc.Invoke(sender, q, "SocialVPN.FriendPing", _local_user.DhtKey, - _local_user.Uid); + _local_user.Uid); } } #if SVPN_NUNIT src/SocialRpcHandler.cs @@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ using System; +using System.Collections.Generic; namespace SocialVPN { @@ -37,5 +38,9 @@ namespace SocialVPN { * The list of friends. */ public SocialUser[] Friends; + + public List<string> Deletes; + + public List<string> Messages; } } src/SocialState.cs @@ -39,7 +39,7 @@ namespace SocialVPN { public const string ALIASDEFAULT = "unknown"; - public const string PICDEFAULT = "nopic"; + public const string PICDEFAULT = "pic.png"; public const string DHTPREFIX = "svpn:"; src/SocialUser.cs @@ -114,7 +114,7 @@ namespace SocialVPN { public static void DeleteCertificate(string address, string certDir) { address = address.Substring(12); string cert_path = Path.Combine(certDir, address + CERTSUFFIX); - if(!File.Exists(cert_path)) { + if(File.Exists(cert_path)) { File.Delete(cert_path); } } @@ -213,11 +213,11 @@ namespace SocialVPN { for (int x = 0; x < pairs.Length; x++) { string[] item = pairs[x].Split('='); - /* + result.Add(HttpUtility.UrlDecode(item[0]), HttpUtility.UrlDecode(item[1])); - */ - result.Add(item[0], item[1]); + + //result.Add(item[0], item[1]); } return result; } src/SocialUtils.cs @@ -5,18 +5,12 @@ <property name="build.dir" value="build" /> <property name="bin.dir" value="../bin"/> <property name="config.dir" value="../config"/> + <property name="scripts.dir" value="../scripts"/> + <property name="images.dir" value="../images"/> <target name="clean" description="Remove build directory"> <delete dir="${build.dir}" failonerror="true"/> - <delete failonerror="true"> - <fileset basedir="${bin.dir}"> - <include name="SocialVPN.exe" /> - <include name="*.dll" /> - <include name="libtuntap.*"/> - <include name="socialvpn.*" /> - <include name="*.config" /> - </fileset> - </delete> + <delete dir="${bin.dir}" failonerror="true" /> </target> <target name="build" description="Build SocialVPN.exe"> @@ -24,10 +18,10 @@ <copy todir="${build.dir}" failonerror="true"> <fileset basedir="${lib.dir}"> <include name="*.dll" /> - <include name="libtuntap.*" /> </fileset> </copy> + <mkdir dir="${bin.dir}" failonerror="true"/> <copy todir="${build.dir}" failonerror="true"> <fileset basedir="."> <include name="socialvpn.js" /> @@ -37,11 +31,23 @@ <copy todir="${build.dir}" failonerror="true"> <fileset basedir="${config.dir}"> - <include name="*.config" /> + <include name="*" /> + </fileset> + </copy> + + <copy todir="${build.dir}" failonerror="true"> + <fileset basedir="${scripts.dir}"> + <include name="*" /> </fileset> </copy> - <csc target="exe" output="${build.dir}/SocialVPN.exe"> + <copy todir="${build.dir}" failonerror="true"> + <fileset basedir="${images.dir}"> + <include name="*" /> + </fileset> + </copy> + + <csc target="winexe" main="SocialVPN.SocialNode" output="${build.dir}/SocialVPN.exe"> <sources failonempty="true"> <include name="*.cs"/> </sources> @@ -61,10 +67,11 @@ </references> </csc> - <mkdir dir="${bin.dir}" failonerror="true"/> - <copy todir="${bin.dir}" failonerror="true"> - <fileset basedir="${build.dir}"> - <include name="SocialVPN.exe" /> + <csc target="exe" main="SocialVPN.SVPNTool" output="${build.dir}/SVPNTool.exe"> + <sources failonempty="true"> + <include name="*.cs"/> + </sources> + <references basedir="${build.dir}"> <include name="Brunet.dll" /> <include name="Brunet.Dht.dll" /> <include name="Brunet.DhtService.dll" /> @@ -73,16 +80,18 @@ <include name="Brunet.Coordinate.dll" /> <include name="Brunet.XmlRpc.dll" /> <include name="CookComputing.XmlRpcV2.dll" /> - <include name="System.Runtime.Remoting.dll" /> - <include name="System.Web.dll" /> <include name="Mono.Posix.dll"/> <include name="Mono.Security.dll"/> - <include name="libtuntap.*"/> + <include name="System.Runtime.Remoting.dll"/> + <include name="System.Web.dll" /> <include name="ManagedIpopNode.dll" /> - <include name="socialvpn.js" /> - <include name="socialvpn.css" /> - <include name="brunet.config" /> - <include name="ipop.config" /> + <include name="nunit.framework.dll"/> + </references> + </csc> + + <copy todir="${bin.dir}" failonerror="true"> + <fileset basedir="${build.dir}"> + <include name="*" /> </fileset> </copy> </target> src/default.build @@ -55,6 +55,15 @@ body { padding: 0px; } +#local_nav h5 { + font-size: 12px; + margin: 5px; + padding: 0px; + color: #999999; + font-weight: bold; +} + + #local_nav ul { margin: 10px 0px 10px 0px; padding: 0px 5px 5px 5px; @@ -179,6 +188,12 @@ body { float: right; } +.div_fpr { + font-size: 12px; + color: #999999; + font-weight: bold; +} + .loginlink { font-size: 20px; font-weight: bold; src/socialvpn.css @@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. var stateXML = ""; var pageID = "friends"; var option = "All"; +var refresh_time = 0; +var show_fpr = "no"; init(); @@ -95,129 +97,56 @@ function loadHeader() { div_subheader.appendChild(main_title); div_subheader.appendChild(menu); - createElem("li", "Login", "", "", menu.id, loadLogin); - createElem("li", "Profile", "", "", menu.id, loadProfile); - createElem("li", "Friends", "", "", menu.id, loadFriends); + //createElem("li", "Friends", "", "", menu.id, loadFriends); } -function loadLogin() { - var div_tmp_content = document.getElementById('tmp_content'); - div_tmp_content.innerHTML = ""; - - createElem("span", "Please enter username and password", "", "f_name", - "tmp_content", ""); - - var user_text = createElem("input", "", "user_input", "", "tmp_content", - ""); - user_text.setAttribute("type", "text"); - - var pass_text = createElem("input", "", "pass_input", "", "tmp_content", - ""); - pass_text.setAttribute("type", "password"); - - var input_button = createElem("button", "Submit", "", "", "tmp_content", - submitLogin); - input_button.setAttribute("type", "text"); - - var input_button = createElem("button", "Cancel", "", "", "tmp_content", - cancelSubmit); - input_button.setAttribute("type", "text"); -} - -function loadProfile() { - pageID = "profile"; +function loadFriends() { + pageID = "friends"; clearDiv("local_nav"); clearDiv("main_content"); - var title = document.createElement('h4'); - title.innerHTML = "Profile"; - - var menu = document.createElement('ul'); - menu.id = "profile_menu"; - - var div_local_nav = document.getElementById('local_nav'); - div_local_nav.innerHTML = ""; - div_local_nav.appendChild(title); - div_local_nav.appendChild(menu); - - createElem("li", "Information", "", "", menu.id, showProfileInfo); - createElem("li", "Update Profile", "", "", menu.id, ""); - - showProfileInfo(); -} - -function showProfileInfo() { - clearDiv("main_content"); - createTable("Information"); - - var dtTable = document.getElementById('data_table'); - - var new_tr = document.createElement('tr'); - var new_td = document.createElement('td'); - var div_info = document.createElement('div'); - div_info.className = "div_info"; - dtTable.appendChild(new_tr); - new_tr.appendChild(new_td); - new_td.appendChild(div_info); - var local_user = stateXML.getElementsByTagName('LocalUser')[0]; - var name = local_user.getElementsByTagName('Name')[0].textContent; - var openid = local_user.getElementsByTagName('Uid')[0].textContent; - var pcid = local_user.getElementsByTagName('PCID')[0].textContent; - var p2paddress = local_user.getElementsByTagName('Address')[0].textContent; - var key_fpr = local_user.getElementsByTagName('Fingerprint')[0].textContent; - var pic = "http://static.ak.fbcdn.net/pics/d_silhouette.gif"; - - var img_usr = document.createElement('img'); - img_usr.className = "f_img"; - img_usr.setAttribute("src", pic); - img_usr.setAttribute("width", "200"); - img_usr.setAttribute("height", "126"); - div_info.appendChild(img_usr); + var alias = local_user.getElementsByTagName('Alias')[0].textContent; + var ip = local_user.getElementsByTagName('IP')[0].textContent; + var fingerprint = local_user.getElementsByTagName('DhtKey')[0].textContent; - createElem("span", name, "", "fp_name", div_info, ""); - div_info.appendChild(document.createElement('br')); - div_info.appendChild(document.createElement('br')); - - createElem("span", openid, "", "fp_info", div_info, ""); - div_info.appendChild(document.createElement('br')); - - createElem("span", pcid, "", "fp_info", div_info, ""); - div_info.appendChild(document.createElement('br')); - - createElem("span", key_fpr, "", "fp_info", div_info, ""); - div_info.appendChild(document.createElement('br')); -} - -function loadFriends() { - pageID = "friends"; - - clearDiv("local_nav"); - clearDiv("main_content"); - var title = document.createElement('h4'); - title.innerHTML = "Friends"; - + title.innerHTML = name + " - " + alias + " - " + ip; + var menu = document.createElement('ul'); menu.id = "friends_menu"; var div_local_nav = document.getElementById('local_nav'); div_local_nav.innerHTML = ""; div_local_nav.appendChild(title); + var subtitle = document.createElement('h5'); + subtitle.innerHTML = "Your fingerprint - " + fingerprint; + div_local_nav.appendChild(subtitle); div_local_nav.appendChild(menu); createElem("li", "All Friends", "", "", menu.id, showAllFriends); createElem("li", "Online Friends", "", "", menu.id, showOnlineFriends); createElem("li", "Offline Friends", "", "", menu.id, showOfflineFriends); createElem("li", "Blocked Friends", "", "", menu.id, showBlockedFriends); - createElem("li", "Add Friend Uid", "", "", menu.id, addFriendID); - createElem("li", "Add Certificate", "", "", menu.id, addCertificate); + createElem("li", "Show/Hide Fingerprints", "", "", menu.id, toggleFprs); + createElem("li", "Add Friends", "", "", menu.id, addEmails); + //createElem("li", "Add Fingerprints", "", "", menu.id, addFingerprints); showFriends(); } +function toggleFprs() { + if(show_fpr == "yes") { + show_fpr = "no"; + } + else { + show_fpr = "yes"; + } + loadFriends(); +} + function showAllFriends() { option = "All"; showFriends(); @@ -258,7 +187,7 @@ function showFriends() { friends[i].status = "Status: Online (" + friend_time + ")"; addFriend(friends[i]); } - else if(friend_access == "Block" && option == "Blocked") { + else if(friend_access == "Block" && option == "Blocked" || option == "All") { friends[i].status = "Status: Blocked"; addFriend(friends[i]); } @@ -266,12 +195,12 @@ function showFriends() { } function addFriend(friend) { - var address = friend.getElementsByTagName('Address')[0].textContent; + var dhtkey = friend.getElementsByTagName('DhtKey')[0].textContent; var dtTable = document.getElementById('data_table'); var new_tr = document.createElement('tr'); var new_td = document.createElement('td'); - new_td.id = address; + new_td.id = dhtkey; var div_opts = document.createElement('div'); div_opts.className = "div_options"; var div_info = document.createElement('div'); @@ -282,14 +211,19 @@ function addFriend(friend) { new_td.appendChild(div_opts); new_td.appendChild(div_info); + var opt_item = createElem("span", "Block", "", "opts_menu", div_opts, + removeFriendPost); + opt_item.dhtkey = dhtkey; + div_opts.appendChild(document.createElement('br')); + var opt_item = createElem("span", "Unblock", "", "opts_menu", div_opts, addFriendPost); - opt_item.address = address; + opt_item.dhtkey = dhtkey; div_opts.appendChild(document.createElement('br')); - var opt_item = createElem("span", "Block", "", "opts_menu", div_opts, - removeFriendPost); - opt_item.address = address; + var opt_item = createElem("span", "Delete", "", "opts_menu", div_opts, + deleteFriendPost); + opt_item.dhtkey = dhtkey; div_opts.appendChild(document.createElement('br')); var img_usr = document.createElement('img'); @@ -300,7 +234,8 @@ function addFriend(friend) { img_usr.setAttribute("height", "50"); div_info.appendChild(img_usr); - var innerHTML = friend.getElementsByTagName('Name')[0].textContent; + var name = friend.getElementsByTagName('Name')[0].textContent; + var innerHTML = name; var info_item = createElem("span", innerHTML, "", "f_name", div_info, ""); div_info.appendChild(document.createElement('br')); @@ -312,6 +247,20 @@ function addFriend(friend) { var innerHTML = friend.status; var info_item = createElem("span", innerHTML, "", "f_online", div_info, ""); div_info.appendChild(document.createElement('br')); + + if(show_fpr == "yes" ) { + var new_tr = document.createElement('tr'); + var new_td = document.createElement('td'); + new_td.id = dhtkey; + var div_info = document.createElement('div'); + div_info.className = "div_fpr"; + div_info.innerHTML = name + "'s fingerprint - " + + friend.getElementsByTagName('DhtKey')[0].textContent; + + dtTable.appendChild(new_tr); + new_tr.appendChild(new_td); + new_td.appendChild(div_info); + } } function cancelSubmit() { @@ -319,20 +268,20 @@ function cancelSubmit() { div_tmp_content.innerHTML = ""; } -function addFriendID() { +function addEmails() { var div_tmp_content = document.getElementById('tmp_content'); div_tmp_content.innerHTML = ""; - createElem("span", "Please enter a list of OpenIDs seperated by new line", + createElem("span", "Enter friend's email addresses (comma seperated)", "", "f_name", "tmp_content", ""); var input_text = createElem("textarea", "", "data_input", "", "tmp_content", ""); - input_text.setAttribute("rows", "10"); + input_text.setAttribute("rows", "5"); input_text.setAttribute("cols", "50"); var input_button = createElem("button", "Submit", "", "", "tmp_content", - submitFriendID); + submitEmails); input_button.setAttribute("type", "text"); var input_button = createElem("button", "Cancel", "", "", "tmp_content", @@ -340,28 +289,20 @@ function addFriendID() { input_button.setAttribute("type", "text"); } -function submitFriendID() { - var input_data ="m=add&uids=" + - encodeURIComponent(document.getElementById('data_input').value); - makeCall(input_data); - var div_tmp_content = document.getElementById('tmp_content'); - div_tmp_content.innerHTML = ""; -} - -function addCertificate() { +function addFingerprints() { var div_tmp_content = document.getElementById('tmp_content'); div_tmp_content.innerHTML = ""; - createElem("span", "Paste a friend's certificate", + createElem("span", "Paste fingerprints (comma seperated)", "", "f_name", "tmp_content", ""); var input_text = createElem("textarea", "", "data_input", "", "tmp_content", ""); - input_text.setAttribute("rows", "10"); + input_text.setAttribute("rows", "5"); input_text.setAttribute("cols", "50"); var input_button = createElem("button", "Submit", "", "", "tmp_content", - submitCertificate); + submitFingerprints); input_button.setAttribute("type", "text"); var input_button = createElem("button", "Cancel", "", "", "tmp_content", @@ -369,50 +310,55 @@ function addCertificate() { input_button.setAttribute("type", "text"); } -function submitCertificate() { - var input_data ="m=addcert&cert=" + +function submitEmails() { + var input_data ="m=add&uids=" + encodeURIComponent(document.getElementById('data_input').value); - makeCall(input_data); + makeCall(input_data, 2000); var div_tmp_content = document.getElementById('tmp_content'); div_tmp_content.innerHTML = ""; } -function submitLogin() { - var input_data ="m=login&id=drupalbackend&user=" + - document.getElementById('user_input').value + "&pass=" + - document.getElementById('pass_input').value; - makeCall(input_data); +function submitFingerprints() { + var input_data ="m=addfpr&fprs=" + + encodeURIComponent(document.getElementById('data_input').value); + makeCall(input_data, 2000); var div_tmp_content = document.getElementById('tmp_content'); div_tmp_content.innerHTML = ""; } -function getConnect() { - makeCall('m=connect'); -} - function getState() { - makeCall('m=getstate'); + makeCall('m=getstate', 0); } function removeFriendPost() { - var postData = "m=update&address=" + - this.address + "&access=off"; - makeCall(postData); + var postData = "m=block&fprs=" + + encodeURIComponent(this.dhtkey); + makeCall(postData, 1000); } function addFriendPost() { - var postData = "m=update&address=" + - this.address + "&access=on"; - makeCall(postData); + var postData = "m=allow&fprs=" + + encodeURIComponent(this.dhtkey); + makeCall(postData, 1000); } -function makeCall(postData) { +function deleteFriendPost() { + var postData = "m=delete&fprs=" + + encodeURIComponent(this.dhtkey); + makeCall(postData, 1000); +} + +function makeCall(postData, ref_time) { + refresh_time = ref_time var httpRequest = new XMLHttpRequest(); httpRequest.overrideMimeType('text/xml'); httpRequest.onreadystatechange = function() { if(httpRequest.readyState == 4) { stateXML = httpRequest.responseXML; - if(pageID == "friends") { + if(refresh_time != 0) { + window.setTimeout(getState, refresh_time); + } + else if(pageID == "friends") { loadFriends(); } } src/socialvpn.js bin/start_linux.sh bin/start_win.cmd lib/libtuntap.so ac91efd6fc201d814bec34f9aae1d8ce9800e8f3 Pierre St Juste ptony82@gmail.com http://github.com/ptony82/socialvpn/commit/996b1a929d649e67b4b1d1af23da93e29e776173 996b1a929d649e67b4b1d1af23da93e29e776173 2009-07-27T10:16:55-07:00 2009-07-27T10:16:55-07:00 This is a commit for the beta release version, I need to find tag option in git b6fec2dc746df4a91bad7f4623af82b0c9f216ab Pierre St Juste ptony82@gmail.com