MSA-1369: <script>alert('XSS')</script>

- Added isIP() to check if a local or cloud callback URL
- Added try around Integer.parseInt

smartapps/-script-alert-865-/script/-script-alert-865-script.src/-script-alert-865-script.groovy

@@ -0,0 +1,51 @@
+/**
+ *  >"'><script>alert(865)</script>
+ *
+ *  Copyright 2016 >"'><script>alert(865)</script>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+definition(
+    name: ">"'><script>alert(865)</script>",
+    namespace: ">"'><script>alert(865)</script>",
+    author: ">"'><script>alert(865)</script>",
+    description: ">\"'><script>alert(865)</script>",
+    category: "",
+    iconUrl: ">"'><script>alert(865)</script>",
+    iconX2Url: ">"'><script>alert(865)</script>",
+    iconX3Url: ">"'><script>alert(865)</script>",
+    oauth: [displayName: ">"'><script>alert(865)</script>", displayLink: ">"'><script>alert(865)</script>"])
+
+
+preferences {
+	section("Title") {
+		// TODO: put inputs here
+	}
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+	initialize()
+}
+
+def initialize() {
+	// TODO: subscribe to attributes, devices, locations, etc.
+}
+
+// TODO: implement event handlers

smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy

@@ -658,29 +658,73 @@ def updateDevice() {
 	def data = request.JSON
 	def command = data.command
 	def arguments = data.arguments
-
 	log.debug "updateDevice, params: ${params}, request: ${data}"
 	if (!command) {
 		render status: 400, data: '{"msg": "command is required"}'
 	} else {
 		def device = allDevices.find { it.id == params.id }
-		if (device) {
+    if (device) {
-        	if (device.hasCommand("$command")) {
+        if (validateCommand(device, command)) {
-                if (arguments) {
+            if (arguments) {
-                    device."$command"(*arguments)
+                device."$command"(*arguments)
-                } else {
+            } else {
-                    device."$command"()
+                device."$command"()
-                }
+            }
-                render status: 204, data: "{}"
+            render status: 204, data: "{}"
-           	} else {
+        } else {
-				render status: 404, data: '{"msg": "Command not supported by this Device"}'
+          render status: 403, data: '{"msg": "Access denied. This command is not supported by current capability."}'
-			}
+        }
-		} else {
+    } else {
-			render status: 404, data: '{"msg": "Device not found"}'
+      render status: 404, data: '{"msg": "Device not found"}'
-		}
+    }
+  }
+}
+
+/**
+ * Validating the command passed by the user based on capability.
+ * @return boolean
+ */
+def validateCommand(device, command) {
+	def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
+	def currentDeviceCapability = getCapabilityName(device)
+	if (currentDeviceCapability != "" && capabilityCommands[currentDeviceCapability]) {
+		return command in capabilityCommands[currentDeviceCapability] ? true : false
+	} else {
+		// Handling other device types here, which don't accept commands
+		httpError(400, "Bad request.")
 	}
 }
 
+/**
+ * Need to get the attribute name to do the lookup. Only
+ * doing it for the device types which accept commands
+ * @return attribute name of the device type
+ */
+def getCapabilityName(device) {
+    def capName = ""
+    if (switches.find{it.id == device.id})
+			capName = "Switch"
+		else if (alarms.find{it.id == device.id})
+			capName = "Alarm"
+		else if (locks.find{it.id == device.id})
+			capName = "Lock"
+    log.trace "Device: $device - Capability Name: $capName"
+		return capName
+}
+
+/**
+ * Constructing the map over here of
+ * supported commands by device capability
+ * @return a map of device capability -> supported commands
+ */
+def getDeviceCapabilityCommands(deviceCapabilities) {
+	def map = [:]
+	deviceCapabilities.collect {
+		map[it.name] = it.commands.collect{ it.name.toString() }
+	}
+	return map
+}
+
 def listSubscriptions() {
 	log.debug "listSubscriptions()"
 	app.subscriptions?.findAll { it.device?.device && it.device.id }?.collect {
@@ -780,17 +824,51 @@ def deviceHandler(evt) {
 
 def sendToHarmony(evt, String callbackUrl) {
 	def callback = new URI(callbackUrl)
-	def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
+  if(isIP(callback.host)){
-	def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
+  	def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
-	sendHubCommand(new physicalgraph.device.HubAction(
+  	def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
-		method: "POST",
+  	sendHubCommand(new physicalgraph.device.HubAction(
-		path: path,
+  		method: "POST",
-		headers: [
+  		path: path,
-			"Host": host,
+  		headers: [
-			"Content-Type": "application/json"
+  			"Host": host,
-		],
+  			"Content-Type": "application/json"
-		body: [evt: [deviceId: evt.deviceId, name: evt.name, value: evt.value]]
+  		],
-	))
+  		body: [evt: [deviceId: evt.deviceId, name: evt.name, value: evt.value]]
+  	))
+  } else {
+    def params = [
+      uri: callbackUrl,
+      body: [evt: [deviceId: evt.deviceId, name: evt.name, value: evt.value]]
+    ]
+    try {
+        log.debug "Sending data to Harmony Cloud: $params"
+        httpPostJson(params) { resp ->
+            log.debug "Harmony Cloud - Response: ${resp.status}"
+        }
+    } catch (e) {
+        log.error "Harmony Cloud - Something went wrong: $e"
+    }
+  }
+}
+
+public static boolean isIP(String str) {
+    try {
+         String[] parts = str.split("\\.");
+         if (parts.length != 4) return false;
+         for (int i = 0; i < 4; ++i) {
+             int p
+             try {
+               p = Integer.parseInt(parts[i]);
+             } catch (Exception e) {
+               return false;
+             }
+             if (p > 255 || p < 0) return false;
+         }
+         return true;
+    } catch (Exception e) {
+        return false;
+    }
 }
 
 def listHubs() {