Added view previous logins.
This commit is contained in:
Ylian Saint-Hilaire
parent
1b4f2f6002
commit
76d93e7d1e
|
|
@ -194,6 +194,7 @@
|
||||||
<Compile Include="public\scripts\meshcentral.js" />
|
<Compile Include="public\scripts\meshcentral.js" />
|
||||||
<Compile Include="redirserver.js" />
|
<Compile Include="redirserver.js" />
|
||||||
<Compile Include="translate\translate.js" />
|
<Compile Include="translate\translate.js" />
|
||||||
|
<Compile Include="ua-parser.js" />
|
||||||
<Compile Include="webauthn.js" />
|
<Compile Include="webauthn.js" />
|
||||||
<Compile Include="webserver.js" />
|
<Compile Include="webserver.js" />
|
||||||
<Compile Include="winservice.js" />
|
<Compile Include="winservice.js" />
|
||||||
|
|
|
||||||
10
meshuser.js
10
meshuser.js
|
|
@ -5383,6 +5383,16 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
|
||||||
console.log(command.value);
|
console.log(command.value);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 'previousLogins': {
|
||||||
|
// TODO: Make a better database call to get filtered data.
|
||||||
|
db.GetUserEvents([user._id], domain.id, user._id.split('/')[2], function (err, docs) {
|
||||||
|
if (err != null) return;
|
||||||
|
var e = [];
|
||||||
|
for (var i in docs) { if ((docs[i].msgArgs) && ((docs[i].action == 'authfail') || (docs[i].action == 'login'))) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); } }
|
||||||
|
try { ws.send(JSON.stringify({ action: 'previousLogins', events: e })); } catch (ex) { }
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
// Unknown user action
|
// Unknown user action
|
||||||
console.log('Unknown action from user ' + user.name + ': ' + command.action + '.');
|
console.log('Unknown action from user ' + user.name + ': ' + command.action + '.');
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,937 @@
|
||||||
|
/*!
|
||||||
|
* UAParser.js v0.7.24
|
||||||
|
* Lightweight JavaScript-based User-Agent string parser
|
||||||
|
* https://github.com/faisalman/ua-parser-js
|
||||||
|
*
|
||||||
|
* Copyright © 2012-2021 Faisal Salman <f@faisalman.com>
|
||||||
|
* Licensed under MIT License
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function (window, undefined) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
//////////////
|
||||||
|
// Constants
|
||||||
|
/////////////
|
||||||
|
|
||||||
|
|
||||||
|
var LIBVERSION = '0.7.24',
|
||||||
|
EMPTY = '',
|
||||||
|
UNKNOWN = '?',
|
||||||
|
FUNC_TYPE = 'function',
|
||||||
|
UNDEF_TYPE = 'undefined',
|
||||||
|
OBJ_TYPE = 'object',
|
||||||
|
STR_TYPE = 'string',
|
||||||
|
MAJOR = 'major', // deprecated
|
||||||
|
MODEL = 'model',
|
||||||
|
NAME = 'name',
|
||||||
|
TYPE = 'type',
|
||||||
|
VENDOR = 'vendor',
|
||||||
|
VERSION = 'version',
|
||||||
|
ARCHITECTURE= 'architecture',
|
||||||
|
CONSOLE = 'console',
|
||||||
|
MOBILE = 'mobile',
|
||||||
|
TABLET = 'tablet',
|
||||||
|
SMARTTV = 'smarttv',
|
||||||
|
WEARABLE = 'wearable',
|
||||||
|
EMBEDDED = 'embedded';
|
||||||
|
|
||||||
|
|
||||||
|
///////////
|
||||||
|
// Helper
|
||||||
|
//////////
|
||||||
|
|
||||||
|
|
||||||
|
var util = {
|
||||||
|
extend : function (regexes, extensions) {
|
||||||
|
var mergedRegexes = {};
|
||||||
|
for (var i in regexes) {
|
||||||
|
if (extensions[i] && extensions[i].length % 2 === 0) {
|
||||||
|
mergedRegexes[i] = extensions[i].concat(regexes[i]);
|
||||||
|
} else {
|
||||||
|
mergedRegexes[i] = regexes[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return mergedRegexes;
|
||||||
|
},
|
||||||
|
has : function (str1, str2) {
|
||||||
|
if (typeof str1 === "string") {
|
||||||
|
return str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
lowerize : function (str) {
|
||||||
|
return str.toLowerCase();
|
||||||
|
},
|
||||||
|
major : function (version) {
|
||||||
|
return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g,'').split(".")[0] : undefined;
|
||||||
|
},
|
||||||
|
trim : function (str) {
|
||||||
|
return str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
///////////////
|
||||||
|
// Map helper
|
||||||
|
//////////////
|
||||||
|
|
||||||
|
|
||||||
|
var mapper = {
|
||||||
|
|
||||||
|
rgx : function (ua, arrays) {
|
||||||
|
|
||||||
|
var i = 0, j, k, p, q, matches, match;
|
||||||
|
|
||||||
|
// loop through all regexes maps
|
||||||
|
while (i < arrays.length && !matches) {
|
||||||
|
|
||||||
|
var regex = arrays[i], // even sequence (0,2,4,..)
|
||||||
|
props = arrays[i + 1]; // odd sequence (1,3,5,..)
|
||||||
|
j = k = 0;
|
||||||
|
|
||||||
|
// try matching uastring with regexes
|
||||||
|
while (j < regex.length && !matches) {
|
||||||
|
|
||||||
|
matches = regex[j++].exec(ua);
|
||||||
|
|
||||||
|
if (!!matches) {
|
||||||
|
for (p = 0; p < props.length; p++) {
|
||||||
|
match = matches[++k];
|
||||||
|
q = props[p];
|
||||||
|
// check if given property is actually array
|
||||||
|
if (typeof q === OBJ_TYPE && q.length > 0) {
|
||||||
|
if (q.length == 2) {
|
||||||
|
if (typeof q[1] == FUNC_TYPE) {
|
||||||
|
// assign modified match
|
||||||
|
this[q[0]] = q[1].call(this, match);
|
||||||
|
} else {
|
||||||
|
// assign given value, ignore regex match
|
||||||
|
this[q[0]] = q[1];
|
||||||
|
}
|
||||||
|
} else if (q.length == 3) {
|
||||||
|
// check whether function or regex
|
||||||
|
if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
|
||||||
|
// call function (usually string mapper)
|
||||||
|
this[q[0]] = match ? q[1].call(this, match, q[2]) : undefined;
|
||||||
|
} else {
|
||||||
|
// sanitize match using given regex
|
||||||
|
this[q[0]] = match ? match.replace(q[1], q[2]) : undefined;
|
||||||
|
}
|
||||||
|
} else if (q.length == 4) {
|
||||||
|
this[q[0]] = match ? q[3].call(this, match.replace(q[1], q[2])) : undefined;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this[q] = match ? match : undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i += 2;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
str : function (str, map) {
|
||||||
|
|
||||||
|
for (var i in map) {
|
||||||
|
// check if array
|
||||||
|
if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
|
||||||
|
for (var j = 0; j < map[i].length; j++) {
|
||||||
|
if (util.has(map[i][j], str)) {
|
||||||
|
return (i === UNKNOWN) ? undefined : i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (util.has(map[i], str)) {
|
||||||
|
return (i === UNKNOWN) ? undefined : i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
///////////////
|
||||||
|
// String map
|
||||||
|
//////////////
|
||||||
|
|
||||||
|
|
||||||
|
var maps = {
|
||||||
|
|
||||||
|
browser : {
|
||||||
|
oldsafari : {
|
||||||
|
version : {
|
||||||
|
'1.0' : '/8',
|
||||||
|
'1.2' : '/1',
|
||||||
|
'1.3' : '/3',
|
||||||
|
'2.0' : '/412',
|
||||||
|
'2.0.2' : '/416',
|
||||||
|
'2.0.3' : '/417',
|
||||||
|
'2.0.4' : '/419',
|
||||||
|
'?' : '/'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
device : {
|
||||||
|
amazon : {
|
||||||
|
model : {
|
||||||
|
'Fire Phone' : ['SD', 'KF']
|
||||||
|
}
|
||||||
|
},
|
||||||
|
sprint : {
|
||||||
|
model : {
|
||||||
|
'Evo Shift 4G' : '7373KT'
|
||||||
|
},
|
||||||
|
vendor : {
|
||||||
|
'HTC' : 'APA',
|
||||||
|
'Sprint' : 'Sprint'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
os : {
|
||||||
|
windows : {
|
||||||
|
version : {
|
||||||
|
'ME' : '4.90',
|
||||||
|
'NT 3.11' : 'NT3.51',
|
||||||
|
'NT 4.0' : 'NT4.0',
|
||||||
|
'2000' : 'NT 5.0',
|
||||||
|
'XP' : ['NT 5.1', 'NT 5.2'],
|
||||||
|
'Vista' : 'NT 6.0',
|
||||||
|
'7' : 'NT 6.1',
|
||||||
|
'8' : 'NT 6.2',
|
||||||
|
'8.1' : 'NT 6.3',
|
||||||
|
'10' : ['NT 6.4', 'NT 10.0'],
|
||||||
|
'RT' : 'ARM'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
//////////////
|
||||||
|
// Regex map
|
||||||
|
/////////////
|
||||||
|
|
||||||
|
|
||||||
|
var regexes = {
|
||||||
|
|
||||||
|
browser : [[
|
||||||
|
|
||||||
|
// Presto based
|
||||||
|
/(opera\smini)\/([\w\.-]+)/i, // Opera Mini
|
||||||
|
/(opera\s[mobiletab]{3,6}).+version\/([\w\.-]+)/i, // Opera Mobi/Tablet
|
||||||
|
/(opera).+version\/([\w\.]+)/i, // Opera > 9.80
|
||||||
|
/(opera)[\/\s]+([\w\.]+)/i // Opera < 9.80
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(opios)[\/\s]+([\w\.]+)/i // Opera mini on iphone >= 8.0
|
||||||
|
], [[NAME, 'Opera Mini'], VERSION], [
|
||||||
|
|
||||||
|
/\s(opr)\/([\w\.]+)/i // Opera Webkit
|
||||||
|
], [[NAME, 'Opera'], VERSION], [
|
||||||
|
|
||||||
|
// Mixed
|
||||||
|
/(kindle)\/([\w\.]+)/i, // Kindle
|
||||||
|
/(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?([\w\.]*)/i,
|
||||||
|
// Lunascape/Maxthon/Netfront/Jasmine/Blazer
|
||||||
|
// Trident based
|
||||||
|
/(avant\s|iemobile|slim)(?:browser)?[\/\s]?([\w\.]*)/i,
|
||||||
|
// Avant/IEMobile/SlimBrowser
|
||||||
|
/(bidubrowser|baidubrowser)[\/\s]?([\w\.]+)/i, // Baidu Browser
|
||||||
|
/(?:ms|\()(ie)\s([\w\.]+)/i, // Internet Explorer
|
||||||
|
|
||||||
|
// Webkit/KHTML based
|
||||||
|
/(rekonq)\/([\w\.]*)/i, // Rekonq
|
||||||
|
/(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon)\/([\w\.-]+)/i
|
||||||
|
// Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(konqueror)\/([\w\.]+)/i // Konqueror
|
||||||
|
], [[NAME, 'Konqueror'], VERSION], [
|
||||||
|
|
||||||
|
/(trident).+rv[:\s]([\w\.]{1,9}).+like\sgecko/i // IE11
|
||||||
|
], [[NAME, 'IE'], VERSION], [
|
||||||
|
|
||||||
|
/(edge|edgios|edga|edg)\/((\d+)?[\w\.]+)/i // Microsoft Edge
|
||||||
|
], [[NAME, 'Edge'], VERSION], [
|
||||||
|
|
||||||
|
/(yabrowser)\/([\w\.]+)/i // Yandex
|
||||||
|
], [[NAME, 'Yandex'], VERSION], [
|
||||||
|
|
||||||
|
/(Avast)\/([\w\.]+)/i // Avast Secure Browser
|
||||||
|
], [[NAME, 'Avast Secure Browser'], VERSION], [
|
||||||
|
|
||||||
|
/(AVG)\/([\w\.]+)/i // AVG Secure Browser
|
||||||
|
], [[NAME, 'AVG Secure Browser'], VERSION], [
|
||||||
|
|
||||||
|
/(puffin)\/([\w\.]+)/i // Puffin
|
||||||
|
], [[NAME, 'Puffin'], VERSION], [
|
||||||
|
|
||||||
|
/(focus)\/([\w\.]+)/i // Firefox Focus
|
||||||
|
], [[NAME, 'Firefox Focus'], VERSION], [
|
||||||
|
|
||||||
|
/(opt)\/([\w\.]+)/i // Opera Touch
|
||||||
|
], [[NAME, 'Opera Touch'], VERSION], [
|
||||||
|
|
||||||
|
/((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i // UCBrowser
|
||||||
|
], [[NAME, 'UCBrowser'], VERSION], [
|
||||||
|
|
||||||
|
/(comodo_dragon)\/([\w\.]+)/i // Comodo Dragon
|
||||||
|
], [[NAME, /_/g, ' '], VERSION], [
|
||||||
|
|
||||||
|
/(windowswechat qbcore)\/([\w\.]+)/i // WeChat Desktop for Windows Built-in Browser
|
||||||
|
], [[NAME, 'WeChat(Win) Desktop'], VERSION], [
|
||||||
|
|
||||||
|
/(micromessenger)\/([\w\.]+)/i // WeChat
|
||||||
|
], [[NAME, 'WeChat'], VERSION], [
|
||||||
|
|
||||||
|
/(brave)\/([\w\.]+)/i // Brave browser
|
||||||
|
], [[NAME, 'Brave'], VERSION], [
|
||||||
|
|
||||||
|
/(whale)\/([\w\.]+)/i // Whale browser
|
||||||
|
], [[NAME, 'Whale'], VERSION], [
|
||||||
|
|
||||||
|
/(qqbrowserlite)\/([\w\.]+)/i // QQBrowserLite
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(QQ)\/([\d\.]+)/i // QQ, aka ShouQ
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/m?(qqbrowser)[\/\s]?([\w\.]+)/i // QQBrowser
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(baiduboxapp)[\/\s]?([\w\.]+)/i // Baidu App
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(2345Explorer)[\/\s]?([\w\.]+)/i // 2345 Browser
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(MetaSr)[\/\s]?([\w\.]+)/i // SouGouBrowser
|
||||||
|
], [NAME], [
|
||||||
|
|
||||||
|
/(LBBROWSER)/i // LieBao Browser
|
||||||
|
], [NAME], [
|
||||||
|
|
||||||
|
/xiaomi\/miuibrowser\/([\w\.]+)/i // MIUI Browser
|
||||||
|
], [VERSION, [NAME, 'MIUI Browser']], [
|
||||||
|
|
||||||
|
/;fbav\/([\w\.]+);/i // Facebook App for iOS & Android with version
|
||||||
|
], [VERSION, [NAME, 'Facebook']], [
|
||||||
|
|
||||||
|
/FBAN\/FBIOS|FB_IAB\/FB4A/i // Facebook App for iOS & Android without version
|
||||||
|
], [[NAME, 'Facebook']], [
|
||||||
|
|
||||||
|
/safari\s(line)\/([\w\.]+)/i, // Line App for iOS
|
||||||
|
/android.+(line)\/([\w\.]+)\/iab/i // Line App for Android
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/headlesschrome(?:\/([\w\.]+)|\s)/i // Chrome Headless
|
||||||
|
], [VERSION, [NAME, 'Chrome Headless']], [
|
||||||
|
|
||||||
|
/\swv\).+(chrome)\/([\w\.]+)/i // Chrome WebView
|
||||||
|
], [[NAME, /(.+)/, '$1 WebView'], VERSION], [
|
||||||
|
|
||||||
|
/((?:oculus|samsung)browser)\/([\w\.]+)/i
|
||||||
|
], [[NAME, /(.+(?:g|us))(.+)/, '$1 $2'], VERSION], [ // Oculus / Samsung Browser
|
||||||
|
|
||||||
|
/android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i // Android Browser
|
||||||
|
], [VERSION, [NAME, 'Android Browser']], [
|
||||||
|
|
||||||
|
/(coc_coc_browser)\/([\w\.]+)/i // Coc Coc Browser
|
||||||
|
], [[NAME, 'Coc Coc'], VERSION], [
|
||||||
|
|
||||||
|
/(sailfishbrowser)\/([\w\.]+)/i // Sailfish Browser
|
||||||
|
], [[NAME, 'Sailfish Browser'], VERSION], [
|
||||||
|
|
||||||
|
/(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i
|
||||||
|
// Chrome/OmniWeb/Arora/Tizen/Nokia
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(dolfin)\/([\w\.]+)/i // Dolphin
|
||||||
|
], [[NAME, 'Dolphin'], VERSION], [
|
||||||
|
|
||||||
|
/(qihu|qhbrowser|qihoobrowser|360browser)/i // 360
|
||||||
|
], [[NAME, '360 Browser']], [
|
||||||
|
|
||||||
|
/((?:android.+)crmo|crios)\/([\w\.]+)/i // Chrome for Android/iOS
|
||||||
|
], [[NAME, 'Chrome'], VERSION], [
|
||||||
|
|
||||||
|
/(coast)\/([\w\.]+)/i // Opera Coast
|
||||||
|
], [[NAME, 'Opera Coast'], VERSION], [
|
||||||
|
|
||||||
|
/fxios\/([\w\.-]+)/i // Firefox for iOS
|
||||||
|
], [VERSION, [NAME, 'Firefox']], [
|
||||||
|
|
||||||
|
/version\/([\w\.]+)\s.*mobile\/\w+\s(safari)/i // Mobile Safari
|
||||||
|
], [VERSION, [NAME, 'Mobile Safari']], [
|
||||||
|
|
||||||
|
/version\/([\w\.]+)\s.*(mobile\s?safari|safari)/i // Safari & Safari Mobile
|
||||||
|
], [VERSION, NAME], [
|
||||||
|
|
||||||
|
/webkit.+?(gsa)\/([\w\.]+)\s.*(mobile\s?safari|safari)(\/[\w\.]+)/i // Google Search Appliance on iOS
|
||||||
|
], [[NAME, 'GSA'], VERSION], [
|
||||||
|
|
||||||
|
/webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i // Safari < 3.0
|
||||||
|
], [NAME, [VERSION, mapper.str, maps.browser.oldsafari.version]], [
|
||||||
|
|
||||||
|
/(webkit|khtml)\/([\w\.]+)/i
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
// Gecko based
|
||||||
|
/(navigator|netscape)\/([\w\.-]+)/i // Netscape
|
||||||
|
], [[NAME, 'Netscape'], VERSION], [
|
||||||
|
/(swiftfox)/i, // Swiftfox
|
||||||
|
/(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?([\w\.\+]+)/i,
|
||||||
|
// IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
|
||||||
|
/(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([\w\.-]+)$/i,
|
||||||
|
|
||||||
|
// Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
|
||||||
|
/(firefox)\/([\w\.]+)\s[\w\s\-]+\/[\w\.]+$/i, // Other Firefox-based
|
||||||
|
/(mozilla)\/([\w\.]+)\s.+rv\:.+gecko\/\d+/i, // Mozilla
|
||||||
|
|
||||||
|
// Other
|
||||||
|
/(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir)[\/\s]?([\w\.]+)/i,
|
||||||
|
// Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Sleipnir
|
||||||
|
/(links)\s\(([\w\.]+)/i, // Links
|
||||||
|
/(gobrowser)\/?([\w\.]*)/i, // GoBrowser
|
||||||
|
/(ice\s?browser)\/v?([\w\._]+)/i, // ICE Browser
|
||||||
|
/(mosaic)[\/\s]([\w\.]+)/i // Mosaic
|
||||||
|
], [NAME, VERSION]
|
||||||
|
],
|
||||||
|
|
||||||
|
cpu : [[
|
||||||
|
|
||||||
|
/(?:(amd|x(?:(?:86|64)[_-])?|wow|win)64)[;\)]/i // AMD64
|
||||||
|
], [[ARCHITECTURE, 'amd64']], [
|
||||||
|
|
||||||
|
/(ia32(?=;))/i // IA32 (quicktime)
|
||||||
|
], [[ARCHITECTURE, util.lowerize]], [
|
||||||
|
|
||||||
|
/((?:i[346]|x)86)[;\)]/i // IA32
|
||||||
|
], [[ARCHITECTURE, 'ia32']], [
|
||||||
|
|
||||||
|
// PocketPC mistakenly identified as PowerPC
|
||||||
|
/windows\s(ce|mobile);\sppc;/i
|
||||||
|
], [[ARCHITECTURE, 'arm']], [
|
||||||
|
|
||||||
|
/((?:ppc|powerpc)(?:64)?)(?:\smac|;|\))/i // PowerPC
|
||||||
|
], [[ARCHITECTURE, /ower/, '', util.lowerize]], [
|
||||||
|
|
||||||
|
/(sun4\w)[;\)]/i // SPARC
|
||||||
|
], [[ARCHITECTURE, 'sparc']], [
|
||||||
|
|
||||||
|
/((?:avr32|ia64(?=;))|68k(?=\))|arm(?:64|(?=v\d+[;l]))|(?=atmel\s)avr|(?:irix|mips|sparc)(?:64)?(?=;)|pa-risc)/i
|
||||||
|
// IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
|
||||||
|
], [[ARCHITECTURE, util.lowerize]]
|
||||||
|
],
|
||||||
|
|
||||||
|
device : [[
|
||||||
|
|
||||||
|
/\((ipad|playbook);[\w\s\),;-]+(rim|apple)/i // iPad/PlayBook
|
||||||
|
], [MODEL, VENDOR, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/applecoremedia\/[\w\.]+ \((ipad)/ // iPad
|
||||||
|
], [MODEL, [VENDOR, 'Apple'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/(apple\s{0,1}tv)/i // Apple TV
|
||||||
|
], [[MODEL, 'Apple TV'], [VENDOR, 'Apple'], [TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/(archos)\s(gamepad2?)/i, // Archos
|
||||||
|
/(hp).+(touchpad)/i, // HP TouchPad
|
||||||
|
/(hp).+(tablet)/i, // HP Tablet
|
||||||
|
/(kindle)\/([\w\.]+)/i, // Kindle
|
||||||
|
/\s(nook)[\w\s]+build\/(\w+)/i, // Nook
|
||||||
|
/(dell)\s(strea[kpr\s\d]*[\dko])/i // Dell Streak
|
||||||
|
], [VENDOR, MODEL, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/(kf[A-z]+)(\sbuild\/|\)).+silk\//i // Kindle Fire HD
|
||||||
|
], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
|
||||||
|
/(sd|kf)[0349hijorstuw]+(\sbuild\/|\)).+silk\//i // Fire Phone
|
||||||
|
], [[MODEL, mapper.str, maps.device.amazon.model], [VENDOR, 'Amazon'], [TYPE, MOBILE]], [
|
||||||
|
/android.+aft([\w])(\sbuild\/|\))/i // Fire TV
|
||||||
|
], [MODEL, [VENDOR, 'Amazon'], [TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/\((ip[honed|\s\w*]+);.+(apple)/i // iPod/iPhone
|
||||||
|
], [MODEL, VENDOR, [TYPE, MOBILE]], [
|
||||||
|
/\((ip[honed|\s\w*]+);/i // iPod/iPhone
|
||||||
|
], [MODEL, [VENDOR, 'Apple'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/(blackberry)[\s-]?(\w+)/i, // BlackBerry
|
||||||
|
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[\s_-]?([\w-]*)/i,
|
||||||
|
// BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
|
||||||
|
/(hp)\s([\w\s]+\w)/i, // HP iPAQ
|
||||||
|
/(asus)-?(\w+)/i // Asus
|
||||||
|
], [VENDOR, MODEL, [TYPE, MOBILE]], [
|
||||||
|
/\(bb10;\s(\w+)/i // BlackBerry 10
|
||||||
|
], [MODEL, [VENDOR, 'BlackBerry'], [TYPE, MOBILE]], [
|
||||||
|
// Asus Tablets
|
||||||
|
/android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7|padfone|p00c)/i
|
||||||
|
], [MODEL, [VENDOR, 'Asus'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/(sony)\s(tablet\s[ps])\sbuild\//i, // Sony
|
||||||
|
/(sony)?(?:sgp.+)\sbuild\//i
|
||||||
|
], [[VENDOR, 'Sony'], [MODEL, 'Xperia Tablet'], [TYPE, TABLET]], [
|
||||||
|
/android.+\s([c-g]\d{4}|so[-l]\w+)(?=\sbuild\/|\).+chrome\/(?![1-6]{0,1}\d\.))/i
|
||||||
|
], [MODEL, [VENDOR, 'Sony'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/\s(ouya)\s/i, // Ouya
|
||||||
|
/(nintendo)\s([wids3u]+)/i // Nintendo
|
||||||
|
], [VENDOR, MODEL, [TYPE, CONSOLE]], [
|
||||||
|
|
||||||
|
/android.+;\s(shield)\sbuild/i // Nvidia
|
||||||
|
], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
|
||||||
|
|
||||||
|
/(playstation\s[34portablevi]+)/i // Playstation
|
||||||
|
], [MODEL, [VENDOR, 'Sony'], [TYPE, CONSOLE]], [
|
||||||
|
|
||||||
|
/(sprint\s(\w+))/i // Sprint Phones
|
||||||
|
], [[VENDOR, mapper.str, maps.device.sprint.vendor], [MODEL, mapper.str, maps.device.sprint.model], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/(htc)[;_\s-]{1,2}([\w\s]+(?=\)|\sbuild)|\w+)/i, // HTC
|
||||||
|
/(zte)-(\w*)/i, // ZTE
|
||||||
|
/(alcatel|geeksphone|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i
|
||||||
|
// Alcatel/GeeksPhone/Nexian/Panasonic/Sony
|
||||||
|
], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/(nexus\s9)/i // HTC Nexus 9
|
||||||
|
], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/d\/huawei([\w\s-]+)[;\)]/i, // Huawei
|
||||||
|
/android.+\s(nexus\s6p|vog-[at]?l\d\d|ane-[at]?l[x\d]\d|eml-a?l\d\da?|lya-[at]?l\d[\dc]|clt-a?l\d\di?)/i
|
||||||
|
|
||||||
|
], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android.+(bah2?-a?[lw]\d{2})/i // Huawei MediaPad
|
||||||
|
], [MODEL, [VENDOR, 'Huawei'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/(microsoft);\s(lumia[\s\w]+)/i // Microsoft Lumia
|
||||||
|
], [VENDOR, MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/[\s\(;](xbox(?:\sone)?)[\s\);]/i // Microsoft Xbox
|
||||||
|
], [MODEL, [VENDOR, 'Microsoft'], [TYPE, CONSOLE]], [
|
||||||
|
/(kin\.[onetw]{3})/i // Microsoft Kin
|
||||||
|
], [[MODEL, /\./g, ' '], [VENDOR, 'Microsoft'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
// Motorola
|
||||||
|
/\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?:?(\s4g)?)[\w\s]+build\//i,
|
||||||
|
/mot[\s-]?(\w*)/i,
|
||||||
|
/(XT\d{3,4}) build\//i,
|
||||||
|
/(nexus\s6)/i
|
||||||
|
], [MODEL, [VENDOR, 'Motorola'], [TYPE, MOBILE]], [
|
||||||
|
/android.+\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i
|
||||||
|
], [MODEL, [VENDOR, 'Motorola'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/hbbtv\/\d+\.\d+\.\d+\s+\([\w\s]*;\s*(\w[^;]*);([^;]*)/i // HbbTV devices
|
||||||
|
], [[VENDOR, util.trim], [MODEL, util.trim], [TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/hbbtv.+maple;(\d+)/i
|
||||||
|
], [[MODEL, /^/, 'SmartTV'], [VENDOR, 'Samsung'], [TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/\(dtv[\);].+(aquos)/i // Sharp
|
||||||
|
], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/android.+((sch-i[89]0\d|shw-m380s|SM-P605|SM-P610|SM-P587|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i,
|
||||||
|
/((SM-T\w+))/i
|
||||||
|
], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [ // Samsung
|
||||||
|
/smart-tv.+(samsung)/i
|
||||||
|
], [VENDOR, [TYPE, SMARTTV], MODEL], [
|
||||||
|
/((s[cgp]h-\w+|gt-\w+|galaxy\snexus|sm-\w[\w\d]+))/i,
|
||||||
|
/(sam[sung]*)[\s-]*(\w+-?[\w-]*)/i,
|
||||||
|
/sec-((sgh\w+))/i
|
||||||
|
], [[VENDOR, 'Samsung'], MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/sie-(\w*)/i // Siemens
|
||||||
|
], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/(maemo|nokia).*(n900|lumia\s\d+)/i, // Nokia
|
||||||
|
/(nokia)[\s_-]?([\w-]*)/i
|
||||||
|
], [[VENDOR, 'Nokia'], MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android[x\d\.\s;]+\s([ab][1-7]\-?[0178a]\d\d?)/i // Acer
|
||||||
|
], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+([vl]k\-?\d{3})\s+build/i // LG Tablet
|
||||||
|
], [MODEL, [VENDOR, 'LG'], [TYPE, TABLET]], [
|
||||||
|
/android\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i // LG Tablet
|
||||||
|
], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
|
||||||
|
/linux;\snetcast.+smarttv/i, // LG SmartTV
|
||||||
|
/lg\snetcast\.tv-201\d/i
|
||||||
|
], [[VENDOR, 'LG'], MODEL, [TYPE, SMARTTV]], [
|
||||||
|
/(nexus\s[45])/i, // LG
|
||||||
|
/lg[e;\s\/-]+(\w*)/i,
|
||||||
|
/android.+lg(\-?[\d\w]+)\s+build/i
|
||||||
|
], [MODEL, [VENDOR, 'LG'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/(lenovo)\s?(s(?:5000|6000)(?:[\w-]+)|tab(?:[\s\w]+))/i // Lenovo tablets
|
||||||
|
], [VENDOR, MODEL, [TYPE, TABLET]], [
|
||||||
|
/android.+(ideatab[a-z0-9\-\s]+)/i // Lenovo
|
||||||
|
], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [
|
||||||
|
/(lenovo)[_\s-]?([\w-]+)/i
|
||||||
|
], [VENDOR, MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/linux;.+((jolla));/i // Jolla
|
||||||
|
], [VENDOR, MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/((pebble))app\/[\d\.]+\s/i // Pebble
|
||||||
|
], [VENDOR, MODEL, [TYPE, WEARABLE]], [
|
||||||
|
|
||||||
|
/android.+;\s(oppo)\s?([\w\s]+)\sbuild/i // OPPO
|
||||||
|
], [VENDOR, MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/crkey/i // Google Chromecast
|
||||||
|
], [[MODEL, 'Chromecast'], [VENDOR, 'Google'], [TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/android.+;\s(glass)\s\d/i // Google Glass
|
||||||
|
], [MODEL, [VENDOR, 'Google'], [TYPE, WEARABLE]], [
|
||||||
|
|
||||||
|
/android.+;\s(pixel c)[\s)]/i // Google Pixel C
|
||||||
|
], [MODEL, [VENDOR, 'Google'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+;\s(pixel( [2-9]a?)?( xl)?)[\s)]/i // Google Pixel
|
||||||
|
], [MODEL, [VENDOR, 'Google'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android.+;\s(\w+)\s+build\/hm\1/i, // Xiaomi Hongmi 'numeric' models
|
||||||
|
/android.+(hm[\s\-_]?note?[\s_]?(?:\d\w)?)\sbuild/i, // Xiaomi Hongmi
|
||||||
|
/android.+(redmi[\s\-_]?(?:note|k)?(?:[\s_]?[\w\s]+))(?:\sbuild|\))/i,
|
||||||
|
// Xiaomi Redmi
|
||||||
|
/android.+(mi[\s\-_]?(?:a\d|one|one[\s_]plus|note lte)?[\s_]?(?:\d?\w?)[\s_]?(?:plus)?)\sbuild/i
|
||||||
|
// Xiaomi Mi
|
||||||
|
], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
|
||||||
|
/android.+(mi[\s\-_]?(?:pad)(?:[\s_]?[\w\s]+))(?:\sbuild|\))/i // Mi Pad tablets
|
||||||
|
],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
|
||||||
|
/android.+;\s(m[1-5]\snote)\sbuild/i // Meizu
|
||||||
|
], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
|
||||||
|
/(mz)-([\w-]{2,})/i
|
||||||
|
], [[VENDOR, 'Meizu'], MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android.+a000(1)\s+build/i, // OnePlus
|
||||||
|
/android.+oneplus\s(a\d{4})[\s)]/i
|
||||||
|
], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(RCT[\d\w]+)\s+build/i // RCA Tablets
|
||||||
|
], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/\s](Venue[\d\s]{2,7})\s+build/i // Dell Venue Tablets
|
||||||
|
], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i // Verizon Tablet
|
||||||
|
], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(\S(?:.*\S)?)\s+build/i // Barnes & Noble Tablet
|
||||||
|
], [[VENDOR, 'Barnes & Noble'], MODEL, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s+(TM\d{3}.*\b)\s+build/i // Barnes & Noble Tablet
|
||||||
|
], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+;\s(k88)\sbuild/i // ZTE K Series Tablet
|
||||||
|
], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(gen\d{3})\s+build.*49h/i // Swiss GEN Mobile
|
||||||
|
], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(zur\d{3})\s+build/i // Swiss ZUR Tablet
|
||||||
|
], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*((Zeki)?TB.*\b)\s+build/i // Zeki Tablets
|
||||||
|
], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/(android).+[;\/]\s+([YR]\d{2})\s+build/i,
|
||||||
|
/android.+[;\/]\s+(Dragon[\-\s]+Touch\s+|DT)(\w{5})\sbuild/i // Dragon Touch Tablet
|
||||||
|
], [[VENDOR, 'Dragon Touch'], MODEL, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(NS-?\w{0,9})\sbuild/i // Insignia Tablets
|
||||||
|
], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*((NX|Next)-?\w{0,9})\s+build/i // NextBook Tablets
|
||||||
|
], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(Xtreme\_)?(V(1[045]|2[015]|30|40|60|7[05]|90))\s+build/i
|
||||||
|
], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [ // Voice Xtreme Phones
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(LVTEL\-)?(V1[12])\s+build/i // LvTel Phones
|
||||||
|
], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
|
||||||
|
|
||||||
|
/android.+;\s(PH-1)\s/i
|
||||||
|
], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [ // Essential PH-1
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(V(100MD|700NA|7011|917G).*\b)\s+build/i // Envizen Tablets
|
||||||
|
], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(Le[\s\-]+Pan)[\s\-]+(\w{1,9})\s+build/i // Le Pan Tablets
|
||||||
|
], [VENDOR, MODEL, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(Trio[\s\w\-\.]+)\s+build/i // MachSpeed Tablets
|
||||||
|
], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*(Trinity)[\-\s]*(T\d{3})\s+build/i // Trinity Tablets
|
||||||
|
], [VENDOR, MODEL, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+[;\/]\s*TU_(1491)\s+build/i // Rotor Tablets
|
||||||
|
], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
//android.+(KS(.+))\s+build/i // Amazon Kindle Tablets
|
||||||
|
//], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/android.+(Gigaset)[\s\-]+(Q\w{1,9})\s+build/i // Gigaset Tablets
|
||||||
|
], [VENDOR, MODEL, [TYPE, TABLET]], [
|
||||||
|
// Android Phones from Unidentified Vendors
|
||||||
|
/android .+?; ([^;]+?)(?: build|\) applewebkit).+? mobile safari/i
|
||||||
|
], [MODEL, [TYPE, MOBILE]], [
|
||||||
|
// Android Tablets from Unidentified Vendors
|
||||||
|
/android .+?;\s([^;]+?)(?: build|\) applewebkit).+?(?! mobile) safari/i
|
||||||
|
], [MODEL, [TYPE, TABLET]], [
|
||||||
|
|
||||||
|
/\s(tablet|tab)[;\/]/i, // Unidentifiable Tablet
|
||||||
|
/\s(mobile)(?:[;\/]|\ssafari)/i // Unidentifiable Mobile
|
||||||
|
], [[TYPE, util.lowerize], VENDOR, MODEL], [
|
||||||
|
|
||||||
|
/[\s\/\(](smart-?tv)[;\)]/i // SmartTV
|
||||||
|
], [[TYPE, SMARTTV]], [
|
||||||
|
|
||||||
|
/(android[\w\.\s\-]{0,9});.+build/i // Generic Android Device
|
||||||
|
], [MODEL, [VENDOR, 'Generic']], [
|
||||||
|
|
||||||
|
/(phone)/i
|
||||||
|
], [[TYPE, MOBILE]]
|
||||||
|
],
|
||||||
|
|
||||||
|
engine : [[
|
||||||
|
|
||||||
|
/windows.+\sedge\/([\w\.]+)/i // EdgeHTML
|
||||||
|
], [VERSION, [NAME, 'EdgeHTML']], [
|
||||||
|
|
||||||
|
/webkit\/537\.36.+chrome\/(?!27)([\w\.]+)/i // Blink
|
||||||
|
], [VERSION, [NAME, 'Blink']], [
|
||||||
|
|
||||||
|
/(presto)\/([\w\.]+)/i, // Presto
|
||||||
|
/(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i,
|
||||||
|
// WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
|
||||||
|
/(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i, // KHTML/Tasman/Links
|
||||||
|
/(icab)[\/\s]([23]\.[\d\.]+)/i // iCab
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/rv\:([\w\.]{1,9}).+(gecko)/i // Gecko
|
||||||
|
], [VERSION, NAME]
|
||||||
|
],
|
||||||
|
|
||||||
|
os : [[
|
||||||
|
|
||||||
|
// Xbox, consider this before other Windows-based devices
|
||||||
|
/(xbox);\s+xbox\s([^\);]+)/i, // Microsoft Xbox (360, One, X, S, Series X, Series S)
|
||||||
|
|
||||||
|
// Windows based
|
||||||
|
/microsoft\s(windows)\s(vista|xp)/i // Windows (iTunes)
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
/(windows)\snt\s6\.2;\s(arm)/i, // Windows RT
|
||||||
|
/(windows\sphone(?:\sos)*)[\s\/]?([\d\.\s\w]*)/i, // Windows Phone
|
||||||
|
/(windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i
|
||||||
|
], [NAME, [VERSION, mapper.str, maps.os.windows.version]], [
|
||||||
|
/(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
|
||||||
|
], [[NAME, 'Windows'], [VERSION, mapper.str, maps.os.windows.version]], [
|
||||||
|
|
||||||
|
// Mobile/Embedded OS
|
||||||
|
/\((bb)(10);/i // BlackBerry 10
|
||||||
|
], [[NAME, 'BlackBerry'], VERSION], [
|
||||||
|
/(blackberry)\w*\/?([\w\.]*)/i, // Blackberry
|
||||||
|
/(tizen|kaios)[\/\s]([\w\.]+)/i, // Tizen/KaiOS
|
||||||
|
/(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|sailfish|contiki)[\/\s-]?([\w\.]*)/i
|
||||||
|
// Android/WebOS/Palm/QNX/Bada/RIM/MeeGo/Contiki/Sailfish OS
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
/(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]*)/i // Symbian
|
||||||
|
], [[NAME, 'Symbian'], VERSION], [
|
||||||
|
/\((series40);/i // Series 40
|
||||||
|
], [NAME], [
|
||||||
|
/mozilla.+\(mobile;.+gecko.+firefox/i // Firefox OS
|
||||||
|
], [[NAME, 'Firefox OS'], VERSION], [
|
||||||
|
|
||||||
|
// Google Chromecast
|
||||||
|
/crkey\/([\d\.]+)/i // Google Chromecast
|
||||||
|
], [VERSION, [NAME, 'Chromecast']], [
|
||||||
|
|
||||||
|
// Console
|
||||||
|
/(nintendo|playstation)\s([wids34portablevu]+)/i, // Nintendo/Playstation
|
||||||
|
|
||||||
|
// GNU/Linux based
|
||||||
|
/(mint)[\/\s\(]?(\w*)/i, // Mint
|
||||||
|
/(mageia|vectorlinux)[;\s]/i, // Mageia/VectorLinux
|
||||||
|
/(joli|[kxln]?ubuntu|debian|suse|opensuse|gentoo|(?=\s)arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk|linpus)[\/\s-]?(?!chrom)([\w\.-]*)/i,
|
||||||
|
// Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
|
||||||
|
// Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus
|
||||||
|
/(hurd|linux)\s?([\w\.]*)/i, // Hurd/Linux
|
||||||
|
/(gnu)\s?([\w\.]*)/i // GNU
|
||||||
|
], [NAME, VERSION], [
|
||||||
|
|
||||||
|
/(cros)\s[\w]+\s([\w\.]+\w)/i // Chromium OS
|
||||||
|
], [[NAME, 'Chromium OS'], VERSION],[
|
||||||
|
|
||||||
|
// Solaris
|
||||||
|
/(sunos)\s?([\w\.\d]*)/i // Solaris
|
||||||
|
], [[NAME, 'Solaris'], VERSION], [
|
||||||
|
|
||||||
|
// BSD based
|
||||||
|
/\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]*)/i // FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly
|
||||||
|
], [NAME, VERSION],[
|
||||||
|
|
||||||
|
/(haiku)\s(\w+)/i // Haiku
|
||||||
|
], [NAME, VERSION],[
|
||||||
|
|
||||||
|
/cfnetwork\/.+darwin/i,
|
||||||
|
/ip[honead]{2,4}(?:.*os\s([\w]+)\slike\smac|;\sopera)/i // iOS
|
||||||
|
], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
|
||||||
|
|
||||||
|
/(mac\sos\sx)\s?([\w\s\.]*)/i,
|
||||||
|
/(macintosh|mac(?=_powerpc)\s)/i // Mac OS
|
||||||
|
], [[NAME, 'Mac OS'], [VERSION, /_/g, '.']], [
|
||||||
|
|
||||||
|
// Other
|
||||||
|
/((?:open)?solaris)[\/\s-]?([\w\.]*)/i, // Solaris
|
||||||
|
/(aix)\s((\d)(?=\.|\)|\s)[\w\.])*/i, // AIX
|
||||||
|
/(plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms|fuchsia)/i,
|
||||||
|
// Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS/OpenVMS/Fuchsia
|
||||||
|
/(unix)\s?([\w\.]*)/i // UNIX
|
||||||
|
], [NAME, VERSION]
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/////////////////
|
||||||
|
// Constructor
|
||||||
|
////////////////
|
||||||
|
var UAParser = function (uastring, extensions) {
|
||||||
|
|
||||||
|
if (typeof uastring === 'object') {
|
||||||
|
extensions = uastring;
|
||||||
|
uastring = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(this instanceof UAParser)) {
|
||||||
|
return new UAParser(uastring, extensions).getResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
var ua = uastring || ((window && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
|
||||||
|
var rgxmap = extensions ? util.extend(regexes, extensions) : regexes;
|
||||||
|
|
||||||
|
this.getBrowser = function () {
|
||||||
|
var browser = { name: undefined, version: undefined };
|
||||||
|
mapper.rgx.call(browser, ua, rgxmap.browser);
|
||||||
|
browser.major = util.major(browser.version); // deprecated
|
||||||
|
return browser;
|
||||||
|
};
|
||||||
|
this.getCPU = function () {
|
||||||
|
var cpu = { architecture: undefined };
|
||||||
|
mapper.rgx.call(cpu, ua, rgxmap.cpu);
|
||||||
|
return cpu;
|
||||||
|
};
|
||||||
|
this.getDevice = function () {
|
||||||
|
var device = { vendor: undefined, model: undefined, type: undefined };
|
||||||
|
mapper.rgx.call(device, ua, rgxmap.device);
|
||||||
|
return device;
|
||||||
|
};
|
||||||
|
this.getEngine = function () {
|
||||||
|
var engine = { name: undefined, version: undefined };
|
||||||
|
mapper.rgx.call(engine, ua, rgxmap.engine);
|
||||||
|
return engine;
|
||||||
|
};
|
||||||
|
this.getOS = function () {
|
||||||
|
var os = { name: undefined, version: undefined };
|
||||||
|
mapper.rgx.call(os, ua, rgxmap.os);
|
||||||
|
return os;
|
||||||
|
};
|
||||||
|
this.getResult = function () {
|
||||||
|
return {
|
||||||
|
ua : this.getUA(),
|
||||||
|
browser : this.getBrowser(),
|
||||||
|
engine : this.getEngine(),
|
||||||
|
os : this.getOS(),
|
||||||
|
device : this.getDevice(),
|
||||||
|
cpu : this.getCPU()
|
||||||
|
};
|
||||||
|
};
|
||||||
|
this.getUA = function () {
|
||||||
|
return ua;
|
||||||
|
};
|
||||||
|
this.setUA = function (uastring) {
|
||||||
|
ua = uastring;
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
|
||||||
|
UAParser.VERSION = LIBVERSION;
|
||||||
|
UAParser.BROWSER = {
|
||||||
|
NAME : NAME,
|
||||||
|
MAJOR : MAJOR, // deprecated
|
||||||
|
VERSION : VERSION
|
||||||
|
};
|
||||||
|
UAParser.CPU = {
|
||||||
|
ARCHITECTURE : ARCHITECTURE
|
||||||
|
};
|
||||||
|
UAParser.DEVICE = {
|
||||||
|
MODEL : MODEL,
|
||||||
|
VENDOR : VENDOR,
|
||||||
|
TYPE : TYPE,
|
||||||
|
CONSOLE : CONSOLE,
|
||||||
|
MOBILE : MOBILE,
|
||||||
|
SMARTTV : SMARTTV,
|
||||||
|
TABLET : TABLET,
|
||||||
|
WEARABLE: WEARABLE,
|
||||||
|
EMBEDDED: EMBEDDED
|
||||||
|
};
|
||||||
|
UAParser.ENGINE = {
|
||||||
|
NAME : NAME,
|
||||||
|
VERSION : VERSION
|
||||||
|
};
|
||||||
|
UAParser.OS = {
|
||||||
|
NAME : NAME,
|
||||||
|
VERSION : VERSION
|
||||||
|
};
|
||||||
|
|
||||||
|
///////////
|
||||||
|
// Export
|
||||||
|
//////////
|
||||||
|
|
||||||
|
|
||||||
|
// check js environment
|
||||||
|
if (typeof(exports) !== UNDEF_TYPE) {
|
||||||
|
// nodejs env
|
||||||
|
if (typeof module !== UNDEF_TYPE && module.exports) {
|
||||||
|
exports = module.exports = UAParser;
|
||||||
|
}
|
||||||
|
exports.UAParser = UAParser;
|
||||||
|
} else {
|
||||||
|
// requirejs env (optional)
|
||||||
|
if (typeof(define) === 'function' && define.amd) {
|
||||||
|
define(function () {
|
||||||
|
return UAParser;
|
||||||
|
});
|
||||||
|
} else if (window) {
|
||||||
|
// browser env
|
||||||
|
window.UAParser = UAParser;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// jQuery/Zepto specific (optional)
|
||||||
|
// Note:
|
||||||
|
// In AMD env the global scope should be kept clean, but jQuery is an exception.
|
||||||
|
// jQuery always exports to global scope, unless jQuery.noConflict(true) is used,
|
||||||
|
// and we should catch that.
|
||||||
|
var $ = window && (window.jQuery || window.Zepto);
|
||||||
|
if ($ && !$.ua) {
|
||||||
|
var parser = new UAParser();
|
||||||
|
$.ua = parser.getResult();
|
||||||
|
$.ua.get = function () {
|
||||||
|
return parser.getUA();
|
||||||
|
};
|
||||||
|
$.ua.set = function (uastring) {
|
||||||
|
parser.setUA(uastring);
|
||||||
|
var result = parser.getResult();
|
||||||
|
for (var prop in result) {
|
||||||
|
$.ua[prop] = result[prop];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
})(typeof window === 'object' ? window : this);
|
||||||
|
|
@ -697,6 +697,7 @@
|
||||||
<div id="manageEmail2FA" style="margin-top:5px;display:none"><a onclick="account_manageAuthEmail()" style="cursor:pointer">Manage email authentication</a> <span id="authEmailSetupCheck"><strong>✓</strong></span></div>
|
<div id="manageEmail2FA" style="margin-top:5px;display:none"><a onclick="account_manageAuthEmail()" style="cursor:pointer">Manage email authentication</a> <span id="authEmailSetupCheck"><strong>✓</strong></span></div>
|
||||||
<div id="manageAuthApp" style="margin-top:5px;display:none"><a onclick="account_manageAuthApp()" style="cursor:pointer">Manage authenticator app</a> <span id="authAppSetupCheck"><strong>✓</strong></span></div>
|
<div id="manageAuthApp" style="margin-top:5px;display:none"><a onclick="account_manageAuthApp()" style="cursor:pointer">Manage authenticator app</a> <span id="authAppSetupCheck"><strong>✓</strong></span></div>
|
||||||
<div id="manageOtp" style="margin-top:5px;display:none"><a onclick="account_manageOtp(0)" style="cursor:pointer">Manage backup codes</a> <span id="authCodesSetupCheck"><strong>✓</strong></span></div>
|
<div id="manageOtp" style="margin-top:5px;display:none"><a onclick="account_manageOtp(0)" style="cursor:pointer">Manage backup codes</a> <span id="authCodesSetupCheck"><strong>✓</strong></span></div>
|
||||||
|
<div style="margin-top:5px"><a href=# onclick="return account_viewPreviousLogins()">View previous logins</a></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="p2AccountActions" style="display:none">
|
<div id="p2AccountActions" style="display:none">
|
||||||
|
|
@ -1551,6 +1552,26 @@
|
||||||
account_managePhoneCodeValidate();
|
account_managePhoneCodeValidate();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 'previousLogins': {
|
||||||
|
if ((xxdialogMode == 2) && (xxdialogTag == 'previousLogins')) {
|
||||||
|
var x = '', c = 'BBB';
|
||||||
|
if (message.events.length == 0) {
|
||||||
|
x += 'No previous login.';
|
||||||
|
} else {
|
||||||
|
x += '<div style=max-height:260px;overflow-y:scroll;overflow-x:hidden>';
|
||||||
|
for (var i in message.events) {
|
||||||
|
var m = message.events[i].m;
|
||||||
|
if (m == 107) { m = "Valid login"; c = 'BBD1BB'; }
|
||||||
|
else if (m == 108) { m = "Invalid password"; c = 'E1BBBB'; }
|
||||||
|
else if (m == 110) { m = "Invalid 2FA"; c = 'DD9DC3'; }
|
||||||
|
x += '<div style=width:260px;background-color:#' + c + ';border-radius:6px;margin-bottom:4px;padding:4px><div><b>' + EscapeHtml(m) + '</b><br />' + printDateTime(new Date(message.events[i].t)) + '</div><div style=font-size:x-small>' + EscapeHtml(message.events[i].a.join(', ')) + '</div></div></tr>';
|
||||||
|
}
|
||||||
|
x += '</div>';
|
||||||
|
}
|
||||||
|
setDialogMode(2, "Previous Logins", 1, null, x);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case 'event': {
|
case 'event': {
|
||||||
/*
|
/*
|
||||||
if (!message.event.nolog) {
|
if (!message.event.nolog) {
|
||||||
|
|
@ -2003,6 +2024,12 @@
|
||||||
// MY ACCOUNT
|
// MY ACCOUNT
|
||||||
//
|
//
|
||||||
|
|
||||||
|
function account_viewPreviousLogins() {
|
||||||
|
if (xxdialogMode) return;
|
||||||
|
setDialogMode(2, "Previous Logins", 1, null, "Loading...", 'previousLogins');
|
||||||
|
meshserver.send({ action: 'previousLogins' });
|
||||||
|
}
|
||||||
|
|
||||||
function toggleNightMode() {
|
function toggleNightMode() {
|
||||||
if (xxdialogMode) return;
|
if (xxdialogMode) return;
|
||||||
var cNightMode = getstore('nightMode', '0');
|
var cNightMode = getstore('nightMode', '0');
|
||||||
|
|
|
||||||
|
|
@ -348,6 +348,7 @@
|
||||||
<div id="manageAuthApp"><div class="p2AccountActions"><span id="authAppSetupCheck"><strong>✓</strong></span></div><span><a href=# onclick="return account_manageAuthApp()">Manage authenticator app</a><br /></span></div>
|
<div id="manageAuthApp"><div class="p2AccountActions"><span id="authAppSetupCheck"><strong>✓</strong></span></div><span><a href=# onclick="return account_manageAuthApp()">Manage authenticator app</a><br /></span></div>
|
||||||
<div id="manageHardwareOtp"><div class="p2AccountActions"><span id="authKeySetupCheck"><strong>✓</strong></span></div><span><a href=# onclick="return account_manageHardwareOtp(0)">Manage security keys</a><br /></span></div>
|
<div id="manageHardwareOtp"><div class="p2AccountActions"><span id="authKeySetupCheck"><strong>✓</strong></span></div><span><a href=# onclick="return account_manageHardwareOtp(0)">Manage security keys</a><br /></span></div>
|
||||||
<div id="manageOtp"><div class="p2AccountActions"><span id="authCodesSetupCheck"><strong>✓</strong></span></div><span><a href=# onclick="return account_manageOtp(0)">Manage backup codes</a><br /></span></div>
|
<div id="manageOtp"><div class="p2AccountActions"><span id="authCodesSetupCheck"><strong>✓</strong></span></div><span><a href=# onclick="return account_manageOtp(0)">Manage backup codes</a><br /></span></div>
|
||||||
|
<div class="p2AccountActions"></div><span><a href=# onclick="return account_viewPreviousLogins()">View previous logins</a><br /></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="p2AccountActions">
|
<div id="p2AccountActions">
|
||||||
|
|
@ -3269,6 +3270,26 @@
|
||||||
saveAs(new Blob([ Uint8Array.from(atob(message.file), function (c) { return c.charCodeAt(0) }) ], { type: 'application/octet-stream' }), 'setup.bin');
|
saveAs(new Blob([ Uint8Array.from(atob(message.file), function (c) { return c.charCodeAt(0) }) ], { type: 'application/octet-stream' }), 'setup.bin');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 'previousLogins':{
|
||||||
|
if ((xxdialogMode == 2) && (xxdialogTag == 'previousLogins')) {
|
||||||
|
var x = '', c = 'BBB', xx = '';
|
||||||
|
if (message.events.length == 0) {
|
||||||
|
x += 'No previous login.';
|
||||||
|
} else {
|
||||||
|
x += '<div style=max-height:260px;overflow-y:scroll;overflow-x:hidden><table>';
|
||||||
|
for (var i in message.events) {
|
||||||
|
var m = message.events[i].m;
|
||||||
|
if (m == 107) { m = "Valid login"; c = 'BBD1BB'; xx = ''; }
|
||||||
|
else if (m == 108) { m = "Invalid password"; c ='E1BBBB'; xx = 'x'; }
|
||||||
|
else if (m == 110) { m = "Invalid 2FA"; c = 'DD9DC3'; xx = 'x'; }
|
||||||
|
x += '<tr><td><img src=images/user-32' + xx + '.png height=32 width=32 style=float:left><td><div style=width:300px;background-color:#' + c + ';border-radius:6px;margin-bottom:4px;padding:4px><div>' + printDateTime(new Date(message.events[i].t)) + ', <b>' + EscapeHtml(m) + '</b></div><div style=font-size:x-small>' + EscapeHtml(message.events[i].a.join(', ')) + '</div></div></tr>';
|
||||||
|
}
|
||||||
|
x += '</table></div>';
|
||||||
|
}
|
||||||
|
setDialogMode(2, "Previous Logins", 1, null, x);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
//console.log('Unknown message.action', message.action);
|
//console.log('Unknown message.action', message.action);
|
||||||
break;
|
break;
|
||||||
|
|
@ -9607,6 +9628,12 @@
|
||||||
// MY ACCOUNT
|
// MY ACCOUNT
|
||||||
//
|
//
|
||||||
|
|
||||||
|
function account_viewPreviousLogins() {
|
||||||
|
if (xxdialogMode) return;
|
||||||
|
setDialogMode(2, "Previous Logins", 1, null, "Loading...", 'previousLogins');
|
||||||
|
meshserver.send({ action: 'previousLogins' });
|
||||||
|
}
|
||||||
|
|
||||||
function account_managePhone() {
|
function account_managePhone() {
|
||||||
if (xxdialogMode || ((features & 0x02000000) == 0)) return;
|
if (xxdialogMode || ((features & 0x02000000) == 0)) return;
|
||||||
var x;
|
var x;
|
||||||
|
|
@ -11575,7 +11602,11 @@
|
||||||
103: "Batch upload of {0} file(s) to folder {1}",
|
103: "Batch upload of {0} file(s) to folder {1}",
|
||||||
104: "Automated download of agent core dump file: \"{0}\"",
|
104: "Automated download of agent core dump file: \"{0}\"",
|
||||||
105: "Upload: \"{0}\", Size: {1}",
|
105: "Upload: \"{0}\", Size: {1}",
|
||||||
106: "Download: \"{0}\", Size: {1}"
|
106: "Download: \"{0}\", Size: {1}",
|
||||||
|
107: "Account login from {0}, {1}, {2}",
|
||||||
|
108: "User login attempt with incorrect 2nd factor from {0}, {1}, {2}",
|
||||||
|
109: "User login attempt on locked account from {0}, {1}, {2}",
|
||||||
|
110: "Invalid user login attempt from {0}, {1}, {2}"
|
||||||
};
|
};
|
||||||
|
|
||||||
// Highlights the device being hovered
|
// Highlights the device being hovered
|
||||||
|
|
|
||||||
30
webserver.js
30
webserver.js
|
|
@ -52,6 +52,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
||||||
obj.meshIderHandler = require('./amt/amt-ider.js');
|
obj.meshIderHandler = require('./amt/amt-ider.js');
|
||||||
obj.meshUserHandler = require('./meshuser.js');
|
obj.meshUserHandler = require('./meshuser.js');
|
||||||
obj.interceptor = require('./interceptor');
|
obj.interceptor = require('./interceptor');
|
||||||
|
obj.uaparser = require('./ua-parser');
|
||||||
const constants = (obj.crypto.constants ? obj.crypto.constants : require('constants')); // require('constants') is deprecated in Node 11.10, use require('crypto').constants instead.
|
const constants = (obj.crypto.constants ? obj.crypto.constants : require('constants')); // require('constants') is deprecated in Node 11.10, use require('crypto').constants instead.
|
||||||
|
|
||||||
// Setup WebAuthn / FIDO2
|
// Setup WebAuthn / FIDO2
|
||||||
|
|
@ -960,7 +961,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
||||||
req.session.messageid = 108; // Invalid token, try again.
|
req.session.messageid = 108; // Invalid token, try again.
|
||||||
if (obj.parent.authlog) { obj.parent.authLog('https', 'Failed 2FA for ' + xusername + ' from ' + cleanRemoteAddr(req.clientIp) + ' port ' + req.port); }
|
if (obj.parent.authlog) { obj.parent.authLog('https', 'Failed 2FA for ' + xusername + ' from ' + cleanRemoteAddr(req.clientIp) + ' port ' + req.port); }
|
||||||
parent.debug('web', 'handleLoginRequest: invalid 2FA token');
|
parent.debug('web', 'handleLoginRequest: invalid 2FA token');
|
||||||
obj.parent.DispatchEvent(['*', 'server-users', user._id], obj, { action: 'authfail', username: user.name, userid: user._id, domain: domain.id, msg: 'User login attempt with incorrect 2nd factor from ' + req.clientIp });
|
const ua = getUserAgentInfo(req);
|
||||||
|
obj.parent.DispatchEvent(['*', 'server-users', user._id], obj, { action: 'authfail', username: user.name, userid: user._id, domain: domain.id, msg: 'User login attempt with incorrect 2nd factor from ' + req.clientIp, msgid: 108, msgArgs: [req.clientIp, ua.browserStr, ua.osStr] });
|
||||||
obj.setbadLogin(req);
|
obj.setbadLogin(req);
|
||||||
} else {
|
} else {
|
||||||
parent.debug('web', 'handleLoginRequest: 2FA token required');
|
parent.debug('web', 'handleLoginRequest: 2FA token required');
|
||||||
|
|
@ -1034,12 +1036,14 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
||||||
if (err == 'locked') {
|
if (err == 'locked') {
|
||||||
parent.debug('web', 'handleLoginRequest: login failed, locked account');
|
parent.debug('web', 'handleLoginRequest: login failed, locked account');
|
||||||
req.session.messageid = 110; // Account locked.
|
req.session.messageid = 110; // Account locked.
|
||||||
obj.parent.DispatchEvent(['*', 'server-users', xuserid], obj, { action: 'authfail', userid: xuserid, username: xusername, domain: domain.id, msg: 'User login attempt on locked account from ' + req.clientIp });
|
const ua = getUserAgentInfo(req);
|
||||||
|
obj.parent.DispatchEvent(['*', 'server-users', xuserid], obj, { action: 'authfail', userid: xuserid, username: xusername, domain: domain.id, msg: 'User login attempt on locked account from ' + req.clientIp, msgid: 109, msgArgs: [req.clientIp, ua.browserStr, ua.osStr] });
|
||||||
obj.setbadLogin(req);
|
obj.setbadLogin(req);
|
||||||
} else {
|
} else {
|
||||||
parent.debug('web', 'handleLoginRequest: login failed, bad username and password');
|
parent.debug('web', 'handleLoginRequest: login failed, bad username and password');
|
||||||
req.session.messageid = 112; // Login failed, check username and password.
|
req.session.messageid = 112; // Login failed, check username and password.
|
||||||
obj.parent.DispatchEvent(['*', 'server-users', xuserid], obj, { action: 'authfail', userid: xuserid, username: xusername, domain: domain.id, msg: 'Invalid user login attempt from ' + req.clientIp });
|
const ua = getUserAgentInfo(req);
|
||||||
|
obj.parent.DispatchEvent(['*', 'server-users', xuserid], obj, { action: 'authfail', userid: xuserid, username: xusername, domain: domain.id, msg: 'Invalid user login attempt from ' + req.clientIp, msgid: 110, msgArgs: [req.clientIp, ua.browserStr, ua.osStr] });
|
||||||
obj.setbadLogin(req);
|
obj.setbadLogin(req);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1078,9 +1082,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
||||||
obj.db.SetUser(user);
|
obj.db.SetUser(user);
|
||||||
|
|
||||||
// Notify account login
|
// Notify account login
|
||||||
var targets = ['*', 'server-users'];
|
const targets = ['*', 'server-users'];
|
||||||
if (user.groups) { for (var i in user.groups) { targets.push('server-users:' + i); } }
|
if (user.groups) { for (var i in user.groups) { targets.push('server-users:' + i); } }
|
||||||
obj.parent.DispatchEvent(targets, obj, { etype: 'user', userid: user._id, username: user.name, account: obj.CloneSafeUser(user), action: 'login', msgid: 1, msg: 'Account login', domain: domain.id });
|
const ua = getUserAgentInfo(req);
|
||||||
|
const loginEvent = { etype: 'user', userid: user._id, username: user.name, account: obj.CloneSafeUser(user), action: 'login', msgid: 107, msgArgs: [req.clientIp, ua.browserStr, ua.osStr], msg: 'Account login', domain: domain.id, ip: req.clientIp, userAgent: req.headers['user-agent'] };
|
||||||
|
obj.parent.DispatchEvent(targets, obj, loginEvent);
|
||||||
|
|
||||||
// Regenerate session when signing in to prevent fixation
|
// Regenerate session when signing in to prevent fixation
|
||||||
//req.session.regenerate(function () {
|
//req.session.regenerate(function () {
|
||||||
|
|
@ -1448,7 +1454,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
||||||
req.session.messageid = 4; // SMS sent.
|
req.session.messageid = 4; // SMS sent.
|
||||||
} else {
|
} else {
|
||||||
req.session.messageid = 108; // Invalid token, try again.
|
req.session.messageid = 108; // Invalid token, try again.
|
||||||
obj.parent.DispatchEvent(['*', 'server-users', user._id], obj, { action: 'authfail', username: user.name, userid: user._id, domain: domain.id, msg: 'User login attempt with incorrect 2nd factor from ' + req.clientIp });
|
const ua = getUserAgentInfo(req);
|
||||||
|
obj.parent.DispatchEvent(['*', 'server-users', user._id], obj, { action: 'authfail', username: user.name, userid: user._id, domain: domain.id, msg: 'User login attempt with incorrect 2nd factor from ' + req.clientIp, msgid: 108, msgArgs: [req.clientIp, ua.browserStr, ua.osStr] });
|
||||||
obj.setbadLogin(req);
|
obj.setbadLogin(req);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -6789,6 +6796,17 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
||||||
return (req.headers['user-agent'].toLowerCase().indexOf('mobile') >= 0);
|
return (req.headers['user-agent'].toLowerCase().indexOf('mobile') >= 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Return decoded user agent information
|
||||||
|
function getUserAgentInfo(req) {
|
||||||
|
var browser = 'Unknown', os = 'Unknown';
|
||||||
|
try {
|
||||||
|
const ua = obj.uaparser(req.headers['user-agent']);
|
||||||
|
if (ua.browser && ua.browser.name) { ua.browserStr = ua.browser.name; if (ua.browser.version) { ua.browserStr += '/' + ua.browser.version } }
|
||||||
|
if (ua.os && ua.os.name) { ua.osStr = ua.os.name; if (ua.os.version) { ua.osStr += '/' + ua.os.version } }
|
||||||
|
return ua;
|
||||||
|
} catch (ex) { return { browserStr: browser, osStr: os } }
|
||||||
|
}
|
||||||
|
|
||||||
// Return the query string portion of the URL, the ? and anything after.
|
// Return the query string portion of the URL, the ? and anything after.
|
||||||
function getQueryPortion(req) { var s = req.url.indexOf('?'); if (s == -1) { if (req.body && req.body.urlargs) { return req.body.urlargs; } return ''; } return req.url.substring(s); }
|
function getQueryPortion(req) { var s = req.url.indexOf('?'); if (s == -1) { if (req.body && req.body.urlargs) { return req.body.urlargs; } return ''; } return req.url.substring(s); }
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue