Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
awall
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
awall
Commits
380590e5
Commit
380590e5
authored
Nov 03, 2017
by
Kaarle Ritvanen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
host: resolvelist function
parent
70aeb9f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
21 deletions
+31
-21
awall/host.lua
awall/host.lua
+21
-5
awall/model.lua
awall/model.lua
+6
-8
awall/modules/filter.lua
awall/modules/filter.lua
+1
-1
awall/modules/log.lua
awall/modules/log.lua
+3
-7
No files found.
awall/host.lua
View file @
380590e5
--[[
Host address resolver for Alpine Wall
Copyright (C) 2012-201
4
Kaarle Ritvanen
Copyright (C) 2012-201
7
Kaarle Ritvanen
See LICENSE file for license details
]]
--
local
familypatterns
=
{
inet
=
'%d[%.%d/]+'
,
inet6
=
'[:%x/]+'
,
domain
=
'[%a-][%.%w-]*'
}
local
M
=
{}
local
util
=
require
(
'awall.util'
)
local
familypatterns
=
{
inet
=
'%d[%.%d/]+'
,
inet6
=
'[:%x/]+'
,
domain
=
'[%a-][%.%w-]*'
}
local
function
getfamily
(
addr
,
context
)
for
k
,
v
in
pairs
(
familypatterns
)
do
...
...
@@ -18,7 +23,7 @@ end
local
dnscache
=
{}
return
function
(
host
,
context
)
function
M
.
resolve
(
host
,
context
)
local
family
=
getfamily
(
host
,
context
)
if
family
==
'domain'
then
...
...
@@ -52,3 +57,14 @@ return function(host, context)
return
{{
family
,
host
}}
end
function
M
.
resolvelist
(
list
,
context
)
local
res
=
{}
for
_
,
host
in
util
.
listpairs
(
list
)
do
util
.
extend
(
res
,
M
.
resolve
(
host
,
context
))
end
return
ipairs
(
res
)
end
return
M
awall/model.lua
View file @
380590e5
...
...
@@ -10,7 +10,7 @@ local M = {}
local
loadclass
=
require
(
'awall'
).
loadclass
M
.
class
=
require
(
'awall.class'
)
local
resolve
=
require
(
'awall.host'
)
local
resolve
list
=
require
(
'awall.host'
).
resolvelist
local
builtin
=
require
(
'awall.iptables'
).
builtin
local
optfrag
=
require
(
'awall.optfrag'
)
...
...
@@ -125,13 +125,11 @@ function M.Zone:optfrags(dir)
local
aopts
=
nil
if
self
.
addr
then
aopts
=
{}
for
i
,
hostdef
in
listpairs
(
self
.
addr
)
do
for
i
,
addr
in
ipairs
(
resolve
(
hostdef
,
self
))
do
table.insert
(
aopts
,
{
family
=
addr
[
1
],
[
aprop
]
=
addr
[
2
],
match
=
'-'
..
aopt
..
' '
..
addr
[
2
]}
)
end
for
_
,
addr
in
resolvelist
(
self
.
addr
)
do
table.insert
(
aopts
,
{
family
=
addr
[
1
],
[
aprop
]
=
addr
[
2
],
match
=
'-'
..
aopt
..
' '
..
addr
[
2
]}
)
end
end
...
...
awall/modules/filter.lua
View file @
380590e5
...
...
@@ -6,7 +6,7 @@ See LICENSE file for license details
local
loadclass
=
require
(
'awall'
).
loadclass
local
resolve
=
require
(
'awall.host'
)
local
resolve
=
require
(
'awall.host'
)
.
resolve
local
model
=
require
(
'awall.model'
)
local
class
=
model
.
class
...
...
awall/modules/log.lua
View file @
380590e5
...
...
@@ -5,7 +5,7 @@ See LICENSE file for license details
]]
--
local
resolve
=
require
(
'awall.host'
)
local
resolve
list
=
require
(
'awall.host'
).
resolvelist
local
model
=
require
(
'awall.model'
)
local
class
=
model
.
class
...
...
@@ -85,12 +85,8 @@ function Log:optfrags()
)
end
for
_
,
hostdef
in
util
.
listpairs
(
self
.
mirror
)
do
for
_
,
addr
in
ipairs
(
resolve
(
hostdef
,
self
))
do
table.insert
(
targets
,
{
family
=
addr
[
1
],
target
=
'TEE --gateway '
..
addr
[
2
]}
)
end
for
_
,
addr
in
resolvelist
(
self
.
mirror
)
do
table.insert
(
targets
,
{
family
=
addr
[
1
],
target
=
'TEE --gateway '
..
addr
[
2
]})
end
return
combinations
(
ofrags
,
targets
)
...
...
Write
Preview
Markdown
is supported
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