Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
PublicAndroidApps
Nebulo
Commits
b69e3434
Commit
b69e3434
authored
Jul 22, 2019
by
Daniel Wolf
Browse files
Allow HOST file type to be used as whitelist
parent
b4175a46
Pipeline
#5015
passed with stage
in 1 minute and 45 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/com/frostnerd/smokescreen/service/RuleImportService.kt
View file @
b69e3434
...
...
@@ -327,17 +327,22 @@ class RuleImportService : IntentService("RuleImportService") {
return
createRuleIfNotExists
(
host
,
target
,
type
,
sourceId
)
}
matcher
==
HOSTS_MATCHER
->
{
var
target
=
matcher
.
group
(
1
)
val
type
=
if
(
target
.
contains
(
":"
))
Record
.
TYPE
.
AAAA
else
Record
.
TYPE
.
A
target
=
target
.
let
{
when
(
it
)
{
"0.0.0.0"
->
"0"
"127.0.0.1"
,
"::1"
->
"1"
else
->
it
return
if
(
isWhitelist
)
{
val
host
=
matcher
.
group
(
2
).
replace
(
wwwRegex
,
""
)
DnsRule
(
Record
.
TYPE
.
ANY
,
host
,
defaultTargetV4
,
defaultTargetV6
,
importedFrom
=
sourceId
)
}
else
{
var
target
=
matcher
.
group
(
1
)
val
type
=
if
(
target
.
contains
(
":"
))
Record
.
TYPE
.
AAAA
else
Record
.
TYPE
.
A
target
=
target
.
let
{
when
(
it
)
{
"0.0.0.0"
->
"0"
"127.0.0.1"
,
"::1"
->
"1"
else
->
it
}
}
val
host
=
matcher
.
group
(
2
).
replace
(
wwwRegex
,
""
)
createRuleIfNotExists
(
host
,
target
,
type
,
sourceId
)
}
val
host
=
matcher
.
group
(
2
).
replace
(
wwwRegex
,
""
)
return
createRuleIfNotExists
(
host
,
target
,
type
,
sourceId
)
}
}
throw
IllegalStateException
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment