[ofono] Access control for SIM Toolkit agent. Fixes JB#49163

Non-privileged process will get org.ofono.Error.AccessDenied from
RegisterAgent. Other methods already check that D-Bus call is coming
from a registered agent.

ofono/drivers/ril/ril_constants.h

@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2013 Canonical Ltd.
- *  Copyright (C) 2013-2019 Jolla Ltd.
+ *  Copyright (C) 2013-2020 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -205,10 +205,44 @@ enum ril_data_call_fail_cause {
 	PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22,
 	PDP_FAIL_NSAPI_IN_USE = 0x23,
 	PDP_FAIL_REGULAR_DEACTIVATION = 0x24,
+	PDP_FAIL_QOS_NOT_ACCEPTED = 0x25,
+	PDP_FAIL_NETWORK_FAILURE = 0x26,
+	PDP_FAIL_UMTS_REACTIVATION_REQ = 0x27,
+	PDP_FAIL_FEATURE_NOT_SUPP = 0x28,
+	PDP_FAIL_TFT_SEMANTIC_ERROR = 0x29,
+	PDP_FAIL_TFT_SYTAX_ERROR = 0x2A,
+	PDP_FAIL_UNKNOWN_PDP_CONTEXT = 0x2B,
+	PDP_FAIL_FILTER_SEMANTIC_ERROR = 0x2C,
+	PDP_FAIL_FILTER_SYTAX_ERROR = 0x2D,
+	PDP_FAIL_PDP_WITHOUT_ACTIVE_TFT = 0x2E,
 	PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32,
 	PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33,
 	PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34,
+	PDP_FAIL_ESM_INFO_NOT_RECEIVED = 0x35,
+	PDP_FAIL_PDN_CONN_DOES_NOT_EXIST = 0x36,
+	PDP_FAIL_MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED = 0x37,
+	PDP_FAIL_MAX_ACTIVE_PDP_CONTEXT_REACHED = 0x41,
+	PDP_FAIL_UNSUPPORTED_APN_IN_CURRENT_PLMN = 0x42,
+	PDP_FAIL_INVALID_TRANSACTION_ID = 0x51,
+	PDP_FAIL_MESSAGE_INCORRECT_SEMANTIC = 0x5F,
+	PDP_FAIL_INVALID_MANDATORY_INFO = 0x60,
+	PDP_FAIL_MESSAGE_TYPE_UNSUPPORTED = 0x61,
+	PDP_FAIL_MSG_TYPE_NONCOMPATIBLE_STATE = 0x62,
+	PDP_FAIL_UNKNOWN_INFO_ELEMENT = 0x63,
+	PDP_FAIL_CONDITIONAL_IE_ERROR = 0x64,
+	PDP_FAIL_MSG_AND_PROTOCOL_STATE_UNCOMPATIBLE = 0x65,
 	PDP_FAIL_PROTOCOL_ERRORS = 0x6F,
+	PDP_FAIL_APN_TYPE_CONFLICT = 0x70,
+	PDP_FAIL_INVALID_PCSCF_ADDR = 0x71,
+	PDP_FAIL_INTERNAL_CALL_PREEMPT_BY_HIGH_PRIO_APN = 0x72,
+	PDP_FAIL_EMM_ACCESS_BARRED = 0x73,
+	PDP_FAIL_EMERGENCY_IFACE_ONLY = 0x74,
+	PDP_FAIL_IFACE_MISMATCH = 0x75,
+	PDP_FAIL_COMPANION_IFACE_IN_USE = 0x76,
+	PDP_FAIL_IP_ADDRESS_MISMATCH = 0x77,
+	PDP_FAIL_IFACE_AND_POL_FAMILY_MISMATCH = 0x78,
+	PDP_FAIL_EMM_ACCESS_BARRED_INFINITE_RETRY = 0x79,
+	PDP_FAIL_AUTH_FAILURE_ON_EMERGENCY_CALL = 0x7A,
 	PDP_FAIL_VOICE_REGISTRATION_FAIL = -1,
 	PDP_FAIL_DATA_REGISTRATION_FAIL = -2,
 	PDP_FAIL_SIGNAL_LOST = -3,

ofono/drivers/ril/ril_data.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2016-2020 Jolla Ltd.
  *  Copyright (C) 2019 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "ril_data.h"
 #include "ril_radio.h"
 #include "ril_network.h"
@@ -29,6 +31,8 @@
 #include <grilio_parser.h>
 #include <grilio_request.h>
 
+#include "common.h" /* ACCESS_TECHNOLOGY_EUTRAN */
+
 /* Yes, it does sometimes take minutes in roaming */
 #define SETUP_DATA_CALL_TIMEOUT (300*1000) /* ms */
 
@@ -115,6 +119,7 @@ struct ril_data_priv {
 	gulong io_event_id[IO_EVENT_COUNT];
 	gulong settings_event_id[SETTINGS_EVENT_COUNT];
 	GHashTable* grab;
+	gboolean downgraded_tech; /* Status 55 workaround */
 };
 
 enum ril_data_signal {
@@ -815,6 +820,31 @@ static gboolean ril_data_call_setup_retry(void *user_data)
 	return G_SOURCE_REMOVE;
 }
 
+static gboolean ril_data_call_retry(struct ril_data_request_setup *setup)
+{
+	struct ril_data_request *req = &setup->req;
+	const struct ril_data_options *options = &req->data->priv->options;
+
+	if (setup->retry_count < options->data_call_retry_limit) {
+		req->pending_id = 0;
+		GASSERT(!setup->retry_delay_id);
+		if (!setup->retry_count) {
+			/* No delay first time */
+			setup->retry_count++;
+			DBG("silent retry %u out of %u", setup->retry_count,
+					options->data_call_retry_limit);
+			req->submit(req);
+		} else {
+			const guint ms = options->data_call_retry_delay_ms;
+			DBG("silent retry scheduled in %u ms", ms);
+			setup->retry_delay_id = g_timeout_add(ms,
+					ril_data_call_setup_retry, setup);
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static void ril_data_call_setup_cb(GRilIoChannel *io, int ril_status,
 				const void *data, guint len, void *user_data)
 {
@@ -839,33 +869,49 @@ static void ril_data_call_setup_cb(GRilIoChannel *io, int ril_status,
 		}
 	}
 
-	if (call && call->status == PDP_FAIL_ERROR_UNSPECIFIED &&
-		setup->retry_count < priv->options.data_call_retry_limit) {
+	if (call) {
+		switch (call->status) {
 		/*
 		 * According to the comment from ril.h we should silently
-		 * retry. First time we retry immediately and if that doedsn't
+		 * retry. First time we retry immediately and if that doesn't
 		 * work, then after certain delay.
 		 */
-		req->pending_id = 0;
-		GASSERT(!setup->retry_delay_id);
-		if (!setup->retry_count) {
-			setup->retry_count++;
-			DBG("silent retry %u out of %u", setup->retry_count,
-					priv->options.data_call_retry_limit);
-			req->submit(req);
-		} else {
-			guint ms = priv->options.data_call_retry_delay_ms;
-			DBG("silent retry scheduled in %u ms", ms);
-			setup->retry_delay_id = g_timeout_add(ms,
-					ril_data_call_setup_retry, setup);
+		case PDP_FAIL_ERROR_UNSPECIFIED:
+			if (ril_data_call_retry(setup)) {
+				ril_data_call_list_free(list);
+				return;
+			}
+			break;
+		/*
+		 * With some networks we sometimes start getting error 55
+		 * (Multiple PDN connections for a given APN not allowed)
+		 * when trying to setup an LTE data call and this error
+		 * doesn't go away until we successfully establish a data
+		 * call over 3G. Then we can switch back to LTE.
+		 */
+		case PDP_FAIL_MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED:
+			if (priv->network->data.access_tech ==
+					ACCESS_TECHNOLOGY_EUTRAN &&
+						!priv->downgraded_tech) {
+				DBG("downgrading preferred technology");
+				priv->downgraded_tech = TRUE;
+				ril_data_manager_check_network_mode(priv->dm);
+				/* And let this call fail */
+			}
+			break;
+		default:
+			break;
 		}
-		ril_data_call_list_free(list);
-		return;
 	}
 
 	ril_data_request_completed(req);
 
 	if (call && call->status == PDP_FAIL_NONE) {
+		if (priv->downgraded_tech) {
+			DBG("done with status 55 workaround");
+			priv->downgraded_tech = FALSE;
+			ril_data_manager_check_network_mode(priv->dm);
+		}
 		if (ril_data_call_list_move_calls(self->data_calls, list) > 0) {
 			DBG("data call(s) added");
 			ril_data_signal_emit(self, SIGNAL_CALLS_CHANGED);
@@ -1151,6 +1197,11 @@ static struct ril_data_request *ril_data_allow_new(struct ril_data *data,
 /*==========================================================================*
  * ril_data
  *==========================================================================*/
+static enum ofono_radio_access_mode ril_data_max_mode(struct ril_data *self)
+{
+	return self->priv->downgraded_tech ? OFONO_RADIO_ACCESS_MODE_UMTS :
+						OFONO_RADIO_ACCESS_MODE_ANY;
+}
 
 gulong ril_data_add_allow_changed_handler(struct ril_data *self,
 						ril_data_cb_t cb, void *arg)
@@ -1684,7 +1735,7 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)
 
 			ril_network_set_max_pref_mode(network,
 					(network == lte_network) ?
-					OFONO_RADIO_ACCESS_MODE_ANY :
+					ril_data_max_mode(data) :
 					OFONO_RADIO_ACCESS_MODE_GSM,
 					FALSE);
 		}
@@ -1694,7 +1745,7 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)
 		for (l= self->data_list; l; l = l->next) {
 			struct ril_data *data = l->data;
 			ril_network_set_max_pref_mode(data->priv->network,
-					OFONO_RADIO_ACCESS_MODE_ANY, FALSE);
+					ril_data_max_mode(data), FALSE);
 		}
 	}
 }
@@ -1723,7 +1774,7 @@ static void ril_data_manager_switch_data_on(struct ril_data_manager *self,
 
 	if (ril_data_manager_handover(self)) {
 		ril_network_set_max_pref_mode(priv->network,
-					OFONO_RADIO_ACCESS_MODE_ANY, TRUE);
+					ril_data_max_mode(data), TRUE);
 	}
 
 	if (priv->options.allow_data == RIL_ALLOW_DATA_ENABLED) {

ofono/drivers/ril/ril_ecclist.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2016-2020 Jolla Ltd.
  *  Copyright (C) 2019 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "ril_ecclist.h"
 #include "ril_log.h"
 

ofono/drivers/ril/ril_network.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2019 Jolla Ltd.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
  *  Copyright (C) 2019 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "ril_network.h"
 #include "ril_radio.h"
 #include "ril_sim_card.h"

ofono/drivers/ril/ril_radio.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2019 Jolla Ltd.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -13,6 +13,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "ril_radio.h"
 #include "ril_util.h"
 #include "ril_log.h"

ofono/drivers/ril/ril_sim_card.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2018 Jolla Ltd.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -13,6 +13,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "ril_sim_card.h"
 #include "ril_radio.h"
 #include "ril_util.h"

ofono/drivers/ril/ril_sim_settings.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2016-2020 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -13,6 +13,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "ril_sim_settings.h"
 #include "ril_log.h"
 

ofono/include/dbus-access.h

@@ -1,7 +1,8 @@
 /*
  *  oFono - Open Source Telephony
  *
- *  Copyright (C) 2019 Jolla Ltd.
+ *  Copyright (C) 2019-2020 Jolla Ltd.
+ *  Copyright (C) 2020 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -25,7 +26,7 @@ extern "C" {
 enum ofono_dbus_access {
 	OFONO_DBUS_ACCESS_DENY,       /* Deny access */
 	OFONO_DBUS_ACCESS_ALLOW,      /* Allow access */
-	OFONO_DBUS_ACCESS_DONT_CARE,  /* No decision */
+	OFONO_DBUS_ACCESS_DONT_CARE   /* No decision */
 };
 
 enum ofono_dbus_access_intf {
@@ -38,6 +39,7 @@ enum ofono_dbus_access_intf {
 	OFONO_DBUS_ACCESS_INTF_SIMMGR,        /* org.ofono.SimManager */
 	OFONO_DBUS_ACCESS_INTF_MODEM,         /* org.ofono.Modem */
 	OFONO_DBUS_ACCESS_INTF_RADIOSETTINGS, /* org.ofono.RadioSettings */
+	OFONO_DBUS_ACCESS_INTF_STK,           /* org.ofono.SimToolkit */
 	OFONO_DBUS_ACCESS_INTF_COUNT
 };
 
@@ -116,6 +118,12 @@ enum ofono_dbus_access_radiosettings_method {
 	OFONO_DBUS_ACCESS_RADIOSETTINGS_METHOD_COUNT
 };
 
+/* OFONO_DBUS_ACCESS_INTF_STK */
+enum ofono_dbus_access_stk_method {
+	OFONO_DBUS_ACCESS_STK_REGISTER_AGENT,
+	OFONO_DBUS_ACCESS_STK_METHOD_COUNT
+};
+
 #define OFONO_DBUS_ACCESS_PRIORITY_LOW     (-100)
 #define OFONO_DBUS_ACCESS_PRIORITY_DEFAULT (0)
 #define OFONO_DBUS_ACCESS_PRIORITY_HIGH    (100)

ofono/plugins/sailfish_manager/sailfish_manager.c

@@ -743,18 +743,32 @@ static int sailfish_manager_update_modem_paths(struct sailfish_manager_priv *p)
 		 */
 		if (sailfish_manager_all_sims_are_initialized(p)) {
 			slot = sailfish_manager_find_slot_imsi(p, NULL);
-			if (slot && slot->watch->online &&
+			if (slot && slot->watch->imsi && slot->watch->online &&
 				p->auto_data_sim == SIM_AUTO_SELECT_ONCE) {
+				const char *imsi = slot->watch->imsi;
+
 				/*
 				 * Data SIM only needs to be auto-selected
 				 * once and it's done. Write that down.
 				 */
+				DBG("Default data sim set to %s once", imsi);
 				p->auto_data_sim_done = TRUE;
 				g_key_file_set_boolean(p->storage,
 						SF_STORE_GROUP,
 						SF_STORE_AUTO_DATA_SIM_DONE,
 						p->auto_data_sim_done);
+
+				g_free(p->default_data_imsi);
+				p->pub.default_data_imsi =
+				p->default_data_imsi = g_strdup(imsi);
+				g_key_file_set_string(p->storage,
+						SF_STORE_GROUP,
+						SF_STORE_DEFAULT_DATA_SIM,
+						imsi);
+
 				storage_sync(NULL, SF_STORE, p->storage);
+				sailfish_manager_dbus_signal(p->dbus,
+					SAILFISH_MANAGER_SIGNAL_DATA_IMSI);
 			}
 		} else {
 			DBG("Skipping auto-selection of data SIM");

ofono/plugins/sailfish_manager/sailfish_sim_info.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony
  *
- *  Copyright (C) 2017-2019 Jolla Ltd.
+ *  Copyright (C) 2017-2020 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -13,6 +13,8 @@
  *  GNU General Public License for more details.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

ofono/src/dbus-access.c

@@ -1,7 +1,8 @@
 /*
  *  oFono - Open Source Telephony
  *
- *  Copyright (C) 2019 Jolla Ltd.
+ *  Copyright (C) 2019-2020 Jolla Ltd.
+ *  Copyright (C) 2020 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -41,6 +42,8 @@ const char *ofono_dbus_access_intf_name(enum ofono_dbus_access_intf intf)
 		return OFONO_MODEM_INTERFACE;
 	case OFONO_DBUS_ACCESS_INTF_RADIOSETTINGS:
 		return OFONO_RADIO_SETTINGS_INTERFACE;
+	case OFONO_DBUS_ACCESS_INTF_STK:
+		return OFONO_STK_INTERFACE;
 	case OFONO_DBUS_ACCESS_INTF_COUNT:
 		break;
 	}
@@ -165,6 +168,14 @@ const char *ofono_dbus_access_method_name(enum ofono_dbus_access_intf intf,
 			break;
 		}
 		break;
+	case OFONO_DBUS_ACCESS_INTF_STK:
+		switch ((enum ofono_dbus_access_stk_method)method) {
+		case OFONO_DBUS_ACCESS_STK_REGISTER_AGENT:
+			return "RegisterAgent";
+		case OFONO_DBUS_ACCESS_STK_METHOD_COUNT:
+			break;
+		}
+		break;
 	case OFONO_DBUS_ACCESS_INTF_COUNT:
 		break;
 	}

ofono/src/stk.c

@@ -3,6 +3,8 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2020 Jolla Ltd.
+ *  Copyright (C) 2020 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -725,6 +727,12 @@ static DBusMessage *stk_register_agent(DBusConnection *conn,
 	if (!dbus_validate_path(agent_path, NULL))
 		return __ofono_error_invalid_format(msg);
 
+	if (!__ofono_dbus_access_method_allowed(dbus_message_get_sender(msg),
+					OFONO_DBUS_ACCESS_INTF_STK,
+					OFONO_DBUS_ACCESS_STK_REGISTER_AGENT,
+					agent_path))
+		return __ofono_error_access_denied(msg);
+
 	stk->default_agent = stk_agent_new(agent_path,
 						dbus_message_get_sender(msg),
 						FALSE);

ofono/unit/test-dbus-access.c

@@ -1,7 +1,8 @@
 /*
  *  oFono - Open Source Telephony
  *
- *  Copyright (C) 2019 Jolla Ltd.
+ *  Copyright (C) 2019-2020 Jolla Ltd.
+ *  Copyright (C) 2020 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -103,6 +104,9 @@ static const struct test_method_name_data method_name_tests[] = {
 	},{
 		OFONO_DBUS_ACCESS_INTF_RADIOSETTINGS,
 		OFONO_DBUS_ACCESS_RADIOSETTINGS_METHOD_COUNT
+	},{
+		OFONO_DBUS_ACCESS_INTF_STK,
+		OFONO_DBUS_ACCESS_STK_METHOD_COUNT
 	}
 };