fixup

Author: Eugeny

warpgate-protocol-rdp/src/server/hold_screen.rs

@@ -10,7 +10,7 @@ use anyhow::{Result, bail};
 use tokio::sync::Mutex;
 use tokio::sync::mpsc::{Sender, UnboundedReceiver};
 use warpgate_common::auth::AuthStateUserInfo;
-use warpgate_core::{DesktopInput, Services};
+use warpgate_core::{DesktopInput, Scancode, Services};
 use warpgate_desktop_auth::{
     Deadline, HoldEvent, HoldFrame, HoldInputSource, HoldPainter as HoldPainterExt,
     InteractiveAuth, OtpAction, run_hold_screen as run_hold_screen_driver,
@@ -82,7 +82,7 @@ impl HoldInputSource for RdpHoldInput<'_> {
                 scancode,
                 down: true,
             })) => scancode
-                .and_then(|s| scancode_otp_action(s.code))
+                .and_then(scancode_otp_action)
                 .or_else(|| keysym.and_then(key_otp_action))
                 .map_or(HoldEvent::Other, HoldEvent::Otp),
             Some(ServerEvent::Size { width, height }) => {
@@ -218,7 +218,14 @@ impl HoldPainter {
 }
 
 /// Map a PC/AT set-1 scancode (what mstsc/FreeRDP send) to an OTP action.
-fn scancode_otp_action(code: u8) -> Option<OtpAction> {
+fn scancode_otp_action(scancode: Scancode) -> Option<OtpAction> {
+    let Scancode { code, extended } = scancode;
+    // The nav cluster shares its make codes with the keypad and is told apart only by the
+    // E0 prefix, so without this an arrow key would type a digit. Numpad Enter is the one
+    // extended key that still means something here.
+    if extended && code != 0x1c {
+        return None;
+    }
     Some(match code {
         0x02..=0x0a => OtpAction::Digit(char::from(b'1' + (code - 0x02))), // top row 1..9
         0x0b | 0x52 => OtpAction::Digit('0'),                              // keypad 0
@@ -249,7 +256,7 @@ fn key_otp_action(keysym: u32) -> Option<OtpAction> {
 
 #[cfg(test)]
 mod otp_input_tests {
-    use super::{OtpAction, key_otp_action, scancode_otp_action};
+    use super::{OtpAction, Scancode, key_otp_action, scancode_otp_action};
 
     fn digit(action: Option<OtpAction>) -> Option<char> {
         match action {
@@ -258,12 +265,26 @@ mod otp_input_tests {
         }
     }
 
+    fn plain(code: u8) -> Option<OtpAction> {
+        scancode_otp_action(Scancode {
+            code,
+            extended: false,
+        })
+    }
+
+    fn e0(code: u8) -> Option<OtpAction> {
+        scancode_otp_action(Scancode {
+            code,
+            extended: true,
+        })
+    }
+
     #[test]
     fn scancode_number_row() {
         // 0x02..=0x0a is the '1'..'9' row (computed, so guard the ends), 0x0b is '0'.
-        assert_eq!(digit(scancode_otp_action(0x02)), Some('1'));
-        assert_eq!(digit(scancode_otp_action(0x0a)), Some('9'));
-        assert_eq!(digit(scancode_otp_action(0x0b)), Some('0'));
+        assert_eq!(digit(plain(0x02)), Some('1'));
+        assert_eq!(digit(plain(0x0a)), Some('9'));
+        assert_eq!(digit(plain(0x0b)), Some('0'));
     }
 
     #[test]
@@ -280,23 +301,26 @@ mod otp_input_tests {
             (0x48, '8'),
             (0x49, '9'),
         ] {
-            assert_eq!(
-                digit(scancode_otp_action(code)),
-                Some(expected),
-                "scancode {code:#x}"
-            );
+            assert_eq!(digit(plain(code)), Some(expected), "scancode {code:#x}");
+        }
+    }
+
+    /// The nav cluster repeats the keypad's make codes under an E0 prefix; pressing an
+    /// arrow must not enter a digit.
+    #[test]
+    fn scancode_nav_cluster_is_not_a_digit() {
+        for code in [0x47u8, 0x48, 0x49, 0x4b, 0x4d, 0x4f, 0x50, 0x51, 0x52] {
+            assert!(e0(code).is_none(), "extended scancode {code:#x}");
         }
+        assert!(matches!(e0(0x1c), Some(OtpAction::Submit))); // numpad Enter
     }
 
     #[test]
     fn scancode_control_and_unmapped() {
-        assert!(matches!(
-            scancode_otp_action(0x0e),
-            Some(OtpAction::Backspace)
-        ));
-        assert!(matches!(scancode_otp_action(0x1c), Some(OtpAction::Submit)));
-        assert!(scancode_otp_action(0x3b).is_none()); // F1 — not an OTP key
-        assert!(scancode_otp_action(0x00).is_none());
+        assert!(matches!(plain(0x0e), Some(OtpAction::Backspace)));
+        assert!(matches!(plain(0x1c), Some(OtpAction::Submit)));
+        assert!(plain(0x3b).is_none()); // F1 — not an OTP key
+        assert!(plain(0x00).is_none());
     }
 
     #[test]

warpgate-web/src/admin/player/DesktopRecordingPlayer.svelte

@@ -50,7 +50,13 @@
     type Frame = DesktopFrame & { time: number }
     type InputItem =
         | { type: 'key_input'; time: number; keysym: number; down: boolean }
-        | { type: 'scancode_input'; time: number; code: number; down: boolean }
+        | {
+              type: 'scancode_input'
+              time: number
+              code: number
+              extended: boolean
+              down: boolean
+          }
         | {
               type: 'pointer_input'
               time: number
@@ -243,7 +249,10 @@
                 if (item.down) {
                     keyPresses = [
                         ...keyPresses,
-                        { time: item.time, label: scancodeLabel(item.code) },
+                        {
+                            time: item.time,
+                            label: scancodeLabel(item.code, item.extended),
+                        },
                     ]
                 }
                 break

warpgate-web/src/common/desktopInput.ts

@@ -152,6 +152,29 @@ const SCANCODE_NAMES: Record<number, string> = {
     88: 'F12',
     69: 'NumLock',
     70: 'ScrollLock',
+    71: 'Num 7',
+    72: 'Num 8',
+    73: 'Num 9',
+    74: 'Num -',
+    75: 'Num 4',
+    76: 'Num 5',
+    77: 'Num 6',
+    78: 'Num +',
+    79: 'Num 1',
+    80: 'Num 2',
+    81: 'Num 3',
+    82: 'Num 0',
+    83: 'Num .',
+}
+
+// The nav cluster, the right-hand modifiers and the keypad's Enter and `/` repeat make
+// codes from the table above and are told apart only by the E0 prefix.
+const EXTENDED_SCANCODE_NAMES: Record<number, string> = {
+    28: 'Enter',
+    29: 'Ctrl',
+    53: '/',
+    55: 'PrintScreen',
+    56: 'Alt',
     71: 'Home',
     72: '↑',
     73: 'PgUp',
@@ -162,10 +185,14 @@ const SCANCODE_NAMES: Record<number, string> = {
     81: 'PgDn',
     82: 'Insert',
     83: 'Delete',
+    91: 'Super',
+    92: 'Super',
+    93: 'Menu',
 }
 
-export function scancodeLabel(code: number): string {
-    return SCANCODE_NAMES[code] ?? `0x${code.toString(16)}`
+export function scancodeLabel(code: number, extended: boolean): string {
+    const names = extended ? EXTENDED_SCANCODE_NAMES : SCANCODE_NAMES
+    return names[code] ?? `0x${code.toString(16)}`
 }
 
 // `KeyboardEvent.code` -> PC/AT set-1 make code, with the 0xE000 bit standing in for the