Fix: Changed pathClause
This commit is contained in:
@@ -28,63 +28,159 @@ describe('webLinks addon', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should allow ~ character in URI path', () => {
|
describe('should allow simple URI path', () => {
|
||||||
const term = new MockTerminal();
|
it('foo.com', () => {
|
||||||
webLinks.webLinksInit(<any>term);
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
const row = ' http://foo.com/a~b#c~d?e~f ';
|
const row = ' http://foo.com ';
|
||||||
|
|
||||||
const match = row.match(term.regex);
|
const match = row.match(term.regex);
|
||||||
const uri = match[term.options.matchIndex];
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
assert.equal(uri, 'http://foo.com/a~b#c~d?e~f');
|
assert.equal(uri, 'http://foo.com');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('bar.io', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = ' http://bar.io ';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://bar.io');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should allow : character in URI path', () => {
|
describe('should allow ~ character in URI path', () => {
|
||||||
const term = new MockTerminal();
|
it('foo.com', () => {
|
||||||
webLinks.webLinksInit(<any>term);
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
const row = ' http://foo.com/colon:test ';
|
const row = ' http://foo.com/a~b#c~d?e~f ';
|
||||||
|
|
||||||
const match = row.match(term.regex);
|
const match = row.match(term.regex);
|
||||||
const uri = match[term.options.matchIndex];
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
assert.equal(uri, 'http://foo.com/colon:test');
|
assert.equal(uri, 'http://foo.com/a~b#c~d?e~f');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('bar.io', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = ' http://bar.io/a~b#c~d?e~f ';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://bar.io/a~b#c~d?e~f');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not allow : character at the end of a URI path', () => {
|
describe('should allow : character in URI path', () => {
|
||||||
const term = new MockTerminal();
|
it('foo.com', () => {
|
||||||
webLinks.webLinksInit(<any>term);
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
const row = ' http://foo.com/colon:test: ';
|
const row = ' http://foo.com/colon:test ';
|
||||||
|
|
||||||
const match = row.match(term.regex);
|
const match = row.match(term.regex);
|
||||||
const uri = match[term.options.matchIndex];
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
assert.equal(uri, 'http://foo.com/colon:test');
|
assert.equal(uri, 'http://foo.com/colon:test');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('bar.io', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = ' http://bar.io/colon:test ';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://bar.io/colon:test');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not allow " character at the end of a URI enclosed with ""', () => {
|
describe('should not allow : character at the end of a URI path', () => {
|
||||||
const term = new MockTerminal();
|
it('foo.com', () => {
|
||||||
webLinks.webLinksInit(<any>term);
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
const row = '"http://foo.com/"';
|
const row = ' http://foo.com/colon:test: ';
|
||||||
|
|
||||||
const match = row.match(term.regex);
|
const match = row.match(term.regex);
|
||||||
const uri = match[term.options.matchIndex];
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
assert.equal(uri, 'http://foo.com/');
|
assert.equal(uri, 'http://foo.com/colon:test');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('bar.io', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = ' http://bar.io/colon:test: ';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://bar.io/colon:test');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not allow \' character at the end of a URI enclosed with \'\'', () => {
|
describe('should not allow " character at the end of a URI enclosed with ""', () => {
|
||||||
const term = new MockTerminal();
|
it('foo.com', () => {
|
||||||
webLinks.webLinksInit(<any>term);
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
const row = '\'http://foo.com/\'';
|
const row = '"http://foo.com/"';
|
||||||
|
|
||||||
const match = row.match(term.regex);
|
const match = row.match(term.regex);
|
||||||
const uri = match[term.options.matchIndex];
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
assert.equal(uri, 'http://foo.com/');
|
assert.equal(uri, 'http://foo.com/');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('bar.io', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = '"http://bar.io/"';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://bar.io/');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('should not allow \' character at the end of a URI enclosed with \'\'', () => {
|
||||||
|
it('foo.com', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = '\'http://foo.com/\'';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://foo.com/');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('bar.io', () => {
|
||||||
|
const term = new MockTerminal();
|
||||||
|
webLinks.webLinksInit(<any>term);
|
||||||
|
|
||||||
|
const row = '\'http://bar.io/\'';
|
||||||
|
|
||||||
|
const match = row.match(term.regex);
|
||||||
|
const uri = match[term.options.matchIndex];
|
||||||
|
|
||||||
|
assert.equal(uri, 'http://bar.io/');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ const ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
|
|||||||
const localHostClause = '(localhost)';
|
const localHostClause = '(localhost)';
|
||||||
const portClause = '(:\\d{1,5})';
|
const portClause = '(:\\d{1,5})';
|
||||||
const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
|
const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
|
||||||
const pathClause = '(\\/[\\/\\w\\.\\-%~:]*)*([^:"\'\\s])';
|
const pathCharacterSet = '(\\/[\\/\\w\\.\\-%~:]*)*([^:"\'\\s])';
|
||||||
|
const pathClause = '(' + pathCharacterSet + ')?';
|
||||||
const queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
|
const queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
|
||||||
const queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
|
const queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
|
||||||
const hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
|
const hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
|
||||||
|
|||||||
Reference in New Issue
Block a user