modified: README.md

modified:   patch.py

.github/workflows/mikrotik_patch_7.yml

@@ -235,7 +235,7 @@ jobs:
     - name: Patch mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
       if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       run: |
-        sudo apt-get install -y mkisofs xorriso > /dev/null
+        sudo apt-get install -y build-essential binutils-arm-linux-gnueabi mkisofs xorriso > /dev/null
         sudo mkdir ./iso 
         sudo mount -o loop,ro mikrotik.iso ./iso
         sudo mkdir ./new_iso
@@ -711,6 +711,20 @@ jobs:
     - name: Upload Files
       if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
       run: |
+        sudo apt-get install -y knockd lftp > /dev/null
+        knock -4  ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }} 
+        echo "Knocking on server..."
+        for i in 1 2 3; do
+          if knock -4  ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }} ; then
+            echo "Knock successful"
+            break
+          else
+            echo "Knock attempt $i failed, retrying..."
+            sleep 2
+          fi
+        done
+        echo "Waiting for firewall to open SSH port..."
+        sleep 3
         sudo chown -R root:root ./publish/
         LOCAL_PATH=./publish/$LATEST_VERSION
         REMOTE_PATH=${{ secrets.SSH_DIRECTORY }}
@@ -792,7 +806,7 @@ jobs:
           
     - name: Upload Files as Artifact (No Release)
       if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'false'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}
         path: |

README.md

@@ -3,7 +3,6 @@
 
 ### 感谢赞助
 [![DigitalOcean Referral Badge](https://web-platforms.sfo2.cdn.digitaloceanspaces.com/WWW/Badge%201.svg)](https://www.digitalocean.com/?refcode=dbf6ed365068&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge)
-
 [DartNode(aff)](https://dartnode.com?aff=SnazzyLobster067)  | [ZMTO(aff)](https://console.zmto.com/?affid=1588) | [Vultr(aff)](https://www.vultr.com/?ref=9807160-9J)
 
 # MikroTik RouterOS Patch  [[English](README_EN.md)]
@@ -63,7 +62,7 @@ graph TD
 ### patch.py
     替换公钥并签名
     
-## 所有的修补操作都自动运行在[Github Action](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/)。
+[![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
 
 
 

patch.py

@@ -321,46 +321,79 @@ def patch_loader(loader_file):
         print("loader module import failed. cannot run patch_loader.py")
         
 def patch_squashfs(path,key_dict):
-    for root, dirs, files in os.walk(path):
+    url_replacements = {
-        for _file in files:
+        os.environ.get('MIKRO_LICENCE_URL', '').encode(): os.environ.get('CUSTOM_LICENCE_URL', '').encode(),
-            file = os.path.join(root,_file)
+        os.environ.get('MIKRO_UPGRADE_URL', '').encode(): os.environ.get('CUSTOM_UPGRADE_URL', '').encode(),
-            if os.path.isfile(file):
+        os.environ.get('MIKRO_CLOUD_URL', '').encode(): os.environ.get('CUSTOM_CLOUD_URL', '').encode(),
-                if _file =='loader':
+        os.environ.get('MIKRO_CLOUD_PUBLIC_KEY', '').encode(): os.environ.get('CUSTOM_CLOUD_PUBLIC_KEY', '').encode(),
-                    patch_loader(file)
+    }
-                    continue
+    url_replacements = {k: v for k, v in url_replacements.items() if k and v}
-                if _file =='BOOTX64.EFI':
+    renew_replacements = {
-                    print(f'patch {file} ...')
+        os.environ.get('MIKRO_RENEW_URL', '').encode(): os.environ.get('CUSTOM_RENEW_URL', '').encode(),
-                    data = open(file,'rb').read()
+    }
-                    data = patch_kernel(data,key_dict)
+    renew_replacements = {k: v for k, v in renew_replacements.items() if k and v}
-                    open(file,'wb').write(data)
-                    continue
-                data = open(file,'rb').read()
-                for old_public_key,new_public_key in key_dict.items():
-                    _data = replace_key(old_public_key,new_public_key,data,file)
-                    if _data != data:
-                        open(file,'wb').write(_data)
-                url_dict = {
-                    os.environ['MIKRO_LICENCE_URL'].encode():os.environ['CUSTOM_LICENCE_URL'].encode(),
-                    os.environ['MIKRO_UPGRADE_URL'].encode():os.environ['CUSTOM_UPGRADE_URL'].encode(),
-                    os.environ['MIKRO_CLOUD_URL'].encode():os.environ['CUSTOM_CLOUD_URL'].encode(),
-                    os.environ['MIKRO_CLOUD_PUBLIC_KEY'].encode():os.environ['CUSTOM_CLOUD_PUBLIC_KEY'].encode(),
-                }
-                data = open(file,'rb').read()
-                for old_url,new_url in url_dict.items():
-                    if old_url in data:
-                        print(f'{file} url patched {old_url.decode()[:7]}...')
-                        data = data.replace(old_url,new_url)
-                        open(file,'wb').write(data)
 
-                if os.path.split(file)[1] == 'licupgr':
+    for root, dirs, files in os.walk(path):
-                    url_dict = {
+        if 'mode' in files and 'keyman' in files:
-                        os.environ['MIKRO_RENEW_URL'].encode():os.environ['CUSTOM_RENEW_URL'].encode(),
+            for file_path in [os.path.join(root, 'mode'),os.path.join(root, 'keyman')]:
-                    }
+                with open(file_path, 'rb') as f:
-                    for old_url,new_url in url_dict.items():
+                    data = f.read()
-                        if old_url in data:
+                modified = False
-                            print(f'{file} url patched {old_url.decode()[:7]}...')
+                for old_public_key,new_public_key in key_dict.items():
-                            data = data.replace(old_url,new_url)
+                    new_data  = replace_key(old_public_key,new_public_key,data,file_path)
-                            open(file,'wb').write(data)
+                    if new_data != data:
+                        data = new_data
+                        modified = True
+                assert modified, f'{file_path} key not patched'
+                with open(f'{file_path}_', 'wb') as f:
+                    f.write(data)
+        if 'loader' in files and os.path.isfile(os.path.join(root, 'loader')):
+            loader_file = os.path.join(root, 'loader')
+            patch_loader(loader_file)
+
+        if 'BOOTX64.EFI' in files and os.path.isfile(os.path.join(root, 'BOOTX64.EFI')):
+            efi_file = os.path.join(root, 'BOOTX64.EFI')
+            with open(efi_file, 'rb') as f:
+                data = f.read()
+            new_data = patch_kernel(data,key_dict)
+            assert new_data != data, f'{file_path} key not patched'
+            with open(efi_file, 'wb') as f:
+                f.write(new_data)
+
+
+        for filename in files:
+            if filename in ['mode','keyman','loader','BOOTX64.EFI']:
+                continue
+            file_path  = os.path.join(root,filename)
+            if not os.path.isfile(file_path):
+                continue
+  
+            modified = False
+            with open(file_path, 'rb') as f:
+                data = f.read()
+
+            for old_public_key,new_public_key in key_dict.items():
+                new_data  = replace_key(old_public_key,new_public_key,data,file_path)
+                if new_data != data:
+                    data = new_data
+                    modified = True
+
+            for old_url,new_url in url_replacements.items():
+                if old_url in data:
+                    print(f'{file_path} url patched {old_url.decode()[:7]}...')
+                    data = data.replace(old_url,new_url)
+                    modified = True
+                    
+            if filename == 'licupgr':
+                for old_url,new_url in renew_replacements.items():
+                    if old_url in data:
+                        print(f'{file_path} url patched {old_url.decode()[:7]}...')
+                        data = data.replace(old_url,new_url)
+                        modified = True
+
+            if modified:
+                with open(file_path, 'wb') as f:
+                    f.write(data)
                     
 def run_shell_command(command):
     process = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)