Merge lp:~cszikszoy/do/proxy into lp:do

[Chris S.]

[Chris Halse Rogers (raof)]

I'd prefer it if there weren't whitespace changes mixed in here, but I know that can be difficult to do.

If I understand this code correctly, you've extended the Preferences service to also handle system-wide preferences. I'm not sure how good an idea this is - could we instead have something like a SystemConfiguration service that would deal with this sort of system-wide configuration? An advantage I see from that is that the proxy configuration work could get factored out into a platform-neutral place - the proxy setting code is platform independent.

That would also remove the somewhat smelly AddNotify/RemoveNotify addition to IPreferencesService.

review: Needs Fixing

[Chris Halse Rogers (raof)]

Actually, make that “need info”

review: Needs Information

Unmerged revisions

1320. By Chris S. on 2010-03-29

use proxy settings from GConf on linux

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GConfPreferencesService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GConfPreferencesService.cs	2009-08-31 01:58:13 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GConfPreferencesService.cs	2010-03-29 03:16:18 +0000
@@ -43,8 +43,13 @@
 		
 		void HandleGConfChanged (object sender, GConf.NotifyEventArgs args)
 		{
+			// if this key falls under the RootPath, strip away that part of the key,
+			// otherwise we leave the full path to the key.
+			string key = args.Key;
+			if (key.StartsWith (RootPath))
+				key = args.Key.Substring (RootPath.Length + 1);
 			if (PreferencesChanged != null)
-				PreferencesChanged (this, new PreferencesChangedEventArgs (args.Key.Substring(RootPath.Length + 1), args.Value));
+				PreferencesChanged (this, new PreferencesChangedEventArgs (key, args.Value));
 		}
 
 		string AbsolutePathForKey (string key)
@@ -74,9 +79,9 @@
 		public bool TryGet<T> (string key, out T val)
 		{
 			bool success = true;
-			val = default (T);
+			val = default(T);
 			try {
-				val = (T) client.Get (AbsolutePathForKey (key));
+				val = (T)client.Get (AbsolutePathForKey (key));
 			} catch (GConf.NoSuchKeyException) {
 				// We don't need to log this, because many keys that do not
 				// exist are asked for.
@@ -88,7 +93,27 @@
 			}
 			return success;
 		}
+		
+		public void AddNotify (string path)
+		{
+			try {
+				client.AddNotify (path, HandleGConfChanged);
+			} catch (Exception e) {
+				Log.Error ("Error removing notification handler, {0}", e.Message);
+				Log.Debug (e.StackTrace);
+			}
+		}
+
+		public void RemoveNotify (string path)
+		{
+			try {
+				client.RemoveNotify (path, HandleGConfChanged);
+			} catch (Exception e) {
+				Log.Error ("Error removing notification handler, {0}", e.Message);
+				Log.Debug (e.StackTrace);
+			}
+		}
 
 		#endregion
 	}
-}
+}
\ No newline at end of file

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs	2009-10-21 07:06:25 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs	2010-03-29 03:16:18 +0000
@@ -18,6 +18,7 @@
 //
 
 using System;
+using System.Net;
 using System.Reflection;
 
 using NDesk.DBus;
@@ -28,9 +29,65 @@
 
 namespace Do.Platform.Linux
 {
-	
-	public class NetworkService : INetworkService
+
+	public class NetworkService : INetworkService, IInitializedService
 	{
+		class NetworkPreferencesWrapper
+		{
+			const string PROXY = "/system/http_proxy";
+			const string PROXY_USE_PROXY = PROXY + "/" + "use_http_proxy";
+			const string PROXY_HOST = PROXY + "/" + "host";
+			const string PROXY_PORT = PROXY + "/" + "port";
+			const string PROXY_USER = PROXY + "/" + "authentication_user";
+			const string PROXY_PASSWORD = PROXY + "/" + "authentication_password";
+			const string PROXY_BYPASS_LIST = PROXY + "/" + "ignore_hosts";
+			
+			IPreferences Preferences { get; set; }
+			
+			public event EventHandler ProxyChanged;
+			
+			public bool UseProxy {
+				get { return Preferences.Get<bool> (PROXY_USE_PROXY, false); }
+			}
+			public string ProxyHost {
+				get { return Preferences.Get<string> (PROXY_HOST, ""); }
+			}
+			public int ProxyPort {
+				get { return Preferences.Get<int> (PROXY_PORT, 0); }
+			}
+			public string ProxyUser {
+				get { return Preferences.Get<string> (PROXY_USER, ""); }
+			}
+			public string ProxyPassword {
+				get { return Preferences.Get<string> (PROXY_PASSWORD, ""); }
+			}
+			public string[] ProxyBypassList {
+				get { return Preferences.Get<string[]> (PROXY_BYPASS_LIST, new[] { "" }); }
+			}
+			
+			public NetworkPreferencesWrapper ()
+			{
+				Preferences = Services.Preferences.Get<NetworkPreferencesWrapper> ();
+				Preferences.AddNotify (PROXY);
+				Preferences.PreferencesChanged += OnPrefsChanged;
+			}
+			
+			void OnPrefsChanged (object sender, PreferencesChangedEventArgs e)
+			{
+				switch (e.Key) {
+				case PROXY_USE_PROXY:
+				case PROXY_HOST:
+				case PROXY_PORT:
+				case PROXY_USER:
+				case PROXY_PASSWORD:
+				case PROXY_BYPASS_LIST:
+					if (ProxyChanged != null)
+						ProxyChanged (this, EventArgs.Empty);
+					break;
+				}
+			}
+		}
+		
 		const string NetworkManagerName = "org.freedesktop.NetworkManager";
 		const string NetworkManagerPath = "/org/freedesktop/NetworkManager";
 		
@@ -43,6 +100,7 @@
 		delegate void StateChangedHandler (uint state);
 		
 		INetworkManager network;
+		static NetworkPreferencesWrapper prefs;
 		
 		public event EventHandler<NetworkStateChangedEventArgs> StateChanged;
 		
@@ -62,6 +120,15 @@
 				Log<NetworkService>.Debug (e.StackTrace);
 			}
 		}
+		
+		public void Initialize ()
+		{
+			prefs = new NetworkPreferencesWrapper ();
+			UpdateProxySettings ();
+			prefs.ProxyChanged += delegate {
+				UpdateProxySettings ();
+			};
+		}
 
 		void OnStateChanged (uint state)
 		{
@@ -81,18 +148,55 @@
 		}
 		
 		NetworkState State {
-			get	{ 
+			get {
 				try {
-					return (NetworkState) Enum.ToObject (typeof (NetworkState), network.Get (NetworkManagerName, "State"));
+					return (NetworkState)Enum.ToObject (typeof(NetworkState), network.Get (NetworkManagerName, "State"));
 				} catch (Exception) {
 					return NetworkState.Unknown;
 				}
 			}
 		}
 		
+		void UpdateProxySettings ()
+		{
+			WebProxy proxy;
+			
+			if (!prefs.UseProxy) {
+				WebRequest.DefaultWebProxy = null;
+				return;
+			}
+			
+			try {
+				string proxyUri = string.Format ("http://{0}:{1}", prefs.ProxyHost, prefs.ProxyPort);
+				
+				proxy = new WebProxy (proxyUri);
+				string[] bypassList = prefs.ProxyBypassList;
+				if (bypassList != null) {
+					foreach (string host in bypassList) {
+						if (host.Contains ("*.local")) {
+							proxy.BypassProxyOnLocal = true;
+							continue;
+						}
+						proxy.BypassArrayList.Add (string.Format ("http://{0}", host));
+					}
+				}
+				proxy.Credentials = new NetworkCredential (prefs.ProxyUser, prefs.ProxyPassword);
+			} catch (Exception e) {
+				Log.Error ("Error creating web proxy, {0}", e.Message);
+				Log.Debug (e.StackTrace);
+				proxy = null;
+			}
+			
+			WebRequest.DefaultWebProxy = proxy;
+		}
+		
 		#region INetworkService
 
 		public bool IsConnected { get; private set; }
+		
+		public string UserAgent {
+			get { return @"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2) Gecko/20100308 Ubuntu/10.04 (lucid) Firefox/3.6"; }
+		}
 
 		#endregion
 	}

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Common/DictionaryPreferencesService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Common/DictionaryPreferencesService.cs	2009-08-31 01:58:13 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Common/DictionaryPreferencesService.cs	2010-03-29 03:16:18 +0000
@@ -57,15 +57,25 @@
 			object val_object;
 			bool success = Store.TryGetValue (key, out val_object);
 			
-			val = default (T);
+			val = default(T);
 			if (success)
-				val = (T) val_object;
+				val = (T)val_object;
 			
 			return success;
 		}
+		
+		public void AddNotify (string path)
+		{
+			Log.Debug ("Dictionary preferences service cannot add notifications");
+			return;
+		}
+		
+		public void RemoveNotify (string path)
+		{
+			Log.Debug ("Dictionary preferences service cannot remove notifications");
+			return;
+		}
 
 		#endregion
-		
 	}
-
-}
+}
\ No newline at end of file

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/NetworkService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/NetworkService.cs	2009-06-10 05:30:30 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/NetworkService.cs	2010-03-29 03:16:18 +0000
@@ -19,6 +19,7 @@
  */
 
 using System;
+using System.Net;
 
 using Do.Platform;
 
@@ -43,6 +44,12 @@
 			get { return connected; }
 		}
 		
+		public string UserAgent {
+			get {
+				return @"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2) Gecko/20100308 Ubuntu/10.04 (lucid) Firefox/3.6";
+			}
+		}
+		
 		#endregion
 	}
 }

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/PreferencesService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/PreferencesService.cs	2009-08-28 05:42:11 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/PreferencesService.cs	2010-03-29 03:16:18 +0000
@@ -40,9 +40,21 @@
 		public bool TryGet<T> (string key, out T val)
 		{
 			Log.Debug ("Default IPreferencesService cannot get key \"{0}\".", key);
-			val = default (T);
+			val = default(T);
 			return false;
 		}
+		
+		public void AddNotify (string path)
+		{
+			Log.Debug ("Default IPreferencesService cannot add notifications");
+			return;
+		}
+		
+		public void RemoveNotify (string path)
+		{
+			Log.Debug ("Default IPreferencesService cannot remove notifications");
+			return;
+		}
 
 		#endregion
 		

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs	2009-08-31 01:58:13 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs	2010-03-29 03:16:18 +0000
@@ -43,10 +43,13 @@
 		
 		void HandlePreferencesChanged (object o, PreferencesChangedEventArgs e)
 		{
-			if (e.Key.Length <= OwnerString.Length + 1 || e.Key.Substring(0, OwnerString.Length) != OwnerString)
-				return;
+			// if the key starts with the OwnerString, just send the relative key
+			// otherwise we send the full path to the key
+			string key = e.Key;
+			if (e.Key.StartsWith (OwnerString))
+				key = e.Key.Substring (OwnerString.Length + 1);
 			if (PreferencesChanged != null)
-				PreferencesChanged (this, new PreferencesChangedEventArgs (e.Key.Substring(OwnerString.Length + 1), e.Value));
+				PreferencesChanged (this, new PreferencesChangedEventArgs (key, e.Value));
 		}
 
 		#region IPreferences
@@ -93,6 +96,16 @@
 		{
 			return Set (SecureService, key, val);
 		}
+		
+		public void AddNotify (string path)
+		{
+			Service.AddNotify (path);
+		}
+		
+		public void RemoveNotify (string path)
+		{
+			Service.RemoveNotify (path);
+		}
 
 		#endregion
 

=== modified file 'Do.Platform/src/Do.Platform/INetworkService.cs'
--- Do.Platform/src/Do.Platform/INetworkService.cs	2009-06-10 05:30:30 +0000
+++ Do.Platform/src/Do.Platform/INetworkService.cs	2010-03-29 03:16:18 +0000
@@ -19,6 +19,7 @@
  */
 
 using System;
+using System.Net;
 
 using Do.Platform.ServiceStack;
 
@@ -38,5 +39,6 @@
 		event EventHandler<NetworkStateChangedEventArgs> StateChanged;
 		
 		bool IsConnected { get; }
+		string UserAgent { get; }
 	}
 }
\ No newline at end of file

=== modified file 'Do.Platform/src/Do.Platform/IPreferences.cs'
--- Do.Platform/src/Do.Platform/IPreferences.cs	2008-12-22 01:33:29 +0000
+++ Do.Platform/src/Do.Platform/IPreferences.cs	2010-03-29 03:16:18 +0000
@@ -33,5 +33,8 @@
 		T    Get<T>		  (string key, T def);
 		bool SetSecure<T> (string key, T def);
 		T    GetSecure<T> (string key, T def);
+		
+		void AddNotify (string path);
+		void RemoveNotify (string path);
 	}
 }
\ No newline at end of file

=== modified file 'Do.Platform/src/Do.Platform/IPreferencesService.cs'
--- Do.Platform/src/Do.Platform/IPreferencesService.cs	2009-08-28 05:42:11 +0000
+++ Do.Platform/src/Do.Platform/IPreferencesService.cs	2010-03-29 03:16:18 +0000
@@ -32,5 +32,8 @@
 		
 		bool Set<T>    (string key, T val);
 		bool TryGet<T> (string key, out T val);
+		
+		void AddNotify (string path);
+		void RemoveNotify (string path);
 	}
 }

=== modified file 'Do.Platform/src/Do.Platform/SecurePreferencesWrapper.cs'
--- Do.Platform/src/Do.Platform/SecurePreferencesWrapper.cs	2009-08-28 05:42:11 +0000
+++ Do.Platform/src/Do.Platform/SecurePreferencesWrapper.cs	2010-03-29 03:16:18 +0000
@@ -61,7 +61,20 @@
 
 		void EnsureString<T> ()
 		{
-			if (typeof (T) != typeof (string)) throw new NotImplementedException ("Unimplemented for non string values");
+			if (typeof(T) != typeof(string))
+				throw new NotImplementedException ("Unimplemented for non string values");
+		}
+		
+		public void AddNotify (string path)
+		{
+			Log.Debug ("Secure preferences service cannot add notifications");
+			return;
+		}
+
+		public void RemoveNotify (string path)
+		{
+			Log.Debug ("Secure preferences service cannot remove notifications");
+			return;
 		}
 	}
 }