Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

joyent/triton-cns#22 Want support for reverse proxy zones #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

joyent/triton-cns#22 Want support for reverse proxy zones #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions bin/cnsadm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright (c) 2018, Joyent, Inc.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will give us build issues if you don't modify to Copyright 2020 Joyent, Inc. Mind to change that line too?

* Copyright 2016, 2020, The University of Queensland
*/

var dashdash = require('dashdash');
Expand Down Expand Up @@ -291,7 +292,17 @@ function do_zones() {
return ((v || []).join(','));
}},
{field: 'hidden_primary', title: 'hidden primary',
type: 'boolean'}
type: 'boolean'},
{field: 'proxy_addr', title: 'proxy address',
type: 'string'},
{field: 'proxy_networks', stringify: function (v) {
v = v || [];
if (v.length === 1 && v[0] === '*')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: can we use braces for conditionals?

return ('*');
if (v.length === 0)
return ('');
return (sprintf('(%d UUIDs)', v.length));
}}
];
var objs = Object.keys(config.forward_zones).map(function (z) {
var obj = config.forward_zones[z];
Expand Down Expand Up @@ -338,7 +349,12 @@ function do_zones() {
type: 'array',
items: {type: 'string'}
},
'hidden_primary': {type: 'boolean'}
'hidden_primary': {type: 'boolean'},
'proxy_addr': {type: 'string'},
'proxy_networks': {
type: 'array',
items: {type: 'string'}
}
}
};
if (args.length === 0 && !opts['delete']) {
Expand Down
11 changes: 11 additions & 0 deletions lib/config-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,17 @@
},
"hidden_primary": {
"type": "boolean"
},
"proxy_addr": {
"type": "string"
},
"proxy_networks": {
"type": "array",
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[*]$|^[a-f0-9-]+$"
}
}
},
"additionalProperties": false
Expand Down
55 changes: 42 additions & 13 deletions lib/vm-to-zones.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright (c) 2018, Joyent, Inc.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same copyright issue than above

* Copyright 2016, 2020, The University of Queensland
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2016?. Shouldn't this just be 2020?

*/

module.exports = buildZonesFromVm;
Expand Down Expand Up @@ -33,7 +34,8 @@ function buildZonesFromVm(vm, config, log) {
type: 'instance',
ip: ip,
zone: zone,
network: nic.network
network: nic.network,
network_pools: nic.network_pools
});
}
vm.services.forEach(function (svc) {
Expand All @@ -42,7 +44,8 @@ function buildZonesFromVm(vm, config, log) {
ip: ip,
zone: zone,
service: svc,
network: nic.network
network: nic.network,
network_pools: nic.network_pools
});
});
});
Expand Down Expand Up @@ -151,16 +154,37 @@ function isNetOwned(vm, netw) {
return ((netw.owner_uuids || []).indexOf(vm.owner.uuid) !== -1);
}

function isProxied(ent, config) {
var zoneConfig = config.forward_zones[ent.zone];
if (!zoneConfig.proxy_networks)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same braces thing than above. Also, why parentheses around the boolean keywords?

return (false);
if (zoneConfig.proxy_networks.indexOf(ent.network.uuid) !== -1)
return (true);
if (zoneConfig.proxy_networks.indexOf('*') !== -1)
return (true);
var pools = ent.network_pools;
if (!pools)
return (false);
for (var i = 0; i < pools.length; ++i) {
if (zoneConfig.proxy_networks.indexOf(pools[i]) !== -1)
return (true);
}
return (false);
}

function addInstance(zones, vm, ent, config) {
function addName(name) {
if (!zones[ent.zone])
zones[ent.zone] = {};
if (!zones[ent.zone][name])
zones[ent.zone][name] = [];
var recs = zones[ent.zone][name];
var ip = ent.ip;
if (isProxied(ent, config))
ip = config.forward_zones[ent.zone].proxy_addr;
recs.push({
constructor: ent.addrType,
args: [ent.ip]
args: [ip]
});
var hasTxt = false;
for (var i = 0; i < recs.length; ++i) {
Expand Down Expand Up @@ -254,15 +278,17 @@ function addInstance(zones, vm, ent, config) {
if (vm.ptrname)
revName = vm.ptrname;

var rev = utils.reverseZoneIp(ent.ip);
if (!zones[rev.zone])
zones[rev.zone] = {};
var revs = zones[rev.zone][rev.name];
if (!revs || revs[0].args[0].length > revName.length) {
zones[rev.zone][rev.name] = [ {
constructor: 'PTR',
args: [revName]
} ];
if (!isProxied(ent, config)) {
var rev = utils.reverseZoneIp(ent.ip);
if (!zones[rev.zone])
zones[rev.zone] = {};
var revs = zones[rev.zone][rev.name];
if (!revs || revs[0].args[0].length > revName.length) {
zones[rev.zone][rev.name] = [ {
constructor: 'PTR',
args: [revName]
} ];
}
}
}

Expand All @@ -274,6 +300,9 @@ function addService(zones, vm, ent, config) {
if (!zones[ent.zone][name])
zones[ent.zone][name] = [];
var recs = zones[ent.zone][name];
var ip = ent.ip;
if (isProxied(ent, config))
ip = config.forward_zones[ent.zone].proxy_addr;
Comment on lines +304 to +305
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Braces please :-)

var hasTxt = false;
for (var i = 0; i < recs.length; ++i) {
if (recs[i].constructor === 'TXT' &&
Expand All @@ -285,7 +314,7 @@ function addService(zones, vm, ent, config) {
if (vm.listServices) {
recs.push({
constructor: ent.addrType,
args: [ent.ip],
args: [ip],
src: vm.uuid
});
if (!hasTxt) {
Expand Down
103 changes: 102 additions & 1 deletion test/unit/vm-to-zones.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ test('with use_alias', function (t) {
var config = {
use_alias: true,
forward_zones: {
'foo': { networks: ['*'] }
'foo': {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we bump Joyent Copyright notice of this file too, please?

networks: ['*'],
proxy_addr: '9.9.9.9',
proxy_networks: ['aaa1111']
}
},
reverse_zones: {}
};
Expand All @@ -131,6 +135,7 @@ test('with use_alias', function (t) {
ip: '1.2.3.4',
zones: ['foo'],
network: {
uuid: 'abcd1234',
name: 'SDC-Customer-Public-Pool-72.2.118.0/23',
owner_uuids: ['def432']
}
Expand Down Expand Up @@ -694,3 +699,99 @@ test('cmon everywhere', function (t) {

t.end();
});

test('reverse proxy zone - wildcard', function (t) {
var config = {
forward_zones: {
'foo': {
networks: ['*'],
proxy_addr: '9.9.9.9',
proxy_networks: ['*']
}
},
reverse_zones: {}
};
var vm = {
uuid: 'abc123',
services: [],
listInstance: true,
listServices: true,
owner: {
uuid: 'def432'
},
nics: [
{
ip: '1.2.3.4',
zones: ['foo'],
network: { name: 'Default-Fabric', owner_uuids: ['def432'] }
}
]
};
var zones = buildZonesFromVm(vm, config, log);
t.deepEqual(Object.keys(zones), ['foo']);

t.deepEqual(Object.keys(zones['foo']), ['abc123.inst.def432',
'default-fabric.abc123.inst.def432', 'abc123.cmon']);

var fwd = zones['foo']['abc123.inst.def432'];
t.deepEqual(fwd, [
{constructor: 'A', args: ['9.9.9.9']},
{constructor: 'TXT', args: ['abc123']}
]);
var cmon = zones['foo']['abc123.cmon'];
t.deepEqual(cmon, [
{constructor: 'CNAME', args: ['cmon.foo']}
]);

t.end();
});

test('reverse proxy zone - specific net', function (t) {
var config = {
forward_zones: {
'foo': {
networks: ['*'],
proxy_addr: '9.9.9.9',
proxy_networks: ['ddd111']
}
},
reverse_zones: {}
};
var vm = {
uuid: 'abc123',
services: [],
listInstance: true,
listServices: true,
owner: {
uuid: 'def432'
},
nics: [
{
ip: '1.2.3.4',
zones: ['foo'],
network: {
uuid: 'ddd111',
name: 'Default-Fabric',
owner_uuids: ['def432']
}
}
]
};
var zones = buildZonesFromVm(vm, config, log);
t.deepEqual(Object.keys(zones), ['foo']);

t.deepEqual(Object.keys(zones['foo']), ['abc123.inst.def432',
'default-fabric.abc123.inst.def432', 'abc123.cmon']);

var fwd = zones['foo']['abc123.inst.def432'];
t.deepEqual(fwd, [
{constructor: 'A', args: ['9.9.9.9']},
{constructor: 'TXT', args: ['abc123']}
]);
var cmon = zones['foo']['abc123.cmon'];
t.deepEqual(cmon, [
{constructor: 'CNAME', args: ['cmon.foo']}
]);

t.end();
});