bye phar

2025-12-09 22:41:15 -03:00
parent e9856e6bbb
commit 1c946f5b16
6 changed files with 89 additions and 105 deletions
--- a/.gitea/workflows/update_phar.yml
+++ b/.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
--- a/14
+++ b/14
@@ -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
--- a/composer.json
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "aws/aws-sdk-php": "^3.0"
+    }
+}
--- a/public/manage_ddns.php
+++ b/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>
--- a/public/update.php
+++ b/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;
--- a/vendor/aws.phar
+++ b/vendor/aws.phar