From f4d97542127420714633f5edb67c43fe5abca165 Mon Sep 17 00:00:00 2001 From: AVMG20 Date: Sat, 5 Jun 2021 18:47:35 +0200 Subject: [PATCH 1/8] fixed hardcoded credit value --- app/Http/Controllers/ProfileController.php | 1 + resources/views/profile/index.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 7fbf6125..e24b5d43 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -23,6 +23,7 @@ class ProfileController extends Controller { return view('profile.index')->with([ 'user' => Auth::user(), + 'credits_reward_after_verify_discord' => Configuration::getValueByKey('CREDITS_REWARD_AFTER_VERIFY_DISCORD'), 'discord_verify_command' => Configuration::getValueByKey('DISCORD_VERIFY_COMMAND') ]); } diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php index 783b20ec..89637997 100644 --- a/resources/views/profile/index.blade.php +++ b/resources/views/profile/index.blade.php @@ -159,7 +159,7 @@ @if(is_null(Auth::user()->discordUser))
-

By verifying your discord account, you receive an extra 375 credits and the Verified role!

+

By verifying your discord account, you receive an extra {{$credits_reward_after_verify_discord}} credits and the Verified role!

From 4f5c4f0d976217ba10ce9f0f141a8ddc4028893e Mon Sep 17 00:00:00 2001 From: AnonDev <85408287+anondev-sudo@users.noreply.github.com> Date: Sat, 5 Jun 2021 19:25:48 +0200 Subject: [PATCH 2/8] Update UserController.php --- app/Http/Controllers/Admin/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index d499e8e2..00922bcf 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -138,7 +138,7 @@ class UserController extends Controller public function reSendVerificationEmail(User $user) { if ($user->hasVerifiedEmail()) - return redirect()->back()->with('error', 'User has already verified there email'); + return redirect()->back()->with('error', 'User has already verified their email'); $user->sendEmailVerificationNotification(); return redirect()->back()->with('success', 'User has been emailed again!'); From f9ce0ac1ea3675c809b217edf320012c6371e510 Mon Sep 17 00:00:00 2001 From: Ramon Robben Date: Sat, 5 Jun 2021 23:09:18 +0200 Subject: [PATCH 3/8] Added docker development environment --- .env.dev | 69 ++++++ BUILDING.md | 16 ++ bin/rebuild.sh | 2 + bin/startdocker.sh | 2 + bin/stopdocker.sh | 1 + docker/docker-compose.yml | 65 ++++++ docker/nginx/Dockerfile | 10 + docker/nginx/default.conf | 20 ++ docker/nginx/nginx.conf | 29 +++ docker/php/Dockerfile | 21 ++ docker/php/www.conf | 439 ++++++++++++++++++++++++++++++++++++++ 11 files changed, 674 insertions(+) create mode 100644 .env.dev create mode 100644 BUILDING.md create mode 100644 bin/rebuild.sh create mode 100644 bin/startdocker.sh create mode 100644 bin/stopdocker.sh create mode 100644 docker/docker-compose.yml create mode 100644 docker/nginx/Dockerfile create mode 100644 docker/nginx/default.conf create mode 100644 docker/nginx/nginx.conf create mode 100644 docker/php/Dockerfile create mode 100644 docker/php/www.conf diff --git a/.env.dev b/.env.dev new file mode 100644 index 00000000..a89afb8c --- /dev/null +++ b/.env.dev @@ -0,0 +1,69 @@ +APP_NAME=Laravel +APP_ENV=local +APP_KEY= +APP_DEBUG=true +APP_URL=http://localhost + +LOG_CHANNEL=stack +LOG_LEVEL=debug + +DB_CONNECTION=mysql +DB_HOST=controlpanel_mysql +DB_PORT=3306 +DB_DATABASE=controlpanel +DB_USERNAME=root +DB_PASSWORD=root + +PAYPAL_SANDBOX_SECRET= +PAYPAL_SANDBOX_CLIENT_ID= +PAYPAL_SECRET= +PAYPAL_CLIENT_ID= +PAYPAL_EMAIL= + +DISCORD_CLIENT_ID= +DISCORD_CLIENT_SECRET= +DISCORD_REDIRECT_URI=http://localhost:8000/auth/callback +DISCORD_INVITE_URL=https://discord.gg/vrUYdxG4wZ + +PTERODACTYL_TOKEN= +PTERODACTYL_URL=https://panel.bitsec.dev +PHPMYADMIN_URL=https://mysql.bitsec.dev + + +RECAPTCHA_SITE_KEY=YOUR_API_SITE_KEY +RECAPTCHA_SECRET_KEY=YOUR_API_SECRET_KEY + + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +QUEUE_CONNECTION=database +SESSION_DRIVER=file +SESSION_LIFETIME=120 + +MEMCACHED_HOST=127.0.0.1 + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_MAILER=smtp +MAIL_HOST=mailhog +MAIL_PORT=1025 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS=null +MAIL_FROM_NAME="${APP_NAME}" + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" diff --git a/BUILDING.md b/BUILDING.md new file mode 100644 index 00000000..f3c85de3 --- /dev/null +++ b/BUILDING.md @@ -0,0 +1,16 @@ +# Building the development environment + +cd into the project directory and run the following command: `sh bin/startdocker` +This should start building the images and start the containers. + +After that you need to go into the controlpanel_php container and run some commands: + +Type `docker exec -it controlpanel_php ash` to go into the container and run the following commands: + +```shell +composer install +cp .env.dev .env +php artisan key:generate --force +php artisan storage:link +php artisan migrate --seed --force +``` diff --git a/bin/rebuild.sh b/bin/rebuild.sh new file mode 100644 index 00000000..7aba0c5c --- /dev/null +++ b/bin/rebuild.sh @@ -0,0 +1,2 @@ +docker-compose -f docker/docker-compose.yml down +docker-compose -f docker/docker-compose.yml build --no-cache diff --git a/bin/startdocker.sh b/bin/startdocker.sh new file mode 100644 index 00000000..d9e21110 --- /dev/null +++ b/bin/startdocker.sh @@ -0,0 +1,2 @@ +docker-compose -f docker/docker-compose.yml down +docker-compose -f docker/docker-compose.yml up -d --force-recreate diff --git a/bin/stopdocker.sh b/bin/stopdocker.sh new file mode 100644 index 00000000..f0bed643 --- /dev/null +++ b/bin/stopdocker.sh @@ -0,0 +1 @@ +docker-compose -f docker/docker-compose.yml down diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 00000000..fbcfa330 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,65 @@ +version: '3' + +networks: + laravel: + +services: + nginx: + build: + context: ../ + dockerfile: docker/nginx/Dockerfile + container_name: controlpanel_nginx + ports: + - 80:80 + volumes: + - ../:/var/www/html:delegated + depends_on: + - php + - mysql + networks: + - laravel + + mysql: + image: mysql + container_name: controlpanel_mysql + restart: unless-stopped + tty: true + ports: + - "3306:3306" + environment: + MYSQL_DATABASE: controlpanel + MYSQL_USER: controlpanel + MYSQL_PASSWORD: root + MYSQL_ROOT_PASSWORD: root + volumes: + - "mysql:/var/lib/mysql:delegated" + networks: + - laravel + + php: + build: + context: ../ + dockerfile: docker/php/Dockerfile + container_name: controlpanel_php + volumes: + - ../:/var/www/html:delegated + networks: + - laravel + + phpmyadmin: + image: phpmyadmin/phpmyadmin + container_name: controlpanel_phpmyadmin + depends_on: + - mysql + ports: + - '8080:80' + environment: + - PMA_HOST=controlpanel_mysql + - PMA_USER=root + - PMA_PASSWORD=root + - PMA_ARBITRARY=1 + networks: + - laravel + +volumes: + mysql: diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile new file mode 100644 index 00000000..606fe311 --- /dev/null +++ b/docker/nginx/Dockerfile @@ -0,0 +1,10 @@ +FROM nginx:stable-alpine + +ADD ./docker/nginx/nginx.conf /etc/nginx/ +ADD ./docker/nginx/default.conf /etc/nginx/conf.d/ + +RUN mkdir -p /var/www/html + +RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel + +RUN chown laravel:laravel /var/www/html diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf new file mode 100644 index 00000000..282633d7 --- /dev/null +++ b/docker/nginx/default.conf @@ -0,0 +1,20 @@ +server { + listen 80; + index index.php index.html; + server_name _; + root /var/www/html/public; + + location / { + try_files $uri $uri/ /index.php?$query_string; + } + + location ~ \.php$ { + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + } +} diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf new file mode 100644 index 00000000..060e5025 --- /dev/null +++ b/docker/nginx/nginx.conf @@ -0,0 +1,29 @@ +user laravel; +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile new file mode 100644 index 00000000..81400ac7 --- /dev/null +++ b/docker/php/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.0-fpm-alpine3.13 + +RUN apk update && apk upgrade +RUN apk add --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/community/ + +RUN apk add --no-cache curl-dev icu-dev libzip-dev +RUN docker-php-ext-install mysqli pdo pdo_mysql intl zip + +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer + +ADD ./docker/php/www.conf /usr/local/etc/php-fpm.d/ + +RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel + +RUN mkdir -p /var/www/html + +RUN chown laravel:laravel /var/www/html + +WORKDIR /var/www/html + +RUN docker-php-ext-install pdo pdo_mysql diff --git a/docker/php/www.conf b/docker/php/www.conf new file mode 100644 index 00000000..eb028e11 --- /dev/null +++ b/docker/php/www.conf @@ -0,0 +1,439 @@ +; Start a new pool named 'www'. +; the variable $pool can be used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'access.log' +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or NONE) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = laravel +group = laravel + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. +; Default Value: 511 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 511 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. The owner +; and group can be specified either by name or by their numeric IDs. +; Default Values: user and group are set as the running user +; mode is set to 0660 +;listen.owner = www-data +;listen.group = www-data +;listen.mode = 0660 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 + +; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; or group is differrent than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 5 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: (min_spare_servers + max_spare_servers) / 2 +pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: /usr/local/share/php/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; Depth of slow log stack trace. +; Default Value: 20 +;request_slowlog_trace_depth = 20 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout set by 'request_terminate_timeout' ini option is not engaged after +; application calls 'fastcgi_finish_request' or when application has finished and +; shutdown functions are being called (registered via register_shutdown_function). +; This option will enable timeout limit to be applied unconditionally +; even in such cases. +; Default Value: no +;request_terminate_timeout_track_finished = no + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Decorate worker output with prefix and suffix containing information about +; the child that writes to the log and if stdout or stderr is used as well as +; log level and time. This options is used only if catch_workers_output is yes. +; Settings to "no" will output data as written to the stdout or stderr. +; Default value: yes +;decorate_workers_output = no + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; execute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 .php7 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/local) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M From 1df00d2b9bc7d042b74a4ef7e4d8051355e5b93a Mon Sep 17 00:00:00 2001 From: Anon Dev <85408287+anondev-sudo@users.noreply.github.com> Date: Sun, 6 Jun 2021 11:25:47 +0200 Subject: [PATCH 4/8] Update main.blade.php --- resources/views/layouts/main.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 808b9858..6d1d649f 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -34,7 +34,7 @@ Home
  • - Discord + Discord
    • From 164ddbe24e7be0c40d908fc7296d84fea6e820be Mon Sep 17 00:00:00 2001 From: Anon Dev <85408287+anondev-sudo@users.noreply.github.com> Date: Sun, 6 Jun 2021 11:28:09 +0200 Subject: [PATCH 5/8] Update home.blade.php --- resources/views/home.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 61c74571..43e786f5 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -58,8 +58,8 @@
    - Usage - {{number_format($useage, 2, '.', '')}} p/m + Credit usage + {{number_format($useage, 2, '.', '')}} per month
    @@ -83,23 +83,23 @@
    -
    Pterodactyl Panel
    Use your servers on our pterodactyl panel (You can use the same login details)
    -
    phpMyAdmin
    View your database online using phpMyAdmin
    -
    Discord
    - Need a helping hand? want to chat? got any questions? Join our discord! + Need a helping hand? Want to chat? Got any questions? Join our discord!
    From 56ea86ad50e9dcd50efa333a0a0d3b29cc94555d Mon Sep 17 00:00:00 2001 From: Anon Dev <85408287+anondev-sudo@users.noreply.github.com> Date: Sun, 6 Jun 2021 11:29:53 +0200 Subject: [PATCH 6/8] Update WelcomeMessage.php --- app/Notifications/WelcomeMessage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Notifications/WelcomeMessage.php b/app/Notifications/WelcomeMessage.php index bb2b6de8..d74390a2 100644 --- a/app/Notifications/WelcomeMessage.php +++ b/app/Notifications/WelcomeMessage.php @@ -52,7 +52,7 @@ class WelcomeMessage extends Notification
    Verification

    Please verify your email address to get " . Configuration::getValueByKey('CREDITS_REWARD_AFTER_VERIFY_EMAIL') . " extra credits and increase your server limit to " . Configuration::getValueByKey('SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') . "
    You can also verify your discord account to get another " . Configuration::getValueByKey('CREDITS_REWARD_AFTER_VERIFY_DISCORD') . " credits and to increase your server limit again with " . Configuration::getValueByKey('SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') . "

    Information
    -

    This dashboard can be used to create and delete servers.
    These servers can be used and managed thru our pterodactyl panel.
    If you have any questions, please join our Discord and #create-a-ticket.

    +

    This dashboard can be used to create and delete servers.
    These servers can be used and managed on our pterodactyl panel.
    If you have any questions, please join our Discord server and #create-a-ticket.

    We hope you can enjoy this hosting experience and if you have any suggestions please let us know!

    Regards,
    " . config('app.name', 'Laravel') . "

    ", From 7c644b39608825dd99e51390fe76e75196aa174a Mon Sep 17 00:00:00 2001 From: AVMG20 Date: Sun, 6 Jun 2021 12:11:35 +0200 Subject: [PATCH 7/8] added the ability to edit users pterodactyl id --- app/Classes/Pterodactyl.php | 74 +++++++++++-------- app/Http/Controllers/Admin/UserController.php | 23 ++++-- resources/views/admin/users/edit.blade.php | 14 ++++ 3 files changed, 75 insertions(+), 36 deletions(-) diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php index 3905552b..3d95abaa 100644 --- a/app/Classes/Pterodactyl.php +++ b/app/Classes/Pterodactyl.php @@ -3,7 +3,6 @@ namespace App\Classes; use App\Models\Egg; -use App\Models\Location; use App\Models\Nest; use App\Models\Node; use App\Models\Server; @@ -14,9 +13,33 @@ use Illuminate\Support\Facades\Http; class Pterodactyl { + /** + * @return PendingRequest + */ + public static function client() + { + return Http::withHeaders([ + 'Authorization' => 'Bearer ' . env('PTERODACTYL_TOKEN', false), + 'Content-type' => 'application/json', + 'Accept' => 'Application/vnd.pterodactyl.v1+json', + ])->baseUrl(env('PTERODACTYL_URL') . '/api'); + } + + /** + * Get user by pterodactyl id + * @param int $pterodactylId + * @return mixed + */ + public static function getUser(int $pterodactylId){ + $response = self::client()->get("/application/users/{$pterodactylId}"); + if ($response->failed()) return null; + return $response->json()['attributes']; + } + /** * @param Node $node * @return array|mixed|null + * @throws Exception */ public static function getFreeAllocations(Node $node) { @@ -98,17 +121,6 @@ class Pterodactyl return $response->json(); } - /** - * @return PendingRequest - */ - public static function client() - { - return Http::withHeaders([ - 'Authorization' => 'Bearer ' . env('PTERODACTYL_TOKEN', false), - 'Content-type' => 'application/json', - 'Accept' => 'Application/vnd.pterodactyl.v1+json', - ])->baseUrl(env('PTERODACTYL_URL') . '/api'); - } /** * @param String $route @@ -125,41 +137,43 @@ class Pterodactyl * @param Node $node * @return Response */ - public static function createServer(Server $server , Egg $egg , Node $node) + public static function createServer(Server $server, Egg $egg, Node $node) { return self::client()->post("/application/servers", [ - "name" => $server->name, - "external_id" => $server->id, - "user" => $server->user->pterodactyl_id, - "egg" => $egg->id, - "docker_image" => $egg->docker_image, - "startup" => $egg->startup, - "environment" => $egg->getEnvironmentVariables(), - "limits" => [ + "name" => $server->name, + "external_id" => $server->id, + "user" => $server->user->pterodactyl_id, + "egg" => $egg->id, + "docker_image" => $egg->docker_image, + "startup" => $egg->startup, + "environment" => $egg->getEnvironmentVariables(), + "limits" => [ "memory" => $server->product->memory, - "swap" => $server->product->swap, - "disk" => $server->product->disk, - "io" => $server->product->io, - "cpu" => $server->product->cpu + "swap" => $server->product->swap, + "disk" => $server->product->disk, + "io" => $server->product->io, + "cpu" => $server->product->cpu ], "feature_limits" => [ - "databases" => $server->product->databases, - "backups" => $server->product->backups, + "databases" => $server->product->databases, + "backups" => $server->product->backups, "allocations" => 1 ], - "allocation" => [ + "allocation" => [ "default" => Pterodactyl::getFreeAllocationId($node) ] ]); } - public static function suspendServer(Server $server){ + public static function suspendServer(Server $server) + { $response = self::client()->post("/application/servers/$server->pterodactyl_id/suspend"); if ($response->failed()) throw self::getException(); return $response; } - public static function unSuspendServer(Server $server){ + public static function unSuspendServer(Server $server) + { $response = self::client()->post("/application/servers/$server->pterodactyl_id/unsuspend"); if ($response->failed()) throw self::getException(); return $response; diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 00922bcf..95eee5a4 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -2,8 +2,10 @@ namespace App\Http\Controllers\Admin; +use App\Classes\Pterodactyl; use App\Http\Controllers\Controller; use App\Models\User; +use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; @@ -12,6 +14,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Auth; use Illuminate\Validation\Rule; +use Illuminate\Validation\ValidationException; class UserController extends Controller { @@ -79,17 +82,25 @@ class UserController extends Controller * @param Request $request * @param User $user * @return RedirectResponse + * @throws Exception */ public function update(Request $request, User $user) { $request->validate([ - "name" => "required|string|min:4|max:30", - "email" => "required|string|email", - "credits" => "required|numeric|min:0|max:1000000", - "server_limit" => "required|numeric|min:0|max:1000000", - "role" => Rule::in(['admin', 'mod', 'client', 'member']), + "name" => "required|string|min:4|max:30", + "pterodactyl_id" => "required|numeric|unique:users,pterodactyl_id,{$user->pterodactyl_id}", + "email" => "required|string|email", + "credits" => "required|numeric|min:0|max:1000000", + "server_limit" => "required|numeric|min:0|max:1000000", + "role" => Rule::in(['admin', 'mod', 'client', 'member']), ]); + if (is_null(Pterodactyl::getUser($request->input('pterodactyl_id')))){ + throw ValidationException::withMessages([ + 'pterodactyl_id' => ["User does not exists on pterodactyl's panel"] + ]); + } + $user->update($request->all()); return redirect()->route('admin.users.index')->with('success', 'User updated!'); @@ -146,7 +157,7 @@ class UserController extends Controller /** * - * @throws \Exception + * @throws Exception */ public function dataTable() { diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 865ad3b1..583d77a3 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -51,6 +51,20 @@ @enderror +
    + + + @error('pterodactyl_id') +
    + {{$message}} +
    + @enderror +
    + This ID refers to the user account created on pterodactyl's panel.
    + Only edit this if you know what you're doing :) +
    +
    Date: Sun, 6 Jun 2021 13:26:26 +0200 Subject: [PATCH 8/8] Create run_tests.yml --- .github/workflows/run_tests.yml | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/run_tests.yml diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml new file mode 100644 index 00000000..60152b5d --- /dev/null +++ b/.github/workflows/run_tests.yml @@ -0,0 +1,35 @@ +name: Laravel + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + laravel-tests: + + runs-on: ubuntu-latest + + steps: + - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e + with: + php-version: '8.0' + - uses: actions/checkout@v2 + - name: Copy .env + run: php -r "file_exists('.env') || copy('.env.dev', '.env');" + - name: Install Dependencies + run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist + - name: Generate key + run: php artisan key:generate + - name: Directory Permissions + run: chmod -R 777 storage bootstrap/cache + - name: Create Database + run: | + mkdir -p database + touch database/database.sqlite + - name: Execute tests (Unit and Feature tests) via PHPUnit + env: + DB_CONNECTION: sqlite + DB_DATABASE: database/database.sqlite + run: vendor/bin/phpunit