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

Fix matchLocation for pattern with port #619

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

Fix matchLocation for pattern with port #619

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
9 changes: 8 additions & 1 deletion content_scripts/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ var matchLocation = function(url, pattern) { // Uses @match syntax
return false;
}
if (url.protocol !== 'file:') {
hostname = pattern.match(/^[^\/]+/g);
hostname = pattern.match(/^[^\/:]+/g);
if (!hostname) {
console.error('cVim Error: Invalid host in pattern: "%s"', pattern);
return false;
Expand All @@ -152,6 +152,13 @@ var matchLocation = function(url, pattern) { // Uses @match syntax
return false;
}
pattern = pattern.slice(origHostname[0].length);

var matches = pattern.match(/^(?::(\d+))?(.*)/);
var port = matches[1];
pattern = matches[2];
if (port && port !== url.port) {
return false;
}
}
if (pattern.length) {
path = pattern.replace(/([.&\\\/\(\)\[\]!?])/g, '\\$1').replace(/\*/g, '.*');
Expand Down