Skip to content

Commit

Permalink
Fix settings. (#144)
Browse files Browse the repository at this point in the history
Co-authored-by: Julia Dijkstra <[email protected]>
Co-authored-by: Maya <[email protected]>
  • Loading branch information
3 people authored Feb 3, 2025
1 parent baad63b commit 187875f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main/scala/li/cil/oc/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import scala.collection.JavaConverters._
import scala.collection.convert.WrapAsScala._
import scala.collection.mutable
import scala.io.{Codec, Source}
import scala.util.Try
import scala.util.matching.Regex

class Settings(val config: Config) {
Expand Down Expand Up @@ -639,8 +640,8 @@ object Settings {
if (fileringRulesPatchVersion.containsVersion(configVersion)) {
OpenComputers.log.info(s"=> Migrating Internet Card filtering rules. ")
val cidrPattern = """(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?:/(\d{1,2}))""".r
val httpHostWhitelist = patched.getStringList(prefix + "internet.whitelist")
val httpHostBlacklist = patched.getStringList(prefix + "internet.blacklist")
val httpHostWhitelist = Try(patched.getStringList(prefix + "internet.whitelist")).getOrElse(new java.util.ArrayList[String]())
val httpHostBlacklist = Try(patched.getStringList(prefix + "internet.blacklist")).getOrElse(new java.util.ArrayList[String]())
val internetFilteringRules = mutable.MutableList[String]()
for (blockedAddress <- httpHostBlacklist) {
if (cidrPattern.findFirstIn(blockedAddress).isDefined) {
Expand Down

0 comments on commit 187875f

Please sign in to comment.