Merge lp:~phablet-team/network-manager/lp1435776 into lp:~phablet-team/network-manager/vivid-phone-overlay

[Tony Espy]

 * debian/patches/lp1435776_rm_ofono_secret_settings.patch: remove code
    that added USERNAME and PASSWORD to NM_SETTING_GSM object. NM doesn't
    actually need access to these settings, and they can cause issues with
    NM's secrets needed logic.

This change affects the ofono settings plugin and the way that it configures system connections based on ofono gprs_contexts ( aka APNs ).

The change removes the addition of USERNAME and PASSWORD NM_SETTING_GSM settings to the connection, as they're not needed by network-manager, and can cause secret-related activation errors.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

I have tried the patch in arale vivid image #35, but the bug did not go away.

To reproduce the issue, I use a SIM that does not need user or password. I change the "gprs" file introducing a user, but without password. I check that the operator still activates the context using the activate-context script. Then I checked that current NM is not able to activate the context. Finally, using the patched NM I still see the issue. The only difference I have noted is that apparently NM is trying only once to activate the context. The trace I see are (the old NM produced similar ones, but twice):

May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Auto-activating connection '/214050030479893/context1'.
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) starting connection '/214050030479893/context1'
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) Stage 1 of 5 (Device Prepare) scheduled...
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) Stage 1 of 5 (Device Prepare) started...
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): device state change: disconnected -> prepare (reason 'none') [30 40 0]
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): device state change: prepare -> failed (reason 'no-secrets') [40 120 7]
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <warn> Activation (ril_0) failed for connection '/214050030479893/context1'
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> Activation (ril_0) Stage 1 of 5 (Device Prepare) complete.
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): device state change: failed -> disconnected (reason 'none') [120 30 0]
May 11 13:08:31 ubuntu-phablet NetworkManager[1206]: <info> (ril_0): deactivating device (reason 'none') [0]

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Please ignore the previous comment, I did not copy around the right library. The fix does solve the issue, and the code seems right to me.

review: Approve

[lp:~phablet-team/network-manager/lp1435776]

962. By Tony Espy on 2015-05-16

debian/patches/lp1435776_rm_ofono_secret_settings.patch: remove code
that added USERNAME and PASSWORD to NM_SETTING_GSM object. NM doesn't
actually need access to these settings, and they can cause issues with
NM's secrets needed logic ( LP: #1435776 ).

[Tony Espy (awe)]

Tested krillin, rc-proposed #171, SIM1: AT&T SIM2: empty

 - phone boots, mobile data (edge-only) connected

 - tested flight-mode ( 5 cycles via the indicator )

 - tested a context/APN w/username, but no passwrd ( this fails w/network-manager 4ubuntu15.1 )
   - manually edited /var/lib/ofono/<IMSI>/gprs after stopping NM & ofono
   - Note: NM won't even attempt to activate this without this fix

Everything worked as expected.

[Tony Espy (awe)]

Tested arale, tangxi-vivid-proposed #31, SIM: AT&T

 - phone boots, mobile data (hspa) connected

 - flight-mode still broken due to lp: #1445080

 - bad APN ( username w/no pw ) - OK

[Tony Espy (awe)]

I should've noted, my testing was performed with network-manager-0.9.10.0-4ubuntu15.1.1 from silo-028.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Tested on

current build number: 13
device name: arale
channel: ubuntu-touch/rc-proposed/meizu

and checked that both #1435776 are fixed #1450790.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-28 19:49:51 +0000
+++ debian/changelog	2015-05-16 03:09:09 +0000
@@ -1,3 +1,12 @@
+network-manager (0.9.10.0-4ubuntu15.1.1) vivid; urgency=medium
+
+  * debian/patches/lp1435776_rm_ofono_secret_settings.patch: remove code
+    that added USERNAME and PASSWORD to NM_SETTING_GSM object.  NM doesn't
+    actually need access to these settings, and they can cause issues with
+    NM's secrets needed logic.
+
+ -- Tony Espy <[e-mail]>  Fri, 15 May 2015 18:39:32 -0400
+
 network-manager (0.9.10.0-4ubuntu15.1) vivid-security; urgency=medium
 
   * SECURITY UPDATE: directory traversal issue resulting in connection

=== added file 'debian/patches/lp1435776_rm_ofono_secret_settings.patch'
--- debian/patches/lp1435776_rm_ofono_secret_settings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1435776_rm_ofono_secret_settings.patch	2015-05-16 03:09:09 +0000
@@ -0,0 +1,39 @@
+Index: network-manager-0.9.10.0/src/settings/plugins/ofono/parser.c
+===================================================================
+--- network-manager-0.9.10.0.orig/src/settings/plugins/ofono/parser.c
++++ network-manager-0.9.10.0/src/settings/plugins/ofono/parser.c
+@@ -53,8 +53,6 @@ ofono_update_connection_from_context (NM
+ 	char *idstr = NULL;
+ 	char *uuid_base = NULL;
+ 	char *uuid = NULL;
+-	const char *username = NULL;
+-	const char *password = NULL;
+ 
+ 	s_con = nm_connection_get_setting_connection (connection);
+ 	if(!s_con) {
+@@ -91,25 +89,6 @@ ofono_update_connection_from_context (NM
+ 	 */
+ 	g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
+ 
+-	/* Set the APN we got from oFono config. */
+-	g_object_set (s_gsm,
+-	              NM_SETTING_GSM_APN, g_hash_table_lookup (context, "Apn"),
+-	              NULL);
+-
+-	username = g_hash_table_lookup (context, "Username");
+-	if (username && g_strcmp0 (username, "") != 0) {
+-        	g_object_set (s_gsm,
+-		              NM_SETTING_GSM_USERNAME, username,
+-	                      NULL);
+-	}
+-
+-	password = g_hash_table_lookup (context, "Password");
+-	if (password && g_strcmp0 (password, "") != 0) {
+-        	g_object_set (s_gsm,
+-		              NM_SETTING_GSM_PASSWORD, password,
+-	                      NULL);
+-	}
+-
+ 	nm_log_info (LOGD_SETTINGS, "SCPlugin-Ofono: "
+ 	             "update_connection_setting_from_context: name:%s, path:%s, type:%s, id:%s, uuid: %s",
+ 	             (char *) g_hash_table_lookup (context, "Name"),

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-28 19:49:51 +0000
+++ debian/patches/series	2015-05-16 03:09:09 +0000
@@ -68,3 +68,4 @@
 # killswitch
 ignore_rfkill_if_urfkill_is_present.patch
 CVE-2015-1322.patch
+lp1435776_rm_ofono_secret_settings.patch