mirror of
https://github.com/MrUnknownDE/utools.git
synced 2026-04-12 02:53:44 +02:00
add more debugging things
This commit is contained in:
@@ -17,48 +17,57 @@ let asnReader;
|
||||
// --- Hilfsfunktionen ---
|
||||
|
||||
/**
|
||||
* Validiert eine IP-Adresse (v4 oder v6) robust.
|
||||
* Validiert eine IP-Adresse (v4 oder v6) robust mit separaten Prüfungen.
|
||||
* @param {string} ip - Die zu validierende IP-Adresse.
|
||||
* @returns {boolean} True, wenn gültig, sonst false.
|
||||
*/
|
||||
function isValidIp(ip) {
|
||||
// Frühe Prüfung auf offensichtlich ungültige Werte
|
||||
if (!ip || typeof ip !== 'string' || ip.trim() === '') {
|
||||
// console.log(`isValidIp: Input invalid (null, not string, or empty)`); // Optional Debugging
|
||||
return false;
|
||||
}
|
||||
|
||||
const trimmedIp = ip.trim(); // Sicherstellen, dass wir getrimmten Wert verwenden
|
||||
// console.log(`isValidIp: Checking trimmed IP "${trimmedIp}"`); // Optional Debugging
|
||||
|
||||
// --- Versuch 1: Ist es eine gültige IPv4? ---
|
||||
try {
|
||||
// Zuerst versuchen, als IPv4 zu parsen und zu validieren
|
||||
const addr4 = new Address4(ip);
|
||||
const addr4 = new Address4(trimmedIp);
|
||||
if (addr4.isValid()) {
|
||||
return true; // Gültige IPv4
|
||||
// console.log(`isValidIp: "${trimmedIp}" is valid IPv4.`); // Optional Debugging
|
||||
return true; // Ja, gültige IPv4 gefunden. Fertig.
|
||||
}
|
||||
|
||||
// Wenn nicht IPv4, versuchen als IPv6 zu parsen und zu validieren
|
||||
const addr6 = new Address6(ip);
|
||||
if (addr6.isValid()) {
|
||||
return true; // Gültige IPv6
|
||||
}
|
||||
|
||||
// Wenn keine der Konstruktoren einen Fehler geworfen hat,
|
||||
// aber isValid() false zurückgibt (selten, aber möglich)
|
||||
return false;
|
||||
|
||||
} catch (error) {
|
||||
// Wenn bei new Address4() oder new Address6() ein Fehler auftritt
|
||||
// (z.B. "Incorrect number of groups"), ist die Eingabe ungültig.
|
||||
// Wir loggen den Fehler optional für Debugging-Zwecke, geben aber false zurück.
|
||||
// console.warn(`IP validation caught error for input "${ip}": ${error.message}`);
|
||||
return false;
|
||||
} catch (e) {
|
||||
// Fehler beim Parsen als IPv4 (z.B. bei IPv6-Format). Das ist OK, wir prüfen als nächstes IPv6.
|
||||
// console.warn(`isValidIp: Error parsing "${trimmedIp}" as IPv4: ${e.message}`); // Optional Debugging
|
||||
}
|
||||
|
||||
// --- Versuch 2: Ist es eine gültige IPv6? ---
|
||||
try {
|
||||
const addr6 = new Address6(trimmedIp);
|
||||
if (addr6.isValid()) {
|
||||
// console.log(`isValidIp: "${trimmedIp}" is valid IPv6.`); // Optional Debugging
|
||||
return true; // Ja, gültige IPv6 gefunden. Fertig.
|
||||
}
|
||||
} catch (e) {
|
||||
// Fehler beim Parsen als IPv6 (z.B. bei IPv4-Format oder ungültigem Text).
|
||||
// console.warn(`isValidIp: Error parsing "${trimmedIp}" as IPv6: ${e.message}`); // Optional Debugging
|
||||
}
|
||||
|
||||
// --- Wenn weder als IPv4 noch als IPv6 gültig ---
|
||||
// console.log(`isValidIp: "${trimmedIp}" is neither valid IPv4 nor IPv6.`); // Optional Debugging
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Bereinigt eine IP-Adresse (z.B. entfernt ::ffff: Präfix von IPv4-mapped IPv6).
|
||||
* @param {string} ip - Die IP-Adresse.
|
||||
* @returns {string} Die bereinigte IP-Adresse.
|
||||
*/
|
||||
function getCleanIp(ip) {
|
||||
if (!ip) return ip; // Handle null/undefined case
|
||||
if (ip.startsWith('::ffff:')) {
|
||||
const potentialIp4 = ip.substring(7);
|
||||
if (new Address4(potentialIp4).isValid()) {
|
||||
@@ -87,8 +96,10 @@ function executeCommand(command, args) {
|
||||
// Einfache Prüfung auf potenziell gefährliche Zeichen
|
||||
// Dies ist KEIN vollständiger Schutz, aber eine zusätzliche Ebene.
|
||||
// Die IP-Validierung vorher ist wichtiger!
|
||||
if (/[;&|`$()<>]/.test(arg)) {
|
||||
return reject(new Error(`Invalid character detected in argument: ${arg}`));
|
||||
if (typeof arg === 'string' && /[;&|`$()<>]/.test(arg)) {
|
||||
// Logge den problematischen Versuch, aber lehne ab
|
||||
console.error(`Potential command injection attempt detected in argument: ${arg}`);
|
||||
return reject(new Error(`Invalid character detected in command argument.`));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -106,13 +117,15 @@ function executeCommand(command, args) {
|
||||
|
||||
proc.on('error', (err) => {
|
||||
// Fehler beim Starten des Prozesses
|
||||
console.error(`Failed to start command ${command}: ${err.message}`);
|
||||
reject(new Error(`Failed to start command ${command}: ${err.message}`));
|
||||
});
|
||||
|
||||
proc.on('close', (code) => {
|
||||
if (code !== 0) {
|
||||
// Befehl wurde ausgeführt, aber mit Fehlercode beendet
|
||||
reject(new Error(`Command ${command} failed with code ${code}: ${stderr || stdout}`));
|
||||
console.error(`Command ${command} ${args.join(' ')} failed with code ${code}: ${stderr || stdout}`);
|
||||
reject(new Error(`Command ${command} failed with code ${code}: ${stderr || 'No stderr output'}`));
|
||||
} else {
|
||||
resolve(stdout);
|
||||
}
|
||||
@@ -125,12 +138,16 @@ function executeCommand(command, args) {
|
||||
async function initialize() {
|
||||
try {
|
||||
console.log('Loading MaxMind databases...');
|
||||
cityReader = await geoip.Reader.open(process.env.GEOIP_CITY_DB || './data/GeoLite2-City.mmdb');
|
||||
asnReader = await geoip.Reader.open(process.env.GEOIP_ASN_DB || './data/GeoLite2-ASN.mmdb');
|
||||
const cityDbPath = process.env.GEOIP_CITY_DB || './data/GeoLite2-City.mmdb';
|
||||
const asnDbPath = process.env.GEOIP_ASN_DB || './data/GeoLite2-ASN.mmdb';
|
||||
console.log(`City DB Path: ${cityDbPath}`);
|
||||
console.log(`ASN DB Path: ${asnDbPath}`);
|
||||
cityReader = await geoip.Reader.open(cityDbPath);
|
||||
asnReader = await geoip.Reader.open(asnDbPath);
|
||||
console.log('MaxMind databases loaded successfully.');
|
||||
} catch (error) {
|
||||
console.error('FATAL: Could not load MaxMind databases.');
|
||||
console.error('Ensure GEOIP_CITY_DB and GEOIP_ASN_DB point to valid .mmdb files.');
|
||||
console.error('Ensure GEOIP_CITY_DB and GEOIP_ASN_DB point to valid .mmdb files in the ./data directory or via .env');
|
||||
console.error(error);
|
||||
process.exit(1); // Beenden, wenn DBs nicht geladen werden können
|
||||
}
|
||||
@@ -138,10 +155,11 @@ async function initialize() {
|
||||
|
||||
// --- Middleware ---
|
||||
app.use(cors()); // Erlaubt Anfragen von anderen Origins (z.B. dein Frontend)
|
||||
app.use(express.json()); // Parst JSON-Request-Bodies (brauchen wir hier nicht direkt, aber gute Praxis)
|
||||
app.use(express.json()); // Parst JSON-Request-Bodies
|
||||
|
||||
// Vertraue dem Proxy-Header für die IP (wenn hinter einem Reverse Proxy wie Nginx)
|
||||
// Vorsicht: Nur aktivieren, wenn du WIRKLICH hinter einem vertrauenswürdigen Proxy bist!
|
||||
// Und konfiguriere es spezifisch für deinen Proxy, z.B. app.set('trust proxy', 'loopback')
|
||||
// app.set('trust proxy', true);
|
||||
|
||||
// --- Routen ---
|
||||
@@ -151,11 +169,29 @@ app.get('/api/ipinfo', async (req, res) => {
|
||||
// WICHTIG: 'req.ip' hängt von 'trust proxy' ab.
|
||||
// Sicherer ist oft, den spezifischen Header zu prüfen, den dein Proxy setzt (z.B. 'X-Forwarded-For')
|
||||
// Beispiel: const clientIpRaw = req.headers['x-forwarded-for']?.split(',')[0].trim() || req.socket.remoteAddress;
|
||||
// Für lokale Tests ist req.ip oft ::1 oder 127.0.0.1, req.socket.remoteAddress ist oft dasselbe.
|
||||
// Wir nehmen req.ip als Standard, aber loggen beides für Debugging.
|
||||
console.log(`ipinfo request: req.ip = ${req.ip}, req.socket.remoteAddress = ${req.socket.remoteAddress}`);
|
||||
const clientIpRaw = req.ip || req.socket.remoteAddress;
|
||||
const clientIp = getCleanIp(clientIpRaw);
|
||||
|
||||
if (!isValidIp(clientIp)) {
|
||||
return res.status(400).json({ error: 'Could not determine a valid client IP address.', rawIp: clientIpRaw });
|
||||
console.log(`ipinfo: Raw IP = ${clientIpRaw}, Cleaned IP = ${clientIp}`);
|
||||
|
||||
|
||||
// Wenn nach Bereinigung keine IP übrig bleibt oder sie ungültig ist
|
||||
if (!clientIp || !isValidIp(clientIp)) {
|
||||
// Spezieller Fall für Localhost / Private IPs, die MaxMind nicht auflösen kann
|
||||
if (clientIp === '127.0.0.1' || clientIp === '::1') {
|
||||
return res.json({
|
||||
ip: clientIp,
|
||||
geo: { note: 'Localhost IP, no Geo data available.' },
|
||||
asn: { note: 'Localhost IP, no ASN data available.' },
|
||||
rdns: ['localhost'], // Annahme
|
||||
});
|
||||
}
|
||||
// Ansonsten ein Fehler
|
||||
console.error(`ipinfo: Could not determine a valid client IP. Raw: ${clientIpRaw}, Cleaned: ${clientIp}`);
|
||||
return res.status(400).json({ error: 'Could not determine a valid client IP address.', rawIp: clientIpRaw, cleanedIp: clientIp });
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -172,7 +208,10 @@ app.get('/api/ipinfo', async (req, res) => {
|
||||
longitude: geoData.location?.longitude,
|
||||
timezone: geoData.location?.timeZone,
|
||||
};
|
||||
} catch (e) { /* IP nicht in DB oder private IP */ }
|
||||
} catch (e) {
|
||||
console.warn(`ipinfo: MaxMind City lookup failed for ${clientIp}: ${e.message}`);
|
||||
geo = { error: 'GeoIP lookup failed (IP not found in database or private range).' };
|
||||
}
|
||||
|
||||
let asn = null;
|
||||
try {
|
||||
@@ -181,7 +220,10 @@ app.get('/api/ipinfo', async (req, res) => {
|
||||
number: asnData.autonomousSystemNumber,
|
||||
organization: asnData.autonomousSystemOrganization,
|
||||
};
|
||||
} catch (e) { /* IP nicht in DB oder private IP */ }
|
||||
} catch (e) {
|
||||
console.warn(`ipinfo: MaxMind ASN lookup failed for ${clientIp}: ${e.message}`);
|
||||
asn = { error: 'ASN lookup failed (IP not found in database or private range).' };
|
||||
}
|
||||
|
||||
let rdns = null;
|
||||
try {
|
||||
@@ -191,8 +233,9 @@ app.get('/api/ipinfo', async (req, res) => {
|
||||
} catch (e) {
|
||||
// Fehler wie NXDOMAIN (No Such Domain) sind normal, ignorieren
|
||||
if (e.code !== 'ENOTFOUND' && e.code !== 'ENODATA') {
|
||||
console.warn(`rDNS lookup error for ${clientIp}:`, e.message);
|
||||
console.warn(`ipinfo: rDNS lookup error for ${clientIp}:`, e.message);
|
||||
}
|
||||
rdns = { error: `rDNS lookup failed (${e.code || 'Unknown error'})` };
|
||||
}
|
||||
|
||||
res.json({
|
||||
@@ -203,72 +246,111 @@ app.get('/api/ipinfo', async (req, res) => {
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error(`Error processing ipinfo for ${clientIp}:`, error);
|
||||
console.error(`ipinfo: Error processing ipinfo for ${clientIp}:`, error);
|
||||
res.status(500).json({ error: 'Internal server error while processing IP information.' });
|
||||
}
|
||||
});
|
||||
|
||||
// Ping Endpunkt
|
||||
app.get('/api/ping', async (req, res) => {
|
||||
const targetIp = req.query.targetIp;
|
||||
const targetIpRaw = req.query.targetIp;
|
||||
const targetIp = typeof targetIpRaw === 'string' ? targetIpRaw.trim() : targetIpRaw;
|
||||
|
||||
// --- DEBUGGING START ---
|
||||
console.log(`--- PING Request ---`);
|
||||
console.log(`Raw req.query.targetIp:`, req.query.targetIp);
|
||||
console.log(`Value of targetIp after trim: "${targetIp}"`);
|
||||
console.log(`Type of targetIp:`, typeof targetIp);
|
||||
console.log(`Value of targetIp before validation: "${targetIp}"`);
|
||||
// --- DEBUGGING END ---
|
||||
|
||||
if (!isValidIp(targetIp)) {
|
||||
// --- DEBUGGING START ---
|
||||
console.log(`isValidIp returned false for "${targetIp}"`);
|
||||
// --- DEBUGGING END ---
|
||||
// --- DIREKTER TEST IN DER ROUTE ---
|
||||
let isDirectlyValidV4 = false;
|
||||
let isDirectlyValidV6 = false;
|
||||
try {
|
||||
if (targetIp) { // Nur testen, wenn targetIp existiert
|
||||
const addr4 = new Address4(targetIp);
|
||||
isDirectlyValidV4 = addr4.isValid();
|
||||
}
|
||||
} catch (e) { /* Ignorieren für diesen Test */ }
|
||||
try {
|
||||
if (targetIp) { // Nur testen, wenn targetIp existiert
|
||||
const addr6 = new Address6(targetIp);
|
||||
isDirectlyValidV6 = addr6.isValid();
|
||||
}
|
||||
} catch (e) { /* Ignorieren für diesen Test */ }
|
||||
console.log(`Direct V4 check in route for "${targetIp}": ${isDirectlyValidV4}`);
|
||||
console.log(`Direct V6 check in route for "${targetIp}": ${isDirectlyValidV6}`);
|
||||
// --- ENDE DIREKTER TEST ---
|
||||
|
||||
const isValidResult = isValidIp(targetIp); // Rufe die Funktion trotzdem auf
|
||||
console.log(`isValidIp function result for "${targetIp}": ${isValidResult}`);
|
||||
|
||||
|
||||
if (!isValidResult) { // Prüfe weiterhin das Ergebnis der Funktion
|
||||
console.log(`isValidIp returned false for "${targetIp}", sending 400.`);
|
||||
return res.status(400).json({ error: 'Invalid target IP address provided.' });
|
||||
}
|
||||
|
||||
// Sicherstellen, dass es sich nicht um eine private/interne IP handelt? Optional.
|
||||
// const addr = new Address6(targetIp);
|
||||
// if (addr.isInSubnet('10.0.0.0/8') || ... ) {
|
||||
// return res.status(403).json({ error: 'Pinging private IPs is not allowed.' });
|
||||
// }
|
||||
|
||||
// --- Rest der Funktion ---
|
||||
try {
|
||||
console.log(`Proceeding to execute ping for "${targetIp}"...`);
|
||||
// Parameter anpassen (z.B. -c für Linux/macOS, -n für Windows)
|
||||
// Hier für Linux/macOS: 4 Pings senden
|
||||
const args = ['-c', '4', targetIp];
|
||||
const args = ['-c', '4', targetIp]; // WICHTIG: Hier den getrimmten targetIp verwenden!
|
||||
const command = 'ping';
|
||||
|
||||
console.log(`Executing: ${command} ${args.join(' ')}`);
|
||||
const output = await executeCommand(command, args);
|
||||
|
||||
// TODO: Ping-Ausgabe parsen für strukturierte Daten (RTT min/avg/max, loss)
|
||||
console.log(`Ping for ${targetIp} successful.`);
|
||||
res.json({ success: true, rawOutput: output });
|
||||
|
||||
} catch (error) {
|
||||
console.error(`Error executing ping for ${targetIp}:`, error);
|
||||
// executeCommand loggt den Fehler bereits
|
||||
res.status(500).json({ success: false, error: `Ping command failed: ${error.message}` });
|
||||
}
|
||||
});
|
||||
|
||||
// Traceroute Endpunkt
|
||||
app.get('/api/traceroute', async (req, res) => {
|
||||
const targetIp = req.query.targetIp;
|
||||
const targetIpRaw = req.query.targetIp;
|
||||
const targetIp = typeof targetIpRaw === 'string' ? targetIpRaw.trim() : targetIpRaw;
|
||||
|
||||
// --- DEBUGGING START ---
|
||||
console.log(`--- TRACEROUTE Request ---`);
|
||||
console.log(`Raw req.query.targetIp:`, req.query.targetIp);
|
||||
console.log(`Value of targetIp after trim: "${targetIp}"`);
|
||||
console.log(`Type of targetIp:`, typeof targetIp);
|
||||
console.log(`Value of targetIp before validation: "${targetIp}"`);
|
||||
// --- DEBUGGING END ---
|
||||
|
||||
if (!isValidIp(targetIp)) {
|
||||
// --- DEBUGGING START ---
|
||||
console.log(`isValidIp returned false for "${targetIp}"`);
|
||||
// --- DEBUGGING END ---
|
||||
// --- DIREKTER TEST IN DER ROUTE ---
|
||||
let isDirectlyValidV4 = false;
|
||||
let isDirectlyValidV6 = false;
|
||||
try {
|
||||
if (targetIp) { // Nur testen, wenn targetIp existiert
|
||||
const addr4 = new Address4(targetIp);
|
||||
isDirectlyValidV4 = addr4.isValid();
|
||||
}
|
||||
} catch (e) { /* Ignorieren für diesen Test */ }
|
||||
try {
|
||||
if (targetIp) { // Nur testen, wenn targetIp existiert
|
||||
const addr6 = new Address6(targetIp);
|
||||
isDirectlyValidV6 = addr6.isValid();
|
||||
}
|
||||
} catch (e) { /* Ignorieren für diesen Test */ }
|
||||
console.log(`Direct V4 check in route for "${targetIp}": ${isDirectlyValidV4}`);
|
||||
console.log(`Direct V6 check in route for "${targetIp}": ${isDirectlyValidV6}`);
|
||||
// --- ENDE DIREKTER TEST ---
|
||||
|
||||
const isValidResult = isValidIp(targetIp); // Rufe die Funktion trotzdem auf
|
||||
console.log(`isValidIp function result for "${targetIp}": ${isValidResult}`);
|
||||
|
||||
|
||||
if (!isValidResult) { // Prüfe weiterhin das Ergebnis der Funktion
|
||||
console.log(`isValidIp returned false for "${targetIp}", sending 400.`);
|
||||
return res.status(400).json({ error: 'Invalid target IP address provided.' });
|
||||
}
|
||||
|
||||
// --- Rest der Funktion ---
|
||||
try {
|
||||
console.log(`Proceeding to execute traceroute for "${targetIp}"...`);
|
||||
// Parameter anpassen. '-n' verhindert rDNS durch traceroute selbst (schneller).
|
||||
// Evtl. Timeouts anpassen (-w), max Hops (-m)
|
||||
const args = ['-n', targetIp]; // Für Linux/macOS
|
||||
@@ -279,10 +361,11 @@ app.get('/api/traceroute', async (req, res) => {
|
||||
const output = await executeCommand(command, args);
|
||||
|
||||
// TODO: Traceroute-Ausgabe parsen für strukturierte Daten (Array von Hops)
|
||||
console.log(`Traceroute for ${targetIp} successful.`);
|
||||
res.json({ success: true, rawOutput: output });
|
||||
|
||||
} catch (error) {
|
||||
console.error(`Error executing traceroute for ${targetIp}:`, error);
|
||||
// executeCommand loggt den Fehler bereits
|
||||
res.status(500).json({ success: false, error: `Traceroute command failed: ${error.message}` });
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user