projects/usbcheck.it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asd

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2025-11-30 03:11:24 +01:00
parent da7838e9bc
commit 337f65205d
2 changed files with 189 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

333
api/v1/result/browser.quick.test.php
View File

@@ -1,158 +1,189 @@
<?php <?php
// /api/v1/browser.quick.test.php // /api/v1/result/browser.quick.test.php
declare(strict_types=1); declare(strict_types=1);
header('Content-Type: application/json; charset=utf-8'); /**
* Handler für: /v1/browser.quick.test
*
* WICHTIG:
* - Keine direkten header()/echo-Ausgaben hier.
* - Der Router (router.v1.php) ruft diese Funktion auf und encodiert das Ergebnis als JSON.
*
* Erwartung des Routers:
* function browser_quick_test_handle_request(): array
*/
function browser_quick_test_handle_request(): array
{
// Session & DB
if (session_status() !== PHP_SESSION_ACTIVE) {
session_start();
}
// --------------------------------------------------------------------- // DB einbinden – Pfad abhängig vom VHost:
// 1. JSON einlesen // api.{staging.}usbcheck.it → DocumentRoot = .../api
// --------------------------------------------------------------------- // config liegt eine Ebene darüber: ../config/db.php
$raw = file_get_contents('php://input'); require_once $_SERVER['DOCUMENT_ROOT'] . '/../config/db.php'; // stellt $pdo (PDO) bereit
$data = json_decode($raw, true);
if (!is_array($data)) { // ---------------------------------------------------------------------
http_response_code(400); // 1. JSON einlesen
echo json_encode([ // ---------------------------------------------------------------------
'ok' => false, $raw = file_get_contents('php://input');
'error' => 'Invalid JSON payload', $data = json_decode($raw, true);
]);
exit; if (!is_array($data)) {
} // Kein gültiges JSON → wir geben nur das Ergebnis zurück,
// HTTP-Status-Code kann der Router setzen, wenn er mag.
// --------------------------------------------------------------------- return [
// 2. User / Session ermitteln 'ok' => false,
// --------------------------------------------------------------------- 'error' => 'Invalid JSON payload',
$userId = $_SESSION['user_id'] ?? null; // abhängig von deiner Login-Implementierung ];
$isLoggedIn = $userId ? 1 : 0; }
$sessionId = session_id() ?: null;
// ---------------------------------------------------------------------
$ipAddress = $_SERVER['REMOTE_ADDR'] ?? null; // 2. User / Session ermitteln
$userAgent = $_SERVER['HTTP_USER_AGENT'] ?? null; // ---------------------------------------------------------------------
$userId = $_SESSION['user_id'] ?? null; // abhängig von deiner Login-Implementierung
// --------------------------------------------------------------------- $isLoggedIn = $userId ? 1 : 0;
// 3. Grobe Auswertung aus dem Report (optional) $sessionId = session_id() ?: null;
// ---------------------------------------------------------------------
$ipAddress = $_SERVER['REMOTE_ADDR'] ?? null;
$modeRequested = $data['mode_requested'] ?? 'unknown'; $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? null;
$meta = $data['meta'] ?? [];
// ---------------------------------------------------------------------
// Browser/OS-Parsing kannst du später ergänzen // 3. Grobe Auswertung aus dem Report (optional)
$browserName = null; // ---------------------------------------------------------------------
$browserVersion = null; $modeRequested = $data['mode_requested'] ?? 'unknown';
$osName = null; $meta = $data['meta'] ?? [];
$osVersion = null;
// Hier könntest du später Browser/OS parsen
// Gesamtmenge geschriebener/verifizierter Bytes aggregieren $browserName = null;
$measuredBytes = 0; $browserVersion = null;
$osName = null;
if (!empty($data['quick']) && is_array($data['quick'])) { $osVersion = null;
$measuredBytes += (int)($data['quick']['size_bytes'] ?? 0);
} // Beispiel: Gesamtmenge geschriebener/verifizierter Bytes aggregieren
if (!empty($data['benchmark']) && is_array($data['benchmark'])) { $measuredBytes = 0;
$measuredBytes += (int)($data['benchmark']['size_bytes'] ?? 0);
} if (!empty($data['quick']) && is_array($data['quick'])) {
if (!empty($data['writeverify']) && is_array($data['writeverify'])) { $measuredBytes += (int)($data['quick']['size_bytes'] ?? 0);
$measuredBytes += (int)($data['writeverify']['total_bytes'] ?? 0); }
} if (!empty($data['benchmark']) && is_array($data['benchmark'])) {
$measuredBytes += (int)($data['benchmark']['size_bytes'] ?? 0);
// Kapazitätsstatus vorerst neutral }
$capacityStatus = 'unknown'; if (!empty($data['writeverify']) && is_array($data['writeverify'])) {
$measuredBytes += (int)($data['writeverify']['total_bytes'] ?? 0);
// Volume-/Stick-Daten aktuell noch nicht separat: }
$volumeLabel = null;
$manufacturer = null; // Kapazitätsstatus vorerst neutral
$modelName = null; $capacityStatus = 'unknown';
$usbType = null;
$filesystem = null; // Volume-/Stick-Daten hast du aktuell im Browser noch nicht separat,
// darum bleiben diese Felder (erstmal) NULL:
// advertised_capacity_bytes kennen wir im Browser noch nicht: $volumeLabel = null;
$advCapacityBytes = null; $manufacturer = null;
$modelName = null;
// test_report_json = kompletter Report $usbType = null;
$testReportJson = $raw; // direkt als JSON-String speichern $filesystem = null;
// --------------------------------------------------------------------- // advertised_capacity_bytes kennen wir im Browser noch nicht:
// 4. Insert in web_quicktests $advCapacityBytes = null;
// ---------------------------------------------------------------------
try { // test_report_json = kompletter Report (roher JSON-String)
$sql = " $testReportJson = $raw ?: json_encode($data, JSON_UNESCAPED_UNICODE);
INSERT INTO web_quicktests (
user_id, // ---------------------------------------------------------------------
is_logged_in, // 4. Insert in web_quicktests
usb_device_id, // ---------------------------------------------------------------------
browser_name, /** @var PDO $pdo */
browser_version, global $pdo;
os_name,
os_version, try {
volume_label, $sql = "
manufacturer, INSERT INTO web_quicktests (
model_name, user_id,
usb_type, is_logged_in,
advertised_capacity_bytes, usb_device_id,
measured_capacity_bytes, browser_name,
capacity_status, browser_version,
filesystem, os_name,
test_report_json, os_version,
ip_address, volume_label,
session_id manufacturer,
) model_name,
VALUES ( usb_type,
:user_id, advertised_capacity_bytes,
:is_logged_in, measured_capacity_bytes,
:usb_device_id, capacity_status,
:browser_name, filesystem,
:browser_version, test_report_json,
:os_name, ip_address,
:os_version, session_id
:volume_label, )
:manufacturer, VALUES (
:model_name, :user_id,
:usb_type, :is_logged_in,
:adv_capacity, :usb_device_id,
:measured_capacity, :browser_name,
:capacity_status, :browser_version,
:filesystem, :os_name,
CAST(:test_report_json AS JSON), :os_version,
:ip_address, :volume_label,
:session_id :manufacturer,
) :model_name,
"; :usb_type,
:adv_capacity,
$stmt = $pdo->prepare($sql); :measured_capacity,
:capacity_status,
$stmt->execute([ :filesystem,
'user_id' => $userId, :test_report_json,
'is_logged_in' => $isLoggedIn, :ip_address,
'usb_device_id' => null, // Browser-Test ist erstmal nicht an gespeicherten Stick gekoppelt :session_id
'browser_name' => $browserName, )
'browser_version' => $browserVersion, ";
'os_name' => $osName,
'os_version' => $osVersion, $stmt = $pdo->prepare($sql);
'volume_label' => $volumeLabel,
'manufacturer' => $manufacturer, $stmt->execute([
'model_name' => $modelName, 'user_id' => $userId,
'usb_type' => $usbType, 'is_logged_in' => $isLoggedIn,
'adv_capacity' => $advCapacityBytes, 'usb_device_id' => null, // Browser-Test ist erstmal nicht an gespeicherten Stick gekoppelt
'measured_capacity' => $measuredBytes ?: null, 'browser_name' => $browserName,
'capacity_status' => $capacityStatus, 'browser_version' => $browserVersion,
'filesystem' => $filesystem, 'os_name' => $osName,
'test_report_json' => $testReportJson, 'os_version' => $osVersion,
'ip_address' => $ipAddress, 'volume_label' => $volumeLabel,
'session_id' => $sessionId, 'manufacturer' => $manufacturer,
]); 'model_name' => $modelName,
'usb_type' => $usbType,
$id = (int)$pdo->lastInsertId(); 'adv_capacity' => $advCapacityBytes,
'measured_capacity' => $measuredBytes ?: null,
echo json_encode([ 'capacity_status' => $capacityStatus,
'ok' => true, 'filesystem' => $filesystem,
'id' => $id, // WICHTIG: KEIN CAST(... AS JSON) → kompatibel mit TEXT / LONGTEXT
]); 'test_report_json' => $testReportJson,
} catch (Throwable $e) { 'ip_address' => $ipAddress,
http_response_code(500); 'session_id' => $sessionId,
echo json_encode([ ]);
'ok' => false,
'error' => 'DB error', $id = (int)$pdo->lastInsertId();
// 'debug' => $e->getMessage(), // nur zum Debuggen aktivieren
]); return [
'ok' => true,
'id' => $id,
'mode' => $modeRequested,
'measured_bytes' => $measuredBytes ?: null,
];
} catch (Throwable $e) {
// Fehler ins Error-Log schreiben (nur Server-seitig sichtbar)
error_log('[usbcheck] web_quicktests insert failed: ' . $e->getMessage());
// Auf STAGING kannst du dir die Detailmeldung im JSON anzeigen lassen,
// in PROD würdest du das "debug" eher weglassen oder per env-Flag steuern.
return [
'ok' => false,
'error' => 'DB error',
'debug' => $e->getMessage(), // zum Debuggen – ggf. später entfernen
];
}
} }

8
public/assets/js/fakecheck/fakecheck.serial.js
View File

@@ -23,7 +23,13 @@
const pidInput = rootSc.querySelector("#sc-pid"); const pidInput = rootSc.querySelector("#sc-pid");
const serialInput = rootSc.querySelector("#sc-serial"); const serialInput = rootSc.querySelector("#sc-serial");
const apiUrl = cfg.apiBase.replace(/\/+$/, "") + "/quickcheck"; // API-Basis:
// - cfg.apiBase kommt aus fakecheck.core.js (z.B. https://api.usbcheck.it)
// - wir hängen /v1/quickcheck dran
// - Fallback: /api/v1/quickcheck auf demselben Host
const apiBaseRaw = (cfg && cfg.apiBase) ? cfg.apiBase : "";
const apiBase = apiBaseRaw.replace(/\/+$/, "");
const apiUrl = apiBase ? (apiBase + "/v1/quickcheck") : "/api/v1/quickcheck";
// ------------------------------------------------------- // -------------------------------------------------------
// Fehleranzeige // Fehleranzeige