mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-08 05:31:56 +00:00
Merge pull request #1213 from rohandesai/log-security-fixes
DVCSMP-1959 security fixes for SAs
This commit is contained in:
@@ -54,10 +54,10 @@ def waterWetHandler(evt) {
|
||||
def alreadySentSms = recentEvents.count { it.value && it.value == "wet" } > 1
|
||||
|
||||
if (alreadySentSms) {
|
||||
log.debug "SMS already sent to $phone within the last $deltaSeconds seconds"
|
||||
log.debug "SMS already sent within the last $deltaSeconds seconds"
|
||||
} else {
|
||||
def msg = "${alarm.displayName} is wet!"
|
||||
log.debug "$alarm is wet, texting $phone"
|
||||
log.debug "$alarm is wet, texting phone number"
|
||||
|
||||
if (location.contactBookEnabled) {
|
||||
sendNotificationToContacts(msg, recipients)
|
||||
|
||||
@@ -47,13 +47,13 @@ preferences {
|
||||
|
||||
def installed() {
|
||||
log.debug "Installed with settings: ${settings}"
|
||||
log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
|
||||
// log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
|
||||
subscribe(people, "presence", presence)
|
||||
}
|
||||
|
||||
def updated() {
|
||||
log.debug "Updated with settings: ${settings}"
|
||||
log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
|
||||
// log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
|
||||
unsubscribe()
|
||||
subscribe(people, "presence", presence)
|
||||
}
|
||||
@@ -71,11 +71,10 @@ def presence(evt)
|
||||
def person = getPerson(evt)
|
||||
def recentNotPresent = person.statesSince("presence", t0).find{it.value == "not present"}
|
||||
if (recentNotPresent) {
|
||||
log.debug "skipping notification of arrival of ${person.displayName} because last departure was only ${now() - recentNotPresent.date.time} msec ago"
|
||||
log.debug "skipping notification of arrival of Person because last departure was only ${now() - recentNotPresent.date.time} msec ago"
|
||||
}
|
||||
else {
|
||||
def message = "${person.displayName} arrived at home, changing mode to '${newMode}'"
|
||||
log.info message
|
||||
send(message)
|
||||
setLocationMode(newMode)
|
||||
}
|
||||
@@ -106,6 +105,4 @@ private send(msg) {
|
||||
sendSms(phone, msg)
|
||||
}
|
||||
}
|
||||
|
||||
log.debug msg
|
||||
}
|
||||
|
||||
@@ -57,12 +57,11 @@ def scheduleCheck()
|
||||
def message = message1 ?: "SmartThings - Habit Helper Reminder!"
|
||||
|
||||
if (location.contactBookEnabled) {
|
||||
log.debug "Texting reminder: ($message) to contacts:${recipients?.size()}"
|
||||
log.debug "Texting reminder to contacts:${recipients?.size()}"
|
||||
sendNotificationToContacts(message, recipients)
|
||||
}
|
||||
else {
|
||||
|
||||
log.debug "Texting reminder: ($message) to $phone1"
|
||||
log.debug "Texting reminder"
|
||||
sendSms(phone1, message)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,14 +53,14 @@ def accelerationActiveHandler(evt) {
|
||||
def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
|
||||
|
||||
if (alreadySentSms) {
|
||||
log.debug "SMS already sent to $phone1 within the last $deltaSeconds seconds"
|
||||
log.debug "SMS already sent within the last $deltaSeconds seconds"
|
||||
} else {
|
||||
if (location.contactBookEnabled) {
|
||||
log.debug "$accelerationSensor has moved, texting contacts: ${recipients?.size()}"
|
||||
log.debug "accelerationSensor has moved, texting contacts: ${recipients?.size()}"
|
||||
sendNotificationToContacts("${accelerationSensor.label ?: accelerationSensor.name} moved", recipients)
|
||||
}
|
||||
else {
|
||||
log.debug "$accelerationSensor has moved, texting $phone1"
|
||||
log.debug "accelerationSensor has moved, sending text message"
|
||||
sendSms(phone1, "${accelerationSensor.label ?: accelerationSensor.name} moved")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,10 +41,10 @@ def updated() {
|
||||
|
||||
def presenceHandler(evt) {
|
||||
if (evt.value == "present") {
|
||||
log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
|
||||
// log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
|
||||
sendPush("${presence.label ?: presence.name} has arrived at the ${location}")
|
||||
} else if (evt.value == "not present") {
|
||||
log.debug "${presence.label ?: presence.name} has left the ${location}"
|
||||
// log.debug "${presence.label ?: presence.name} has left the ${location}"
|
||||
sendPush("${presence.label ?: presence.name} has left the ${location}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ def updated() {
|
||||
|
||||
def presenceHandler(evt) {
|
||||
if (evt.value == "present") {
|
||||
log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
|
||||
// log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
|
||||
|
||||
if (location.contactBookEnabled) {
|
||||
sendNotificationToContacts("${presence.label ?: presence.name} has arrived at the ${location}", recipients)
|
||||
@@ -56,7 +56,7 @@ def presenceHandler(evt) {
|
||||
sendSms(phone1, "${presence.label ?: presence.name} has arrived at the ${location}")
|
||||
}
|
||||
} else if (evt.value == "not present") {
|
||||
log.debug "${presence.label ?: presence.name} has left the ${location}"
|
||||
// log.debug "${presence.label ?: presence.name} has left the ${location}"
|
||||
|
||||
if (location.contactBookEnabled) {
|
||||
sendNotificationToContacts("${presence.label ?: presence.name} has left the ${location}", recipients)
|
||||
|
||||
Reference in New Issue
Block a user