Merge pull request #996 from smartdevicelink/feature/block_old_hu

Block Old SDL Head Units from Cloud apps

2 files changed, 76 insertions, 1 deletions

diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 012f07726..b8adf36d3 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -68,6 +68,8 @@ public class SdlManager extends BaseSdlManager{
 	private List<Class<? extends SdlSecurityBase>> sdlSecList;
 	//FIXME private LockScreenConfig lockScreenConfig;
 	private final Object STATE_LOCK = new Object();
+	private Version minimumProtocolVersion;
+	private Version minimumRPCVersion;
 
 
 	// Managers
@@ -402,6 +404,10 @@ public class SdlManager extends BaseSdlManager{
 
 	protected String getShortAppName() { return shortAppName; }
 
+	protected Version getMinimumProtocolVersion() { return minimumProtocolVersion; }
+
+	protected Version getMinimumRPCVersion() { return minimumRPCVersion; }
+
 	protected Language getHmiLanguage() { return hmiLanguage; }
 
 	protected TemplateColorScheme getDayColorScheme() { return dayColorScheme; }
@@ -560,6 +566,8 @@ public class SdlManager extends BaseSdlManager{
 
 				proxy = new LifecycleManager(appConfig, (WebSocketServerConfig)transport, lifecycleListener);
 				proxy.start();
+				proxy.setMinimumProtocolVersion(minimumProtocolVersion);
+				proxy.setMinimumRPCVersion(minimumRPCVersion);
 				if (sdlSecList != null && !sdlSecList.isEmpty()) {
 					proxy.setSdlSecurityClassList(sdlSecList);
 				}
@@ -804,6 +812,27 @@ public class SdlManager extends BaseSdlManager{
 		}
 
 		/**
+		 * Sets the minimum protocol version that will be permitted to connect.
+		 * If the protocol version of the head unit connected is below this version,
+		 * the app will disconnect with an EndService protocol message and will not register.
+		 * @param minimumProtocolVersion
+		 */
+		public Builder setMinimumProtocolVersion(final Version minimumProtocolVersion) {
+			sdlManager.minimumProtocolVersion = minimumProtocolVersion;
+			return this;
+		}
+
+		/**
+		 * The minimum RPC version that will be permitted to connect.
+		 * If the RPC version of the head unit connected is below this version, an UnregisterAppInterface will be sent.
+		 * @param minimumRPCVersion
+		 */
+		public Builder setMinimumRPClVersion(final Version minimumRPCVersion) {
+			sdlManager.minimumRPCVersion = minimumRPCVersion;
+			return this;
+		}
+
+		/**
 		 * Sets the Language of the App
 		 * @param hmiLanguage
 		 */
@@ -960,6 +989,14 @@ public class SdlManager extends BaseSdlManager{
 				sdlManager.hmiLanguage = Language.EN_US;
 			}
 
+			if (sdlManager.minimumProtocolVersion == null){
+				sdlManager.minimumProtocolVersion = new Version("1.0.0");
+			}
+
+			if (sdlManager.minimumRPCVersion == null){
+				sdlManager.minimumRPCVersion = new Version("1.0.0");
+			}
+
 			sdlManager.transitionToState(BaseSubManager.SETTING_UP);
 
 			return sdlManager;
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index 7ea248101..548a70712 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -42,7 +42,8 @@ public class LifecycleManager extends BaseLifecycleManager {
     public static final Version MAX_SUPPORTED_RPC_VERSION = new Version("5.0.0");
 
     // Protected Correlation IDs
-    private final int 	REGISTER_APP_INTERFACE_CORRELATION_ID = 65529;
+    private final int 	REGISTER_APP_INTERFACE_CORRELATION_ID = 65529,
+                        UNREGISTER_APP_INTERFACE_CORRELATION_ID = 65530;
 
 
     // Sdl Synchronization Objects
@@ -74,6 +75,9 @@ public class LifecycleManager extends BaseLifecycleManager {
 
     private List<Class<? extends SdlSecurityBase>> _secList = null;
 
+    private Version minimumProtocolVersion;
+    private Version minimumRPCVersion;
+
 
     public LifecycleManager(AppConfig appConfig, WebSocketServerConfig config, LifecycleListener listener){
 
@@ -216,6 +220,14 @@ public class LifecycleManager extends BaseLifecycleManager {
                         } else {
                             LifecycleManager.this.rpcSpecVersion = MAX_SUPPORTED_RPC_VERSION;
                         }
+                        if (minimumRPCVersion != null && minimumRPCVersion.isNewerThan(rpcSpecVersion) == 1) {
+                            Log.w(TAG, String.format("Disconnecting from head unit, the configured minimum RPC version %s is greater than the supported RPC version %s", minimumRPCVersion, rpcSpecVersion));
+                            UnregisterAppInterface msg = new UnregisterAppInterface();
+                            msg.setCorrelationID(UNREGISTER_APP_INTERFACE_CORRELATION_ID);
+                            sendRPCMessagePrivate(msg);
+                            cleanProxy();
+                            return;
+                        }
                         processRaiResponse(raiResponse);
                         systemCapabilityManager.parseRAIResponse(raiResponse);
                         break;
@@ -583,6 +595,13 @@ public class LifecycleManager extends BaseLifecycleManager {
 
         Log.i(TAG, "on protocol session started");
         if (sessionType != null) {
+            if (minimumProtocolVersion != null && minimumProtocolVersion.isNewerThan(getProtocolVersion()) == 1){
+                Log.w(TAG, String.format("Disconnecting from head unit, the configured minimum protocol version %s is greater than the supported protocol version %s", minimumProtocolVersion, getProtocolVersion()));
+                session.endService(sessionType, session.getSessionId());
+                cleanProxy();
+                return;
+            }
+
             if (sessionType.equals(SessionType.RPC)) {
                 if(appConfig != null){
 
@@ -654,6 +673,25 @@ public class LifecycleManager extends BaseLifecycleManager {
 
     }
 
+    /**
+     * Sets the minimum protocol version that will be permitted to connect.
+     * If the protocol version of the head unit connected is below this version,
+     * the app will disconnect with an EndService protocol message and will not register.
+     * @param minimumProtocolVersion
+     */
+    public void setMinimumProtocolVersion(Version minimumProtocolVersion){
+        this.minimumProtocolVersion = minimumProtocolVersion;
+    }
+
+    /**
+     * The minimum RPC version that will be permitted to connect.
+     * If the RPC version of the head unit connected is below this version, an UnregisterAppInterface will be sent.
+     * @param minimumRPCVersion
+     */
+    public void setMinimumRPCVersion(Version minimumRPCVersion){
+        this.minimumRPCVersion = minimumRPCVersion;
+    }
+
     /* *******************************************************************************************************
      *************************************** ISdlConnectionListener END ************************************
      *********************************************************************************************************/