Update manifest version to 6.0.3 [▶️]

.gitea/workflows/release_build.yml

@@ -6,7 +6,7 @@ on:
       - main
   workflow_dispatch:
   schedule:
-    - cron: '28 5 * * *'
+    - cron: "28 5 * * *"
   # workflow_run support in Gitea can be tricky, keeping it but might need adjustment
   workflow_run:
     workflows: ["Sync Repo"]
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
-    
+
     permissions:
       contents: write
       packages: write
@@ -80,15 +80,11 @@ jobs:
                echo "Repo URL not found in Dockerargs."
                echo "upstream_needs_update=false" >> "$GITHUB_OUTPUT"
                echo "build_args=" >> "$GITHUB_OUTPUT"
-               echo "repo_url=" >> "$GITHUB_OUTPUT"
-               echo "repo_branch=" >> "$GITHUB_OUTPUT"
             fi
           else
             echo "No Dockerargs found."
             echo "upstream_needs_update=false" >> "$GITHUB_OUTPUT"
             echo "build_args=" >> "$GITHUB_OUTPUT"
-            echo "repo_url=" >> "$GITHUB_OUTPUT"
-            echo "repo_branch=" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Check if any tags exist
@@ -143,7 +139,7 @@ jobs:
           LATEST_RELEASE_TAG=$(curl -sL -H "Accept: application/json" \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/latest" | jq -r .tag_name)
-          
+
           if [ -z "$LATEST_RELEASE_TAG" ] || [ "$LATEST_RELEASE_TAG" = "null" ]; then
             LATEST_RELEASE_TAG="v1.0.0"
           fi
@@ -249,7 +245,7 @@ jobs:
           AUTHOR="Ivan Carlos"
           VERSION_FILE="manifest.json"
           UPSTREAM_SHA="${{ steps.check_upstream.outputs.upstream_sha }}"
-          
+
           if [ -f "$VERSION_FILE" ]; then
              jq --arg v "$VERSION" \
                 --arg a "$AUTHOR" \
@@ -269,6 +265,11 @@ jobs:
           git commit -m "Update manifest version to ${{ steps.version.outputs.VERSION }} [▶️]" || echo "Nothing to commit"
           git push origin main
 
+      - name: 🛠 Install zip
+        if: steps.check_commits.outputs.commit_count != '0'
+        run: |
+          apt-get update && apt-get install -y zip
+
       - name: 📦 Create ZIP package (excluding certain files)
         if: steps.check_commits.outputs.commit_count != '0'
         run: |
@@ -283,11 +284,11 @@ jobs:
         run: |
           TAG_NAME="v${{ steps.version.outputs.VERSION }}"
           RELEASE_NAME="${{ steps.version.outputs.REPO_NAME }} v${{ steps.version.outputs.VERSION }}"
-          
+
           # Construct Markdown body safely using env var
           # We use printf to avoid interpreting backslashes in the file list
           BODY=$(printf "### Changelog\nFiles changed in this release:\n%s" "$CHANGELOG_LIST")
-          
+
           # Create JSON payload using jq
           jq -n \
             --arg tag_name "$TAG_NAME" \
@@ -303,13 +304,13 @@ jobs:
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Content-Type: application/json" \
             -d @release_payload.json > api_response.json
-          
+
           echo "DEBUG: API Response:"
           cat api_response.json || true
-          
+
           RELEASE_ID=$(jq -r .id api_response.json)
           echo "RELEASE_ID=$RELEASE_ID" >> "$GITHUB_OUTPUT"
-          
+
           if [ "$RELEASE_ID" == "null" ] || [ -z "$RELEASE_ID" ]; then
             echo "Failed to create release. Response content:"
             cat api_response.json
@@ -322,19 +323,18 @@ jobs:
           RELEASE_ID="${{ steps.create_release.outputs.RELEASE_ID }}"
           ZIP_NAME="${{ steps.version.outputs.ZIP_NAME }}"
           FILE_PATH="./$ZIP_NAME"
-          
-          curl -s -X POST "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets" \
+
+          curl --fail -s -X POST "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets?name=$ZIP_NAME" \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Content-Type: application/zip" \
-            --data-binary @"$FILE_PATH" \
-            -o /dev/null
+            --data-binary @"$FILE_PATH"
 
       # ----- Docker steps -----
       - name: Clone Upstream Code (if needed)
         if: steps.check_commits.outputs.commit_count != '0' && (steps.check_upstream.outputs.upstream_needs_update == 'true' || steps.check_upstream.outputs.repo_url != '')
         run: |
-           rm -rf upstream_src
-           git clone --depth 1 --branch ${{ steps.check_upstream.outputs.repo_branch }} ${{ steps.check_upstream.outputs.repo_url }} upstream_src
+          rm -rf upstream_src
+          git clone --depth 1 --branch ${{ steps.check_upstream.outputs.repo_branch }} ${{ steps.check_upstream.outputs.repo_url }} upstream_src
 
       - name: 🔍 Check if Dockerfile exists
         if: steps.check_commits.outputs.commit_count != '0' || steps.check_upstream.outputs.upstream_needs_update == 'true'

.gitea/workflows/update_phar.yml

@@ -1,45 +0,0 @@
-name: Update AWS SDK PHAR
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '34 3 * * *'  # 03:34 UTC == 00:34 BRT
-
-permissions:
-  contents: write
-
-jobs:
-  download-aws-sdk:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    permissions:
-      contents: write
-      actions: write  # needed to dispatch another workflow
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download AWS SDK PHAR
-        run: |
-          mkdir -p vendor
-          wget https://github.com/aws/aws-sdk-php/releases/latest/download/aws.phar -O vendor/aws.phar
-
-      - name: Commit and push changes
-        id: commit_step
-        run: |
-          git config --global --add safe.directory '*'
-          git config user.name "Gitea Actions"
-          git config user.email "actions@git.icc.gg"
-          git add vendor/aws.phar
-
-          # If there are changes, commit & push; set output flag accordingly
-          if git diff --quiet && git diff --staged --quiet; then
-            echo "No changes to commit"
-            echo "changes_committed=false" >> $GITHUB_OUTPUT
-          else
-            git commit -m "Update AWS SDK PHAR [▶️]"
-            git push origin HEAD:main
-            echo "changes_committed=true" >> $GITHUB_OUTPUT
-          fi

.gitea/workflows/update_readme.yml

@@ -0,0 +1,60 @@
+name: Update README
+
+# Allow Gitea Actions to commit and push changes
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 4 * * *" # Every day at 4 AM UTC
+
+jobs:
+  update-readme:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+
+    env:
+      SOURCE_REPO: ivancarlos/.gitea
+      SOURCE_BRANCH: main
+
+    steps:
+      - name: Checkout current repository
+        uses: actions/checkout@v4
+
+      - name: Checkout source README template
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ env.SOURCE_REPO }}
+          ref: ${{ env.SOURCE_BRANCH }}
+          token: ${{ secrets.CR_PAT }}
+          path: source_readme
+
+      - name: Update README.md (footer only)
+        run: |
+          set -e
+
+          # --- Extract footer block from source (everything from <!-- footer --> onward) ---
+          FOOTER=$(awk '/<!-- footer -->/{flag=1}flag' source_readme/README.md)
+
+          # --- Replace everything after <!-- footer --> with FOOTER ---
+          awk -v footer="$FOOTER" '
+            /<!-- footer -->/ {
+              print footer
+              found=1
+              exit
+            }
+            { print }
+          ' README.md > README.tmp && mv README.tmp README.md
+
+      - name: Remove source_readme from git index
+        run: rm -rf source_readme
+
+      - name: Commit and push changes
+        run: |
+          git config user.name "Gitea Actions"
+          git config user.email "actions@git.icc.gg"
+          git add README.md
+          git commit -m "Sync README from template [▶️]" || echo "Nothing to commit"
+          git push origin ${{ github.ref_name }}

Dockerfile

@@ -1,11 +1,21 @@
 FROM php:8.4-fpm-alpine
 
 # Install Nginx and MariaDB client; install PHP extensions (mysqli) and clean up
-RUN apk add --no-cache --update nginx \
+RUN apk add --no-cache --update nginx git unzip \
   && docker-php-ext-install mysqli \
   && rm -rf /var/cache/apk/* /tmp/*
 
-# Copy your application code
+# Install Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Copy only composer files first to leverage Docker cache
+COPY composer.json /var/www/html/
+
+# Increase timeout and install dependencies
+ENV COMPOSER_PROCESS_TIMEOUT=2000
+RUN composer install --no-dev --optimize-autoloader
+
+# Copy the rest of the application code
 COPY . /var/www/html/
 
 # Create nginx.conf directly in the Docker build

README.md

@@ -17,6 +17,7 @@ Router friendly client to update AWS Route53 entries for Dynamic DNS funtionalit
 ## Requirement:
 
 * [Docker Compose](https://docs.docker.com/engine/install/)
+* Domain zone on AWS Route 53
 * MySQL/MariaDB
 * Keycloak for SSO
 
@@ -84,18 +85,8 @@ Example: `https://[FQDN]:[PASSWORD]@subdomain.example.com/update.php?hostname=[F
 TP-Link Omada Update URL:
 * `https://[USERNAME]:[PASSWORD]@subdomain.example.com/update.php?hostname=[DOMAIN]&myip=[IP]`
 
-## To Do:
-
-* HTML beautification
-* Build releases using Compose to populate AWS SDK dinamically
-
-## Hosting note:
-
-Using PHP with the Suhosin patch is not recommended, but is common on some Ubuntu and Debian distributions. To modify `suhosin.ini`, add the following line.
-
-```
-suhosin.executor.include.whitelist = phar
-```
+Unifi Cloud Gateway custom server:
+* `subdomain.example.com/update.php?hostname=%h&myip=%i`
 
 <!-- footer -->
 ---

composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "aws/aws-sdk-php": "^3.0"
+    }
+}

manifest.json

@@ -1,4 +1,4 @@
 {
-  "version": "5.0.0",
+  "version": "6.0.3",
   "author": "Ivan Carlos"
 }

public/manage_ddns.php

@@ -6,7 +6,7 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
 }
 
 include '../dbconfig.php';
-require '../vendor/aws.phar';
+require '../vendor/autoload.php';
 
 use Aws\Route53\Route53Client;
 use Aws\Exception\AwsException;
@@ -40,10 +40,10 @@ if ($aws_result = $link->query($aws_sql)) {
 // Initialize the Route53 client
 try {
     $route53 = new Route53Client([
-        'version'     => 'latest',
-        'region'      => $region,
+        'version' => 'latest',
+        'region' => $region,
         'credentials' => [
-            'key'    => $access_key_id,
+            'key' => $access_key_id,
             'secret' => $secret_access_key,
         ],
     ]);
@@ -86,7 +86,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['add_ddns'])) {
                                 'ResourceRecordSet' => [
                                     'Name' => $ddns_fqdn . '.',
                                     'Type' => 'A',
-                                    'TTL'  => (int)$ttl,
+                                    'TTL' => (int) $ttl,
                                     'ResourceRecords' => [
                                         [
                                             'Value' => $initial_ip,
@@ -101,7 +101,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['add_ddns'])) {
                         // Create the DNS record in Route53
                         $result = $route53->changeResourceRecordSets([
                             'HostedZoneId' => $hosted_zone_id,
-                            'ChangeBatch'  => $changeBatch,
+                            'ChangeBatch' => $changeBatch,
                         ]);
 
                         // Insert the new DDNS entry into the database
@@ -168,7 +168,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['update_ip'])) {
                         'ResourceRecordSet' => [
                             'Name' => $ddns_fqdn . '.',
                             'Type' => 'A',
-                            'TTL'  => (int)$new_ttl,
+                            'TTL' => (int) $new_ttl,
                             'ResourceRecords' => [
                                 [
                                     'Value' => $new_ip,
@@ -183,7 +183,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['update_ip'])) {
                 // Update the DNS record in Route53
                 $result = $route53->changeResourceRecordSets([
                     'HostedZoneId' => $hosted_zone_id,
-                    'ChangeBatch'  => $changeBatch,
+                    'ChangeBatch' => $changeBatch,
                 ]);
 
                 // Update the IP and TTL in the database
@@ -237,7 +237,7 @@ if (isset($_GET['delete'])) {
                     'ResourceRecordSet' => [
                         'Name' => $ddns_fqdn . '.',
                         'Type' => 'A',
-                        'TTL'  => (int)$ttl,
+                        'TTL' => (int) $ttl,
                         'ResourceRecords' => [
                             [
                                 'Value' => $last_ipv4,
@@ -252,7 +252,7 @@ if (isset($_GET['delete'])) {
             // Delete the DNS record in Route53
             $result = $route53->changeResourceRecordSets([
                 'HostedZoneId' => $hosted_zone_id,
-                'ChangeBatch'  => $changeBatch,
+                'ChangeBatch' => $changeBatch,
             ]);
 
             // Delete the DDNS entry from the database
@@ -284,6 +284,7 @@ if ($result = $link->query($sql)) {
 ?>
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -295,29 +296,34 @@ if ($result = $link->query($sql)) {
             cursor: pointer;
             position: relative;
         }
+
         th.sortable:hover {
             background-color: #f0f0f0;
         }
+
         th.sortable::after {
             content: '↕';
             position: absolute;
             right: 8px;
             opacity: 0.3;
         }
+
         th.sortable.asc::after {
             content: '↑';
             opacity: 1;
         }
+
         th.sortable.desc::after {
             content: '↓';
             opacity: 1;
         }
     </style>
 </head>
+
 <body>
     <div class="container">
         <h1>Manage DDNS Entries</h1>
-        
+
         <?php if (isset($error)): ?>
             <div class="alert alert-error"><?php echo htmlspecialchars($error); ?></div>
         <?php endif; ?>
@@ -329,17 +335,18 @@ if ($result = $link->query($sql)) {
             <h2>Add New DDNS Entry</h2>
             <form method="post">
                 <label>DDNS FQDN:</label>
-                <input type="text" name="ddns_fqdn" required placeholder="subdomain.<?php echo htmlspecialchars($approved_fqdn); ?>">
-                
+                <input type="text" name="ddns_fqdn" required
+                    placeholder="subdomain.<?php echo htmlspecialchars($approved_fqdn); ?>">
+
                 <label>DDNS Password:</label>
                 <input type="password" name="ddns_password" required>
-                
+
                 <label>Initial IP:</label>
                 <input type="text" name="initial_ip" required value="<?php echo $_SERVER['REMOTE_ADDR']; ?>">
-                
+
                 <label>TTL (Time to Live):</label>
                 <input type="number" name="ttl" min="1" required value="300">
-                
+
                 <input type="submit" name="add_ddns" value="Add DDNS Entry">
             </form>
         </div>
@@ -347,51 +354,58 @@ if ($result = $link->query($sql)) {
         <div class="card">
             <h2>DDNS Entries</h2>
             <div class="table-responsive">
-            <table id="ddnsTable">
-                <thead>
-                    <tr>
-                        <th class="sortable" data-type="string">FQDN</th>
-                        <th class="sortable" data-type="string">Password</th>
-                        <th class="sortable" data-type="string">Last IPv4</th>
-                        <th class="sortable" data-type="number">TTL</th>
-                        <th class="sortable" data-type="string">Last Update</th>
-                        <th>Update IP/TTL</th>
-                        <th>Logs</th>
-                        <th>Action</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php foreach ($ddns_entries as $entry): ?>
-                    <tr>
-                        <td><?php echo htmlspecialchars($entry['ddns_fqdn']); ?></td>
-                        <td><?php echo htmlspecialchars($entry['ddns_password']); ?></td>
-                        <td><?php echo htmlspecialchars($entry['last_ipv4']); ?></td>
-                        <td><?php echo htmlspecialchars($entry['ttl']); ?></td>
-                        <td><?php echo htmlspecialchars($entry['last_update']); ?></td>
-                        <td>
-                            <form method="post" style="display:inline; max-width: none;">
-                                <input type="hidden" name="ddns_id" value="<?php echo $entry['id']; ?>">
-                                <div class="flex gap-2">
-                                    <input type="text" name="new_ip" placeholder="New IP" required style="width: 120px;">
-                                    <input type="number" name="new_ttl" placeholder="TTL" min="1" required style="width: 80px;">
-                                    <input type="submit" name="update_ip" value="Update" style="padding: 0.5rem;">
-                                </div>
-                            </form>
-                        </td>
-                        <td>
-                            <a href="view_logs.php?ddns_id=<?php echo $entry['id']; ?>" class="btn" style="padding: 0.25rem 0.5rem; font-size: 0.875rem;">Logs</a>
-                        </td>
-                        <td>
-                            <a href="manage_ddns.php?delete=<?php echo $entry['id']; ?>" onclick="return confirm('Are you sure you want to delete this DDNS entry?');" class="btn btn-danger" style="padding: 0.25rem 0.5rem; font-size: 0.875rem;">Delete</a>
-                        </td>
-                    </tr>
-                    <?php endforeach; ?>
-                </tbody>
-            </table>
+                <table id="ddnsTable">
+                    <thead>
+                        <tr>
+                            <th class="sortable" data-type="string">FQDN</th>
+                            <th class="sortable" data-type="string">Password</th>
+                            <th class="sortable" data-type="string">Last IPv4</th>
+                            <th class="sortable" data-type="number">TTL</th>
+                            <th class="sortable" data-type="string">Last Update</th>
+                            <th>Update IP/TTL</th>
+                            <th>Logs</th>
+                            <th>Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach ($ddns_entries as $entry): ?>
+                            <tr>
+                                <td><?php echo htmlspecialchars($entry['ddns_fqdn']); ?></td>
+                                <td><?php echo htmlspecialchars($entry['ddns_password']); ?></td>
+                                <td><?php echo htmlspecialchars($entry['last_ipv4']); ?></td>
+                                <td><?php echo htmlspecialchars($entry['ttl']); ?></td>
+                                <td><?php echo htmlspecialchars($entry['last_update']); ?></td>
+                                <td>
+                                    <form method="post" style="display:inline; max-width: none;">
+                                        <input type="hidden" name="ddns_id" value="<?php echo $entry['id']; ?>">
+                                        <div class="flex gap-2">
+                                            <input type="text" name="new_ip" placeholder="New IP" required
+                                                style="width: 120px;">
+                                            <input type="number" name="new_ttl" placeholder="TTL" min="1" required
+                                                style="width: 80px;">
+                                            <input type="submit" name="update_ip" value="Update" style="padding: 0.5rem;">
+                                        </div>
+                                    </form>
+                                </td>
+                                <td>
+                                    <a href="view_logs.php?ddns_id=<?php echo $entry['id']; ?>" class="btn"
+                                        style="padding: 0.25rem 0.5rem; font-size: 0.875rem;">Logs</a>
+                                </td>
+                                <td>
+                                    <a href="manage_ddns.php?delete=<?php echo $entry['id']; ?>"
+                                        onclick="return confirm('Are you sure you want to delete this DDNS entry?');"
+                                        class="btn btn-danger"
+                                        style="padding: 0.25rem 0.5rem; font-size: 0.875rem;">Delete</a>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                </table>
             </div>
         </div>
 
         <p><a href="dashboard.php">Back to Dashboard</a></p>
     </div>
 </body>
+
 </html>

public/update.php

@@ -1,6 +1,6 @@
 <?php
 include '../dbconfig.php';
-require '../vendor/aws.phar';
+require '../vendor/autoload.php';
 
 use Aws\Route53\Route53Client;
 use Aws\Exception\AwsException;