Flesh out YAML config spike

unix/vncserver

@@ -1119,7 +1119,7 @@ sub DefineFilePathsAndStuff {
 
   %xvncArgsToConfigAliases = (
     '-AcceptPointerEvents' => [qw(pointer.allow_clicks_and_cursor_movement)],
-    '-AcceptKeyEvents' => [qw(keyboard.allow_input)],
+    '-AcceptKeyEvents' => [qw(data_loss_prevention.keyboard.allow_input)],
     '-AcceptSetDesktopSize' => [qw(desktop.allow_resize)],
     '-FrameRate' => [qw(framerate)],
     '-DynamicQualityMin' => [qw(dynamic_quality.min)],
@@ -1129,14 +1129,23 @@ sub DefineFilePathsAndStuff {
     '-JpegVideoQuality' => [qw(video.jpeg_quality)],
     '-WebpVideoQuality' => [qw(video.webp_quality)],
     '-VideoScaling' => [qw(video.scaling_method)],
-    '-SendCutText' => [qw(dlp.clipboard.allow_copy_to_client_clipboard)],
+    '-PrintVideoArea' => [qw(video.print_video_area)],
-    '-DLP_ClipSendMax' => [qw(dlp.clipboard.limit_bytes_copied_to_client_clipboard)],
+    # Clipboard
-    '-AcceptCutText' => [qw(dlp.clipboard.allow_paste_to_server)],
+    '-SendCutText' => [qw(data_loss_prevention.clipboard.allow_copy_to_client_clipboard)],
-    '-DLP_ClipAcceptMax' => [qw(dlp.clipboard.limit_bytes_pasted_to_server_clipboard)],
+    '-AcceptCutText' => [qw(data_loss_prevention.clipboard.allow_paste_to_server)],
-    '-MaxCutText' => [qw(dlp.clipboard.max_paste_size dlp.clipboard.delay)],
+    '-SendPrimary' => [qw(data_loss_prevention.clipboard.allow_copy_primary_selection_to_client_clipboard)],
-    '-DLP_ClipDelay' => [qw(dlp.clipboard.delay)],
+    '-DLP_ClipSendMax' => [qw(data_loss_prevention.clipboard.limit_bytes_copied_to_client_clipboard)],
-    '-DLP_KeyRateLimit' => [qw(dlp.keyboard.limit_keypress_rate_per_second)],
+    '-DLP_ClipAcceptMax' => [qw(data_loss_prevention.clipboard.limit_bytes_pasted_to_server_clipboard)],
+    '-DLP_Region' => [qw(data_loss_prevention.region.coords)],
+    '-DLP_ClipDelay' => [qw(data_loss_prevention.clipboard.delay_in_milliseconds)],
+    # '-DLP_KeyRateLimit' => [qw(data_loss_prevention.keyboard.limit_keypress_rate_per_second)],
     '-httpd' => [qw(httpd_directory)],
+    '-disableBasicAuth' => [qw(disable_basic_auth)],
+    '-IdleTimeout' => [qw(idle_timeout)],
+    '-MaxDisconnectionTime' => [qw(max_disconnection_time)],
+    '-localhost' => [qw(allow_localhost_only)],
+    '-QueryConnect' => [qw(query_connect)],
+    '-DLP_Log' => [qw(data_loss_prevention_log)],
   );
 }
 
@@ -1299,7 +1308,7 @@ sub LoadYAMLConfig {
   %mergedConfig = %{ Hash::Merge::Simple::merge($defaultsConfig, $systemConfig) };
 
   say $mergedConfig{framerate};
-  say $mergedConfig{dlp}{region}{x1};
+  say $mergedConfig{data_loss_prevention}{region}{x1};
   say ConvertConfigToXvncArgs();
 }
 

unix/vncserver_defaults.yaml

@@ -1,11 +1,124 @@
 ---
-geometry: 1024x768
+desktop:
-depth: 24
+  resolution:
+    width: 1024
+    height: 768
+  allow_resize: true
+  pixel_depth: 16|24|32
+
 network:
+  protocol: http|vnc
   interface: 0.0.0.0
   use_ipv4: true
   use_ipv6: true
+  ssl:
+    pem_certificate: [/etc/...]
+    pem_key: [/etc/...]
+    force_ssl: false
+
+user_session:
+  force_session_type: shared|exclusive
+  new_session_disconnects_existing_exlusive_session: true
+  ask_user_to_vet_new_sessions: false
+  vetting_dialog_duration: 10
+
+save_resources:
+  user_session:
+    idle_user_session_timeout: never
+  server_process:
+    no_user_session_timeout: never
+    active_user_session_timeout: never
+    inactive_user_session_timeout: never
+
+keyboard:
+  remap_keys:
+    - 0x22->0x40
+    - 0x24->0x40
+  # If NumLock is on (as it usually is), then pressing a key on the numeric
+  # keypad while holding the shift key overrides NumLock and instead generates
+  # the arrow key (or other navigation key) printed in small print under the big
+  # digits.
+  ignore_numlock: false
+  raw_keyboard: false
+
+# Mouse, trackpad, etc.
+pointer:
+  allow_clicks_and_cursor_movement: true
+
+runtime_configuration:
+  allow_client_to_override_server_settings: true
+  allow_override_list:
+    - pointer.allow_client_to_override_server_settings
+
+logging:
+  log_writer_name: all|*|<string>
+  log_to: stderr|stdout|syslog
+  # 0 - silent(?), 100 - most verbose
+  log_level: 0..100
+
+performance:
+  compare_framebuffer: off|always|auto
+  zrle_zlib_level: 0..9
+  hextile_improved_compression: true
+
+password_cracking_protection:
+  # Blacklist after N login attempts.
+  blacklist_threshold: 5
+  blacklist_timeout: 10
+
+data_loss_prevention:
+  visible_region:
+    top: 10
+    left: 10
+    right: 40
+    bottom: 40
+    allow_click_within_blacked_out_region: false
+    allow_click_release_within_blacked_out_region: false
+  clipboard:
+    # Cut buffers and CLIPBOARD selection.
+    allow_copy_to_client_clipboard: true
+    limit_copied_bytes_to_client_clipboard: 10000|no_limit
+    allow_copy_primary_selection_to_client_clipboard: true
+    allow_paste_to_server: true
+    limit_bytes_pasted_to_server_clipboard: 10000|no_limit
+    # This many milliseconds must pass between clipboard actions. In
+    # milliseconds.
+    delay_betwwen_operations: 1000
+  keyboard:
+    allow_input: true
+    # Set to a positive number. To disable, set to "no_limit" or 0.
+    limit_keypress_rate_per_second: 1|no_limit
+  log_clipboard_and_keyboard_actions:
+    level: off|info|verbose
+
+# legacy:
+#   pixel_format: 16|24|32
+#   inetd: false
+#   desktop_name: default
+#   rfb_port: 5900
+#   rfb_unix_socket_path:
+#   rfb_unix_mode: 0600
+#   password_file:
+#   password:
+#   plain_user_list:
+#     - foo
+#     - bar
+#   pam_service: vnc
+#   use_protocol_3.3: false
+#   x509_certificate:
+#   x509_key:
+#   gnu_tls_priority: NORMAL
+
+picture:
+  max_frame_rate: 60
+  low_rate_of_change:
+    min_quality: 7
+    max_quality: 8
+    treat_this_quality_level_as_lossless: 10
+    prefer_bandwidth_over_quality: false
+
 httpd_directory: /usr/share/kasmvnc/www
+disable_basic_auth: false
 display_title: default
 password_file: ~/.kasmpasswd
 framerate: 30
@@ -18,34 +131,14 @@ video:
   jpeg_quality: -1
   webp_quality: -1
   scaling_method: 2
+  print_video_area: true
 max_video_resolution:
   width: 640
   height: 480
-dlp:
-  region:
-    top_left_point: 10,10
-    bottom_right_point: 40,40
-    allow_click: false
-  clipboard:
-    allow_copy_to_client_clipboard: true
-    limit_bytes_copied_to_client_clipboard: 10000
-    allow_paste_to_server: true
-    limit_bytes_pasted_to_server_clipboard: 10000
-    max_paste_size: 262144
-    send_max: 10000
-    accept_max: 10000
-    delay: 1000
-  keyboard:
-    ratelimit: 30
-    # Set to a positive number. To disable, set to "no_limit" or 0.
-    limit_keypress_rate_per_second: no_limit
-  logging:
-    level: verbose
 
-# Mouse, trackpad, etc.
+# in seconds
-pointer:
+# idle_timeout: 0
-  allow_clicks_and_cursor_movement: true
+# max_disconnection_time: 3
-keyboard:
+# allow_localhost_only: true
-  allow_input: true
+# query_connect: true
-desktop:
+dlp_log: info
-  allow_resize: true