code polish
This commit is contained in:
parent
20d4a25232
commit
ac5ae44cd4
@ -104,7 +104,7 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
|
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass !== callingClass) {
|
if (callerClass !== callingClass) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
throw SecurityException(message)
|
throw SecurityException(message)
|
||||||
@ -128,14 +128,10 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
.findFirst()
|
.findFirst()
|
||||||
}.get()
|
}.get()
|
||||||
|
|
||||||
var ok = false
|
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass != null) {
|
val ok = callerClass === callingClass1 || callerClass === callingClass2
|
||||||
ok = callerClass === callingClass1 || callerClass === callingClass2
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
throw SecurityException(message)
|
throw SecurityException(message)
|
||||||
@ -159,14 +155,10 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
.findFirst()
|
.findFirst()
|
||||||
}.get()
|
}.get()
|
||||||
|
|
||||||
var ok = false
|
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass != null) {
|
val ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
|
||||||
ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
throw SecurityException(message)
|
throw SecurityException(message)
|
||||||
@ -189,17 +181,15 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
|
|
||||||
var ok = false
|
var ok = false
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass != null) {
|
for (clazz in callingClasses) {
|
||||||
for (clazz in callingClasses) {
|
if (callerClass === clazz) {
|
||||||
if (callerClass === clazz) {
|
ok = true
|
||||||
ok = true
|
break
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
throw SecurityException(message)
|
throw SecurityException(message)
|
||||||
@ -225,8 +215,8 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
}.get()
|
}.get()
|
||||||
|
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass == null || callerClass !== callingClass) {
|
if (callerClass !== callingClass) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
return false
|
return false
|
||||||
@ -252,14 +242,10 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
.findFirst()
|
.findFirst()
|
||||||
}.get()
|
}.get()
|
||||||
|
|
||||||
var ok = false
|
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass != null) {
|
var ok = callerClass === callingClass1 || callerClass === callingClass2
|
||||||
ok = callerClass === callingClass1 || callerClass === callingClass2
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
return false
|
return false
|
||||||
@ -286,14 +272,10 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
.findFirst()
|
.findFirst()
|
||||||
}.get()
|
}.get()
|
||||||
|
|
||||||
var ok = false
|
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass != null) {
|
val ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
|
||||||
ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
return false
|
return false
|
||||||
@ -319,17 +301,15 @@ abstract class SettingsStore : AutoCloseable {
|
|||||||
|
|
||||||
var ok = false
|
var ok = false
|
||||||
// starts with will allow for anonymous inner classes.
|
// starts with will allow for anonymous inner classes.
|
||||||
if (callerClass != null) {
|
for (clazz in callingClasses) {
|
||||||
for (clazz in callingClasses) {
|
if (callerClass === clazz) {
|
||||||
if (callerClass === clazz) {
|
ok = true
|
||||||
ok = true
|
break
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
val message = "Security violation by: " + (callerClass ?: "???")
|
val message = "Security violation by: $callerClass"
|
||||||
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
val logger = LoggerFactory.getLogger(SettingsStore::class.java)
|
||||||
logger.error(message)
|
logger.error(message)
|
||||||
return false
|
return false
|
||||||
|
Loading…
Reference in New Issue
Block a user