refactor: enhance CORS and Gzip middleware header handling, improve Comment model structure, and update Dockerfile permissions

Author: dewanakl

app/Middleware/CorsMiddleware.php

@@ -15,9 +15,15 @@ public function handle(Request $request, Closure $next)
         $header->set('Access-Control-Allow-Origin', '*');
         $header->set('Access-Control-Expose-Headers', 'Content-Length, Content-Disposition');
 
-        $vary = $header->has('Vary') ? explode(', ', $header->get('Vary')) : [];
-        $vary = array_unique([...$vary, 'Accept', 'Access-Control-Request-Method', 'Access-Control-Request-Headers', 'Origin']);
-        $header->set('Vary', join(', ', $vary));
+        $varyList = ['Accept', 'Access-Control-Request-Method', 'Access-Control-Request-Headers', 'Origin'];
+
+        if ($header->has('Vary')) {
+            $existing = preg_split('/\s*,\s*/', $header->get('Vary'), -1, PREG_SPLIT_NO_EMPTY);
+            $varyList = array_merge($existing, $varyList);
+        }
+
+        $varyList = array_unique(array_map('trim', $varyList));
+        $header->set('Vary', implode(', ', $varyList));
 
         if (!$request->method(Request::OPTIONS)) {
             return $next($request);

app/Middleware/GzipMiddleware.php

@@ -40,12 +40,17 @@ public function handle(Request $request, Closure $next): Stream|Respond
 
         $response->setContent($compressed);
 
-        $vary = (!$response->headers->has('Vary')) ? [] : explode(', ', $response->headers->get('Vary'));
-        $vary = array_unique([...$vary, 'Accept-Encoding']);
+        $varyList = ['Accept-Encoding'];
 
-        $response->headers
-            ->set('Vary', join(', ', $vary))
-            ->set('Content-Encoding', 'gzip');
+        if ($response->headers->has('Vary')) {
+            $existing = preg_split('/\s*,\s*/', $response->headers->get('Vary'), -1, PREG_SPLIT_NO_EMPTY);
+            $varyList = array_merge($existing, $varyList);
+        }
+
+        $varyList = array_unique(array_map('trim', $varyList));
+        $response->headers->set('Vary', implode(', ', $varyList));
+
+        $response->headers->set('Content-Encoding', 'gzip');
 
         return $response;
     }

app/Models/Comment.php

@@ -3,8 +3,6 @@
 namespace App\Models;
 
 use Core\Model\Model;
-use Core\Model\Query;
-use Core\Model\Relational;
 
 final class Comment extends Model
 {
@@ -29,28 +27,4 @@ final class Comment extends Model
         'is_admin' => 'bool',
         'created_at' => 'datetime:diff'
     ];
-
-    public function comments(): Relational
-    {
-        return $this->hasMany(
-            Comment::class,
-            'parent_id',
-            'uuid',
-            function (Query $query): Query {
-                return $query->select(['uuid', 'name', 'presence', 'comment', 'is_admin', 'gif_url', 'created_at', ...(auth()->user()->isAdmin() ? ['ip', 'own', 'user_agent'] : [])])->orderBy('id');
-            }
-        )->as('comments')->with($this->likes())->recursive();
-    }
-
-    public function likes(): Relational
-    {
-        return $this->belongsTo(
-            Like::class,
-            'uuid',
-            'comment_id',
-            function (Query $query): Query {
-                return $query->count('uuid', 'love');
-            }
-        )->as('like');
-    }
 }

docker/nginx/default.conf

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name localhost;
+    server_name localhost 127.0.0.1;
     index index.php;
 
     error_log  /var/log/nginx/error.log;
@@ -9,11 +9,11 @@ server {
     root /var/www/public;
 
     charset utf-8;
- 
+
     location / {
         try_files $uri $uri/ /index.php?$query_string;
     }
- 
+
     error_page 404 /index.php;
 
     location ~ \.php$ {

docker/php/Dockerfile

@@ -6,8 +6,8 @@ RUN apt-get install -y libzip-dev libpq-dev
 RUN apt-get install -y build-essential libssl-dev zlib1g-dev
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install pdo zip pdo_pgsql pgsql opcache
-RUN docker-php-ext-enable pdo zip pdo_pgsql pgsql opcache
+RUN docker-php-ext-install pdo zip pdo_pgsql pgsql opcache intl bcmath mbstring
+RUN docker-php-ext-enable pdo zip pdo_pgsql pgsql opcache intl bcmath mbstring
 
 COPY /api/php.ini /usr/local/etc/php/conf.d/opcache.ini
 
@@ -16,11 +16,16 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 COPY . /var/www
 WORKDIR /var/www
 
-RUN chmod 777 -R /var/www/cache
+RUN chown -R www-data:www-data /var/www && \
+    chmod -R 755 /var/www && \
+    chmod -R 777 /var/www/cache
+
 RUN composer install --prefer-dist --no-dev --optimize-autoloader --no-interaction
 
 RUN php saya key
 RUN php saya view:cache
 
+USER www-data
+
 EXPOSE 9000
 CMD ["php-fpm"]

public/.htaccess

@@ -14,8 +14,11 @@
     RewriteCond %{REQUEST_URI} (.+)/$
     RewriteRule ^ %1 [L,R=301]
 
+    # Prevent directory listing
+    Options -Indexes
+
     # Send Requests To Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.+)$ index.php/$1 [L]
-</IfModule>
+    RewriteRule ^ index.php [L]
+</IfModule>