Add support for "unique_client_id"

Author: rishabhc32

.github/workflows/tests.yml

@@ -24,5 +24,6 @@ jobs:
         organization: ${{ secrets.CLOUDFLARE_ACCESS_ORGANIZATION }}
         auth_client_id: ${{ secrets.CLOUDFLARE_ACCESS_CLIENT_ID }}
         auth_client_secret: ${{ secrets.CLOUDFLARE_ACCESS_CLIENT_SECRET }}
+        unique_client_id: 1a9472c0-ada8-42d1-888b-c5b0750a42f0
         configure_docker_dns: true
     - run: curl -I https://www.google.com

action.yml

@@ -15,6 +15,9 @@ inputs:
   configure_docker_dns:
     description: 'Configure Docker to use Cloudflare WARP for DNS resolution'
     default: 'false'
+  unique_client_id:
+    description: 'A unique identifier for the client device'
+    required: false
 runs:
   using: 'node20'
   main: 'dist/index.js'

lib/setup-cloudflare-warp.js

@@ -9,6 +9,25 @@ const backoffOptions = {
   maxDelay: 4000,
 };
 
+function jsonToXml(config) {
+  let xml = '';
+  
+  for (const [key, value] of Object.entries(config)) {
+    // Skip null, undefined values and empty strings
+    if (value === undefined || value === null || value === '') continue;    
+
+    if (typeof value === 'boolean') {
+      xml += `<key>${key}</key>\n<${value} />\n`;
+    } else if (typeof value === 'number') {
+      xml += `<key>${key}</key>\n<integer>${value}</integer>\n`;
+    } else if (typeof value === 'string') {
+      xml += `<key>${key}</key>\n<string>${value}</string>\n`;
+    }
+  }
+  
+  return xml;
+}
+
 async function installLinuxClient(version) {
   const gpgKeyPath = await tc.downloadTool(
     "https://pkg.cloudflareclient.com/pubkey.gpg",
@@ -50,17 +69,22 @@ async function writeLinuxConfiguration(
   organization,
   auth_client_id,
   auth_client_secret,
+  unique_client_id,
 ) {
+  const configObj = {
+    organization,
+    auth_client_id,
+    auth_client_secret,
+    unique_client_id
+  };
+  
+  const xmlContent = jsonToXml(configObj);
   const config = `
-<dict>
-  <key>organization</key>
-  <string>${organization}</string>
-  <key>auth_client_id</key>
-  <string>${auth_client_id}</string>
-  <key>auth_client_secret</key>
-  <string>${auth_client_secret}</string>
-</dict>
+  <dict>
+    ${xmlContent}
+  </dict>
   `;
+
   await exec.exec("sudo mkdir -p /var/lib/cloudflare-warp/");
   fs.writeFileSync("/tmp/mdm.xml", config);
   await exec.exec("sudo mv /tmp/mdm.xml /var/lib/cloudflare-warp/");
@@ -70,27 +94,29 @@ async function writeMacOSConfiguration(
   organization,
   auth_client_id,
   auth_client_secret,
+  unique_client_id,
 ) {
+  const configObj = {
+    enable: true,
+    organization,
+    auth_client_id,
+    auth_client_secret,
+    unique_client_id,
+    service_mode: "warp",
+    auto_connect: 1
+  };
+  
+  const xmlContent = jsonToXml(configObj);
   const config = `
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
   <plist version="1.0">
-  <dict>
-      <key>enable</key>
-      <true />
-      <key>organization</key>
-      <string>${organization}</string>
-      <key>auth_client_id</key>
-      <string>${auth_client_id}</string>
-      <key>auth_client_secret</key>
-      <string>${auth_client_secret}</string>
-      <key>service_mode</key>
-      <string>warp</string>
-      <key>auto_connect</key>
-      <integer>1</integer>
+    <dict>
+      ${xmlContent}
     </dict>
-    </plist>
+  </plist>
   `;
+
   await exec.exec('sudo mkdir -p "/Library/Managed Preferences/"');
   fs.writeFileSync("/tmp/com.cloudflare.warp.plist", config);
   await exec.exec("plutil -convert binary1 /tmp/com.cloudflare.warp.plist");
@@ -103,18 +129,25 @@ async function writeWindowsConfiguration(
   organization,
   auth_client_id,
   auth_client_secret,
+  unique_client_id,
 ) {
+  const configObj = {
+    organization,
+    auth_client_id,
+    auth_client_secret,
+    unique_client_id
+  };
+
+  const xmlContent = jsonToXml(configObj);
   const config = `
-<dict>
-    <key>organization</key>
-    <string>${organization}</string>
-    <key>auth_client_id</key>
-    <string>${auth_client_id}</string>
-    <key>auth_client_secret</key>
-    <string>${auth_client_secret}</string>
-</dict>`;
-  if (!fs.existsSync("C:\\ProgramData\\Cloudflare"))
+  <dict>
+    ${xmlContent}
+  </dict>
+  `;
+  
+  if (!fs.existsSync("C:\\ProgramData\\Cloudflare")) {
     fs.mkdirSync("C:\\ProgramData\\Cloudflare");
+  }
   fs.writeFileSync("C:\\ProgramData\\Cloudflare\\mdm.xml", config);
 }
 
@@ -191,6 +224,9 @@ export async function run() {
   const auth_client_secret = core.getInput("auth_client_secret", {
     required: true,
   });
+  const unique_client_id = core.getInput("unique_client_id", { 
+    required: false 
+  });
   const configure_docker_dns = core.getBooleanInput("configure_docker_dns", {
     required: false,
   });
@@ -204,6 +240,7 @@ export async function run() {
         organization,
         auth_client_id,
         auth_client_secret,
+        unique_client_id,
       );
       await installLinuxClient(version);
       break;
@@ -212,6 +249,7 @@ export async function run() {
         organization,
         auth_client_id,
         auth_client_secret,
+        unique_client_id,
       );
       await installMacOSClient(version);
       break;
@@ -220,6 +258,7 @@ export async function run() {
         organization,
         auth_client_id,
         auth_client_secret,
+        unique_client_id,
       );
       await installWindowsClient(version);
       break;