BreizhHardware/Jellystat
1
0
Fork 0
mirror of https://github.com/BreizhHardware/Jellystat.git synced 2026-01-18 16:27:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

update ipv4 regex

Browse Source 
- filter out local ip addresses
- do not show modal for local ip addresses, only remote
- tooltip to show local/remote
This commit is contained in:
fuzz
2023-11-03 17:03:50 +00:00
parent 3126d636f8
commit 300c6d5dfd
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/routes/utils.js
View File

@@ -10,8 +10,8 @@ const geoliteUrlBase = 'https://geolite.info/geoip/v2.1/city';
const geoliteAccountId = process.env.GEOLITE_ACCOUNT_ID;
const geoliteLicenseKey = process.env.GEOLITE_LICENSE_KEY;
//https://stackoverflow.com/questions/5284147/validating-ipv4-addresses-with-regexp
const ipRegex = new RegExp(`^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}$`);
//https://stackoverflow.com/a/29268025
const ipRegex = new RegExp(/\b(?!(10\.|172\.(1[6-9]|2[0-9]|3[0-1])\.|192\.168))(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/);
const agent = new https.Agent({
rejectUnauthorized: (process.env.REJECT_SELF_SIGNED_CERTIFICATES || 'true').toLowerCase() ==='true'

28
src/pages/components/sessions/session-card.js
View File

@@ -1,4 +1,4 @@
import React, {useState} from "react";
import React, {useState,useEffect} from "react";
import { Link } from 'react-router-dom';
import Card from 'react-bootstrap/Card';
import Row from 'react-bootstrap/Row';
@@ -73,10 +73,24 @@ function SessionCard(props) {
const token = localStorage.getItem('token');
const ipv4Regex = new RegExp(/\b(?!(10\.|172\.(1[6-9]|2[0-9]|3[0-1])\.|192\.168))(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/);
const [modalVisible, setModalVisible] = useState(false);
const [modalData, setModalData] = useState();
const [isRemoteSession, setIsRemoteSession] = useState();
useEffect(() => {
ipv4Regex.lastIndex = 0;
if(ipv4Regex.test(props.data.session.RemoteEndPoint)) {
setIsRemoteSession(true)
}
}, []);
function showModal() {
if(!isRemoteSession) {
return
}
const fetchData = async () => {
const result = await axios.post(`/utils/geolocateIp`, {
ipAddress: props.data.session.RemoteEndPoint
@@ -140,7 +154,17 @@ function SessionCard(props) {
</Row>
<Row>
<Col className="px-0 col-auto ellipse">
<Card.Text>IP Address: <Link onClick={showModal}>{props.data.session.RemoteEndPoint}</Link></Card.Text>
<Tooltip title={isRemoteSession ? 'Remote' : 'Local'}>
{isRemoteSession ?
<Card.Text>
IP Address: <Link onClick={showModal}>{props.data.session.RemoteEndPoint}</Link>
</Card.Text>
:
<span>
IP Address: {props.data.session.RemoteEndPoint}
</span>
}
</Tooltip>
</Col>
</Row>
</Col>