From e35ba8e94447ae6fb15f03bfcc07c29352c43bd8 Mon Sep 17 00:00:00 2001 From: arm Date: Thu, 4 May 2023 09:49:39 +0700 Subject: [PATCH] add http secure aware --- .env.example | 2 ++ Dockerfile | 4 ++-- app/Http/Kernel.php | 1 + app/Http/Middleware/HttpSecureAware.php | 26 +++++++++++++++++++++++++ docker-compose.yml | 2 +- package-lock.json | 2 +- package.json | 2 +- vite.config.js | 4 ++++ 8 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 app/Http/Middleware/HttpSecureAware.php diff --git a/.env.example b/.env.example index 82ecb51..9be0af6 100644 --- a/.env.example +++ b/.env.example @@ -51,3 +51,5 @@ VITE_PUSHER_HOST="${PUSHER_HOST}" VITE_PUSHER_PORT="${PUSHER_PORT}" VITE_PUSHER_SCHEME="${PUSHER_SCHEME}" VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + +HTTP_SECURE=true diff --git a/Dockerfile b/Dockerfile index a5afe17..d331df0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,8 +32,8 @@ RUN apt-get update && apt-get dist-upgrade -y && \ # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* -# Install PHP extensions -RUN docker-php-ext-install pdo mysqli pdo_mysql mbstring exif pcntl bcmath gd intl zip pgsql pdo_pgsql curl xml +# Install PHP extensions - pdo mysqli pdo_mysql pgsql pdo_pgsql +RUN docker-php-ext-install mbstring exif pcntl bcmath gd intl zip curl xml # Get latest Composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 19f3e7f..97cf87b 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -21,6 +21,7 @@ class Kernel extends HttpKernel \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, + \App\Http\Middleware\HttpSecureAware::class, ]; /** diff --git a/app/Http/Middleware/HttpSecureAware.php b/app/Http/Middleware/HttpSecureAware.php new file mode 100644 index 0000000..dc9acac --- /dev/null +++ b/app/Http/Middleware/HttpSecureAware.php @@ -0,0 +1,26 @@ +server->set('HTTPS', 'on'); + } + + return $next($request); + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c40e656..d2b0437 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: - "/etc/localtime:/etc/localtime:ro" mem_limit: 512m mem_reservation: 128M - cpus: 0.5 + # cpus: 0.5 networks: - simplepos nginx: diff --git a/package-lock.json b/package-lock.json index 9ef15f3..5059920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "simple-pos", + "name": "laravel-simplepos", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index f89f1cd..9c1eaae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "scripts": { - "dev": "vite --host 0.0.0.0", + "dev": "vite", "build": "vite build" }, "devDependencies": { diff --git a/vite.config.js b/vite.config.js index 24f3573..f7de5cf 100644 --- a/vite.config.js +++ b/vite.config.js @@ -10,4 +10,8 @@ export default defineConfig({ }), react(), ], + server: { + host: '0.0.0.0', + port: 5173 + } });