tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 15:08:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generate correct isInNetEx calls. See #67.

Browse Source
This commit is contained in:
FelisCatus 2016-10-24 22:36:34 -04:00
parent 8dcad1697e
commit d489e2eeaf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
omega-pac/src/conditions.coffee
View File

@ -520,13 +520,15 @@ module.exports = exports =
new U2.AST_String value: cache.mask new U2.AST_String value: cache.mask
] ]
) )
if cache.addr.v6 if not cache.addr.v4
# Example: isInNetEx(host,"fefe:13::abc/33")
# For documentation on the isInNetEx function, see:
# https://msdn.microsoft.com/en-us/library/windows/desktop/gg308479(v=vs.85).aspx
hostIsInNetEx = new U2.AST_Call( hostIsInNetEx = new U2.AST_Call(
expression: new U2.AST_SymbolRef name: 'isInNetEx' expression: new U2.AST_SymbolRef name: 'isInNetEx'
args: [ args: [
new U2.AST_SymbolRef name: 'host' new U2.AST_SymbolRef name: 'host'
new U2.AST_String value: cache.normalized new U2.AST_String value: cache.normalized + cache.addr.subnet
new U2.AST_String value: cache.mask
] ]
) )
# Use isInNetEx if possible. # Use isInNetEx if possible.

4
omega-pac/test/conditions.coffee
View File

@ -268,8 +268,8 @@ describe 'Conditions', ->
Conditions.match(cond, request).should.be.true Conditions.match(cond, request).should.be.true
compiled = Conditions.compile(cond).print_to_string() compiled = Conditions.compile(cond).print_to_string()
compiled_args = compiled.substr(compiled.lastIndexOf('(')) compiled.should.contain('isInNet(host,"fefe:13::abc","ffff:ffff:8000::")')
compiled_args.should.eql('(host,"fefe:13::abc","ffff:ffff:8000::")') compiled.should.contain('isInNetEx(host,"fefe:13::abc/33")')
it 'should support IPv6 subnet with zero prefixLength', -> it 'should support IPv6 subnet with zero prefixLength', ->
cond = cond =
conditionType: "IpCondition" conditionType: "IpCondition"