-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #173 from noodlefrenzy/address-parsing
refactor address parsing
- Loading branch information
Showing
13 changed files
with
299 additions
and
170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| 'use strict'; | ||
|
|
||
| var u = require('../utilities'), | ||
| DefaultPolicy = require('./default_policy'); | ||
|
|
||
| module.exports = u.deepMerge({ | ||
| defaultSubjects: false, | ||
| parseAddress: function(address) { | ||
| var result = DefaultPolicy.parseAddress(address); | ||
|
|
||
| // accept vhosts | ||
| if (result.path !== '/') { | ||
| var pathParts = result.path.substr(1).split('/'); | ||
| result.vhost = pathParts[0]; | ||
| result.path = pathParts.slice(1).join('/'); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
| }, DefaultPolicy); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| "use strict"; | ||
| var DefaultPolicy = require('../../lib/policies/default_policy'), | ||
| QpidJavaPolicy = require('../../lib/policies/qpid_java_policy'), | ||
| expect = require('chai').expect; | ||
|
|
||
| describe('Address', function() { | ||
| describe('default', function() { | ||
| [ | ||
| { | ||
| description: 'amqp no port no route', | ||
| address: 'amqp://127.0.0.1', | ||
| expected: { | ||
| protocol: 'amqp', host: '127.0.0.1', port: 5672, path: '/', | ||
| rootUri: 'amqp://127.0.0.1:5672' | ||
| } | ||
| }, | ||
| { | ||
| description: 'amqps no port no route', | ||
| address: 'amqps://localhost', | ||
| expected: { | ||
| protocol: 'amqps', host: 'localhost', port: 5671, path: '/', | ||
| rootUri: 'amqps://localhost:5671' | ||
| } | ||
| }, | ||
| { | ||
| description: 'should match with port and with/without route (1)', | ||
| address: 'amqp://localhost:1234', | ||
| expected: { | ||
| protocol: 'amqp', host: 'localhost', port: 1234, path: '/', | ||
| rootUri: 'amqp://localhost:1234' | ||
| } | ||
| }, | ||
| { | ||
| description: 'should match with port and with/without route (2)', | ||
| address: 'amqps://mq.myhost.com:1235/myroute?with=arguments&multiple=arguments', | ||
| expected: { | ||
| protocol: 'amqps', host: 'mq.myhost.com', port: 1235, | ||
| path: '/myroute?with=arguments&multiple=arguments', | ||
| rootUri: 'amqps://mq.myhost.com:1235' | ||
| } | ||
| }, | ||
| { | ||
| description: 'should match ip + port', | ||
| address: 'amqp://10.42.1.193:8118/testqueue', | ||
| expected: { | ||
| protocol: 'amqp', host: '10.42.1.193', port: 8118, path: '/testqueue', | ||
| rootUri: 'amqp://10.42.1.193:8118' | ||
| } | ||
| }, | ||
| { | ||
| description: 'should match credentials no port no route', | ||
| address: 'amqp://username:password@my.amqp.server', | ||
| expected: { | ||
| protocol: 'amqp', host: 'my.amqp.server', port: 5672, path: '/', | ||
| user: 'username', pass: 'password', | ||
| rootUri: 'amqp://username:password@my.amqp.server:5672' | ||
| } | ||
| }, | ||
| { | ||
| description: 'should match credentials with port and route', | ||
| address: 'amqps://username:password@192.168.1.1:1234/myroute', | ||
| expected: { | ||
| protocol: 'amqps', host: '192.168.1.1', port: 1234, path: '/myroute', | ||
| user: 'username', pass: 'password', | ||
| rootUri: 'amqps://username:password@192.168.1.1:1234' | ||
| } | ||
| } | ||
| ].forEach(function(testCase) { | ||
| it('should match ' + testCase.description, function() { | ||
| expect(DefaultPolicy.parseAddress(testCase.address)) | ||
| .to.eql(testCase.expected); | ||
| }); | ||
| }); | ||
|
|
||
| [ | ||
| { address: 'invalid://localhost', error: 'Should validate protocol' } | ||
|
|
||
| ].forEach(function(testCase, idx) { | ||
| it('should throw error on invalid address (' + (idx+1) + ')', function() { | ||
| expect(function() { | ||
| DefaultPolicy.parseAddress(testCase.address); | ||
| }).to.throw(Error, null, testCase.error); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Qpid Java', function() { | ||
| it('should parse vhosts', function() { | ||
| var address = 'amqps://username:password@192.168.1.1:1234/some-vhost/topic/and/more'; | ||
| expect(QpidJavaPolicy.parseAddress(address)).to.eql({ | ||
| host: "192.168.1.1", | ||
| pass: "password", | ||
| path: "topic/and/more", | ||
| port: 1234, | ||
| protocol: "amqps", | ||
| rootUri: "amqps://username:password@192.168.1.1:1234", | ||
| user: "username", | ||
| vhost: "some-vhost" | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| }); |
Oops, something went wrong.