kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #97 from cilerler/patch-1

Browse Source 
Fix whitelist matching issues
This commit is contained in:
Alan Hamlett
2021-01-11 23:58:39 -08:00
committed by GitHub
parent d4a7723840 f63e5b9519
commit aa655f7a63
1 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
assets/js/core/WakaTimeCore.js
View File

@@ -146,35 +146,46 @@ class WakaTimeCore {
getHeartbeat(url, list) {
var lines = list.split('\n');
for (var i = 0; i < lines.length; i ++) {
// Trim all lines from the list one by one
var cleanLine = lines[i].trim();
// If by any chance one line in the list is empty, ignore it
if (cleanLine === '') {
continue;
}
// If url contains the current line return object
if (url.indexOf(cleanLine.split('@@')[0]) > -1) {
if (cleanLine.split('@@')[1]) {
return {
url: cleanLine.split('@@')[0],
project: cleanLine.split('@@')[1]
};
}
else {
return {
url: cleanLine.split('@@')[0],
project: null,
};
}
}
for (var i = 0; i < lines.length; i++) {
// strip (http:// or https://) and trailing (`/` or `@@`)
var line = lines[i];
var cleanLine = line.trim().replace(/(\/|@@)$/, '').replace(/^(?:https?:\/\/)?/i, '');
var emptyLine = cleanLine === '';
if (emptyLine) {
continue;
}
var projectIndicatorCharacters = '@@';
var projectIndicatorIndex = cleanLine.lastIndexOf(projectIndicatorCharacters);
var projectIndicatorExists = projectIndicatorIndex > -1;
var projectName = null;
var urlFromLine = cleanLine;
if (projectIndicatorExists) {
var start = projectIndicatorIndex + projectIndicatorCharacters.length;
projectName = cleanLine.substring(start);
urlFromLine = cleanLine.replace(cleanLine.substring(projectIndicatorIndex), '').replace(/\/$/, '');
}
var schemaHttpExists = url.match(/^http:\/\//i);
var schemaHttpsExists = url.match(/^https:\/\//i);
var schema = '';
if (schemaHttpExists) {
schema = 'http://';
}
if (schemaHttpsExists) {
schema = 'https://';
}
var cleanUrl = url.trim().replace(/(\/|@@)$/, '').replace(/^(?:https?:\/\/)?/i, '');
var startsWithUrl = cleanUrl.toLowerCase().indexOf(urlFromLine.toLowerCase()) > -1;
if (startsWithUrl) {
return {
url: schema + urlFromLine,
project: projectName
};
}
}
return {
url: null,
project: null,
url: null,
project: null,
};
}