added retry to file downloads

since I kinda erased tht's implementation while working on the new way to download files
Soviet-Linux · Jul 24, 2024 · 79eabea · 79eabea
1 parent 55658fa
commit 79eabea
Showing 1 changed file with 59 additions and 27 deletions.
diff --git a/src/make.c b/src/make.c
@@ -46,6 +46,9 @@ int make(char* package_dir, struct package* pkg) {
     // Parse the files
     for (int i = 0; i < pkg->filesCount; i++)
     {
+        int download_attempts = 3;
+        int download_success = 0;
+
         struct stat st_source = {0};
         struct stat st_source_loc = {0};
 
@@ -81,44 +84,73 @@ int make(char* package_dir, struct package* pkg) {
             // Check if the checksum shall be bypassed
             if (!INSECURE)
             {
-                // Check the hash, abort if mismatch
-                unsigned char hash[SHA256_DIGEST_LENGTH];
-                char* hash_str = calloc(SHA256_DIGEST_LENGTH, 8);
+                do
+                {
+                    // Check the hash, abort if mismatch
+                    unsigned char hash[SHA256_DIGEST_LENGTH];
+                    char* hash_str = calloc(SHA256_DIGEST_LENGTH, 8);
 
-                struct stat st;
-                stat(location, &st);
-                int size = st.st_size;
+                    struct stat st;
+                    stat(location, &st);
+                    int size = st.st_size;
 
-                char* buffer = malloc(size);
-                FILE *ptr;
-                ptr = fopen(location,"r"); 
-                fread(buffer, sizeof(char), size, ptr); 
+                    char* buffer = malloc(size);
+                    FILE *ptr;
+                    ptr = fopen(location,"r"); 
+                    fread(buffer, sizeof(char), size, ptr); 
+                    fclose(ptr);
 
-                if (!(buffer == NULL))
-                {
-                    SHA256(buffer, size, hash);
+                    if (!(buffer == NULL))
+                    {
+                        SHA256(buffer, size, hash);
+                        free(buffer);
 
-                    if (!((hash == NULL) || (hash[0] == '\0')))
+                        if (!((hash == NULL) || (hash[0] == '\0')))
+                        {
+                            dbg(1, "Hash is %s", file_sha256);
+                            for(int k = 0; k < SHA256_DIGEST_LENGTH; k++)
+                            {
+                                char* temp = calloc(8, 1);
+                                sprintf(temp, "%02x", hash[k]);
+                                strcat(hash_str, temp);
+                                free(temp);
+                            }
+
+                            dbg(1, "Got %s", hash_str);
+                            if(strcmp(hash_str, file_sha256) != 0)
+                            {
+                                free(hash_str);
+
+                                if(download_attempts == 0)
+                                {
+                                    msg(FATAL, "Hash mismatch, aborting");
+                                }
+                                else
+                                {
+                                    msg(WARNING, "Hash mismatch, retrying...");
+                                    --download_attempts;
+                                }
+                            }
+                            else
+                            {
+                                download_success = 1;
+                            }
+                        }
+                    }
+                    else
                     {
-                        dbg(1, "Hash is %s", file_sha256);
-                        for(int k = 0; k < SHA256_DIGEST_LENGTH; k++)
+                        if(download_attempts == 0)
                         {
-                            char* temp = calloc(8, 1);
-                            sprintf(temp, "%02x", hash[k]);
-                            strcat(hash_str, temp);
+                            msg(FATAL, "Could not download file, aborting");
                         }
-
-                        dbg(1, "Got %s", hash_str);
-                        if(strcmp(hash_str, file_sha256) != 0)
+                        else
                         {
-                            msg(FATAL, "Hash mismatch, aborting");
+                            msg(WARNING, "Could not download file, retrying...");
+                            --download_attempts;
                         }
                     }
                 }
-                else
-                {
-                    msg(FATAL, "Could not verify the file's hash");
-                }
+                while (download_success != 1);
             } 
             else 
             {