Merge pull request #354 from smartdevicelink/bugfix/issue_353

Add protection against incorrect implementations of SdlRouterService

4 files changed, 48 insertions, 4 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index d6c873a3b..e915a960d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java
@@ -4,6 +4,8 @@ import java.util.Locale;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import com.smartdevicelink.util.AndroidTools;
+
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.bluetooth.BluetoothAdapter;
@@ -189,7 +191,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
 	    for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
 	    	//We will check to see if it contains this name, should be pretty specific
 	    	//Log.d(TAG, "Found Service: "+ service.service.getClassName());
-	    	if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SDL_ROUTER_SERVICE_CLASS_NAME)) {
+	    	if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SDL_ROUTER_SERVICE_CLASS_NAME) && AndroidTools.isServiceExported(context, service.service)) {
 	    		
 	    		runningBluetoothServicePackage.add(service.service);	//Store which instance is running
 	            if(pingService){
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
index 9dd80ff99..254556014 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
@@ -36,7 +36,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
@@ -67,6 +70,7 @@ import com.smartdevicelink.proxy.rpc.UnregisterAppInterface;
 import com.smartdevicelink.transport.enums.TransportType;
 import com.smartdevicelink.transport.utl.ByteAraryMessageAssembler;
 import com.smartdevicelink.transport.utl.ByteArrayMessageSpliter;
+import com.smartdevicelink.util.AndroidTools;
 import com.smartdevicelink.util.BitConverter;
 
 /**
@@ -223,7 +227,7 @@ public class SdlRouterService extends Service{
 								if(tempService.name!=null){
 									sdlMultiList.remove(tempService.name.getPackageName());
 								}
-								if((localCompareTo == null || localCompareTo.isNewer(tempService))){
+								if((localCompareTo == null || localCompareTo.isNewer(tempService)) && AndroidTools.isServiceExported(context, tempService.name)){
 									LocalRouterService self = getLocalRouterService();
 									if(!self.isEqual(tempService)){ //We want to ignore self
 										Log.i(TAG, "Newer service received than previously stored service - " + tempService.launchIntent.getAction());
@@ -759,7 +763,7 @@ public class SdlRouterService extends Service{
 		return false;
 
 	}
-	
+
 	@Override
 	public void onCreate() {
 		super.onCreate();
@@ -770,6 +774,11 @@ public class SdlRouterService extends Service{
 			stopSelf();
 			return;
 		}
+		if(!AndroidTools.isServiceExported(this, new ComponentName(this, this.getClass()))){ //We want to check to see if our service is actually exported
+			Log.e(TAG, "Service isn't exported. Shutting down");
+			stopSelf();
+			return;
+		}
 		else{Log.d(TAG, "We are in the correct process");}
 		synchronized(REGISTERED_APPS_LOCK){
 			registeredApps = new HashMap<Long,RegisteredApp>();
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
index 7daad4760..4b98475db 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
@@ -2,11 +2,16 @@ package com.smartdevicelink.transport;
 
 import java.lang.ref.WeakReference;
 
+import com.smartdevicelink.util.AndroidTools;
+
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -70,7 +75,7 @@ public class SdlRouterStatusProvider {
 		this.flags = flags;
 	}
 	public void checkIsConnected(){
-		if(!bindToService()){
+		if(!AndroidTools.isServiceExported(context,routerService) || !bindToService()){
 			//We are unable to bind to service
 			cb.onConnectionStatusUpdate(false, routerService, context);
 			unBindFromService();
@@ -87,6 +92,9 @@ public class SdlRouterStatusProvider {
 		if(isBound){
 			return true;
 		}
+		if(clientMessenger == null){
+			return false;
+		}
 		Intent bindingIntent = new Intent();
 		bindingIntent.setClassName(this.routerService.getPackageName(), this.routerService.getClassName());//This sets an explicit intent
 		//Quickly make sure it's just up and running
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/AndroidTools.java b/sdl_android_lib/src/com/smartdevicelink/util/AndroidTools.java
new file mode 100644
index 000000000..ff8819ec3
--- /dev/null
+++ b/sdl_android_lib/src/com/smartdevicelink/util/AndroidTools.java
@@ -0,0 +1,25 @@
+package com.smartdevicelink.util;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+
+public class AndroidTools {
+	/**
+	 * Check to see if a component is exported
+	 * @param Context object used to retrieve the package manager
+	 * @param componentName of the component in question
+	 * @return true if this component is tagged as exported
+	 */
+	public static boolean isServiceExported(Context context, ComponentName name) {
+	    try {
+	        ServiceInfo serviceInfo = context.getPackageManager().getServiceInfo(name, PackageManager.GET_META_DATA);
+	        return serviceInfo.exported;
+	    } catch (NameNotFoundException e) {
+	        e.printStackTrace();
+	    }
+	    return false;
+	}
+}