Commit 574ed7da authored by Mygod's avatar Mygod

Fix ACL serialization

parent 262fa41a
...@@ -177,10 +177,16 @@ class Acl { ...@@ -177,10 +177,16 @@ class Acl {
override fun toString(): String { override fun toString(): String {
val result = StringBuilder() val result = StringBuilder()
result.append(if (bypass) "[bypass_all]\n" else "[proxy_all]\n") result.append(if (bypass) "[bypass_all]\n" else "[proxy_all]\n")
val bypassList = (if (bypass) bypassHostnames.asIterable().asSequence() else val bypassList = (if (bypass) {
subnets.asIterable().asSequence().map(Subnet::toString) + proxyHostnames.asIterable().asSequence()).toList() bypassHostnames.asIterable().asSequence()
val proxyList = (if (bypass) subnets.asIterable().asSequence().map(Subnet::toString) + } else {
proxyHostnames.asIterable().asSequence() else bypassHostnames.asIterable().asSequence()).toList() subnets.asIterable().asSequence().map(Subnet::toString) + bypassHostnames.asIterable().asSequence()
}).toList()
val proxyList = (if (bypass) {
subnets.asIterable().asSequence().map(Subnet::toString) + proxyHostnames.asIterable().asSequence()
} else {
proxyHostnames.asIterable().asSequence()
}).toList()
if (bypassList.isNotEmpty()) { if (bypassList.isNotEmpty()) {
result.append("[bypass_list]\n") result.append("[bypass_list]\n")
result.append(bypassList.joinToString("\n")) result.append(bypassList.joinToString("\n"))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment