diff --git a/admin.css b/admin.css index 5eb87dc..c50d2ee 100644 --- a/admin.css +++ b/admin.css @@ -123,6 +123,7 @@ &.cap_H::before { background-position-y: -80px } &.cap_X::before { background-position-y: -100px } &.cap_YH::before { background-position-y: -120px } + &.cap_YNH::before { background-position-y: -140px } /* Country flags */ /* Note: flag images and CSS adapted from: https://github.com/lafeber/world-flags-sprite/ */ diff --git a/admin.js b/admin.js index a75a3c2..608225c 100644 --- a/admin.js +++ b/admin.js @@ -730,7 +730,11 @@ BotMon.live = { } else if (v._type == BM_USERTYPE.LIKELY_BOT) { /* probable bots only */ // add bot views to IP range information: - me.addToIpRanges(v); + if (v.ip) { + me.addToIpRanges(v); + } else { + console.log(v); + } } else { /* registered users and probable humans */ @@ -1864,8 +1868,12 @@ BotMon.live = { } logtxt.split('\n').forEach((line) => { - if (line.trim() === '') return; // skip empty lines + + const line2 = line.replaceAll(new RegExp('[\x00-\x1F]','g'), "\u{FFFD}").trim(); + if (line2 === '') return; // skip empty lines + const cols = line.split('\t'); + if (cols.length == 1) return // assign the columns to an object: const data = {}; diff --git a/config/known-ipranges.json b/config/known-ipranges.json index ff4b503..11449a3 100644 --- a/config/known-ipranges.json +++ b/config/known-ipranges.json @@ -9,6 +9,7 @@ {"id": "cloudflare", "name": "Cloudflare Network"}, {"id": "cnisp", "name": "China ISP Range"}, {"id": "cnmob", "name": "China Mobile"}, + {"id": "domtehniki", "name": "Dom Tehniki / WS Telecom"}, {"id": "google", "name": "Google LLC Network"}, {"id": "hetzner", "name": "Hetzner US"}, {"id": "huawei", "name": "Huawei Network"}, @@ -72,6 +73,7 @@ {"from": "138.121.0.0", "to": "138.121.225.254", "m": 16, "g": "misc_sa"}, {"from": "142.147.128.0", "to": "1142.147.255.254", "m": 17, "g": "w2obj"}, {"from": "146.174.128.0", "to": "146.174.191.254", "m": 18, "g": "huawei"}, + {"from": "149.126.192.0", "to": "149.126.223.255", "m": 19, "g": "domtehniki"}, {"from": "149.232.128.0", "to": "149.232.159.254", "m": 19, "g": "huawei"}, {"from": "150.40.128.0", "to": "150.40.255.254", "m": 17, "g": "huawei"}, {"from": "159.138.0.0", "to": "159.138.225.254", "m": 16, "g": "huawei"}, diff --git a/img/captcha.png b/img/captcha.png index c6a8dad..4ba51c6 100644 Binary files a/img/captcha.png and b/img/captcha.png differ