Fix issue with shader IPC file permissions across user accounts, add config for opting out of metrics collection

#90

Author: wheaney

bin/xr_driver_cli

@@ -122,6 +122,9 @@ then
         if [ -n "$2" ]; then
             config_value="$2"
         fi
+    elif [ "$1" == "--disable-metrics" ] || [ "$1" == "-dm" ]; then
+        config_key="metrics_disabled"
+        config_value="true"
     elif [ "$1" == "--request-token" ] || [ "$1" == "--verify-token" ] || [ "$1" == "--refresh-license" ] || [ "$1" == "--get-hardware-id" ]; then
         config_type="string"
         config_key="hardware_id"
@@ -234,6 +237,7 @@ Options:
   -sbs3d, --sbs-content-3d [true|false]
   -sbsds, --sbs-display-size [display_size]
   -sbsdd, --sbs-display-distance [display_distance]
+  -dm, --disable-metrics
   --request-token [email]
   --verify-token [token]
   --refresh-license

include/config.h

@@ -9,6 +9,7 @@ struct driver_config_t {
     int mouse_sensitivity;
     char *output_mode;
     bool multi_tap_enabled;
+    bool metrics_disabled;
 
     bool debug_threads;
     bool debug_joystick;

src/config.c

@@ -24,6 +24,7 @@ driver_config_type *default_config() {
     config->mouse_sensitivity = 30;
     config->output_mode = strdup(mouse_output_mode);
     config->multi_tap_enabled = false;
+    config->metrics_disabled = false;
 
     config->debug_threads = false;
     config->debug_joystick = false;
@@ -113,6 +114,8 @@ driver_config_type* parse_config_file(FILE *fp) {
             string_config(key, value, &config->output_mode);
         } else if (equal(key, "multi_tap_enabled")) {
             boolean_config(key, value, &config->multi_tap_enabled);
+        } else if (equal(key, "metrics_disabled")) {
+            boolean_config(key, value, &config->metrics_disabled);
         }
 
         plugins.handle_config_line(plugin_configs, key, value);

src/driver.c

@@ -281,6 +281,9 @@ void update_config_from_file(FILE *fp) {
     if (output_mode_changed)
         log_message("Output mode has been changed to '%s'\n", new_config->output_mode);
 
+    if (config()->metrics_disabled != new_config->metrics_disabled)
+        log_message("Metrics have been %s\n", new_config->metrics_disabled ? "disabled" : "enabled");
+
     if (!config()->debug_joystick && new_config->debug_joystick)
         log_message("Joystick debugging has been enabled, to see it, use 'watch -n 0.1 cat $XDG_RUNTIME_DIR/xr_driver/joystick_debug' in bash\n");
     if (config()->debug_joystick && !new_config->debug_joystick)

src/ipc.c

@@ -2,6 +2,7 @@
 #include "logging.h"
 
 #include <errno.h>
+#include <fcntl.h>
 #include <glob.h>
 #include <pthread.h>
 #include <sys/ipc.h>
@@ -10,6 +11,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 const char *sombrero_ipc_file_prefix = "/tmp/shader_runtime_";
 
@@ -66,12 +69,14 @@ void setup_ipc_value(const char *name, void **shmemValue, size_t size, bool debu
     strcpy(path, sombrero_ipc_file_prefix);
     strcat(path, name);
 
-    FILE *ipc_file = fopen(path, "w");
-    if (ipc_file == NULL) {
+    mode_t old_umask = umask(0);
+    int fd = open(path, O_CREAT, 0666);
+    if (fd == -1) {
         log_error("Could not create IPC shared file\n");
         exit(1);
     }
-    fclose(ipc_file);
+    close(fd);
+    umask(old_umask);
 
     key_t key = ftok(path, 0);
     if (debug) log_debug("ipc_key, got key %d for path %s\n", key, path);

src/plugins/metrics.c

@@ -15,6 +15,8 @@ const char *UA_MEASUREMENT_ID = "G-Z94MXP18T6";
 const char *UA_CLIENT_ID="ARLinuxDriver";
 void log_metric(char *event_name) {
     #ifdef UA_API_SECRET
+        if (config()->metrics_disabled) return;
+
         CURL *curl;
         CURLcode res;