Pass username and password more securely to curl. Fix a quoting bug in remove_profile. (#709)

2026-08-06 01:06:26 +08:00 · 2020-10-01 16:03:29 +02:00
parent 648b7894df
commit 9e0d5ed6f8
28 changed files with 29 additions and 29 deletions
--- a/tools/api/commands/account_configuration_populate_user
+++ b/tools/api/commands/account_configuration_populate_user
@@ -20,5 +20,5 @@ jq -n \
  |.primary_account_user_name = $username
  |.request_type = $request_type
  '|\
-   curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+   curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-

--- a/tools/api/commands/activation_lock_bypass_code
+++ b/tools/api/commands/activation_lock_bypass_code
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/available_os_updates
+++ b/tools/api/commands/available_os_updates
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/certificate_list
+++ b/tools/api/commands/certificate_list
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/device_configured
+++ b/tools/api/commands/device_configured
@@ -8,4 +8,4 @@ jq -n \
 '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/device_information
+++ b/tools/api/commands/device_information
@@ -9,4 +9,4 @@ jq -n \
  |.request_type = $request_type
  |.queries = ($query_strings | split(","))
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/device_lock
+++ b/tools/api/commands/device_lock
@@ -9,4 +9,4 @@ jq -n \
  |.pin = $pin 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/disable_remote_desktop
+++ b/tools/api/commands/disable_remote_desktop
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/enable_remote_desktop
+++ b/tools/api/commands/enable_remote_desktop
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/erase_device
+++ b/tools/api/commands/erase_device
@@ -9,4 +9,4 @@ jq -n \
  |.pin = $pin 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/install_application
+++ b/tools/api/commands/install_application
@@ -11,4 +11,4 @@ jq -n \
  '|\
  curl $CURL_OPTS \
    -H "Content-Type: application/json" \
-    -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+    -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/install_appstore_application
+++ b/tools/api/commands/install_appstore_application
@@ -11,4 +11,4 @@ jq -n \
  '|\
  curl $CURL_OPTS \
    -H "Content-Type: application/json" \
-    -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+    -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/install_enterprise_application
+++ b/tools/api/commands/install_enterprise_application
@@ -11,4 +11,4 @@ jq -n \
  '|\
  curl $CURL_OPTS \
    -H "Content-Type: application/json" \
-    -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+    -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/install_profile
+++ b/tools/api/commands/install_profile
@@ -9,4 +9,4 @@ jq -n \
  |.payload = $payload 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/install_provisioning_profile
+++ b/tools/api/commands/install_provisioning_profile
@@ -9,4 +9,4 @@ jq -n \
  |.provisioning_profile = $provisioning_profile
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/installed_application_list
+++ b/tools/api/commands/installed_application_list
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/os_update_status
+++ b/tools/api/commands/os_update_status
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/profile_list
+++ b/tools/api/commands/profile_list
@@ -9,4 +9,4 @@ jq -n \
  '|\
  curl $CURL_OPTS \
    -H "Content-Type: application/json" \
-    -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+    -K <(cat <<< "-u \"micromdm:$API_TOKEN\"") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/provisioning_profile_list
+++ b/tools/api/commands/provisioning_profile_list
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/remove_profile
+++ b/tools/api/commands/remove_profile
@@ -4,9 +4,9 @@ endpoint="v1/commands"
 jq -n \
  --arg request_type "RemoveProfile" \
  --arg udid "$1" \
-  --arg identifier $2 \
+  --arg identifier "$2" \
  '.udid = $udid
  |.identifier = $identifier
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/remove_provisioning_profile
+++ b/tools/api/commands/remove_provisioning_profile
@@ -9,4 +9,4 @@ jq -n \
  |.uuid = $uuid
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/restart_device
+++ b/tools/api/commands/restart_device
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/schedule_os_update
+++ b/tools/api/commands/schedule_os_update
@@ -13,4 +13,4 @@ jq -n \
      |.install_action = $install_action
      ]
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/schedule_os_update_scan
+++ b/tools/api/commands/schedule_os_update_scan
@@ -9,4 +9,4 @@ jq -n \
  |.request_type = $request_type
  |.force = $force
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/security_info
+++ b/tools/api/commands/security_info
@@ -7,4 +7,4 @@ jq -n \
  '.udid = $udid 
  |.request_type = $request_type
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/set_bootstrap_token
+++ b/tools/api/commands/set_bootstrap_token
@@ -9,4 +9,4 @@ jq -n \
  |.request_type = $request_type
  |.bootstrap_token = $token
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/commands/settings_application_configuration
+++ b/tools/api/commands/settings_application_configuration
@@ -30,4 +30,4 @@ jq -n \
  |.settings[0].identifier = $identifier
  |.settings[0].configuration = $payload
  '|\
-  curl $CURL_OPTS -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint" -d@-
+  curl $CURL_OPTS -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint" -d@-
--- a/tools/api/get_devices
+++ b/tools/api/get_devices
@@ -1,4 +1,4 @@
 #!/bin/bash
 source $MICROMDM_ENV_PATH
 endpoint="v1/devices"
-curl $CURL_OPTS -X POST --data-binary {} -s -u "micromdm:$API_TOKEN" "$SERVER_URL/$endpoint"
+curl $CURL_OPTS -X POST --data-binary {} -s -K <(cat <<< "-u micromdm:$API_TOKEN") "$SERVER_URL/$endpoint"