Compare commits
7 commits
develop
...
0.7-develo
Author | SHA1 | Date | |
---|---|---|---|
|
4028588621 | ||
|
1cd08e2f8d | ||
|
dcf5cb3cd3 | ||
|
6d69f6ef47 | ||
|
78514f9eb4 | ||
|
7deed07cd1 | ||
|
597196ad3e |
2018 changed files with 76336 additions and 74478 deletions
8
.babelrc
Normal file
8
.babelrc
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"presets": ["es2015"],
|
||||||
|
"compact": true,
|
||||||
|
"minified": true,
|
||||||
|
"only": "public/themes/pterodactyl/js/frontend/files/src/*.js",
|
||||||
|
"sourceMaps": "inline",
|
||||||
|
"comments": false
|
||||||
|
}
|
76
.dev/docker/README.md
Normal file
76
.dev/docker/README.md
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
# Pterodactyl Panel - Docker Image
|
||||||
|
This is a ready to use docker image for the panel.
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
This docker image requires some additional software to function. The software can either be provided in other containers (see the [docker-compose.yml](docker-compose.yml) as an example) or as existing instances.
|
||||||
|
|
||||||
|
A mysql database is required. We recommend the stock [MariaDB Image](https://hub.docker.com/_/mariadb/) image if you prefer to run it in a docker container. As a non-containerized option we recommend mariadb.
|
||||||
|
|
||||||
|
A caching software is required as well. We recommend the stock [Redis Image](https://hub.docker.com/_/redis/) image. You can choose any of the [supported options](#cache-drivers).
|
||||||
|
|
||||||
|
You can provide additional settings using a custom `.env` file or by setting the appropriate environment variables in the docker-compose file.
|
||||||
|
|
||||||
|
## Setup
|
||||||
|
|
||||||
|
Start the docker container and the required dependencies (either provide existing ones or start containers as well, see the [docker-compose.yml](docker-compose.yml) file as an example).
|
||||||
|
|
||||||
|
After the startup is complete you'll need to create a user.
|
||||||
|
If you are running the docker container without docker-compose, use:
|
||||||
|
```
|
||||||
|
docker exec -it <container id> php artisan p:user:make
|
||||||
|
```
|
||||||
|
If you are using docker compose use
|
||||||
|
```
|
||||||
|
docker-compose exec panel php artisan p:user:make
|
||||||
|
```
|
||||||
|
|
||||||
|
## Environment Variables
|
||||||
|
There are multiple environment variables to configure the panel when not providing your own `.env` file, see the following table for details on each available option.
|
||||||
|
|
||||||
|
Note: If your `APP_URL` starts with `https://` you need to provide an `LETSENCRYPT_EMAIL` as well so Certificates can be generated.
|
||||||
|
|
||||||
|
| Variable | Description | Required |
|
||||||
|
| ------------------- | ------------------------------------------------------------------------------ | -------- |
|
||||||
|
| `APP_URL` | The URL the panel will be reachable with (including protocol) | yes |
|
||||||
|
| `APP_TIMEZONE` | The timezone to use for the panel | yes |
|
||||||
|
| `LETSENCRYPT_EMAIL` | The email used for letsencrypt certificate generation | yes |
|
||||||
|
| `DB_HOST` | The host of the mysql instance | yes |
|
||||||
|
| `DB_PORT` | The port of the mysql instance | yes |
|
||||||
|
| `DB_DATABASE` | The name of the mysql database | yes |
|
||||||
|
| `DB_USERNAME` | The mysql user | yes |
|
||||||
|
| `DB_PASSWORD` | The mysql password for the specified user | yes |
|
||||||
|
| `CACHE_DRIVER` | The cache driver (see [Cache drivers](#cache-drivers) for detais) | yes |
|
||||||
|
| `SESSION_DRIVER` | | yes |
|
||||||
|
| `QUEUE_DRIVER` | | yes |
|
||||||
|
| `REDIS_HOST` | The hostname or IP address of the redis database | yes |
|
||||||
|
| `REDIS_PASSWORD` | The password used to secure the redis database | maybe |
|
||||||
|
| `REDIS_PORT` | The port the redis database is using on the host | maybe |
|
||||||
|
| `MAIL_DRIVER` | The email driver (see [Mail drivers](#mail-drivers) for details) | yes |
|
||||||
|
| `MAIL_FROM` | The email that should be used as the sender email | yes |
|
||||||
|
| `MAIL_HOST` | The host of your mail driver instance | maybe |
|
||||||
|
| `MAIL_PORT` | The port of your mail driver instance | maybe |
|
||||||
|
| `MAIL_USERNAME` | The username for your mail driver | maybe |
|
||||||
|
| `MAIL_PASSWORD` | The password for your mail driver | maybe |
|
||||||
|
|
||||||
|
|
||||||
|
### Cache drivers
|
||||||
|
You can choose between different cache drivers depending on what you prefer.
|
||||||
|
We recommend redis when using docker as it can be started in a container easily.
|
||||||
|
|
||||||
|
| Driver | Description | Required variables |
|
||||||
|
| -------- | ------------------------------------ | ------------------------------------------------------ |
|
||||||
|
| redis | host where redis is running | `REDIS_HOST` |
|
||||||
|
| redis | port redis is running on | `REDIS_PORT` |
|
||||||
|
| redis | redis database password | `REDIS_PASSWORD` |
|
||||||
|
|
||||||
|
### Mail drivers
|
||||||
|
You can choose between different mail drivers according to your needs.
|
||||||
|
Every driver requires `MAIL_FROM` to be set.
|
||||||
|
|
||||||
|
| Driver | Description | Required variables |
|
||||||
|
| -------- | ------------------------------------ | ------------------------------------------------------------- |
|
||||||
|
| mail | uses the installed php mail | |
|
||||||
|
| mandrill | [Mandrill](http://www.mandrill.com/) | `MAIL_USERNAME` |
|
||||||
|
| postmark | [Postmark](https://postmarkapp.com/) | `MAIL_USERNAME` |
|
||||||
|
| mailgun | [Mailgun](https://www.mailgun.com/) | `MAIL_USERNAME`, `MAIL_HOST` |
|
||||||
|
| smtp | Any SMTP server can be configured | `MAIL_USERNAME`, `MAIL_HOST`, `MAIL_PASSWORD`, `MAIL_PORT` |
|
51
.dev/docker/default.conf
Normal file
51
.dev/docker/default.conf
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
# If using Ubuntu this file should be placed in:
|
||||||
|
# /etc/nginx/sites-available/
|
||||||
|
#
|
||||||
|
# If using CentOS this file should be placed in:
|
||||||
|
# /etc/nginx/conf.d/
|
||||||
|
#
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name _;
|
||||||
|
|
||||||
|
root /app/public;
|
||||||
|
index index.html index.htm index.php;
|
||||||
|
charset utf-8;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.php?$query_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
location = /favicon.ico { access_log off; log_not_found off; }
|
||||||
|
location = /robots.txt { access_log off; log_not_found off; }
|
||||||
|
|
||||||
|
access_log off;
|
||||||
|
error_log /var/log/nginx/pterodactyl.app-error.log error;
|
||||||
|
|
||||||
|
# allow larger file uploads and longer script runtimes
|
||||||
|
client_max_body_size 100m;
|
||||||
|
client_body_timeout 120s;
|
||||||
|
|
||||||
|
sendfile off;
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
# the fastcgi_pass path needs to be changed accordingly when using CentOS
|
||||||
|
fastcgi_pass unix:/var/run/php/php-fpm7.2.sock;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_param HTTP_PROXY "";
|
||||||
|
fastcgi_intercept_errors off;
|
||||||
|
fastcgi_buffer_size 16k;
|
||||||
|
fastcgi_buffers 4 16k;
|
||||||
|
fastcgi_connect_timeout 300;
|
||||||
|
fastcgi_send_timeout 300;
|
||||||
|
fastcgi_read_timeout 300;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /\.ht {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
}
|
70
.dev/docker/default_ssl.conf
Normal file
70
.dev/docker/default_ssl.conf
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
# If using Ubuntu this file should be placed in:
|
||||||
|
# /etc/nginx/sites-available/
|
||||||
|
#
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name <domain>;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl http2;
|
||||||
|
server_name <domain>;
|
||||||
|
|
||||||
|
root /app/public;
|
||||||
|
index index.php;
|
||||||
|
|
||||||
|
access_log /var/log/nginx/pterodactyl.app-access.log;
|
||||||
|
error_log /var/log/nginx/pterodactyl.app-error.log error;
|
||||||
|
|
||||||
|
# allow larger file uploads and longer script runtimes
|
||||||
|
client_max_body_size 100m;
|
||||||
|
client_body_timeout 120s;
|
||||||
|
|
||||||
|
sendfile off;
|
||||||
|
|
||||||
|
# strengthen ssl security
|
||||||
|
ssl_certificate /etc/letsencrypt/live/<domain>/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/<domain>/privkey.pem;
|
||||||
|
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
|
||||||
|
|
||||||
|
# See the link below for more SSL information:
|
||||||
|
# https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
|
||||||
|
#
|
||||||
|
# ssl_dhparam /etc/ssl/certs/dhparam.pem;
|
||||||
|
|
||||||
|
# Add headers to serve security related headers
|
||||||
|
add_header Strict-Transport-Security "max-age=15768000; preload;";
|
||||||
|
add_header X-Content-Type-Options nosniff;
|
||||||
|
add_header X-XSS-Protection "1; mode=block";
|
||||||
|
add_header X-Robots-Tag none;
|
||||||
|
add_header Content-Security-Policy "frame-ancestors 'self'";
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.php?$query_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
fastcgi_pass unix:/var/run/php/php-fpm7.2.sock;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_param HTTP_PROXY "";
|
||||||
|
fastcgi_intercept_errors off;
|
||||||
|
fastcgi_buffer_size 16k;
|
||||||
|
fastcgi_buffers 4 16k;
|
||||||
|
fastcgi_connect_timeout 300;
|
||||||
|
fastcgi_send_timeout 300;
|
||||||
|
fastcgi_read_timeout 300;
|
||||||
|
include /etc/nginx/fastcgi_params;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /\.ht {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
}
|
70
.dev/docker/entrypoint.sh
Normal file
70
.dev/docker/entrypoint.sh
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
#!/bin/ash
|
||||||
|
## Ensure we are in /app
|
||||||
|
|
||||||
|
cd /app
|
||||||
|
|
||||||
|
mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php7/ \
|
||||||
|
&& rmdir /app/storage/logs/ \
|
||||||
|
&& chmod 777 /var/log/panel/logs/ \
|
||||||
|
&& ln -s /var/log/panel/logs/ /app/storage/
|
||||||
|
|
||||||
|
## check for .env file and generate app keys if missing
|
||||||
|
if [ -f /app/var/.env ]; then
|
||||||
|
echo "external vars exist."
|
||||||
|
rm /app/.env
|
||||||
|
|
||||||
|
ln -s /app/var/.env /app/
|
||||||
|
else
|
||||||
|
echo "external vars don't exist."
|
||||||
|
rm /app/.env
|
||||||
|
touch /app/var/.env
|
||||||
|
|
||||||
|
## manually generate a key because key generate --force fails
|
||||||
|
echo -e "Generating key."
|
||||||
|
APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
||||||
|
echo -e "Generated app key: $APP_KEY"
|
||||||
|
echo -e "APP_KEY=$APP_KEY" > /app/var/.env
|
||||||
|
|
||||||
|
ln -s /app/var/.env /app/
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Checking if https is required."
|
||||||
|
if [ -f /etc/nginx/conf.d/default.conf ]; then
|
||||||
|
echo "Using nginx config already in place."
|
||||||
|
else
|
||||||
|
echo "Checking if letsencrypt email is set."
|
||||||
|
if [ -z $LE_EMAIL ]; then
|
||||||
|
echo "No letsencrypt email is set Failing to http."
|
||||||
|
cp .dev/docker/default.conf /etc/nginx/conf.d/default.conf
|
||||||
|
|
||||||
|
else
|
||||||
|
echo "writing ssl config"
|
||||||
|
cp .dev/docker/default_ssl.conf /etc/nginx/conf.d/default.conf
|
||||||
|
echo "updating ssl config for domain"
|
||||||
|
sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf
|
||||||
|
echo "generating certs"
|
||||||
|
certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g') --standalone -m $LE_EMAIL --agree-tos -n
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
## check for DB up before starting the panel
|
||||||
|
echo "Checking database status."
|
||||||
|
until nc -z -v -w30 $DB_HOST 3306
|
||||||
|
|
||||||
|
do
|
||||||
|
echo "Waiting for database connection..."
|
||||||
|
# wait for 5 seconds before check again
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
|
||||||
|
## make sure the db is set up
|
||||||
|
echo -e "Migrating and Seeding D.B"
|
||||||
|
php artisan migrate --force
|
||||||
|
php artisan db:seed --force
|
||||||
|
|
||||||
|
## start cronjobs for the queue
|
||||||
|
echo -e "Starting cron jobs."
|
||||||
|
crond -L /var/log/crond -l 5
|
||||||
|
|
||||||
|
echo -e "Starting supervisord."
|
||||||
|
exec "$@"
|
39
.dev/docker/supervisord.conf
Normal file
39
.dev/docker/supervisord.conf
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
[unix_http_server]
|
||||||
|
file=/tmp/supervisor.sock ; path to your socket file
|
||||||
|
|
||||||
|
[supervisord]
|
||||||
|
logfile=/var/log/supervisord/supervisord.log ; supervisord log file
|
||||||
|
logfile_maxbytes=50MB ; maximum size of logfile before rotation
|
||||||
|
logfile_backups=2 ; number of backed up logfiles
|
||||||
|
loglevel=error ; info, debug, warn, trace
|
||||||
|
pidfile=/var/run/supervisord.pid ; pidfile location
|
||||||
|
nodaemon=false ; run supervisord as a daemon
|
||||||
|
minfds=1024 ; number of startup file descriptors
|
||||||
|
minprocs=200 ; number of process descriptors
|
||||||
|
user=root ; default user
|
||||||
|
childlogdir=/var/log/supervisord/ ; where child log files will live
|
||||||
|
|
||||||
|
[rpcinterface:supervisor]
|
||||||
|
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||||
|
|
||||||
|
[supervisorctl]
|
||||||
|
serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket
|
||||||
|
|
||||||
|
[program:php-fpm]
|
||||||
|
command=/usr/sbin/php-fpm7 -F
|
||||||
|
autostart=true
|
||||||
|
autorestart=true
|
||||||
|
|
||||||
|
[program:queue-worker]
|
||||||
|
command=/usr/bin/php /app/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
|
||||||
|
user=nginx
|
||||||
|
autostart=true
|
||||||
|
autorestart=true
|
||||||
|
|
||||||
|
[program:nginx]
|
||||||
|
command=/usr/sbin/nginx -g 'daemon off;'
|
||||||
|
autostart=true
|
||||||
|
autorestart=true
|
||||||
|
priority=10
|
||||||
|
stdout_events_enabled=true
|
||||||
|
stderr_events_enabled=true
|
16
.dev/docker/www.conf
Normal file
16
.dev/docker/www.conf
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
[pterodactyl]
|
||||||
|
|
||||||
|
user = nginx
|
||||||
|
group = nginx
|
||||||
|
|
||||||
|
listen = /var/run/php/php-fpm7.2.sock
|
||||||
|
listen.owner = nginx
|
||||||
|
listen.group = nginx
|
||||||
|
listen.mode = 0750
|
||||||
|
|
||||||
|
pm = ondemand
|
||||||
|
pm.max_children = 9
|
||||||
|
pm.process_idle_timeout = 10s
|
||||||
|
pm.max_requests = 200
|
||||||
|
|
||||||
|
clear_env = no
|
39
.dev/vagrant/.env.vagrant
Normal file
39
.dev/vagrant/.env.vagrant
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
APP_ENV=develop
|
||||||
|
APP_DEBUG=true
|
||||||
|
APP_KEY=SomeRandomString3232RandomString
|
||||||
|
APP_THEME=pterodactyl
|
||||||
|
APP_TIMEZONE=UTC
|
||||||
|
APP_CLEAR_TASKLOG=720
|
||||||
|
APP_DELETE_MINUTES=10
|
||||||
|
APP_URL=http://192.168.50.2/
|
||||||
|
|
||||||
|
DB_HOST=localhost
|
||||||
|
DB_PORT=3306
|
||||||
|
DB_DATABASE=panel
|
||||||
|
DB_USERNAME=pterodactyl
|
||||||
|
DB_PASSWORD=pterodactyl
|
||||||
|
|
||||||
|
CACHE_DRIVER=memcached
|
||||||
|
MEMCACHED_HOST=127.0.0.1
|
||||||
|
SESSION_DRIVER=database
|
||||||
|
|
||||||
|
MAIL_DRIVER=smtp
|
||||||
|
MAIL_HOST=127.0.0.1
|
||||||
|
MAIL_PORT=1025
|
||||||
|
MAIL_USERNAME=
|
||||||
|
MAIL_PASSWORD=
|
||||||
|
MAIL_ENCRYPTION=
|
||||||
|
MAIL_FROM=support@pterodactyl.io
|
||||||
|
|
||||||
|
API_PREFIX=api
|
||||||
|
API_VERSION=v1
|
||||||
|
API_DEBUG=true
|
||||||
|
|
||||||
|
QUEUE_DRIVER=database
|
||||||
|
QUEUE_HIGH=high
|
||||||
|
QUEUE_STANDARD=standard
|
||||||
|
QUEUE_LOW=low
|
||||||
|
|
||||||
|
SQS_KEY=aws-public
|
||||||
|
SQS_SECRET=aws-secret
|
||||||
|
SQS_QUEUE_PREFIX=aws-queue-prefix
|
13
.dev/vagrant/mailhog.service
Normal file
13
.dev/vagrant/mailhog.service
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Mailhog
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
# On some systems the user and group might be different.
|
||||||
|
# Some systems use `apache` as the user and group.
|
||||||
|
User=www-data
|
||||||
|
Group=www-data
|
||||||
|
Restart=on-failure
|
||||||
|
ExecStart=/usr/bin/mailhog
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
189
.dev/vagrant/mariadb.cnf
Normal file
189
.dev/vagrant/mariadb.cnf
Normal file
|
@ -0,0 +1,189 @@
|
||||||
|
# MariaDB database server configuration file.
|
||||||
|
#
|
||||||
|
# You can copy this file to one of:
|
||||||
|
# - "/etc/mysql/my.cnf" to set global options,
|
||||||
|
# - "~/.my.cnf" to set user-specific options.
|
||||||
|
#
|
||||||
|
# One can use all long options that the program supports.
|
||||||
|
# Run program with --help to get a list of available options and with
|
||||||
|
# --print-defaults to see which it would actually understand and use.
|
||||||
|
#
|
||||||
|
# For explanations see
|
||||||
|
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
|
||||||
|
|
||||||
|
# This will be passed to all mysql clients
|
||||||
|
# It has been reported that passwords should be enclosed with ticks/quotes
|
||||||
|
# escpecially if they contain "#" chars...
|
||||||
|
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
|
||||||
|
[client]
|
||||||
|
port = 3306
|
||||||
|
socket = /var/run/mysqld/mysqld.sock
|
||||||
|
|
||||||
|
# Here is entries for some specific programs
|
||||||
|
# The following values assume you have at least 32M ram
|
||||||
|
|
||||||
|
# This was formally known as [safe_mysqld]. Both versions are currently parsed.
|
||||||
|
[mysqld_safe]
|
||||||
|
socket = /var/run/mysqld/mysqld.sock
|
||||||
|
nice = 0
|
||||||
|
|
||||||
|
[mysqld]
|
||||||
|
#
|
||||||
|
# * Basic Settings
|
||||||
|
#
|
||||||
|
user = mysql
|
||||||
|
pid-file = /var/run/mysqld/mysqld.pid
|
||||||
|
socket = /var/run/mysqld/mysqld.sock
|
||||||
|
port = 3306
|
||||||
|
basedir = /usr
|
||||||
|
datadir = /var/lib/mysql
|
||||||
|
tmpdir = /tmp
|
||||||
|
lc_messages_dir = /usr/share/mysql
|
||||||
|
lc_messages = en_US
|
||||||
|
skip-external-locking
|
||||||
|
#
|
||||||
|
# Instead of skip-networking the default is now to listen only on
|
||||||
|
# localhost which is more compatible and is not less secure.
|
||||||
|
bind-address = 0.0.0.0
|
||||||
|
#
|
||||||
|
# * Fine Tuning
|
||||||
|
#
|
||||||
|
max_connections = 100
|
||||||
|
connect_timeout = 5
|
||||||
|
wait_timeout = 600
|
||||||
|
max_allowed_packet = 16M
|
||||||
|
thread_cache_size = 128
|
||||||
|
sort_buffer_size = 4M
|
||||||
|
bulk_insert_buffer_size = 16M
|
||||||
|
tmp_table_size = 32M
|
||||||
|
max_heap_table_size = 32M
|
||||||
|
#
|
||||||
|
# * MyISAM
|
||||||
|
#
|
||||||
|
# This replaces the startup script and checks MyISAM tables if needed
|
||||||
|
# the first time they are touched. On error, make copy and try a repair.
|
||||||
|
myisam_recover_options = BACKUP
|
||||||
|
key_buffer_size = 128M
|
||||||
|
#open-files-limit = 2000
|
||||||
|
table_open_cache = 400
|
||||||
|
myisam_sort_buffer_size = 512M
|
||||||
|
concurrent_insert = 2
|
||||||
|
read_buffer_size = 2M
|
||||||
|
read_rnd_buffer_size = 1M
|
||||||
|
#
|
||||||
|
# * Query Cache Configuration
|
||||||
|
#
|
||||||
|
# Cache only tiny result sets, so we can fit more in the query cache.
|
||||||
|
query_cache_limit = 128K
|
||||||
|
query_cache_size = 64M
|
||||||
|
# for more write intensive setups, set to DEMAND or OFF
|
||||||
|
#query_cache_type = DEMAND
|
||||||
|
#
|
||||||
|
# * Logging and Replication
|
||||||
|
#
|
||||||
|
# Both location gets rotated by the cronjob.
|
||||||
|
# Be aware that this log type is a performance killer.
|
||||||
|
# As of 5.1 you can enable the log at runtime!
|
||||||
|
#general_log_file = /var/log/mysql/mysql.log
|
||||||
|
#general_log = 1
|
||||||
|
#
|
||||||
|
# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
|
||||||
|
#
|
||||||
|
# we do want to know about network errors and such
|
||||||
|
log_warnings = 2
|
||||||
|
#
|
||||||
|
# Enable the slow query log to see queries with especially long duration
|
||||||
|
#slow_query_log[={0|1}]
|
||||||
|
slow_query_log_file = /var/log/mysql/mariadb-slow.log
|
||||||
|
long_query_time = 10
|
||||||
|
#log_slow_rate_limit = 1000
|
||||||
|
log_slow_verbosity = query_plan
|
||||||
|
|
||||||
|
#log-queries-not-using-indexes
|
||||||
|
#log_slow_admin_statements
|
||||||
|
#
|
||||||
|
# The following can be used as easy to replay backup logs or for replication.
|
||||||
|
# note: if you are setting up a replication slave, see README.Debian about
|
||||||
|
# other settings you may need to change.
|
||||||
|
#server-id = 1
|
||||||
|
#report_host = master1
|
||||||
|
#auto_increment_increment = 2
|
||||||
|
#auto_increment_offset = 1
|
||||||
|
log_bin = /var/log/mysql/mariadb-bin
|
||||||
|
log_bin_index = /var/log/mysql/mariadb-bin.index
|
||||||
|
# not fab for performance, but safer
|
||||||
|
#sync_binlog = 1
|
||||||
|
expire_logs_days = 10
|
||||||
|
max_binlog_size = 100M
|
||||||
|
# slaves
|
||||||
|
#relay_log = /var/log/mysql/relay-bin
|
||||||
|
#relay_log_index = /var/log/mysql/relay-bin.index
|
||||||
|
#relay_log_info_file = /var/log/mysql/relay-bin.info
|
||||||
|
#log_slave_updates
|
||||||
|
#read_only
|
||||||
|
#
|
||||||
|
# If applications support it, this stricter sql_mode prevents some
|
||||||
|
# mistakes like inserting invalid dates etc.
|
||||||
|
#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL
|
||||||
|
#
|
||||||
|
# * InnoDB
|
||||||
|
#
|
||||||
|
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
|
||||||
|
# Read the manual for more InnoDB related options. There are many!
|
||||||
|
default_storage_engine = InnoDB
|
||||||
|
# you can't just change log file size, requires special procedure
|
||||||
|
#innodb_log_file_size = 50M
|
||||||
|
innodb_buffer_pool_size = 256M
|
||||||
|
innodb_log_buffer_size = 8M
|
||||||
|
innodb_file_per_table = 1
|
||||||
|
innodb_open_files = 400
|
||||||
|
innodb_io_capacity = 400
|
||||||
|
innodb_flush_method = O_DIRECT
|
||||||
|
#
|
||||||
|
# * Security Features
|
||||||
|
#
|
||||||
|
# Read the manual, too, if you want chroot!
|
||||||
|
# chroot = /var/lib/mysql/
|
||||||
|
#
|
||||||
|
# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
|
||||||
|
#
|
||||||
|
# ssl-ca=/etc/mysql/cacert.pem
|
||||||
|
# ssl-cert=/etc/mysql/server-cert.pem
|
||||||
|
# ssl-key=/etc/mysql/server-key.pem
|
||||||
|
|
||||||
|
#
|
||||||
|
# * Galera-related settings
|
||||||
|
#
|
||||||
|
[galera]
|
||||||
|
# Mandatory settings
|
||||||
|
#wsrep_on=ON
|
||||||
|
#wsrep_provider=
|
||||||
|
#wsrep_cluster_address=
|
||||||
|
#binlog_format=row
|
||||||
|
#default_storage_engine=InnoDB
|
||||||
|
#innodb_autoinc_lock_mode=2
|
||||||
|
#
|
||||||
|
# Allow server to accept connections on all interfaces.
|
||||||
|
#
|
||||||
|
#bind-address=0.0.0.0
|
||||||
|
#
|
||||||
|
# Optional setting
|
||||||
|
#wsrep_slave_threads=1
|
||||||
|
#innodb_flush_log_at_trx_commit=0
|
||||||
|
|
||||||
|
[mysqldump]
|
||||||
|
quick
|
||||||
|
quote-names
|
||||||
|
max_allowed_packet = 16M
|
||||||
|
|
||||||
|
[mysql]
|
||||||
|
#no-auto-rehash # faster start of mysql but no tab completion
|
||||||
|
|
||||||
|
[isamchk]
|
||||||
|
key_buffer = 16M
|
||||||
|
|
||||||
|
#
|
||||||
|
# * IMPORTANT: Additional settings that can override those from this file!
|
||||||
|
# The files must end with '.cnf', otherwise they'll be ignored.
|
||||||
|
#
|
||||||
|
!includedir /etc/mysql/conf.d/
|
17
.dev/vagrant/motd.txt
Normal file
17
.dev/vagrant/motd.txt
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
#####################################################
|
||||||
|
Pterodactyl Panel Vagrant VM
|
||||||
|
|
||||||
|
Install: /var/www/html/pterodactyl
|
||||||
|
Ports:
|
||||||
|
Panel: 80 (50080 on host)
|
||||||
|
MailHog: 8025 (58025 on host)
|
||||||
|
MySQL: 3306 (53306 on host)
|
||||||
|
|
||||||
|
Default panel users:
|
||||||
|
user: admin passwd: Ptero123 (admin user)
|
||||||
|
user: user passwd: Ptero123 (standard user)
|
||||||
|
|
||||||
|
MySQL is accessible using root/pterodactyl or pterodactyl/pterodactyl
|
||||||
|
|
||||||
|
Service for pteroq and mailhog are running
|
||||||
|
#####################################################
|
84
.dev/vagrant/provision.sh
Normal file
84
.dev/vagrant/provision.sh
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "Provisioning development environment for Pterodactyl Panel."
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/motd.txt /etc/motd
|
||||||
|
chmod -x /etc/update-motd.d/10-help-text /etc/update-motd.d/51-cloudguest
|
||||||
|
|
||||||
|
apt-get install -y software-properties-common > /dev/null
|
||||||
|
|
||||||
|
echo "Add the ondrej/php ppa repository"
|
||||||
|
add-apt-repository -y ppa:ondrej/php > /dev/null
|
||||||
|
echo "Add the mariadb repository"
|
||||||
|
curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | bash > /dev/null
|
||||||
|
|
||||||
|
apt-get update > /dev/null
|
||||||
|
|
||||||
|
echo "Install the dependencies"
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
# set the mariadb root password because mariadb asks for it
|
||||||
|
debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password password pterodactyl'
|
||||||
|
debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password_again password pterodactyl'
|
||||||
|
# actually install
|
||||||
|
apt-get install -y php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-memcached php7.2-curl php7.2-zip php-xdebug mariadb-server nginx curl tar unzip git memcached > /dev/null
|
||||||
|
|
||||||
|
echo "Install composer"
|
||||||
|
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
|
||||||
|
|
||||||
|
echo "Install and run mailhog"
|
||||||
|
curl -sL -o /usr/bin/mailhog https://github.com/mailhog/MailHog/releases/download/v1.0.0/MailHog_linux_amd64
|
||||||
|
chmod +x /usr/bin/mailhog
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/mailhog.service /etc/systemd/system/
|
||||||
|
systemctl enable mailhog.service
|
||||||
|
systemctl start mailhog
|
||||||
|
|
||||||
|
echo "Configure xDebug"
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.2/mods-available/
|
||||||
|
systemctl restart php7.2-fpm
|
||||||
|
|
||||||
|
echo "Configure nginx"
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/pterodactyl.conf /etc/nginx/sites-available/
|
||||||
|
rm /etc/nginx/sites-available/default
|
||||||
|
ln -s /etc/nginx/sites-available/pterodactyl.conf /etc/nginx/sites-enabled/pterodactyl.conf
|
||||||
|
systemctl restart nginx
|
||||||
|
|
||||||
|
echo "Setup database"
|
||||||
|
# Replace default config with custom one to bind mysql to 0.0.0.0 to make it accessible from the host
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/mariadb.cnf /etc/mysql/my.cnf
|
||||||
|
systemctl restart mariadb
|
||||||
|
mysql -u root -ppterodactyl << SQL
|
||||||
|
CREATE DATABASE panel;
|
||||||
|
GRANT ALL PRIVILEGES ON panel.* TO 'pterodactyl'@'%' IDENTIFIED BY 'pterodactyl' WITH GRANT OPTION;
|
||||||
|
GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'pterodactyl' WITH GRANT OPTION;
|
||||||
|
FLUSH PRIVILEGES;
|
||||||
|
SQL
|
||||||
|
|
||||||
|
echo "Setup pterodactyl queue worker service"
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/pteroq.service /etc/systemd/system/
|
||||||
|
systemctl enable pteroq.service
|
||||||
|
|
||||||
|
|
||||||
|
echo "Setup panel with base settings"
|
||||||
|
cp /var/www/html/pterodactyl/.dev/vagrant/.env.vagrant /var/www/html/pterodactyl/.env
|
||||||
|
cd /var/www/html/pterodactyl
|
||||||
|
chmod -R 755 storage/* bootstrap/cache
|
||||||
|
composer install --no-progress
|
||||||
|
php artisan key:generate --force
|
||||||
|
php artisan migrate
|
||||||
|
php artisan db:seed
|
||||||
|
php artisan p:user:make --name-first Test --name-last Admin --username admin --email testadmin@pterodactyl.io --password Ptero123 --admin 1
|
||||||
|
php artisan p:user:make --name-first Test --name-last User --username user --email testuser@pterodactyl.io --password Ptero123 --admin 0
|
||||||
|
|
||||||
|
echo "Add queue cronjob and start queue worker"
|
||||||
|
(crontab -l 2>/dev/null; echo "* * * * * php /var/www/html/pterodactyl/artisan schedule:run >> /dev/null 2>&1") | crontab -
|
||||||
|
systemctl start pteroq
|
||||||
|
|
||||||
|
echo " ----------------"
|
||||||
|
echo "Provisioning is completed."
|
||||||
|
echo "The panel should be available at http://localhost:50080/"
|
||||||
|
echo "You may use the default admin user to login: admin/Ptero123"
|
||||||
|
echo "A normal user has also been created: user/Ptero123"
|
||||||
|
echo "MailHog is available at http://localhost:58025/"
|
||||||
|
echo "Connect to the database using root/pterodactyl or pterodactyl/pterodactyl on localhost:53306"
|
||||||
|
echo "If you want to access the panel using http://pterodactyl.app you can use the vagrant-dns plugin"
|
||||||
|
echo "Install it with 'vagrant plugin install vagrant-dns', then run 'vagrant dns --install' once"
|
||||||
|
echo "On first use you'll have to manually start vagrant-dns with 'vagrant dns --start'"
|
51
.dev/vagrant/pterodactyl.conf
Normal file
51
.dev/vagrant/pterodactyl.conf
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
# If using Ubuntu this file should be placed in:
|
||||||
|
# /etc/nginx/sites-available/
|
||||||
|
#
|
||||||
|
# If using CentOS this file should be placed in:
|
||||||
|
# /etc/nginx/conf.d/
|
||||||
|
#
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name 0.0.0.0;
|
||||||
|
|
||||||
|
root /var/www/html/pterodactyl/public;
|
||||||
|
index index.html index.htm index.php;
|
||||||
|
charset utf-8;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.php?$query_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
location = /favicon.ico { access_log off; log_not_found off; }
|
||||||
|
location = /robots.txt { access_log off; log_not_found off; }
|
||||||
|
|
||||||
|
access_log off;
|
||||||
|
error_log /var/log/nginx/pterodactyl.app-error.log error;
|
||||||
|
|
||||||
|
# allow larger file uploads and longer script runtimes
|
||||||
|
client_max_body_size 100m;
|
||||||
|
client_body_timeout 120s;
|
||||||
|
|
||||||
|
sendfile off;
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
# the fastcgi_pass path needs to be changed accordingly when using CentOS
|
||||||
|
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_param HTTP_PROXY "";
|
||||||
|
fastcgi_intercept_errors off;
|
||||||
|
fastcgi_buffer_size 16k;
|
||||||
|
fastcgi_buffers 4 16k;
|
||||||
|
fastcgi_connect_timeout 300;
|
||||||
|
fastcgi_send_timeout 300;
|
||||||
|
fastcgi_read_timeout 300;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /\.ht {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
}
|
20
.dev/vagrant/pteroq.service
Normal file
20
.dev/vagrant/pteroq.service
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Pterodactyl Queue Worker File
|
||||||
|
# ----------------------------------
|
||||||
|
# File should be placed in:
|
||||||
|
# /etc/systemd/system
|
||||||
|
#
|
||||||
|
# nano /etc/systemd/system/pteroq.service
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description=Pterodactyl Queue Worker
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
# On some systems the user and group might be different.
|
||||||
|
# Some systems use `apache` as the user and group.
|
||||||
|
User=www-data
|
||||||
|
Group=www-data
|
||||||
|
Restart=on-failure
|
||||||
|
ExecStart=/usr/bin/php /var/www/html/pterodactyl/artisan queue:work database --queue=high,standard,low --sleep=3 --tries=3
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
10
.dev/vagrant/xdebug.ini
Normal file
10
.dev/vagrant/xdebug.ini
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
zend_extension=xdebug.so
|
||||||
|
|
||||||
|
xdebug.remote_enable=1
|
||||||
|
xdebug.remote_connect_back=1
|
||||||
|
xdebug.remote_port=9000
|
||||||
|
xdebug.scream=0
|
||||||
|
xdebug.show_local_vars=1
|
||||||
|
xdebug.idekey=PHPSTORM
|
||||||
|
|
||||||
|
xdebug.remote_log=/tmp/xdebug.log
|
|
@ -1,17 +1,12 @@
|
||||||
root = true
|
root = true
|
||||||
|
|
||||||
[*]
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
tab_width = 4
|
|
||||||
end_of_line = lf
|
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = true
|
|
||||||
|
|
||||||
[*.md]
|
[*.md]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
[*.{md,nix,yml,yaml}]
|
|
||||||
indent_size = 2
|
|
||||||
tab_width = 2
|
|
||||||
|
|
38
.env.example
38
.env.example
|
@ -1,43 +1,31 @@
|
||||||
APP_ENV=production
|
APP_ENV=production
|
||||||
APP_DEBUG=false
|
APP_DEBUG=false
|
||||||
APP_KEY=
|
APP_KEY=
|
||||||
APP_TIMEZONE=UTC
|
APP_THEME=pterodactyl
|
||||||
APP_URL=http://panel.example.com
|
APP_TIMEZONE=America/New_York
|
||||||
APP_LOCALE=en
|
APP_CLEAR_TASKLOG=720
|
||||||
|
APP_DELETE_MINUTES=10
|
||||||
APP_ENVIRONMENT_ONLY=true
|
APP_ENVIRONMENT_ONLY=true
|
||||||
|
|
||||||
LOG_CHANNEL=daily
|
LOG_CHANNEL=daily
|
||||||
LOG_DEPRECATIONS_CHANNEL=null
|
APP_LOCALE=en
|
||||||
LOG_LEVEL=debug
|
|
||||||
|
|
||||||
DB_CONNECTION=mysql
|
|
||||||
DB_HOST=127.0.0.1
|
DB_HOST=127.0.0.1
|
||||||
DB_PORT=3306
|
DB_PORT=3306
|
||||||
DB_DATABASE=panel
|
DB_DATABASE=panel
|
||||||
DB_USERNAME=pterodactyl
|
DB_USERNAME=pterodactyl
|
||||||
DB_PASSWORD=
|
DB_PASSWORD=
|
||||||
|
|
||||||
REDIS_HOST=127.0.0.1
|
|
||||||
REDIS_PASSWORD=null
|
|
||||||
REDIS_PORT=6379
|
|
||||||
|
|
||||||
CACHE_DRIVER=file
|
|
||||||
QUEUE_CONNECTION=redis
|
|
||||||
SESSION_DRIVER=file
|
|
||||||
|
|
||||||
HASHIDS_SALT=
|
HASHIDS_SALT=
|
||||||
HASHIDS_LENGTH=8
|
HASHIDS_LENGTH=8
|
||||||
|
|
||||||
MAIL_MAILER=smtp
|
MAIL_DRIVER=smtp
|
||||||
MAIL_HOST=smtp.example.com
|
MAIL_HOST=mailtrap.io
|
||||||
MAIL_PORT=25
|
MAIL_PORT=2525
|
||||||
MAIL_USERNAME=
|
MAIL_USERNAME=
|
||||||
MAIL_PASSWORD=
|
MAIL_PASSWORD=
|
||||||
MAIL_ENCRYPTION=tls
|
MAIL_ENCRYPTION=tls
|
||||||
MAIL_FROM_ADDRESS=no-reply@example.com
|
MAIL_FROM=no-reply@example.com
|
||||||
MAIL_FROM_NAME="Pterodactyl Panel"
|
|
||||||
# You should set this to your domain to prevent it defaulting to 'localhost', causing
|
QUEUE_HIGH=high
|
||||||
# mail servers such as Gmail to reject your mail.
|
QUEUE_STANDARD=standard
|
||||||
#
|
QUEUE_LOW=low
|
||||||
# @see: https://github.com/pterodactyl/panel/pull/3110
|
|
||||||
# MAIL_EHLO_DOMAIN=panel.example.com
|
|
19
.env.travis
Normal file
19
.env.travis
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
APP_ENV=testing
|
||||||
|
APP_DEBUG=true
|
||||||
|
APP_KEY=SomeRandomString3232RandomString
|
||||||
|
APP_THEME=pterodactyl
|
||||||
|
APP_TIMEZONE=UTC
|
||||||
|
APP_URL=http://localhost/
|
||||||
|
|
||||||
|
TESTING_DB_HOST=127.0.0.1
|
||||||
|
TESTING_DB_DATABASE=travis
|
||||||
|
TESTING_DB_USERNAME=root
|
||||||
|
TESTING_DB_PASSWORD=""
|
||||||
|
|
||||||
|
CACHE_DRIVER=array
|
||||||
|
SESSION_DRIVER=array
|
||||||
|
MAIL_DRIVER=array
|
||||||
|
QUEUE_DRIVER=sync
|
||||||
|
|
||||||
|
HASHIDS_SALT=test123
|
||||||
|
APP_ENVIRONMENT_ONLY=true
|
|
@ -1,6 +0,0 @@
|
||||||
public
|
|
||||||
node_modules
|
|
||||||
resources/views
|
|
||||||
babel.config.js
|
|
||||||
tailwind.config.js
|
|
||||||
webpack.config.js
|
|
52
.eslintrc.js
52
.eslintrc.js
|
@ -1,52 +0,0 @@
|
||||||
/** @type {import('eslint').Linter.Config} */
|
|
||||||
module.exports = {
|
|
||||||
parser: '@typescript-eslint/parser',
|
|
||||||
parserOptions: {
|
|
||||||
ecmaVersion: 6,
|
|
||||||
ecmaFeatures: {
|
|
||||||
jsx: true,
|
|
||||||
},
|
|
||||||
project: './tsconfig.json',
|
|
||||||
tsconfigRootDir: './',
|
|
||||||
},
|
|
||||||
settings: {
|
|
||||||
react: {
|
|
||||||
pragma: 'React',
|
|
||||||
version: 'detect',
|
|
||||||
},
|
|
||||||
linkComponents: [
|
|
||||||
{ name: 'Link', linkAttribute: 'to' },
|
|
||||||
{ name: 'NavLink', linkAttribute: 'to' },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
env: {
|
|
||||||
browser: true,
|
|
||||||
es6: true,
|
|
||||||
},
|
|
||||||
plugins: ['react', 'react-hooks', 'prettier', '@typescript-eslint'],
|
|
||||||
extends: [
|
|
||||||
// 'standard',
|
|
||||||
'eslint:recommended',
|
|
||||||
'plugin:react/recommended',
|
|
||||||
'plugin:react/jsx-runtime',
|
|
||||||
'plugin:@typescript-eslint/recommended',
|
|
||||||
],
|
|
||||||
rules: {
|
|
||||||
eqeqeq: 'error',
|
|
||||||
'prettier/prettier': ['error', {}, { usePrettierrc: true }],
|
|
||||||
// TypeScript can infer this significantly better than eslint ever can.
|
|
||||||
'react/prop-types': 0,
|
|
||||||
'react/display-name': 0,
|
|
||||||
'react/no-unknown-property': ['error', {ignore: ['css']}],
|
|
||||||
'@typescript-eslint/no-explicit-any': 0,
|
|
||||||
'@typescript-eslint/no-non-null-assertion': 0,
|
|
||||||
// This setup is required to avoid a spam of errors when running eslint about React being
|
|
||||||
// used before it is defined.
|
|
||||||
//
|
|
||||||
// @see https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-use-before-define.md#how-to-use
|
|
||||||
'no-use-before-define': 0,
|
|
||||||
'@typescript-eslint/no-use-before-define': 'warn',
|
|
||||||
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
|
|
||||||
'@typescript-eslint/ban-ts-comment': ['error', { 'ts-expect-error': 'allow-with-description' }],
|
|
||||||
},
|
|
||||||
};
|
|
1
.github/FUNDING.yml
vendored
1
.github/FUNDING.yml
vendored
|
@ -1 +0,0 @@
|
||||||
github: [matthewpi]
|
|
35
.github/ISSUE_TEMPLATE/---bug-report.md
vendored
Normal file
35
.github/ISSUE_TEMPLATE/---bug-report.md
vendored
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
---
|
||||||
|
name: "\U0001F41B Bug Report"
|
||||||
|
about: For reporting code or design bugs with the software. DO NOT REPORT APACHE/NGINX/PHP CONFIGURATION ISSUES.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
DO NOT REPORT ISSUES CONFIGURING: SSL, PHP, APACHE, NGINX, YOUR MACHINE, SSH, SFTP, ETC. ON THIS GITHUB TRACKER.
|
||||||
|
|
||||||
|
For assistance installating this software, as well as debugging issues with dependencies, please use our discord server: https://discord.gg/pterodactyl
|
||||||
|
|
||||||
|
You MUST complete all of the below information when reporting a bug, failure to do so will result in closure of your issue. PLEASE stop spamming our tracker with "bugs" that are not related to this project.
|
||||||
|
|
||||||
|
**STOP: READ FIRST, AND THEN DELETE THE ABOVE LINES**
|
||||||
|
|
||||||
|
**Background (please complete the following information):**
|
||||||
|
* Panel or Daemon:
|
||||||
|
* Version of Panel/Daemon:
|
||||||
|
* Server's OS:
|
||||||
|
* Your Computer's OS & Browser:
|
||||||
|
|
||||||
|
**Describe the bug**
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
Please provide additional information too, depending on what you have issues with:
|
||||||
|
Panel: `php -v` (the php version in use).
|
||||||
|
Daemon: `uname -a` and `docker info` (your kernel version and information regarding docker)
|
||||||
|
|
||||||
|
**To Reproduce**
|
||||||
|
Steps to reproduce the behavior:
|
||||||
|
1. Go to '...'
|
||||||
|
2. Click on '....'
|
||||||
|
3. Scroll down to '....'
|
||||||
|
4. See error
|
||||||
|
|
||||||
|
**Expected behavior**
|
||||||
|
A clear and concise description of what you expected to happen. If applicable, add screenshots or a recording to help explain your problem.
|
17
.github/ISSUE_TEMPLATE/---feature-request.md
vendored
Normal file
17
.github/ISSUE_TEMPLATE/---feature-request.md
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
---
|
||||||
|
name: "\U0001F680 Feature Request"
|
||||||
|
about: Suggest an idea for this project
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Is your feature request related to a problem? Please describe.**
|
||||||
|
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
|
||||||
|
**Describe the solution you'd like**
|
||||||
|
A clear and concise description of what you want to happen.
|
||||||
|
|
||||||
|
**Describe alternatives you've considered**
|
||||||
|
A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context or screenshots about the feature request here.
|
14
.github/ISSUE_TEMPLATE/--installation-help.md
vendored
Normal file
14
.github/ISSUE_TEMPLATE/--installation-help.md
vendored
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
---
|
||||||
|
name: "⛔ Installation Help"
|
||||||
|
about: 'Visit our Discord for installation help: https://pterodactyl.io/discord'
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
We use GitHub issues only to discuss about Pterodactyl bugs and new features. For
|
||||||
|
this kind of questions about using Pterodactyl, please visit our Discord for assistance: https://pterodactyl.io/discord
|
||||||
|
|
||||||
|
DO NOT REPORT ISSUES CONFIGURING: SSL, PHP, APACHE, NGINX, YOUR MACHINE, SSH, SFTP, ETC. ON THIS GITHUB TRACKER.
|
||||||
|
|
||||||
|
For assistance installating this software, as well as debugging issues with dependencies, please use our discord server: https://discord.gg/pterodactyl
|
||||||
|
|
||||||
|
PLEASE stop spamming our tracker with "bugs" that are not related to this project.
|
87
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
87
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
|
@ -1,87 +0,0 @@
|
||||||
name: Bug Report
|
|
||||||
description: Something isn't working quite right in the software.
|
|
||||||
labels: [not confirmed]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](https://discord.gg/pterodactyl).
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Current Behavior
|
|
||||||
description: Please provide a clear & concise description of the issue.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Expected Behavior
|
|
||||||
description: Please describe what you expected to happen.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Steps to Reproduce
|
|
||||||
description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will result in this issue being closed.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
id: panel-version
|
|
||||||
attributes:
|
|
||||||
label: Panel Version
|
|
||||||
description: Version number of your Panel (latest is not a version)
|
|
||||||
placeholder: 1.4.0
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
id: wings-version
|
|
||||||
attributes:
|
|
||||||
label: Wings Version
|
|
||||||
description: Version number of your Wings (latest is not a version)
|
|
||||||
placeholder: 1.4.2
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
id: egg-details
|
|
||||||
attributes:
|
|
||||||
label: Games and/or Eggs Affected
|
|
||||||
description: Please include the specific game(s) or egg(s) you are running into this bug with.
|
|
||||||
placeholder: Minecraft (Paper), Minecraft (Forge)
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
id: docker-image
|
|
||||||
attributes:
|
|
||||||
label: Docker Image
|
|
||||||
description: The specific Docker image you are using for the game(s) above.
|
|
||||||
placeholder: ghcr.io/pterodactyl/yolks:java_17
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: panel-logs
|
|
||||||
attributes:
|
|
||||||
label: Error Logs
|
|
||||||
description: |
|
|
||||||
Run the following command to collect logs on your system.
|
|
||||||
|
|
||||||
Wings: `sudo wings diagnostics`
|
|
||||||
Panel: `tail -n 150 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc pteropaste.com 99`
|
|
||||||
placeholder: "https://pteropaste.com/a1h6z"
|
|
||||||
render: bash
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
|
|
||||||
- type: checkboxes
|
|
||||||
attributes:
|
|
||||||
label: Is there an existing issue for this?
|
|
||||||
description: Please [search here](https://github.com/pterodactyl/panel/issues) to see if an issue already exists for your problem.
|
|
||||||
options:
|
|
||||||
- label: I have searched the existing issues before opening this issue.
|
|
||||||
required: true
|
|
||||||
- label: I have provided all relevant details, including the specific game and Docker images I am using if this issue is related to running a server.
|
|
||||||
required: true
|
|
||||||
- label: I have checked in the Discord server and believe this is a bug with the software, and not a configuration issue with my specific system.
|
|
||||||
required: true
|
|
8
.github/ISSUE_TEMPLATE/config.yml
vendored
8
.github/ISSUE_TEMPLATE/config.yml
vendored
|
@ -1,8 +0,0 @@
|
||||||
blank_issues_enabled: true
|
|
||||||
contact_links:
|
|
||||||
- name: Installation Help
|
|
||||||
url: https://discord.gg/pterodactyl
|
|
||||||
about: Please visit our Discord for help with your installation.
|
|
||||||
- name: General Question
|
|
||||||
url: https://discord.gg/pterodactyl
|
|
||||||
about: Please visit our Discord for general questions about Pterodactyl.
|
|
32
.github/ISSUE_TEMPLATE/feature-request.yml
vendored
32
.github/ISSUE_TEMPLATE/feature-request.yml
vendored
|
@ -1,32 +0,0 @@
|
||||||
name: Feature Request
|
|
||||||
description: Suggest a new feature or improvement for the software.
|
|
||||||
labels: [feature request]
|
|
||||||
body:
|
|
||||||
- type: checkboxes
|
|
||||||
attributes:
|
|
||||||
label: Is there an existing feature request for this?
|
|
||||||
description: Please [search here](https://github.com/pterodactyl/panel/issues?q=is%3Aissue) to see if someone else has already suggested this.
|
|
||||||
options:
|
|
||||||
- label: I have searched the existing issues before opening this feature request.
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Describe the feature you would like to see.
|
|
||||||
description: "A clear & concise description of the feature you'd like to have added, and what issues it would solve."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Describe the solution you'd like.
|
|
||||||
description: "You must explain how you'd like to see this feature implemented. Technical implementation details are not necessary, rather an idea of how you'd like to see this feature used."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Additional context to this request.
|
|
||||||
description: "Add any other context or screenshots about the feature request."
|
|
||||||
validations:
|
|
||||||
required: false
|
|
21
.github/docker/Caddyfile
vendored
21
.github/docker/Caddyfile
vendored
|
@ -1,21 +0,0 @@
|
||||||
:8080 {
|
|
||||||
root * /var/www/pterodactyl/public/
|
|
||||||
file_server
|
|
||||||
|
|
||||||
header {
|
|
||||||
-Server
|
|
||||||
-X-Powered-By
|
|
||||||
Referrer-Policy "same-origin"
|
|
||||||
X-Frame-Options "deny"
|
|
||||||
X-XSS-Protection "1; mode=block"
|
|
||||||
X-Content-Type-Options "nosniff"
|
|
||||||
}
|
|
||||||
|
|
||||||
encode gzip zstd
|
|
||||||
|
|
||||||
php_fastcgi 127.0.0.1:9000 {
|
|
||||||
trusted_proxies 172.20.0.0/16
|
|
||||||
}
|
|
||||||
|
|
||||||
try_files {path} {path}/ /index.php?{query}
|
|
||||||
}
|
|
21
.github/docker/php-fpm.conf
vendored
21
.github/docker/php-fpm.conf
vendored
|
@ -1,21 +0,0 @@
|
||||||
[global]
|
|
||||||
error_log = /dev/stderr
|
|
||||||
daemonize = no
|
|
||||||
|
|
||||||
[www]
|
|
||||||
user = nobody
|
|
||||||
group = nobody
|
|
||||||
|
|
||||||
listen = 127.0.0.1:9000
|
|
||||||
|
|
||||||
pm = dynamic
|
|
||||||
pm.start_servers = 4
|
|
||||||
pm.min_spare_servers = 4
|
|
||||||
pm.max_spare_servers = 16
|
|
||||||
pm.max_children = 64
|
|
||||||
pm.max_requests = 256
|
|
||||||
|
|
||||||
clear_env = no
|
|
||||||
catch_workers_output = yes
|
|
||||||
|
|
||||||
decorate_workers_output = no
|
|
57
.github/docker/supervisord.conf
vendored
57
.github/docker/supervisord.conf
vendored
|
@ -1,57 +0,0 @@
|
||||||
[supervisord]
|
|
||||||
logfile=/dev/stdout
|
|
||||||
logfile_maxbytes=0
|
|
||||||
loglevel=info
|
|
||||||
minfds=1024
|
|
||||||
minprocs=200
|
|
||||||
nodaemon=true
|
|
||||||
pidfile=/dev/null
|
|
||||||
|
|
||||||
[unix_http_server]
|
|
||||||
file=/tmp/supervisor.sock
|
|
||||||
|
|
||||||
[supervisorctl]
|
|
||||||
serverurl=unix:///tmp/supervisor.sock
|
|
||||||
|
|
||||||
[rpcinterface:supervisor]
|
|
||||||
supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
|
|
||||||
|
|
||||||
[program:caddy]
|
|
||||||
command=/usr/local/bin/caddy run --config /etc/caddy/Caddyfile
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
priority=10
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
|
|
||||||
[program:php-fpm]
|
|
||||||
command=/usr/sbin/php-fpm --nodaemonize
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
environment=LOG_CHANNEL="stderr"
|
|
||||||
|
|
||||||
[program:queue-worker]
|
|
||||||
command=/usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=standard --sleep=3 --tries=3
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
environment=LOG_CHANNEL="stderr"
|
|
||||||
|
|
||||||
[program:yacron]
|
|
||||||
command=/usr/local/bin/yacron -c /etc/yacron.yaml
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
environment=LOG_CHANNEL="stderr"
|
|
8
.github/docker/yacron.yaml
vendored
8
.github/docker/yacron.yaml
vendored
|
@ -1,8 +0,0 @@
|
||||||
jobs:
|
|
||||||
- name: scheduler
|
|
||||||
command:
|
|
||||||
- /usr/bin/php
|
|
||||||
- /var/www/pterodactyl/artisan
|
|
||||||
- schedule:run
|
|
||||||
schedule: "* * * * *"
|
|
||||||
utc: true
|
|
67
.github/workflows/docker.yaml
vendored
67
.github/workflows/docker.yaml
vendored
|
@ -1,67 +0,0 @@
|
||||||
name: Docker
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- 1.0-develop
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- 1.0-develop
|
|
||||||
release:
|
|
||||||
types:
|
|
||||||
- published
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
push:
|
|
||||||
name: Push
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Fetch metadata
|
|
||||||
id: metadata
|
|
||||||
uses: docker/metadata-action@v4
|
|
||||||
with:
|
|
||||||
images: ghcr.io/pterodactyl/panel
|
|
||||||
flavor: |
|
|
||||||
latest=false
|
|
||||||
tags: |
|
|
||||||
type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
|
|
||||||
type=ref,event=tag
|
|
||||||
type=ref,event=branch
|
|
||||||
|
|
||||||
- name: Setup QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
|
|
||||||
- name: Setup Docker buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
if: "github.event_name != 'pull_request'"
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.repository_owner }}
|
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
|
||||||
|
|
||||||
- name: Update version
|
|
||||||
if: "github.event_name == 'release' && github.event.action == 'published'"
|
|
||||||
env:
|
|
||||||
REF: ${{ github.event.release.tag_name }}
|
|
||||||
run: |
|
|
||||||
sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:1}',/" config/app.php
|
|
||||||
|
|
||||||
- name: Build and Push
|
|
||||||
uses: docker/build-push-action@v4
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
file: ./Containerfile
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
labels: ${{ steps.metadata.outputs.labels }}
|
|
||||||
tags: ${{ steps.metadata.outputs.tags }}
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
210
.github/workflows/laravel.yaml
vendored
210
.github/workflows/laravel.yaml
vendored
|
@ -1,210 +0,0 @@
|
||||||
name: Laravel
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- "develop"
|
|
||||||
- "1.0-develop"
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- "develop"
|
|
||||||
- "1.0-develop"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
analysis:
|
|
||||||
name: Static Analysis
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
env:
|
|
||||||
APP_ENV: testing
|
|
||||||
APP_DEBUG: "true"
|
|
||||||
APP_KEY: SomeRandomString3232RandomString
|
|
||||||
CACHE_DRIVER: array
|
|
||||||
MAIL_MAILER: array
|
|
||||||
SESSION_DRIVER: array
|
|
||||||
QUEUE_CONNECTION: sync
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Setup PHP
|
|
||||||
uses: shivammathur/setup-php@v2
|
|
||||||
with:
|
|
||||||
php-version: 8.1
|
|
||||||
extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
|
|
||||||
tools: composer:v2
|
|
||||||
coverage: none
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
|
|
||||||
|
|
||||||
- name: Analyze
|
|
||||||
run: vendor/bin/phpstan analyse
|
|
||||||
|
|
||||||
lint:
|
|
||||||
name: Lint
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Setup PHP
|
|
||||||
uses: shivammathur/setup-php@v2
|
|
||||||
with:
|
|
||||||
# TODO: Update to 8.2 once php-cs-fixer supports it
|
|
||||||
php-version: 8.1
|
|
||||||
extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
|
|
||||||
tools: composer:v2
|
|
||||||
coverage: none
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
|
|
||||||
|
|
||||||
- name: PHP CS Fixer
|
|
||||||
run: vendor/bin/php-cs-fixer fix --dry-run --diff
|
|
||||||
|
|
||||||
mysql:
|
|
||||||
name: Tests
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
php: [8.1, 8.2]
|
|
||||||
database: ["mariadb:10.2", "mariadb:10.9", "mysql:8"]
|
|
||||||
services:
|
|
||||||
database:
|
|
||||||
image: docker.io/library/${{ matrix.database }}
|
|
||||||
env:
|
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
|
||||||
MYSQL_DATABASE: testing
|
|
||||||
ports:
|
|
||||||
- 3306/tcp
|
|
||||||
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
|
|
||||||
env:
|
|
||||||
APP_ENV: testing
|
|
||||||
APP_DEBUG: "true"
|
|
||||||
APP_KEY: SomeRandomString3232RandomString
|
|
||||||
APP_THEME: pterodactyl
|
|
||||||
APP_TIMEZONE: UTC
|
|
||||||
APP_URL: http://localhost/
|
|
||||||
APP_ENVIRONMENT_ONLY: "true"
|
|
||||||
CACHE_DRIVER: array
|
|
||||||
MAIL_MAILER: array
|
|
||||||
SESSION_DRIVER: array
|
|
||||||
QUEUE_CONNECTION: sync
|
|
||||||
HASHIDS_SALT: test123
|
|
||||||
DB_CONNECTION: mysql
|
|
||||||
DB_HOST: 127.0.0.1
|
|
||||||
DB_DATABASE: testing
|
|
||||||
DB_USERNAME: root
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Get cache directory
|
|
||||||
id: composer-cache
|
|
||||||
run: |
|
|
||||||
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: ${{ steps.composer-cache.outputs.dir }}
|
|
||||||
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-composer-${{ matrix.php }}-
|
|
||||||
|
|
||||||
- name: Setup PHP
|
|
||||||
uses: shivammathur/setup-php@v2
|
|
||||||
with:
|
|
||||||
php-version: ${{ matrix.php }}
|
|
||||||
extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
|
|
||||||
tools: composer:v2
|
|
||||||
coverage: none
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
|
|
||||||
|
|
||||||
- name: Unit tests
|
|
||||||
run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
|
|
||||||
env:
|
|
||||||
DB_HOST: UNIT_NO_DB
|
|
||||||
|
|
||||||
- name: Integration tests
|
|
||||||
run: vendor/bin/phpunit tests/Integration
|
|
||||||
env:
|
|
||||||
DB_PORT: ${{ job.services.database.ports[3306] }}
|
|
||||||
|
|
||||||
postgres:
|
|
||||||
name: Tests
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
php: [8.1, 8.2]
|
|
||||||
database: ["postgres:13", "postgres:14", "postgres:15"]
|
|
||||||
services:
|
|
||||||
database:
|
|
||||||
image: docker.io/library/${{ matrix.database }}
|
|
||||||
env:
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_PASSWORD: postgres
|
|
||||||
POSTGRES_DB: testing
|
|
||||||
ports:
|
|
||||||
- 5432/tcp
|
|
||||||
options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
|
|
||||||
env:
|
|
||||||
APP_ENV: testing
|
|
||||||
APP_DEBUG: "true"
|
|
||||||
APP_KEY: SomeRandomString3232RandomString
|
|
||||||
APP_THEME: pterodactyl
|
|
||||||
APP_TIMEZONE: UTC
|
|
||||||
APP_URL: http://localhost/
|
|
||||||
APP_ENVIRONMENT_ONLY: "true"
|
|
||||||
CACHE_DRIVER: array
|
|
||||||
MAIL_MAILER: array
|
|
||||||
SESSION_DRIVER: array
|
|
||||||
QUEUE_CONNECTION: sync
|
|
||||||
HASHIDS_SALT: test123
|
|
||||||
DB_CONNECTION: pgsql
|
|
||||||
DB_HOST: 127.0.0.1
|
|
||||||
DB_DATABASE: testing
|
|
||||||
DB_USERNAME: postgres
|
|
||||||
DB_PASSWORD: postgres
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Get cache directory
|
|
||||||
id: composer-cache
|
|
||||||
run: |
|
|
||||||
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: ${{ steps.composer-cache.outputs.dir }}
|
|
||||||
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-composer-${{ matrix.php }}-
|
|
||||||
|
|
||||||
- name: Setup PHP
|
|
||||||
uses: shivammathur/setup-php@v2
|
|
||||||
with:
|
|
||||||
php-version: ${{ matrix.php }}
|
|
||||||
extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
|
|
||||||
tools: composer:v2
|
|
||||||
coverage: none
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
|
|
||||||
|
|
||||||
- name: Unit tests
|
|
||||||
run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
|
|
||||||
env:
|
|
||||||
DB_HOST: UNIT_NO_DB
|
|
||||||
|
|
||||||
- name: Integration tests
|
|
||||||
run: vendor/bin/phpunit tests/Integration
|
|
||||||
env:
|
|
||||||
DB_PORT: ${{ job.services.database.ports[5432] }}
|
|
92
.github/workflows/release.yaml
vendored
92
.github/workflows/release.yaml
vendored
|
@ -1,92 +0,0 @@
|
||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- "v*"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
name: Release
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v2
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 18
|
|
||||||
cache: pnpm
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm run build
|
|
||||||
|
|
||||||
- name: Create release branch and bump version
|
|
||||||
env:
|
|
||||||
REF: ${{ github.ref }}
|
|
||||||
run: |
|
|
||||||
BRANCH=release/${REF:10}
|
|
||||||
git config --local user.email "ci@pterodactyl.io"
|
|
||||||
git config --local user.name "Pterodactyl CI"
|
|
||||||
git checkout -b $BRANCH
|
|
||||||
git push -u origin $BRANCH
|
|
||||||
sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:11}',/" config/app.php
|
|
||||||
git add config/app.php
|
|
||||||
git commit -m "ci(release): bump version"
|
|
||||||
git push
|
|
||||||
|
|
||||||
- name: Create release archive
|
|
||||||
run: |
|
|
||||||
rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpstan.neon phpunit.xml shell.nix
|
|
||||||
tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
|
|
||||||
|
|
||||||
- name: Extract changelog
|
|
||||||
env:
|
|
||||||
REF: ${{ github.ref }}
|
|
||||||
run: |
|
|
||||||
sed -n "/^## ${REF:10}/,/^## /{/^## /b;p}" CHANGELOG.md > ./RELEASE_CHANGELOG
|
|
||||||
|
|
||||||
- name: Create checksum and add to changelog
|
|
||||||
run: |
|
|
||||||
SUM=`sha256sum panel.tar.gz`
|
|
||||||
echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG
|
|
||||||
echo $SUM > checksum.txt
|
|
||||||
|
|
||||||
- name: Create release
|
|
||||||
id: create_release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
draft: true
|
|
||||||
prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
|
|
||||||
body_path: ./RELEASE_CHANGELOG
|
|
||||||
|
|
||||||
- name: Upload release archive
|
|
||||||
id: upload-release-archive
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
|
||||||
asset_path: panel.tar.gz
|
|
||||||
asset_name: panel.tar.gz
|
|
||||||
asset_content_type: application/gzip
|
|
||||||
|
|
||||||
- name: Upload release checksum
|
|
||||||
id: upload-release-checksum
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
|
||||||
asset_path: ./checksum.txt
|
|
||||||
asset_name: checksum.txt
|
|
||||||
asset_content_type: text/plain
|
|
63
.github/workflows/ui.yaml
vendored
63
.github/workflows/ui.yaml
vendored
|
@ -1,63 +0,0 @@
|
||||||
name: UI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- "develop"
|
|
||||||
- "1.0-develop"
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- "develop"
|
|
||||||
- "1.0-develop"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lint:
|
|
||||||
name: Lint
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v2
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 18
|
|
||||||
cache: pnpm
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Lint
|
|
||||||
run: pnpm run lint
|
|
||||||
|
|
||||||
tests:
|
|
||||||
name: Tests
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
node: [16, 18]
|
|
||||||
steps:
|
|
||||||
- name: Code checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v2
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: ${{ matrix.node }}
|
|
||||||
cache: pnpm
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm run build
|
|
||||||
|
|
||||||
- name: Tests
|
|
||||||
run: pnpm run test
|
|
32
.gitignore
vendored
32
.gitignore
vendored
|
@ -1,36 +1,34 @@
|
||||||
/vendor
|
/vendor
|
||||||
*.DS_Store*
|
*.DS_Store*
|
||||||
!.env.ci
|
.env
|
||||||
!.env.example
|
|
||||||
.env*
|
|
||||||
.vagrant/*
|
.vagrant/*
|
||||||
.vscode/*
|
.vscode/*
|
||||||
storage/framework/*
|
storage/framework/*
|
||||||
/.idea
|
/.idea
|
||||||
/nbproject
|
/nbproject
|
||||||
/.direnv
|
|
||||||
|
|
||||||
|
package-lock.json
|
||||||
|
composer.lock
|
||||||
node_modules
|
node_modules
|
||||||
*.log
|
|
||||||
_ide_helper.php
|
|
||||||
_ide_helper_models.php
|
_ide_helper_models.php
|
||||||
.phpstorm.meta.php
|
_ide_helper.php
|
||||||
.yarn
|
|
||||||
public/assets/manifest.json
|
sami.phar
|
||||||
|
/.sami
|
||||||
|
|
||||||
# For local development with docker
|
# For local development with docker
|
||||||
# Remove if we ever put the Dockerfile in the repo
|
# Remove if we ever put the Dockerfile in the repo
|
||||||
.dockerignore
|
.dockerignore
|
||||||
|
#Dockerfile
|
||||||
docker-compose.yml
|
docker-compose.yml
|
||||||
|
|
||||||
# for image related files
|
# for image related files
|
||||||
misc
|
misc
|
||||||
.php-cs-fixer.cache
|
.phpstorm.meta.php
|
||||||
coverage.xml
|
.php_cs.cache
|
||||||
resources/lang/locales.js
|
|
||||||
.phpunit.result.cache
|
|
||||||
|
|
||||||
/public/build
|
coverage.xml
|
||||||
/public/hot
|
|
||||||
result
|
# Vagrant
|
||||||
docker-compose.yaml
|
*.log
|
||||||
|
|
1
.npmrc
1
.npmrc
|
@ -1 +0,0 @@
|
||||||
shamefully-hoist=true
|
|
|
@ -1,52 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
use PhpCsFixer\Config;
|
|
||||||
use PhpCsFixer\Finder;
|
|
||||||
|
|
||||||
$finder = (new Finder())
|
|
||||||
->in(__DIR__)
|
|
||||||
->exclude([
|
|
||||||
'vendor',
|
|
||||||
'node_modules',
|
|
||||||
'storage',
|
|
||||||
'bootstrap/cache',
|
|
||||||
])
|
|
||||||
->notName(['_ide_helper*']);
|
|
||||||
|
|
||||||
return (new Config())
|
|
||||||
->setRiskyAllowed(true)
|
|
||||||
->setFinder($finder)
|
|
||||||
->setRules([
|
|
||||||
'@Symfony' => true,
|
|
||||||
'@PSR1' => true,
|
|
||||||
'@PSR2' => true,
|
|
||||||
'@PSR12' => true,
|
|
||||||
'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
|
|
||||||
'combine_consecutive_unsets' => true,
|
|
||||||
'concat_space' => ['spacing' => 'one'],
|
|
||||||
'heredoc_to_nowdoc' => true,
|
|
||||||
'no_alias_functions' => true,
|
|
||||||
'no_unreachable_default_argument_value' => true,
|
|
||||||
'no_useless_return' => true,
|
|
||||||
'ordered_imports' => [
|
|
||||||
'sort_algorithm' => 'length',
|
|
||||||
],
|
|
||||||
'phpdoc_align' => [
|
|
||||||
'align' => 'left',
|
|
||||||
'tags' => [
|
|
||||||
'param',
|
|
||||||
'property',
|
|
||||||
'return',
|
|
||||||
'throws',
|
|
||||||
'type',
|
|
||||||
'var',
|
|
||||||
],
|
|
||||||
],
|
|
||||||
'random_api_migration' => true,
|
|
||||||
'ternary_to_null_coalescing' => true,
|
|
||||||
'yoda_style' => [
|
|
||||||
'equal' => false,
|
|
||||||
'identical' => false,
|
|
||||||
'less_and_greater' => false,
|
|
||||||
],
|
|
||||||
]);
|
|
55
.php_cs
Normal file
55
.php_cs
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$finder = PhpCsFixer\Finder::create()
|
||||||
|
->in([
|
||||||
|
'app',
|
||||||
|
'bootstrap',
|
||||||
|
'config',
|
||||||
|
'database',
|
||||||
|
'resources/lang',
|
||||||
|
'routes',
|
||||||
|
'tests',
|
||||||
|
]);
|
||||||
|
|
||||||
|
return PhpCsFixer\Config::create()
|
||||||
|
->setRules([
|
||||||
|
'@Symfony' => true,
|
||||||
|
'@PSR1' => true,
|
||||||
|
'@PSR2' => true,
|
||||||
|
'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
|
||||||
|
'array_syntax' => ['syntax' => 'short'],
|
||||||
|
'blank_line_before_return' => true,
|
||||||
|
'blank_line_before_statement' => false,
|
||||||
|
'combine_consecutive_unsets' => true,
|
||||||
|
'concat_space' => ['spacing' => 'one'],
|
||||||
|
'declare_equal_normalize' => ['space' => 'single'],
|
||||||
|
'heredoc_to_nowdoc' => true,
|
||||||
|
'increment_style' => ['style' => 'post'],
|
||||||
|
'linebreak_after_opening_tag' => true,
|
||||||
|
'method_argument_space' => [
|
||||||
|
'ensure_fully_multiline' => false,
|
||||||
|
'keep_multiple_spaces_after_comma' => false,
|
||||||
|
],
|
||||||
|
'new_with_braces' => false,
|
||||||
|
'no_alias_functions' => true,
|
||||||
|
'no_multiline_whitespace_before_semicolons' => true,
|
||||||
|
'no_unreachable_default_argument_value' => true,
|
||||||
|
'no_useless_return' => true,
|
||||||
|
'not_operator_with_successor_space' => true,
|
||||||
|
'ordered_imports' => [
|
||||||
|
'sortAlgorithm' => 'length',
|
||||||
|
],
|
||||||
|
'phpdoc_align' => ['tags' => ['param']],
|
||||||
|
'phpdoc_separation' => false,
|
||||||
|
'protected_to_private' => false,
|
||||||
|
'psr0' => ['dir' => 'app'],
|
||||||
|
'psr4' => true,
|
||||||
|
'random_api_migration' => true,
|
||||||
|
'standardize_not_equals' => true,
|
||||||
|
'ternary_to_null_coalescing' => true,
|
||||||
|
'yoda_style' => [
|
||||||
|
'equal' => false,
|
||||||
|
'identical' => false,
|
||||||
|
'less_and_greater' => false,
|
||||||
|
],
|
||||||
|
])->setRiskyAllowed(true)->setFinder($finder);
|
|
@ -1,4 +0,0 @@
|
||||||
.github
|
|
||||||
public
|
|
||||||
node_modules
|
|
||||||
resources/views
|
|
|
@ -1,22 +0,0 @@
|
||||||
{
|
|
||||||
"printWidth": 120,
|
|
||||||
"tabWidth": 4,
|
|
||||||
"useTabs": false,
|
|
||||||
"semi": true,
|
|
||||||
"singleQuote": true,
|
|
||||||
"jsxSingleQuote": false,
|
|
||||||
"trailingComma": "all",
|
|
||||||
"bracketSpacing": true,
|
|
||||||
"arrowParens": "avoid",
|
|
||||||
"endOfLine": "lf",
|
|
||||||
"overrides": [
|
|
||||||
{
|
|
||||||
"files": ["**/*.md"],
|
|
||||||
"options": {
|
|
||||||
"tabWidth": 2,
|
|
||||||
"useTabs": false,
|
|
||||||
"singleQuote": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
16
.sami.php
Normal file
16
.sami.php
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Sami\Sami;
|
||||||
|
use Symfony\Component\Finder\Finder;
|
||||||
|
|
||||||
|
$iterator = Finder::create()
|
||||||
|
->files()
|
||||||
|
->name('*.php')
|
||||||
|
->in($dir = __DIR__ . '/app');
|
||||||
|
|
||||||
|
return new Sami($iterator, array(
|
||||||
|
'title' => 'Pterodactyl',
|
||||||
|
'build_dir' => __DIR__ . '/.sami/build',
|
||||||
|
'cache_dir' => __DIR__ . '/.sami/cache',
|
||||||
|
'default_opened_level' => 2,
|
||||||
|
));
|
7
.styleci.yml
Normal file
7
.styleci.yml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
preset: laravel
|
||||||
|
risky: false
|
||||||
|
disabled:
|
||||||
|
- concat_without_spaces
|
||||||
|
enabled:
|
||||||
|
- concat_with_spaces
|
||||||
|
- no_unused_imports
|
44
.travis.yml
Normal file
44
.travis.yml
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
language: php
|
||||||
|
dist: trusty
|
||||||
|
git:
|
||||||
|
depth: 3
|
||||||
|
quiet: true
|
||||||
|
matrix:
|
||||||
|
fast_finish: true
|
||||||
|
allow_failures:
|
||||||
|
- env: TEST_SUITE=Coverage
|
||||||
|
env:
|
||||||
|
matrix:
|
||||||
|
- TEST_SUITE=Unit
|
||||||
|
- TEST_SUITE=Coverage
|
||||||
|
- TEST_SUITE=Integration
|
||||||
|
php:
|
||||||
|
- 7.2
|
||||||
|
sudo: false
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $HOME/.composer/cache
|
||||||
|
services:
|
||||||
|
- mysql
|
||||||
|
before_install:
|
||||||
|
- mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
|
||||||
|
before_script:
|
||||||
|
- echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
|
||||||
|
- cp .env.travis .env
|
||||||
|
- travis_retry composer install --no-interaction --prefer-dist --no-suggest
|
||||||
|
script:
|
||||||
|
- if [ "$TEST_SUITE" = "Unit" ]; then vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit; fi;
|
||||||
|
- if [ "$TEST_SUITE" = "Coverage" ]; then vendor/bin/phpunit --bootstrap vendor/autoload.php --coverage-clover coverage.xml tests/Unit; fi;
|
||||||
|
- if [ "$TEST_SUITE" = "Integration" ]; then vendor/bin/phpunit tests/Integration; fi;
|
||||||
|
notifications:
|
||||||
|
email: false
|
||||||
|
webhooks:
|
||||||
|
urls:
|
||||||
|
- https://misc.schrej.net/travistodiscord/pterodev.php
|
||||||
|
on_success: change
|
||||||
|
on_failure: always
|
||||||
|
on_error: always
|
||||||
|
on_cancel: always
|
||||||
|
on_start: never
|
||||||
|
after_success:
|
||||||
|
- bash <(curl -s https://codecov.io/bash)
|
639
CHANGELOG.md
639
CHANGELOG.md
|
@ -3,645 +3,6 @@ This file is a running track of new features and fixes to each version of the pa
|
||||||
|
|
||||||
This project follows [Semantic Versioning](http://semver.org) guidelines.
|
This project follows [Semantic Versioning](http://semver.org) guidelines.
|
||||||
|
|
||||||
## v1.11.3
|
|
||||||
### Changed
|
|
||||||
* When updating a server's description through the client API, if no value is specified, the description will now remain unchanged.
|
|
||||||
* When installing the Panel for the first time, the queue driver will now all default to `redis` instead of `sync`.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* `php artisan p:environment:mail` not correctly setting the right variable for `MAIL_FROM_ADDRESS`.
|
|
||||||
* Fixed the conflict state rendering on the UI for a server showing `reinstall_failed` as `restoring_backup`.
|
|
||||||
* Fixed the unknown column `uuid` error when jobs fail, causing them not to get stored correctly.
|
|
||||||
* Fixed the server task endpoints in the client API not allowing `sequence_id` and `continue_on_failure` to be set.
|
|
||||||
|
|
||||||
## v1.11.2
|
|
||||||
### Changed
|
|
||||||
* Telemetry no longer sends a map of Egg and Nest UUIDs to the number of servers using them.
|
|
||||||
* Increased the timeout for the decompress files endpoint in the client API from 15 seconds to 15 minutes.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Fixed Panel Docker image having a `v` prefix in the version displayed in the admin area.
|
|
||||||
* Fixed emails using the wrong queue name, causing them to not be sent.
|
|
||||||
* Fixed the settings keys used for configuring SMTP settings, causing settings to not save properly.
|
|
||||||
* Fixed the `MAIL_EHLO_DOMAIN` environment variable not being properly backwards compatible with the old `SERVER_NAME` variable.
|
|
||||||
|
|
||||||
## v1.11.1
|
|
||||||
### Fixed
|
|
||||||
* Fixed Panel Docker image showing `canary` as it's version.
|
|
||||||
|
|
||||||
## v1.11.0
|
|
||||||
### Changed (since 1.10.4)
|
|
||||||
* Changed minimum PHP version requirement from `7.4` to `8.0`.
|
|
||||||
* Upgraded from Laravel 8 to Laravel 9.
|
|
||||||
* This release requires Wings v1.11.x in order for Server Transfers to work.
|
|
||||||
* `MB` byte suffixes are now displayed as `MiB` to more accurately reflect the actual value.
|
|
||||||
* Server re-installation failures are tracked independently of the initial installation process.
|
|
||||||
|
|
||||||
### Fixed (since 1.10.4)
|
|
||||||
* Node maintenance mode now properly blocks access to servers.
|
|
||||||
* Fixed the length validation on the Minecraft Forge egg.
|
|
||||||
* Fixed the password in the JDBC string not being properly URL encoded.
|
|
||||||
* Fixed an issue where Wings would throw a validation error while attempting to upload activity logs.
|
|
||||||
* Properly handle a missing `Content-Length` header in the response from the daemon.
|
|
||||||
* Ensure activity log properties are always returned as an object instead of an empty array.
|
|
||||||
|
|
||||||
### Added (since 1.10.4)
|
|
||||||
* Added the `server:settings.description` activity log event for when a server description is changed.
|
|
||||||
* Added the ability to cancel file uploads in the file manager for a server.
|
|
||||||
* Added a telemetry service to collect anonymous metrics from the panel, this feature is *enabled* by default and can be toggled using the `PTERODACTYL_TELEMETRY_ENABLED` environment variable.
|
|
||||||
|
|
||||||
## v1.11.0-rc.2
|
|
||||||
### Changed
|
|
||||||
* `MB` byte suffixes are now displayed as `MiB` to more accurately reflect the actual value.
|
|
||||||
* Server re-installation failures are tracked independently of the initial installation process.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Properly handle a missing `Content-Length` header in the response from the daemon.
|
|
||||||
* Ensure activity log properties are always returned as an object instead of an empty array.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Added the `server:settings.description` activity log event for when a server description is changed.
|
|
||||||
* Added the ability to cancel file uploads in the file manager for a server.
|
|
||||||
* Added a telemetry service to collect anonymous metrics from the panel, this feature is disabled by default and can be toggled using the `PTERODACTYL_TELEMETRY_ENABLED` environment variable.
|
|
||||||
|
|
||||||
## v1.11.0-rc.1
|
|
||||||
### Changed
|
|
||||||
* Changed minimum PHP version requirement from `7.4` to `8.0`.
|
|
||||||
* Upgraded from Laravel 8 to Laravel 9.
|
|
||||||
* This release requires Wings v1.11.x in order for Server Transfers to work.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Node maintenance mode now properly blocks access to servers.
|
|
||||||
* Fixed the length validation on the Minecraft Forge egg.
|
|
||||||
* Fixed the password in the JDBC string not being properly URL encoded.
|
|
||||||
* Fixed an issue where Wings would throw a validation error while attempting to upload activity logs.
|
|
||||||
|
|
||||||
## v1.10.4
|
|
||||||
### Fixed
|
|
||||||
* Fixed an issue where subusers could be given permissions that are not actually registered or used.
|
|
||||||
* Fixed an issue where node FQDNs could not just be IP addresses.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Change maximum number of API keys per user from `10` to `25`.
|
|
||||||
* Change byte unit prefix from `B` to `iB` to better reflect our usage of base 2 (multiples of 1024).
|
|
||||||
|
|
||||||
## v1.10.3
|
|
||||||
### Fixed
|
|
||||||
* S3 Backup driver now supports Cloudflare R2.
|
|
||||||
* Node FQDNs can now be used with AAAA records with no A records present.
|
|
||||||
* Server transfers can no longer be initiated if the server is being installed, transferred, or restoring a backup.
|
|
||||||
* Fixed an issue relating to the use of arrays in the `config_files` field with eggs.
|
|
||||||
* Fixed `oom_disabled` not being mapped in the Application API when creating a new server.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* File manager now supports selecting multiple files for upload (when using the upload button).
|
|
||||||
* Added a configuration option for specifying the S3 storage class for backups.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Servers will now show the current uptime when the server is starting rather than only showing when the server is marked as online.
|
|
||||||
|
|
||||||
## v1.10.2
|
|
||||||
### Fixed
|
|
||||||
* Fixes a rendering issue with egg descriptions in the admin area
|
|
||||||
* Fixes the page title on the SSH Keys page
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Additional validation rules will now show a toggle switch rather than an input when editing server variables
|
|
||||||
* The eggs endpoint will now always return an empty JSON object for the `config_files` field, even if the field is completely empty
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds a `Force Outgoing IP` option for eggs that can be used to ensure servers making outgoing connections use their allocation IP rather than the node's primary ip
|
|
||||||
* Adds options to configure sending of email (re)install notifications
|
|
||||||
* Add an option to configure the part size for backups uploaded to S3
|
|
||||||
|
|
||||||
## v1.10.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes a surprise `clock()` function that was used for debugging and should not have made it into the release. This was causing activity events to not properly sync between the Panel and Wings.
|
|
||||||
|
|
||||||
## v1.10.0
|
|
||||||
### Fixed
|
|
||||||
* Fixes improper cache key naming on the frontend causing server activity logs to be duplicated across server page views.
|
|
||||||
* Fixes overflow issues on dialogs when the internal content is too long.
|
|
||||||
* Fixes spinner overlay on console improperly taking up the entire page making it impossible to use navigation controls.
|
|
||||||
* Fixes 2FA QR code background being too dark for some phones to properly scan.
|
|
||||||
* File manager now properly displays an error message if a user attempts to upload a folder rather than files.
|
|
||||||
* Fixes the "Create Directory" dialog persisting the previously entered value when it is re-opened.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* IP addresses in activity logs are now always displayed to administrators, regardless of if they own the server or not.
|
|
||||||
* Scroll down indicator on the console has been changed to a down arrow to be clearer.
|
|
||||||
* Docker builds have been updated to use `PHP 8.1`.
|
|
||||||
* Recaptcha validation domain is now configurable using the `RECAPTCHA_DOMAIN` environment variable.
|
|
||||||
* Drag and drop overlay on the file manager has been tweaked to be slightly more consistent with the frontend style and be a little easier to read.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds support for the `user_uuid` claim on all generated JWTs which allows Wings to properly identify the user performing each action.
|
|
||||||
* Adds support for recieving external activity log events from Wings instances (power state, commands, SFTP, and uploads).
|
|
||||||
* Adds support for tracking failed password-based SFTP logins.
|
|
||||||
* Server name and description are now passed along to Wings making them available in egg variables for parsing and including.
|
|
||||||
* Adds support for displaying all active file uploads in the file manager.
|
|
||||||
|
|
||||||
## v1.9.2
|
|
||||||
### Fixed
|
|
||||||
* Fixes rouding in sidebar of CPU usage graph that was causing an excessive number of zeros to be rendered.
|
|
||||||
* Fixes the Java Version selector modal having the wrong default value selected initially.
|
|
||||||
* Fixes console rendering in Safari that was causing the console to resize excessively and graphs to overlay content.
|
|
||||||
* Fixes missing "Starting"/"Stopping" status display in the server uptime block.
|
|
||||||
* Fixes incorrect formatting of activity log when viewing certain file actions.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updated the UI for the two-step authorization setup on accounts to use new Dialog UI and provide better clarity to new users.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Added missing `<DOCTYPE html>` tag to template output to avoid entering quirks mode in browsers.
|
|
||||||
* Added password requirement when enabling TOTP on an account.
|
|
||||||
|
|
||||||
## v1.9.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes missing "Click to Copy" for server address on the console data blocks.
|
|
||||||
* Fixes data points on the graphs not being properly rounded to two decimal places.
|
|
||||||
* Returns byte formatting logic to use `1024` as the base value, rather than `1000`.
|
|
||||||
* Fixes permission error occurring when a server is marked as installing and an admin navigates to the console screen.
|
|
||||||
* Fixes improper display of install/transfer warning on the server console page.
|
|
||||||
* Fixes permission matching for the server settings page to correctly allow access when a user has _any_ of the needed permissions.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Moves the server data blocks to the right-hand side of the console, rather than the left.
|
|
||||||
* Rather than defaulting graph values at `0` when resetting or refreshing the page, their values are now hidden entirely.
|
|
||||||
* **[security]** Hides IP addresses from all activity log entries that are not directly associated with the currently signed in user.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds the current resource limits for a server next to each data block on the console screen.
|
|
||||||
|
|
||||||
## v1.9.0
|
|
||||||
### Added
|
|
||||||
* Added support for using Tailwind classes inside components using `className={}` rather than having to use `twin.macro` with the `css={}` prop.
|
|
||||||
* Added HeadlessUI and Heroicons packages.
|
|
||||||
* Added new `Tooltip.tsx` component to support displaying tooltips within the Panel.
|
|
||||||
* Adds a new activity log view for both user accounts and individual servers. This builds upon data collected in previous releases.
|
|
||||||
* Added a new column `api_key_id` to the `activity_logs` table to indicate if the user performed the action while using an API key.
|
|
||||||
* Adds initial support for language translations on the front-end. The underlying implementation details are working, however work has not yet begun on actually translating all of the strings yet. Expect this to continue in future releases.
|
|
||||||
* Improved accessibility for navigation icons by adding a tooltip on hover to indicate what each one does.
|
|
||||||
* Adds logging for API keys that are blocked from performing an API action due to IP address limiting.
|
|
||||||
* Adds support for `?filter[description]=foo` when querying servers on both the client and application API.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updated how release assets are generated to perform more logical bundle splitting. This should help reduce the amount of data users have to download at once in order to render the UI.
|
|
||||||
* Upgraded From TailwindCSS 2 to 3 — for most people this should have minimal if any impact.
|
|
||||||
* Chart.js updated from v2 to v3.
|
|
||||||
* Reduced the number of custom colors in use — by default we now use Tailwind's default color pallet, with the exception of a custom gray scheme.
|
|
||||||
* **[deprecated]** The use of `neutral` and `primary` have been deprecated in class names, prefer `gray` and `blue` respectively.
|
|
||||||
* Begins the process of dropping the use of Gravatars for user avatars and replaces them with dynamically generated SVG images.
|
|
||||||
* Improved front-end route definitions to make it easier for external modifications to inject their routes and components into the codebase without having to modify as many core files.
|
|
||||||
* Redesigned the server console screen to better display data users might be looking for, and increase the height of the console itself.
|
|
||||||
* Merged the two network data graphs into a single dual-line graph to better display incoming and outgoing data volumes.
|
|
||||||
* Updated all byte formatting logic to use `1000` as the divisor rather than `1024` to be more consistent with what users most likely expect.
|
|
||||||
* Changed the underlying `eslint` rules applied to the front-end codebase to simplify them dramatically. We now utilize `prettier` in combination with some basic default rulesets to make it easier to understand the expected formatting.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Fixes a bug causing a 404 error when attempting to delete a database from a server in the admin control panel.
|
|
||||||
* Fixes console input auto-capitalizing and auto-correcting when entering text on some mobile devices.
|
|
||||||
* Fixes SES service configuration using a hard-coded `us-east-1` region.
|
|
||||||
* Fixes a bug causing a 404 error when attempting to delete an SSH key from your account when the SHA256 hash includes a slash.
|
|
||||||
* Fixes mobile keyboards automatically attempting to capitalize and spellcheck typing on the server console.
|
|
||||||
* Fixes improper support for IP address CIDR ranges when creating API keys for the client area.
|
|
||||||
* Fixes a bug preventing additional included details from being returned from the application API when utilizing a client API key as an administrator.
|
|
||||||
|
|
||||||
## v1.8.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes a bug causing mounts to return a 404 error when adding them to a server.
|
|
||||||
* Fixes a bug causing the Egg Image dropdown to not display properly when creating a new server.
|
|
||||||
* Fixes a bug causing an error when attemping to create a new server via the API.
|
|
||||||
|
|
||||||
## v1.8.0
|
|
||||||
**Important:** this version updates the `version` field on generated Eggs to be `PTDL_v2` due to formatting changes. This
|
|
||||||
should be completely seamless for most installations as the Panel is able to convert between the two. Custom solutions
|
|
||||||
using these eggs should be updated to account for the new format.
|
|
||||||
|
|
||||||
This release also changes API key behavior — "client" keys belonging to admin users can now be used to access
|
|
||||||
the `/api/application` endpoints in their entirety. Existing "application" keys generated in the admin area should
|
|
||||||
be considered deprecated, but will continue to work. Application keys _will not_ work with the client API.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Schedules are no longer run when a server is suspended or marked as installing.
|
|
||||||
* The remote field when creating a database is no longer limited to an IP address and `%` wildcard — all expected MySQL remote host values are allowed.
|
|
||||||
* Allocations cannot be deleted from a server by a user if the server is configured with an `allocation_limit` set to `0`.
|
|
||||||
* The Java Version modal no longer shows a dropdown and update option to users that do not have permission to make those changes.
|
|
||||||
* The Java Version modal now correctly returns only the images available to the server's selected Egg.
|
|
||||||
* Fixes leading and trailing spaces being removed from variable values on file manager endpoints, causing errors when trying to perform actions against certain files and folders.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Forces HTTPS on URLs when the `APP_URL` value is set and includes `https://` within the URL. This addresses proxy misconfiguration issues that would cause URLs to be generated incorrectly.
|
|
||||||
* Lowers the default timeout values for requests to Wings instances from 10 seconds to 5 seconds.
|
|
||||||
* Additional permissions (`CREATE TEMPORARY TABLES`, `CREATE VIEW`, `SHOW VIEW`, `EVENT`, and `TRIGGER`) are granted to users when creating new databases for servers.
|
|
||||||
* development: removed Laravel Debugbar in favor of Clockwork for debugging.
|
|
||||||
* The 2FA input field when logging in is now correctly identified as `one-time-password` to help browser autofill capabilities.
|
|
||||||
* Changed API authentication mechanisms to make use of Laravel Sanctum to significantly clean up our internal handling of sessions.
|
|
||||||
* API keys generated by the system now set a prefix to identify them as Pterodactyl API keys, and if they are client or application keys. This prefix looks like `ptlc_` for client keys, and `ptla_` for application keys. Existing API keys are unaffected by this change.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Added support for PHP 8.1 in addition to PHP 8.0 and 7.4.
|
|
||||||
* Adds more support for catching potential PID exhaustion errors in different games.
|
|
||||||
* It is now possible to create a new node on the Panel using an artisan command.
|
|
||||||
* A new cron cheatsheet has been added which appears when creating a schedule.
|
|
||||||
* Adds support for filtering the `/api/application/nodes/:id/allocations` endpoint using `?filter[server_id]=0` to only return allocations that are not currently assigned to a server on that node.
|
|
||||||
* Adds support for naming docker image values in an Egg to improve front-end display capabilities.
|
|
||||||
* Adds command to return the configuration for a specific node in both YAML and JSON format (`php artisan p:node:configuration`).
|
|
||||||
* Adds command to return a list of all nodes available on the Panel in both table and JSON format (`php artisan p:node:list`).
|
|
||||||
* Adds server network (inbound/outbound) usage graphs to the console screen.
|
|
||||||
* Adds support for configuring CORS on the API by setting the `APP_CORS_ALLOWED_ORIGINS=example.com,dashboard.example.com` environment variable. By default all instances are configured with this set to `*` which allows any origin.
|
|
||||||
* Adds proper activity logging for the following areas of the Panel: authentication, user account modifications, server modification. This is an initial test implementation before further roll-out in the software. Events are logged into the database but are not currently exposed in the UI — they will be displayed in a future update.
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
* Removes Google Analytics from the front end code.
|
|
||||||
* Removes multiple middleware that were previously used for configuring API access and controlling model fetching. This has all been replaced with Laravel Sanctum and standard Laravel API tooling. This should make codebase discovery significantly more simple.
|
|
||||||
* **DEPRECATED**: The use of `Pterodactyl\Models\AuditLog` is deprecated and all references to this model have been removed from the codebase. In the next major release this model and table will be fully dropped.
|
|
||||||
|
|
||||||
## v1.7.0
|
|
||||||
### Fixed
|
|
||||||
* Fixes typo in message shown to user when deleting a database.
|
|
||||||
* Fixes formatting of IPv6 addresses when displaying allocations to users.
|
|
||||||
* Fixes an exception thrown while trying to return error messages from API endpoints that inproperly masked the true underlying error.
|
|
||||||
* Fixes SSL certificate path generation for Let's Encrypt by ensuring they are always transformed to lowercase.
|
|
||||||
* Removes duplicate entries when creating a nested folder in the file manager.
|
|
||||||
* Fixes missing validation of Egg Author email addresses during the setup process that could cause unexpected failures later on.
|
|
||||||
* Fixes font rendering issues of the console on Firefox due to an outdated version of xterm.js being used.
|
|
||||||
* Fixes display overlap issues of the two-factor configuration form in a user's settings.
|
|
||||||
* **[security]** When authenticating using an API key a user session is now only persisted for the duration of the request before being destroyed.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* CPU graph changed to show the maximum amount of CPU available to a server to better match how the memory graph is displayed.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds support for `DB_PORT` environment variable in the Docker enterpoint for the Panel image.
|
|
||||||
* Adds suport for ARM environments in the Docker image.
|
|
||||||
* Adds a new warning modal for Steam servers shown when an invalid Game Server Login Token (GSL Token) is detected.
|
|
||||||
* Adds a new warning modal for Steam servers shown when the installation process runs out of available disk space.
|
|
||||||
* Adds a new warning modal for Minecraft servers shown when a server exceeds the maximum number of child processes.
|
|
||||||
* Adds support for displaying certain server variable fields as a checkbox when they're detected as using `boolean` or `in:0,1` validation rules.
|
|
||||||
* Adds support for Pug and Jade in the file editor.
|
|
||||||
* Adds an entry to the `robots.txt` file to correctly disallow all bot indexing.
|
|
||||||
|
|
||||||
|
|
||||||
## v1.6.6
|
|
||||||
### Fixed
|
|
||||||
* **[security]** Fixes a CSRF vulnerability for both the administrative test email endpoint and node auto-deployment token generation endpoint. [GHSA-wwgq-9jhf-qgw6](https://github.com/pterodactyl/panel/security/advisories/GHSA-wwgq-9jhf-qgw6)
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updates Minecraft eggs to include latest Java 17 yolk by default.
|
|
||||||
|
|
||||||
## v1.6.5
|
|
||||||
### Fixed
|
|
||||||
* Fixes broken application API endpoints due to changes introduced with session management in 1.6.4.
|
|
||||||
|
|
||||||
## v1.6.4
|
|
||||||
_This release should not be used, please use `1.6.5`. It has been pulled from our releases._
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Fixes a session management bug that would cause a user who signs out of one browser to be unintentionally logged out of other browser sessions when using the client API.
|
|
||||||
|
|
||||||
## v1.6.3
|
|
||||||
### Fixed
|
|
||||||
* **[Security]** Changes logout endpoint to be a POST request with CSRF-token validation to prevent a malicious actor from triggering a user logout.
|
|
||||||
* Fixes Wings receiving the wrong server suspension state when syncing servers.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds additional throttling to login and password reset endpoints.
|
|
||||||
* Adds server uptime display when viewing a server console.
|
|
||||||
|
|
||||||
## v1.6.2
|
|
||||||
### Fixed
|
|
||||||
* **[Security]** Fixes an authentication bypass vulerability that could allow a malicious actor to login as another user in the Panel without knowing that user's email or password.
|
|
||||||
|
|
||||||
## v1.6.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes server build modifications not being properly persisted to the database when edited.
|
|
||||||
* Correctly exposes the `oom_disabled` field in the `build` limits block for a server build so that Wings can pick it up.
|
|
||||||
*
|
|
||||||
## v1.6.0
|
|
||||||
### Fixed
|
|
||||||
* Fixes array merging logic for server transfers that would cause a 500 error to occur in some scenarios.
|
|
||||||
* Fixes user password updates not correctly logging the user out and returning a failure message even upon successful update.
|
|
||||||
* Fixes the count of used backups when browsing a paginated backup list for a server.
|
|
||||||
* Fixes an error being triggered when API endpoints are called with no `User-Agent` header and an audit log is generated for the action.
|
|
||||||
* Fixes state management on the frontend not properly resetting the loading indicator when adding subusers to a server.
|
|
||||||
* Fixes extraneous API calls being made to Wings for the server file listing when not on a file manager screen.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds foreign key relationship on the `mount_node`, `mount_server` and `egg_mount` tables.
|
|
||||||
* Adds environment variable `PER_SCHEDULE_TASK_LIMIT` to allow manual overrides for the number of tasks that can exist on a single schedule. This is currently defaulted to `10`.
|
|
||||||
* OOM killer can now be configured at the time of server creation.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Server updates are not dependent on a successful call to Wings occurring — if the API call fails internally the error will be logged but the server update will still be persisted.
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
* Removed `WingsServerRepository::update()` function — if you were previously using this to modify server elements on Wings please replace calls to it with `::sync()` after updating Wings.
|
|
||||||
|
|
||||||
## v1.5.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes Docker image 404ing instead of being able to access the Panel.
|
|
||||||
* Fixes Java version feature being only loaded when the `eula` feature is specified.
|
|
||||||
* Fixes `php artisan p:upgrade` not forcing and seeding while running migrations.
|
|
||||||
* Fixes spinner overlays overlapping on the server console page.
|
|
||||||
* Fixes Wings being unable to update backup statuses.
|
|
||||||
|
|
||||||
## v1.5.0
|
|
||||||
### Fixed
|
|
||||||
* Fixes deleting a locked backup that has also been marked as failed to allow deletion rather than returning an error about being locked.
|
|
||||||
* Fixes server creation process not correctly sending `start_on_completion` to Wings instance.
|
|
||||||
* Fixes `z-index` on file mass delete modal so it is displayed on top of all elements, rather than hidden under some.
|
|
||||||
* Supports re-sending requests to the Panel API for backups that are currently marked as failed, allowing a previously failed backup to be marked as successful.
|
|
||||||
* Minor updates to multiple default eggs for improved error handling and more accurate field-level validation.
|
|
||||||
|
|
||||||
### Updated
|
|
||||||
* Updates help text for CPU limiting when creating a new server to properly indicate virtual threads are included, rather than only physical threads.
|
|
||||||
* Updates all of the default eggs shipped with the Panel to reference new [`ghcr.io` yolks repository](https://github.com/pterodactyl/yolks).
|
|
||||||
* When adding 2FA to an account the key used to generate the token is now displayed to the user allowing them to manually input into their app if necessary.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds SSL/TLS options for MySQL and Redis in line with most recent Laravel updates.
|
|
||||||
* New users created for server MySQL instances will now have the correct permissions for creating foreign keys on tables.
|
|
||||||
* Adds new automatic popup feature to allow users to quickly update their Minecraft servers to the latest Java® eggs as necessary if unsupported versions are detected.
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
* Removes legacy `userInteraction` key from eggs which was unused.
|
|
||||||
|
|
||||||
## v1.4.2
|
|
||||||
### Fixed
|
|
||||||
* Fixes logic to disallow creating a backup schedule if the server's backup limit is set to 0.
|
|
||||||
* Fixes bug preventing a database host from being updated if the linked node is set to "none".
|
|
||||||
* Fixes files and menus under the "Mass Actions Bar" being unclickable when it is visible.
|
|
||||||
* Fixes issues with the Teamspeak and Mumble eggs causing installs to fail.
|
|
||||||
* Fixes automated query to avoid pruning backups that are still running unintentionally.
|
|
||||||
* Fixes "Delete Server" confirmation modal on the admin screen to actually show up when deleting rather than immediately deleting the server.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds support for locking individual server backups to prevent deletion by users or automated backup processes.
|
|
||||||
* List of files to be deleted is now shown on the delete file confirmation modal.
|
|
||||||
* Adds support for using `IF` statements in database queries when a database user is created through the Panel.
|
|
||||||
* Adds support for using a custom mailgun API endpoint rather than only the US based endpoint.
|
|
||||||
* Adds CPU limit display next to the current CPU usage to match disk and memory usage reporting.
|
|
||||||
* Adds a "Scroll to Bottom" helper element to the server console when not scrolled to the bottom currently.
|
|
||||||
* Adds support for querying the API for servers by using the `uuidShort` field rather than only the `uuid` field.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updates codebase to use TypeScript 4.
|
|
||||||
* **[security]**: removes the external dependency for loading QRCode images. They're now generated directly on the frontend using JavaScript.
|
|
||||||
|
|
||||||
## v1.4.1
|
|
||||||
### Added
|
|
||||||
* Adds support for only running a schedule if the server is currently in an online state.
|
|
||||||
* Adds support for ignoring errors during task execution and continuing on to the next item in the sequence. For example, continuing to a server restart even if sending a command beforehand failed.
|
|
||||||
* Adds the ability to specify the group to use for file permissions when using the `p:upgrade` command.
|
|
||||||
* Adds the ability to manually run a schedule even if it is currently disabled.
|
|
||||||
|
|
||||||
## v1.4.0
|
|
||||||
### Fixed
|
|
||||||
* Removes the use of tagging when storing server resource usage in the cache. This addresses errors encountered when using the `file` driver.
|
|
||||||
* Fixes Wings response handling if Wings returns an error response with a 200-level status code that would improperly be passed back to the client as a successful request.
|
|
||||||
* Fixes use of JSON specific functions in SQL queries to better support MariaDB users.
|
|
||||||
* Fixes a migration that could fail on some MySQL/MariaDB setups when trying to encrypt node token values.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Increases the maximum length allowed for a server name using the Rust egg.
|
|
||||||
* Updated server resource utilization API call to Wings to use new API response format used by `Wings@1.4.0`.
|
|
||||||
|
|
||||||
## v1.3.2
|
|
||||||
### Fixed
|
|
||||||
* Fixes self-upgrade incorrectly executing the command to un-tar downloaded archives.
|
|
||||||
* Fixes the checkbox to delete all files when restoring a backup not actually passing that along in the API call. Files will now properly be deleted when restoring if selected.
|
|
||||||
* Fixes some keybindings not working correctly in the server console on Windows machines.
|
|
||||||
* Fixes mobile UI incorrectly squishing the Docker image selector on the server settings page.
|
|
||||||
* Fixes recovery tokens not having a `created_at` value set on them properly when they are created.
|
|
||||||
* Fixes flawed migration that would not correctly set the month value into schedule crons.
|
|
||||||
* Fixes incorrect mounting for Docker compose file that would cause error logs to be missing.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Server resource lookups are now cached on the Panel for 20 seconds at a time to reduce the load from multiple clients requesting the same server's stats.
|
|
||||||
* Bungeecord egg no longer force-enables the query listener.
|
|
||||||
* Adds page to the dashboard URL to allow easy loading of a specific pagination page rather than resetting back to the first page when refreshing.
|
|
||||||
* All application API endpoints now correctly support the `?per_page=N` query parameter to specify how many resources to return at once.
|
|
||||||
|
|
||||||
## v1.3.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes the Rust egg not properly seeding during the upgrade & installation process.
|
|
||||||
* Fixes backups not being downloadable via the frontend.
|
|
||||||
* Fixes backup listing showing the wrong number of existing backups based on the current page you're on.
|
|
||||||
|
|
||||||
## v1.3.0
|
|
||||||
### Fixed
|
|
||||||
* Fixes administrator "Other Servers" toggle being persisted wrongly when signing out and signing into a non-administrator account on the server dashboard.
|
|
||||||
* Fixes composer failing to run properly in local environments where there is no database connection available once configured.
|
|
||||||
* Fixes SQL exception caused by the Panel attempting to store null values in the database.
|
|
||||||
* Fixes validation errors caused by improper defaults when trying to edit system settings in the admin area.
|
|
||||||
* Fixes console overflow when using smaller-than-default font sizes in Firefox.
|
|
||||||
* Fixes console text input field having a white background when manually building new assets from the release build due to a missing `babel-macros` definition file.
|
|
||||||
* Fixes database improperly using a signed `smallint` field rather than an unsigned field which restricted SFTP ports to 32767 or less.
|
|
||||||
* Fixes server console resize handler to no longer encounter an exception at random that breaks the entire UI.
|
|
||||||
* Fixes unhandled error caused by entering an invalid IP address or FQDN when creating a new node allocation.
|
|
||||||
* Fixes unhandled error when Wings would fetch a server configuration from the Panel that uses an Egg with invalid JSON data for the configuration fields.
|
|
||||||
* Fixes email not being sent to a user when their server is done installing.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds support for automatically copying SFTP connection details when clicking into the text field.
|
|
||||||
* Messaging about a node not having any allocations available for deployment has been adjusted to be more understandable by users.
|
|
||||||
* Adds automated self-upgrade process for Pterodactyl Panel once this version is installed on servers. This allows users to update by using a single command.
|
|
||||||
* Adds support for specifying a month when creating or modifying a server schedule.
|
|
||||||
* Adds support for restoring backups (including those in S3 buckets) to a server and optionally deleting all existing files when doing so.
|
|
||||||
* Adds underlying support for audit logging on servers. Currently this is only used by some internal functionality but will be slowly expanded as time permits to allow more robust logging.
|
|
||||||
* Adds logic to automatically reset failed server states when Wings is rebooted. This will kick servers out of "installing" and "restoring from backup" states automatically.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updated to `Laravel 8` and bumped minimum PHP version from `7.3` to `7.4` with PHP `8.0` being the recommended.
|
|
||||||
* Server state is now stored in a single `status` column within the database rather than multiple different `tinyint` columns.
|
|
||||||
|
|
||||||
## v1.2.2
|
|
||||||
### Fixed
|
|
||||||
* **[security]** Fixes authentication bypass allowing a user to take control of specific server actions such as executing schedules, rotating database passwords, and viewing or deleting a backup.
|
|
||||||
|
|
||||||
## v1.2.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes URL-encoding of filenames when working in the filemanager to fix issues when moving, renaming, or deleting files.
|
|
||||||
* Fixes URL-encoding of email addresses when requesting a password reset.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds the ability for users to select a base Java Docker image for most Minecraft specific eggs shipped as defaults.
|
|
||||||
|
|
||||||
## v1.2.0
|
|
||||||
### Fixed
|
|
||||||
* Fixes newest backup being deleted when creating a new one using the schedule tasks, rather than the oldest backup.
|
|
||||||
* Fixes multiple encoding issues when handling file names in the manager.
|
|
||||||
* Fixes database password not properly being copied to the clipboard when clicked.
|
|
||||||
* Fixes failed transfers unintentionally locking a server into a failed state and not properly releasing allocations that were reserved.
|
|
||||||
* Fixes error box on server pages having an oval refresh button rather than a perfect circle.
|
|
||||||
* Fixes a bunch of errors and usage issues relating to backups especially when uploading to S3-based systems.
|
|
||||||
* Fixes HMR breaking navigation in development modes on the frontend.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updated Paper egg to default to Java 11 as the base docker image.
|
|
||||||
* Removes the file mode display from the File Manager row listing.
|
|
||||||
* Updated input UI elements to have thicker borders and more consistent highlighting when active.
|
|
||||||
* Changed searchbar toggle from `"k"` to `Cmd/Ctrl + "/"` to avoid accidental toggles and be more consistent with other sites.
|
|
||||||
* Upgrades TailwindCSS to `v2`.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds support for eggs to define multiple Docker images that can be selected by users (e.g. Java 8 & 11 images for a single egg).
|
|
||||||
* Adds support for configuring the default interval for failed backups to be pruned from the system to avoid long running backups being incorrectly cleared.
|
|
||||||
* Adds server transfer output logging to the server console allowing admins to see how a transfer is progressing directly in the UI.
|
|
||||||
* Adds client API endpoint to download a file from a remote souce. This functionality is not currently expressed in the UI.
|
|
||||||
|
|
||||||
## v1.1.3
|
|
||||||
### Fixed
|
|
||||||
* Server bulk power actions command will no longer attempt to run commands against installing or suspended servers.
|
|
||||||
* Fixes the application API throwing an error when attempting to return variables for a server.
|
|
||||||
* Fixes an error when attempting to install Panel dependencies without specifying an `.env` file due to an unset default timezone.
|
|
||||||
* Fixes a null value flip in the database migrations.
|
|
||||||
* Fixes password change endpoint for users allowing a blank value to be provided (even if nothing actually happened).
|
|
||||||
* Fixes database IP addresses not allowing a `0` in the first octet field.
|
|
||||||
* Fixes node information being impossible to update if there was a network error during the process. Any errors encountered communicating with Wings are now reported but will not block the actual saving of the changes.
|
|
||||||
* **[Security]** When 2FA is required on an account the client API endpoints will now properly return an error and the UI will redirect the user to setup 2FA.
|
|
||||||
* **[Security]** When changing the owner of a server the old owner's JWT is now properly invalidated on Wings.
|
|
||||||
* Fixes a server error when requesting database information for a server as a subuser and the account is not granted `view_password` permissions.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds support for basic backup rotation on a server when creating scheduled backup tasks.
|
|
||||||
* Makes URLs present in the console clickable.
|
|
||||||
* Adds `chmod` support to the file manager so that users can manually make modifications to file permissions as they need.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* UI will no longer show a delete button to users when they're editing themselves.
|
|
||||||
* Updated logic for bulk power actions to no longer run actions against suspended or installing servers.
|
|
||||||
|
|
||||||
## v1.1.2
|
|
||||||
### Fixed
|
|
||||||
* Fixes an exception thrown while trying to validate IP access for the client API.
|
|
||||||
* Fixes command history scrolling not putting the cursor at the end of the line.
|
|
||||||
* Fixes file manager rows triggering a 404 when middle-clicked to open in a new tab.
|
|
||||||
|
|
||||||
## v1.1.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes allocation permissions checking on the frontend checking the wrong permission therefore leading to the item never showing up.
|
|
||||||
* Fixes allocations not updating correctly when added or deleted and switching between pages.
|
|
||||||
|
|
||||||
## v1.1.0
|
|
||||||
This release **requires** `Wings@1.1.0` in order to work properly due to breaking internal API changes.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Fixes subuser creation/edit modal not submitting correctly when attemping to make modifications.
|
|
||||||
* Fixes a few remaining issues with multiple egg install scripts.
|
|
||||||
* Removes the ability for a schedule to have a null name and replaces any existing null names with a randomly generated name.
|
|
||||||
* Fixes schedules aborting the entire run process if a single schedule encountered an exception. This resolves batches of schedules never running correctly if they occur after a broken schedule.
|
|
||||||
* Fixes schedules not properly resetting themselves if an exception was encountered during the run.
|
|
||||||
* Fixes numerous N+1 query run-aways when loading multiple servers via the API.
|
|
||||||
* Fixes numerous issues with displaying directory and file names in the file manager if they included special characters that could not be decoded properly.
|
|
||||||
* Fixes CPU pinning not being properly passed along to Wings when updated (this also fixes memory/CPU/disk not passing along correctly as well).
|
|
||||||
* Fixes spinner not displaying properly when displayed over a modal.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds ability for users to generate their own additional server allocations via the frontend if enabled.
|
|
||||||
* Adds the ability for a user to remove un-needed allocations from their server (as long as it is not the primary allocation).
|
|
||||||
* Adds support for tracking the last 32 sent console commands for a server. Access the history by using the arrow keys when the command field is active.
|
|
||||||
* Adds S3 specific environment variables allowing for backups to use any S3 compatiable system, not just AWS.
|
|
||||||
* Adds support for copying a server allocation address to the clipboard when clicked.
|
|
||||||
* Adds information about the next schedule run time when viewing an individual schedule.
|
|
||||||
* Adds link to view a server in the admin control panel to the frontend server view when logged in as a root admin.
|
|
||||||
* Adds support for egg-specific frontend/backend functionality. This is a beta feature meant for internal features at this time.
|
|
||||||
* Adds back the EULA warning popup when starting a Minecraft server without an accepted EULA.
|
|
||||||
* Adds missing descriptions for some user permissions on the frontend UI.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Adds Save/Invite button to top of subuser edit/creation modal to reduce the need for scrolling.
|
|
||||||
* Updated language for server transfers and mounts to be less confusing.
|
|
||||||
* Wings API endpoint for fetching all servers on a node is now properly paginated to reduce system load when returning hundreds or thousands of servers at once.
|
|
||||||
* Removes unnecessary Wings API calls when adding/editing/deleting mounts.
|
|
||||||
* Primary allocation for a server is now always returned, even if the subuser does not have permission to view all of the server allocations.
|
|
||||||
* Google Analytics frontend code is now only loaded when a valid key is provided.
|
|
||||||
|
|
||||||
## v1.0.3
|
|
||||||
### Fixed
|
|
||||||
* Fixes bug causing subusers to not be creatable or editable via the frontend for servers.
|
|
||||||
* Fixes system timezone not being passed along properly to the MySQL connection causing scheduled tasks to run every minute when the MySQL instance and Panel timezone did not line up.
|
|
||||||
* Fixes listing servers owned by a user in the admin area to actually list their servers.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Adds SameSite `lax` attribute for cookies generated by the Panel.
|
|
||||||
* Adds better filtering for searching servers in the admin area to better key off name, uuid, or owner username/email.
|
|
||||||
|
|
||||||
## v1.0.2
|
|
||||||
### Added
|
|
||||||
* Adds support for searching inside the file editor.
|
|
||||||
* Adds support for manually executing a schedule regardless of if it is currently queued or not.
|
|
||||||
* Adds an indicator to the schedule UI to show when a schedule is currently processing.
|
|
||||||
* Adds support for setting the `backup_limit` of a server via the API.
|
|
||||||
* **[Security]** Adds login throttling to the 2FA verification endpoint.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* Fixes subuser page title missing server name.
|
|
||||||
* Fixes schedule task `sequence_id` not properly being reset when a schedule's task is deleted.
|
|
||||||
* Fixes misc. UI bugs throughout the frontend when long text overflows its bounds.
|
|
||||||
* Fixes user deletion command to properly handle email & ID searching.
|
|
||||||
* Fixes color issues in the terminal causing certain text & background combinations to be illegible.
|
|
||||||
* Fixes reCAPTCHA not properly resetting on login failure.
|
|
||||||
* Fixes error messages not properly resetting between login screens.
|
|
||||||
* Fixes a UI crash when attempting to create or view a directory or file that contained the `%` somewhere in the name.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Updated the search modal to close itself when the ESC key is pressed.
|
|
||||||
* Updates the schedule view and editing UI to better display information to users.
|
|
||||||
* Changed logic powering server searching on the frontend to return more accurate results and return all servers when executing the query as an admin.
|
|
||||||
* Admin CP link no longer opens in a new tab.
|
|
||||||
* Mounts will no longer allow a user to mount certain directory combinations. This blocks mounting one server's files into another server, and blocks using the server data directory as a mount destination.
|
|
||||||
* Cleaned up assorted server build modification code.
|
|
||||||
* Updates default eggs to have improved install scripts and more consistent container usage.
|
|
||||||
|
|
||||||
## v1.0.1
|
|
||||||
### Fixed
|
|
||||||
* Fixes 500 error when mounting a mount to a server, and other related errors when handling mounts.
|
|
||||||
* Ensures that `server_transfers` database is deleted if it already exists to avoid unnecessary error.
|
|
||||||
* Fixes servers getting marked as "not installed" when modifying their startup arguments.
|
|
||||||
* Fixes filemanager breadcrumbs being set incorrectly when navigating between files and folders.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Change the requests per minute from 240 to 720 for the client API to avoid unecessarily displaying
|
|
||||||
"Too Many Requests" errors.
|
|
||||||
* Added error output to certain commands that will output and terminate the command execution if the database
|
|
||||||
migrations have not been run correctly for the instance.
|
|
||||||
|
|
||||||
## v1.0.0
|
|
||||||
Pterodactyl 1.0 represents the culmination of over two years of work, almost 2,000 commits, endless bug and feature requests, and a dream that
|
|
||||||
has been in the making since 2013. 🎉
|
|
||||||
|
|
||||||
Due to the sheer size and timeline of this release I've massively truncated the listing below. There are numerous smaller
|
|
||||||
bug fixes and changes that would simply be too difficult to keep track of here. Please feel free to browse through the releases
|
|
||||||
tab for this repository to see more specific changes that have been made.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Adds a new client-facing API allowing a user to control all aspects of their individual servers, or servers
|
|
||||||
which they have been granted access to as a subuser.
|
|
||||||
* Adds the ability for backups to be created for a server both manually and via a scheduled task.
|
|
||||||
* Adds the ability for users to modify their server allocations on the fly and include notes for each allocation.
|
|
||||||
* Adds the ability for users to generate recovery tokens for 2FA protected logins which can be used in place of
|
|
||||||
a code should their device be inaccessible.
|
|
||||||
* Adds support for transfering servers between Nodes via the Panel.
|
|
||||||
* Adds the ability to assign specific CPU cores to a server (CPU Pinning) process.
|
|
||||||
* Server owners can now reinstall their assigned server egg automatically with a button on the frontend.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* The entire user frontend has been replaced with a responsive, React backed design implemented using Tailwind CSS.
|
|
||||||
* Replaces a large amount of complex daemon authentication logic by funneling most API calls through the Panel, and using
|
|
||||||
JSON Web Tokens where necessary to handle one-time direct authentication with Wings.
|
|
||||||
* Frontend server listing now includes a toggle to show or hide servers which an administrator has access to, rather
|
|
||||||
than always showing all servers on the system when logged into an admin account.
|
|
||||||
* We've replaced Ace Editor on the frontend with a better solution to allow lighter builds and more end-user functionality.
|
|
||||||
* Server permissions have been overhauled to be both easier to understand in the codebase, and allows plugins to better
|
|
||||||
hook into the permission system.
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
* Removes large swaths of code complexity and confusing interface designs that caused a lot of pain to new developers
|
|
||||||
trying to jump into the codebase. We've simplified this to stick to more established Laravel design standards to make
|
|
||||||
it easy to parse through the project and make contributions.
|
|
||||||
|
|
||||||
## v0.7.19 (Derelict Dermodactylus)
|
## v0.7.19 (Derelict Dermodactylus)
|
||||||
### Fixed
|
### Fixed
|
||||||
* **[Security]** Fixes XSS in the admin area's server owner selection.
|
* **[Security]** Fixes XSS in the admin area's server owner selection.
|
||||||
|
|
|
@ -1,31 +1,44 @@
|
||||||
# Contributing
|
# Contributing
|
||||||
|
We're glad you want to help us out and make this panel the best that it can be! We have a few simple things to follow when making changes to files and adding new features.
|
||||||
|
|
||||||
Pterodactyl does not accept Pull Requests (PRs) _for new functionality_ from users that are not currently part of the
|
### Project Branches
|
||||||
core project team. It has become overwhelming to try and give the proper time and attention that such complicated PRs
|
This section mainly applies to those with read/write access to our repositories, but can be helpful for others.
|
||||||
tend to require — and deserve. As a result, it is in the project's best interest to limit the scope of work on
|
|
||||||
new functionality to work done within the core project team.
|
|
||||||
|
|
||||||
PRs that address existing _bugs_ with a corresponding issue opened in our issue tracker will continue to be accepted
|
The `develop` branch should always be in a runnable state, and not contain any major breaking features. For the most part, this means you will need to create `feature/` branches in order to add new functionality or change how things work. When making a feature branch, if it is referencing something in the issue tracker, please title the branch `feature/PTDL-###` where `###` is the issue number.
|
||||||
and reviewed. Their scope is often significantly more targeted, and simply improving upon existing and well defined
|
|
||||||
logic.
|
Moving forward all commits from contributors should be in the form of a PR, unless it is something we have previously discussed as being able to be pushed right into `develop`.
|
||||||
|
|
||||||
|
All new code should contain unit tests at a minimum (where applicable). There is a lot of uncovered code currently, so as you are doing things please be looking for places that you can write tests.
|
||||||
|
|
||||||
|
### Update the CHANGELOG
|
||||||
|
When adding something that is new, fixed, changed, or security-related for the next release you should be adding a note to the CHANGELOG. If something is changing within the same version (i.e. fixing a bug introduced but not released) it should _not_ go into the CHANGELOG.
|
||||||
|
|
||||||
|
### Code Guidelines
|
||||||
|
We are a `PSR-4` and `PSR-0` compliant project, so please follow those guidelines at a minimum. In addition, StyleCI runs on all of our code to ensure the formatting is standardized across everything. When a PR is made StyleCI will analyze your code and make a pull to that branch if necessary to fix any formatting issues. This project also ships with a PHP-CS configuration file and you are welcome to configure your local environment to make use of that.
|
||||||
|
|
||||||
|
All class variable declarations should be in alphabetical order, and constructor arguments should be in alphabetical order based on the classname. See the example below for how this should look, or check out any of the `app/Service` files for examples.
|
||||||
|
|
||||||
|
```php
|
||||||
|
class ProcessScheduleService
|
||||||
|
{
|
||||||
|
protected $repository;
|
||||||
|
protected $runnerService;
|
||||||
|
|
||||||
|
public function __construct(RunTaskService $runnerService, ScheduleRepositoryInterface $repository)
|
||||||
|
{
|
||||||
|
$this->repository = $repository;
|
||||||
|
$this->runnerService = $runnerService;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
### Responsible Disclosure
|
### Responsible Disclosure
|
||||||
|
This is a fairly in-depth project and makes use of a lot of parts. We strive to keep everything as secure as possible and welcome you to take a look at the code provided in this project yourself. We do ask that you be considerate of others who are using the software and not publicly disclose security issues without contacting us first by email.
|
||||||
|
|
||||||
This is a fairly in-depth project and makes use of a lot of parts. We strive to keep everything as secure as possible
|
We'll make a deal with you: if you contact us by email and we fail to respond to you within a week you are welcome to publicly disclose whatever issue you have found. We understand how frustrating it is when you find something big and no one will respond to you. This holds us to a standard of providing prompt attention to any issues that arise and keeping this community safe.
|
||||||
and welcome you to take a look at the code provided in this project yourself. We do ask that you be considerate of
|
|
||||||
others who are using the software and not publicly disclose security issues without contacting us first by email.
|
|
||||||
|
|
||||||
We'll make a deal with you: if you contact us by email, and we fail to respond to you within a week you are welcome to
|
If you've found what you believe is a security issue please email us at `support@pterodactyl.io`.
|
||||||
publicly disclose whatever issue you have found. We understand how frustrating it is when you find something big and
|
|
||||||
no one will respond to you. This holds us to a standard of providing prompt attention to any issues that arise and
|
|
||||||
keeping this community safe.
|
|
||||||
|
|
||||||
If you've found what you believe is a security issue please email `matthew@pterodactyl.io`. Please check
|
### Where to find Us
|
||||||
[SECURITY.md](/SECURITY.md) for additional details.
|
You can find us in a couple places online. First and foremost, we're active right here on Github. If you encounter a bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
|
||||||
|
|
||||||
### Contact Us
|
You can also find us on [Discord](https://pterodactyl.io/discord). In the event that you need to get in contact with us privately feel free to contact us at `support@pterodactyl.io`. Try not to email us with requests for support regarding the panel, we'll probably just direct you to our Discord.
|
||||||
|
|
||||||
You can find us in a couple places online. First and foremost, we're active right here on GitHub. If you encounter a
|
|
||||||
bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
|
|
||||||
|
|
||||||
You can also find us on [Discord](https://discord.gg/pterodactyl).
|
|
||||||
|
|
14
CONTRIBUTORS.md
Normal file
14
CONTRIBUTORS.md
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
# Pterodactyl Panel Contributors
|
||||||
|
This panel would not be possible without the support of our wonderful community of
|
||||||
|
developers who provide code enhancements, new features, and bug fixes to make this panel
|
||||||
|
the best that is can be. You can view a full listing of contributors [here](https://github.com/Pterodactyl/Panel/graphs/contributors).
|
||||||
|
|
||||||
|
Dane Everitt [@DaneEveritt](https://github.com/Pterodactyl/Panel/commits?author=DaneEveritt)
|
||||||
|
|
||||||
|
Dylan Seidt [@DDynamic](https://github.com/Pterodactyl/Panel/commits?author=DDynamic)
|
||||||
|
|
||||||
|
[@nikkiii](https://github.com/Pterodactyl/Panel/commits?author=nikkiii)
|
||||||
|
|
||||||
|
# Get Involved
|
||||||
|
See our `CONTRIBUTING.md` document for information on how to get started. Once you've submitted some code feel free to
|
||||||
|
modify this file and add your name to the list. Please follow the format above for your name and linking to your contributions.
|
|
@ -1,77 +0,0 @@
|
||||||
# Stage 1 - Builder
|
|
||||||
FROM --platform=$TARGETOS/$TARGETARCH registry.access.redhat.com/ubi9/nodejs-18-minimal AS builder
|
|
||||||
|
|
||||||
USER 0
|
|
||||||
RUN npm install -g pnpm
|
|
||||||
|
|
||||||
WORKDIR /var/www/pterodactyl
|
|
||||||
|
|
||||||
COPY --chown=1001:0 public ./public
|
|
||||||
COPY --chown=1001:0 resources/scripts ./resources/scripts
|
|
||||||
COPY --chown=1001:0 .eslintignore .eslintrc.js .npmrc .prettierrc.json package.json pnpm-lock.yaml tailwind.config.js tsconfig.json vite.config.ts .
|
|
||||||
|
|
||||||
RUN /opt/app-root/src/.npm-global/bin/pnpm install \
|
|
||||||
&& /opt/app-root/src/.npm-global/bin/pnpm build \
|
|
||||||
&& rm -rf resources/scripts .eslintignore .eslintrc.yml .npmrc package.json pnpm-lock.yaml tailwind.config.js tsconfig.json vite.config.ts node_modules
|
|
||||||
|
|
||||||
USER 1001
|
|
||||||
|
|
||||||
COPY --chown=1001:0 app ./app
|
|
||||||
COPY --chown=1001:0 bootstrap ./bootstrap
|
|
||||||
COPY --chown=1001:0 config ./config
|
|
||||||
COPY --chown=1001:0 database ./database
|
|
||||||
COPY --chown=1001:0 resources/lang ./resources/lang
|
|
||||||
COPY --chown=1001:0 resources/views ./resources/views
|
|
||||||
COPY --chown=1001:0 routes ./routes
|
|
||||||
COPY --chown=1001:0 .env.example ./.env
|
|
||||||
COPY --chown=1001:0 artisan CHANGELOG.md composer.json composer.lock LICENSE.md README.md SECURITY.md .
|
|
||||||
|
|
||||||
# Stage 2 - Final
|
|
||||||
FROM --platform=$TARGETOS/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal
|
|
||||||
|
|
||||||
RUN microdnf update -y \
|
|
||||||
&& rpm --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
|
|
||||||
&& rpm --install https://rpms.remirepo.net/enterprise/remi-release-9.rpm \
|
|
||||||
&& microdnf update -y \
|
|
||||||
&& microdnf install -y ca-certificates shadow-utils tar tzdata unzip wget \
|
|
||||||
# ref; https://bugzilla.redhat.com/show_bug.cgi?id=1870814
|
|
||||||
&& microdnf reinstall -y tzdata \
|
|
||||||
&& microdnf module -y reset php \
|
|
||||||
&& microdnf module -y enable php:remi-8.2 \
|
|
||||||
&& microdnf install -y composer cronie php-{bcmath,cli,common,fpm,gd,gmp,intl,json,mbstring,mysqlnd,opcache,pdo,pecl-redis5,pecl-zip,phpiredis,pgsql,process,sodium,xml,zstd} supervisor \
|
|
||||||
&& rm /etc/php-fpm.d/www.conf \
|
|
||||||
&& useradd --home-dir /var/lib/caddy --create-home caddy \
|
|
||||||
&& mkdir /etc/caddy \
|
|
||||||
&& wget -O /usr/local/bin/yacron https://github.com/gjcarneiro/yacron/releases/download/0.17.0/yacron-0.17.0-x86_64-unknown-linux-gnu \
|
|
||||||
&& chmod 755 /usr/local/bin/yacron \
|
|
||||||
&& microdnf remove -y tar wget \
|
|
||||||
&& microdnf clean all
|
|
||||||
|
|
||||||
COPY --chown=caddy:caddy --from=builder /var/www/pterodactyl /var/www/pterodactyl
|
|
||||||
|
|
||||||
WORKDIR /var/www/pterodactyl
|
|
||||||
|
|
||||||
RUN mkdir -p /tmp/pterodactyl/cache /tmp/pterodactyl/framework/{cache,sessions,views} storage/framework \
|
|
||||||
&& rm -rf bootstrap/cache storage/framework/sessions storage/framework/views storage/framework/cache \
|
|
||||||
&& ln -s /tmp/pterodactyl/cache /var/www/pterodactyl/bootstrap/cache \
|
|
||||||
&& ln -s /tmp/pterodactyl/framework/cache /var/www/pterodactyl/storage/framework/cache \
|
|
||||||
&& ln -s /tmp/pterodactyl/framework/sessions /var/www/pterodactyl/storage/framework/sessions \
|
|
||||||
&& ln -s /tmp/pterodactyl/framework/views /var/www/pterodactyl/storage/framework/views \
|
|
||||||
&& chmod -R 755 /var/www/pterodactyl/storage/* /tmp/pterodactyl/cache \
|
|
||||||
&& chown -R caddy:caddy /var/www/pterodactyl /tmp/pterodactyl/{cache,framework}
|
|
||||||
|
|
||||||
USER caddy
|
|
||||||
ENV USER=caddy
|
|
||||||
|
|
||||||
RUN composer install --no-dev --optimize-autoloader \
|
|
||||||
&& rm -rf bootstrap/cache/*.php \
|
|
||||||
&& rm -rf .env storage/logs/*.log
|
|
||||||
|
|
||||||
COPY --from=docker.io/library/caddy:latest /usr/bin/caddy /usr/local/bin/caddy
|
|
||||||
COPY .github/docker/Caddyfile /etc/caddy/Caddyfile
|
|
||||||
COPY .github/docker/php-fpm.conf /etc/php-fpm.conf
|
|
||||||
COPY .github/docker/supervisord.conf /etc/supervisord.conf
|
|
||||||
COPY .github/docker/yacron.yaml /etc/yacron.yaml
|
|
||||||
|
|
||||||
EXPOSE 8080
|
|
||||||
CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]
|
|
26
Dockerfile
Normal file
26
Dockerfile
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
FROM alpine:3.8
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
RUN apk add --no-cache --update ca-certificates certbot nginx dcron curl tini php7 php7-bcmath php7-common php7-dom php7-fpm php7-gd php7-mbstring php7-openssl php7-zip php7-pdo php7-phar php7-json php7-pdo_mysql php7-session php7-ctype php7-tokenizer php7-zlib php7-simplexml php7-fileinfo supervisor \
|
||||||
|
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
|
||||||
|
RUN cp .env.example .env \
|
||||||
|
&& composer install --no-dev --optimize-autoloader \
|
||||||
|
&& rm .env \
|
||||||
|
&& chown -R nginx:nginx . && chmod -R 777 storage/* bootstrap/cache
|
||||||
|
|
||||||
|
RUN cp .dev/docker/default.conf /etc/nginx/conf.d/default.conf \
|
||||||
|
&& cp .dev/docker/www.conf /etc/php7/php-fpm.d/www.conf \
|
||||||
|
&& cat .dev/docker/supervisord.conf > /etc/supervisord.conf \
|
||||||
|
&& echo "* * * * * /usr/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
|
||||||
|
&& sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
|
||||||
|
&& mkdir -p /var/run/php /var/run/nginx
|
||||||
|
|
||||||
|
EXPOSE 80 443
|
||||||
|
|
||||||
|
ENTRYPOINT ["/bin/ash", ".dev/docker/entrypoint.sh"]
|
||||||
|
|
||||||
|
CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]
|
9
LICENSE
9
LICENSE
|
@ -1,9 +0,0 @@
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2024 Skynet
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
@ -1,8 +1,7 @@
|
||||||
# The MIT License (MIT)
|
# The MIT License (MIT)
|
||||||
|
|
||||||
```
|
```
|
||||||
Pterodactyl®
|
Copyright (c) 2015 - 2020 Dane Everitt <dane@daneeveritt.com>
|
||||||
Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|
88
README.md
88
README.md
|
@ -1,52 +1,26 @@
|
||||||
[![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
|
[![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
|
||||||
|
|
||||||
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pterodactyl/panel/laravel.yaml?label=Tests&style=for-the-badge&branch=develop)
|
[![Build status](https://img.shields.io/travis/pterodactyl/panel/develop.svg?style=flat-square)](https://travis-ci.org/pterodactyl/panel)
|
||||||
![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white&style=for-the-badge)
|
[![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644)
|
||||||
![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/panel/latest/total?style=for-the-badge)
|
[![Codecov](https://img.shields.io/codecov/c/github/pterodactyl/panel/develop.svg?style=flat-square)](https://codecov.io/gh/Pterodactyl/Panel)
|
||||||
![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge)
|
[![Discord](https://img.shields.io/discord/122900397965705216.svg?style=flat-square&label=Discord)](https://pterodactyl.io/discord)
|
||||||
|
|
||||||
# Pterodactyl Panel
|
# Pterodactyl Panel
|
||||||
|
|
||||||
Pterodactyl® is a free, open-source game server management panel built with PHP, React, and Go. Designed with security
|
Pterodactyl is the open-source game server management panel built with PHP7, Nodejs, and Go. Designed with security in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive UI to administrators and users.
|
||||||
in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive
|
What more are you waiting for? Make game servers a first class citizen on your platform today.
|
||||||
UI to end users.
|
|
||||||
|
|
||||||
Stop settling for less. Make game servers a first class citizen on your platform.
|
![Image](https://cdn.pterodactyl.io/site-assets/mockup-macbook-grey.png)
|
||||||
|
|
||||||
![Image](https://cdn.pterodactyl.io/site-assets/pterodactyl_v1_demo.gif)
|
## Support & Documentation
|
||||||
|
Support for using Pterodactyl can be found on our [Documentation Website](https://pterodactyl.io/project/introduction.html), [Guides Website](https://guides.pterodactyl.io), or via our [Discord Chat](https://discord.gg/QRDZvVm).
|
||||||
## Documentation
|
|
||||||
|
|
||||||
* [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)
|
|
||||||
* [Wings Documentation](https://pterodactyl.io/wings/1.0/installing.html)
|
|
||||||
* [Community Guides](https://pterodactyl.io/community/about.html)
|
|
||||||
* Or, get additional help [via Discord](https://discord.gg/pterodactyl)
|
|
||||||
|
|
||||||
## Sponsors
|
|
||||||
|
|
||||||
I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's development.
|
|
||||||
[Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi)
|
|
||||||
|
|
||||||
| Company | About |
|
|
||||||
|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| [**WISP**](https://wisp.gg) | Extra features. |
|
|
||||||
| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
|
|
||||||
| [**WemX**](https://wemx.net/) | WemX helps automate your hosting company or SaaS business by automating billing, user management, authentication, and much more. |
|
|
||||||
| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
|
|
||||||
| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! |
|
|
||||||
| [**VibeGAMES**](https://vibegames.net/) | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa. |
|
|
||||||
| [**DutchIS**](https://dutchis.net?ref=pterodactyl) | DutchIS provides instant infrastructure such as pay per use VPS hosting. Start your game hosting journey on DutchIS. |
|
|
||||||
| [**Skoali**](https://skoali.com/) | Skoali is a French company that hosts game servers and other types of services (VPS, WEB, Dedicated servers, ...). We also have a free plan for Minecraft and Garry's Mod. |
|
|
||||||
| [**Rabbit Computing**](https://www.rabbitcomputing.com/link.php?id=5) | Rabbit Computing offers powerful VPS servers, highly available game hosting, and fully unlimited web hosting. Use code README for 20% off your first three months! |
|
|
||||||
|
|
||||||
### Supported Games
|
### Supported Games
|
||||||
|
We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to host your games across the world without having to bloat each physical machine with additional dependencies.
|
||||||
Pterodactyl supports a wide variety of games by utilizing Docker containers to isolate each instance. This gives
|
|
||||||
you the power to run game servers without bloating machines with a host of additional dependencies.
|
|
||||||
|
|
||||||
Some of our core supported games include:
|
Some of our core supported games include:
|
||||||
|
|
||||||
* Minecraft — including Paper, Sponge, Bungeecord, Waterfall, and more
|
* Minecraft — including Spigot, Sponge, Bungeecord, Waterfall, and more
|
||||||
* Rust
|
* Rust
|
||||||
* Terraria
|
* Terraria
|
||||||
* Teamspeak
|
* Teamspeak
|
||||||
|
@ -56,20 +30,46 @@ Some of our core supported games include:
|
||||||
* Garry's Mod
|
* Garry's Mod
|
||||||
* ARK: Survival Evolved
|
* ARK: Survival Evolved
|
||||||
|
|
||||||
In addition to our standard nest of supported games, our community is constantly pushing the limits of this software
|
In addition to our standard nest of supported games, our community is constantly pushing the limits of this software and there are plenty more games available provided by the community. Some of these games include:
|
||||||
and there are plenty more games available provided by the community. Some of these games include:
|
|
||||||
|
|
||||||
* Factorio
|
* Factorio
|
||||||
* San Andreas: MP
|
* San Andreas: MP
|
||||||
* Pocketmine MP
|
* Pocketmine MP
|
||||||
* Squad
|
* Squad
|
||||||
|
* FiveM
|
||||||
* Xonotic
|
* Xonotic
|
||||||
* Starmade
|
* Discord ATLBot
|
||||||
* Discord ATLBot, and most other Node.js/Python discord bots
|
|
||||||
* [and many more...](https://github.com/parkervcp/eggs)
|
## Credits
|
||||||
|
This software would not be possible without the work of other open-source authors who provide tools such as:
|
||||||
|
|
||||||
|
[Ace Editor](https://ace.c9.io), [AdminLTE](https://almsaeedstudio.com), [Animate.css](http://daneden.github.io/animate.css/), [AnsiUp](https://github.com/drudru/ansi_up), [Async.js](https://github.com/caolan/async),
|
||||||
|
[Bootstrap](http://getbootstrap.com), [Bootstrap Notify](http://bootstrap-notify.remabledesigns.com), [Chart.js](http://www.chartjs.org), [FontAwesome](http://fontawesome.io),
|
||||||
|
[FontAwesome Animations](https://github.com/l-lin/font-awesome-animation), [jQuery](http://jquery.com), [Laravel](https://laravel.com), [Lodash](https://lodash.com),
|
||||||
|
[Select2](https://select2.github.io), [Socket.io](http://socket.io), [Socket.io File Upload](https://github.com/vote539/socketio-file-upload), [SweetAlert](http://t4t5.github.io/sweetalert),
|
||||||
|
[Typeahead](https://github.com/bassjobsen/Bootstrap-3-Typeahead), and [Particles.js](http://vincentgarreau.com/particles.js).
|
||||||
|
|
||||||
|
Some Javascript and CSS used within the panel is licensed under a `MIT` or `Apache 2.0` license. Please check their respective header files for more information.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
```
|
||||||
|
Copyright (c) 2015 - 2018 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
|
||||||
Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors.
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
Code released under the [MIT License](./LICENSE.md).
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
```
|
||||||
|
|
20
SECURITY.md
20
SECURITY.md
|
@ -1,20 +0,0 @@
|
||||||
# Security Policy
|
|
||||||
|
|
||||||
## Supported Versions
|
|
||||||
|
|
||||||
The following versions of Pterodactyl are receiving active support and maintenance. Any security vulnerabilities discovered must be reproducible in supported versions.
|
|
||||||
|
|
||||||
| Panel | Daemon | Supported |
|
|
||||||
|--------|--------------|--------------------|
|
|
||||||
| 1.10.x | wings@1.7.x | :white_check_mark: |
|
|
||||||
| 1.11.x | wings@1.11.x | :white_check_mark: |
|
|
||||||
| 0.7.x | daemon@0.6.x | :x: |
|
|
||||||
|
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
|
||||||
|
|
||||||
Please reach out directly to any project team member on Discord when reporting a security vulnerability, or you can email `matthew@pterodactyl.io`.
|
|
||||||
|
|
||||||
We make every effort to respond as soon as possible, although it may take a day or two for us to sync internally and determine the severity of the report and its impact. Please, _do not_ use a public facing channel or GitHub issues to report sensitive security issues.
|
|
||||||
|
|
||||||
As part of our process, we will create a security advisory for the affected versions and disclose it publicly, usually two to four weeks after a releasing a version that addresses it.
|
|
17
Vagrantfile
vendored
Normal file
17
Vagrantfile
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
Vagrant.configure("2") do |config|
|
||||||
|
config.vm.box = "bento/ubuntu-16.04"
|
||||||
|
|
||||||
|
config.vm.synced_folder "./", "/var/www/html/pterodactyl",
|
||||||
|
owner: "www-data", group: "www-data"
|
||||||
|
|
||||||
|
config.vm.provision :shell, path: ".dev/vagrant/provision.sh"
|
||||||
|
|
||||||
|
config.vm.network :private_network, ip: "192.168.50.2"
|
||||||
|
config.vm.network :forwarded_port, guest: 80, host: 50080
|
||||||
|
config.vm.network :forwarded_port, guest: 8025, host: 58025
|
||||||
|
config.vm.network :forwarded_port, guest: 3306, host: 53306
|
||||||
|
|
||||||
|
# Config for the vagrant-dns plugin (https://github.com/BerlinVagrant/vagrant-dns)
|
||||||
|
config.dns.tld = "test"
|
||||||
|
config.dns.patterns = [/^pterodactyl.test$/]
|
||||||
|
end
|
|
@ -1,22 +1,31 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Environment;
|
namespace Pterodactyl\Console\Commands\Environment;
|
||||||
|
|
||||||
|
use DateTimeZone;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Contracts\Console\Kernel;
|
use Illuminate\Contracts\Console\Kernel;
|
||||||
use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
|
use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
|
||||||
|
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||||
|
|
||||||
class AppSettingsCommand extends Command
|
class AppSettingsCommand extends Command
|
||||||
{
|
{
|
||||||
use EnvironmentWriterTrait;
|
use EnvironmentWriterTrait;
|
||||||
|
|
||||||
public const CACHE_DRIVERS = [
|
const ALLOWED_CACHE_DRIVERS = [
|
||||||
'redis' => 'Redis (recommended)',
|
'redis' => 'Redis (recommended)',
|
||||||
'memcached' => 'Memcached',
|
'memcached' => 'Memcached',
|
||||||
'file' => 'Filesystem',
|
'file' => 'Filesystem',
|
||||||
];
|
];
|
||||||
|
|
||||||
public const SESSION_DRIVERS = [
|
const ALLOWED_SESSION_DRIVERS = [
|
||||||
'redis' => 'Redis (recommended)',
|
'redis' => 'Redis (recommended)',
|
||||||
'memcached' => 'Memcached',
|
'memcached' => 'Memcached',
|
||||||
'database' => 'MySQL Database',
|
'database' => 'MySQL Database',
|
||||||
|
@ -24,14 +33,30 @@ class AppSettingsCommand extends Command
|
||||||
'cookie' => 'Cookie',
|
'cookie' => 'Cookie',
|
||||||
];
|
];
|
||||||
|
|
||||||
public const QUEUE_DRIVERS = [
|
const ALLOWED_QUEUE_DRIVERS = [
|
||||||
'redis' => 'Redis (recommended)',
|
'redis' => 'Redis (recommended)',
|
||||||
'database' => 'MySQL Database',
|
'database' => 'MySQL Database',
|
||||||
'sync' => 'Sync',
|
'sync' => 'Sync',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Console\Kernel
|
||||||
|
*/
|
||||||
|
protected $command;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Config\Repository
|
||||||
|
*/
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Configure basic environment settings for the Panel.';
|
protected $description = 'Configure basic environment settings for the Panel.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:environment:setup
|
protected $signature = 'p:environment:setup
|
||||||
{--new-salt : Whether or not to generate a new salt for Hashids.}
|
{--new-salt : Whether or not to generate a new salt for Hashids.}
|
||||||
{--author= : The email that services created on this instance should be linked to.}
|
{--author= : The email that services created on this instance should be linked to.}
|
||||||
|
@ -43,17 +68,25 @@ class AppSettingsCommand extends Command
|
||||||
{--redis-host= : Redis host to use for connections.}
|
{--redis-host= : Redis host to use for connections.}
|
||||||
{--redis-pass= : Password used to connect to redis.}
|
{--redis-pass= : Password used to connect to redis.}
|
||||||
{--redis-port= : Port to connect to redis over.}
|
{--redis-port= : Port to connect to redis over.}
|
||||||
{--settings-ui= : Enable or disable the settings UI.}
|
{--disable-settings-ui}';
|
||||||
{--telemetry= : Enable or disable anonymous telemetry.}';
|
|
||||||
|
|
||||||
protected array $variables = [];
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $variables = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* AppSettingsCommand constructor.
|
* AppSettingsCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Contracts\Config\Repository $config
|
||||||
|
* @param \Illuminate\Contracts\Console\Kernel $command
|
||||||
*/
|
*/
|
||||||
public function __construct(private Kernel $console)
|
public function __construct(ConfigRepository $config, Kernel $command)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->command = $command;
|
||||||
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -61,81 +94,60 @@ class AppSettingsCommand extends Command
|
||||||
*
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\PterodactylException
|
* @throws \Pterodactyl\Exceptions\PterodactylException
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle()
|
||||||
{
|
{
|
||||||
if (empty(config('hashids.salt')) || $this->option('new-salt')) {
|
if (empty($this->config->get('hashids.salt')) || $this->option('new-salt')) {
|
||||||
$this->variables['HASHIDS_SALT'] = str_random(20);
|
$this->variables['HASHIDS_SALT'] = str_random(20);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->output->comment('Provide the email address that eggs exported by this Panel should be from. This should be a valid email address.');
|
$this->output->comment(trans('command/messages.environment.app.author_help'));
|
||||||
$this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
|
$this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
|
||||||
'Egg Author Email',
|
trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'unknown@unknown.com')
|
||||||
config('pterodactyl.service.author', 'unknown@unknown.com')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!filter_var($this->variables['APP_SERVICE_AUTHOR'], FILTER_VALIDATE_EMAIL)) {
|
$this->output->comment(trans('command/messages.environment.app.app_url_help'));
|
||||||
$this->output->error('The service author email provided is invalid.');
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->output->comment('The application URL MUST begin with https:// or http:// depending on if you are using SSL or not. If you do not include the scheme your emails and other content will link to the wrong location.');
|
|
||||||
$this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
|
$this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
|
||||||
'Application URL',
|
trans('command/messages.environment.app.app_url'), $this->config->get('app.url', 'http://example.org')
|
||||||
config('app.url', 'https://example.com')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->output->comment('The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference https://php.net/manual/en/timezones.php.');
|
$this->output->comment(trans('command/messages.environment.app.timezone_help'));
|
||||||
$this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate(
|
$this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate(
|
||||||
'Application Timezone',
|
trans('command/messages.environment.app.timezone'),
|
||||||
\DateTimeZone::listIdentifiers(),
|
DateTimeZone::listIdentifiers(DateTimeZone::ALL),
|
||||||
config('app.timezone')
|
$this->config->get('app.timezone')
|
||||||
);
|
);
|
||||||
|
|
||||||
$selected = config('cache.default', 'redis');
|
$selected = $this->config->get('cache.default', 'redis');
|
||||||
$this->variables['CACHE_DRIVER'] = $this->option('cache') ?? $this->choice(
|
$this->variables['CACHE_DRIVER'] = $this->option('cache') ?? $this->choice(
|
||||||
'Cache Driver',
|
trans('command/messages.environment.app.cache_driver'),
|
||||||
self::CACHE_DRIVERS,
|
self::ALLOWED_CACHE_DRIVERS,
|
||||||
array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
|
array_key_exists($selected, self::ALLOWED_CACHE_DRIVERS) ? $selected : null
|
||||||
);
|
);
|
||||||
|
|
||||||
$selected = config('session.driver', 'redis');
|
$selected = $this->config->get('session.driver', 'redis');
|
||||||
$this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice(
|
$this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice(
|
||||||
'Session Driver',
|
trans('command/messages.environment.app.session_driver'),
|
||||||
self::SESSION_DRIVERS,
|
self::ALLOWED_SESSION_DRIVERS,
|
||||||
array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
|
array_key_exists($selected, self::ALLOWED_SESSION_DRIVERS) ? $selected : null
|
||||||
);
|
);
|
||||||
|
|
||||||
$selected = config('queue.default', 'redis');
|
$selected = $this->config->get('queue.default', 'redis');
|
||||||
$this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
|
$this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
|
||||||
'Queue Driver',
|
trans('command/messages.environment.app.queue_driver'),
|
||||||
self::QUEUE_DRIVERS,
|
self::ALLOWED_QUEUE_DRIVERS,
|
||||||
array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
|
array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!is_null($this->option('settings-ui'))) {
|
if ($this->option('disable-settings-ui')) {
|
||||||
$this->variables['APP_ENVIRONMENT_ONLY'] = $this->option('settings-ui') == 'true' ? 'false' : 'true';
|
$this->variables['APP_ENVIRONMENT_ONLY'] = 'true';
|
||||||
} else {
|
} else {
|
||||||
$this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm('Enable UI based settings editor?', true) ? 'false' : 'true';
|
$this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm(trans('command/messages.environment.app.settings'), true) ? 'false' : 'true';
|
||||||
}
|
|
||||||
|
|
||||||
$this->output->comment('Please reference https://pterodactyl.io/panel/1.0/additional_configuration.html#telemetry for more detailed information regarding telemetry data and collection.');
|
|
||||||
$this->variables['PTERODACTYL_TELEMETRY_ENABLED'] = $this->option('telemetry') ?? $this->confirm(
|
|
||||||
'Enable sending anonymous telemetry data?',
|
|
||||||
config('pterodactyl.telemetry.enabled', true)
|
|
||||||
) ? 'true' : 'false';
|
|
||||||
|
|
||||||
// Make sure session cookies are set as "secure" when using HTTPS
|
|
||||||
if (str_starts_with($this->variables['APP_URL'], 'https://')) {
|
|
||||||
$this->variables['SESSION_SECURE_COOKIE'] = 'true';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->checkForRedis();
|
$this->checkForRedis();
|
||||||
$this->writeToEnvironment($this->variables);
|
$this->writeToEnvironment($this->variables);
|
||||||
|
|
||||||
$this->info($this->console->output());
|
$this->info($this->command->output());
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -152,22 +164,21 @@ class AppSettingsCommand extends Command
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->output->note('You\'ve selected the Redis driver for one or more options, please provide valid connection information below. In most cases you can use the defaults provided unless you have modified your setup.');
|
$this->output->note(trans('command/messages.environment.app.using_redis'));
|
||||||
$this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
|
$this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
|
||||||
'Redis Host',
|
trans('command/messages.environment.app.redis_host'), $this->config->get('database.redis.default.host')
|
||||||
config('database.redis.default.host')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$askForRedisPassword = true;
|
$askForRedisPassword = true;
|
||||||
if (!empty(config('database.redis.default.password'))) {
|
if (! empty($this->config->get('database.redis.default.password'))) {
|
||||||
$this->variables['REDIS_PASSWORD'] = config('database.redis.default.password');
|
$this->variables['REDIS_PASSWORD'] = $this->config->get('database.redis.default.password');
|
||||||
$askForRedisPassword = $this->confirm('It seems a password is already defined for Redis, would you like to change it?');
|
$askForRedisPassword = $this->confirm(trans('command/messages.environment.app.redis_pass_defined'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($askForRedisPassword) {
|
if ($askForRedisPassword) {
|
||||||
$this->output->comment('By default a Redis server instance has no password as it is running locally and inaccessible to the outside world. If this is the case, simply hit enter without entering a value.');
|
$this->output->comment(trans('command/messages.environment.app.redis_pass_help'));
|
||||||
$this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
|
$this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
|
||||||
'Redis Password'
|
trans('command/messages.environment.app.redis_password')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -176,8 +187,7 @@ class AppSettingsCommand extends Command
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
|
$this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
|
||||||
'Redis Port',
|
trans('command/messages.environment.app.redis_port'), $this->config->get('database.redis.default.port')
|
||||||
config('database.redis.default.port')
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,48 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Environment;
|
namespace Pterodactyl\Console\Commands\Environment;
|
||||||
|
|
||||||
|
use PDOException;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Contracts\Console\Kernel;
|
use Illuminate\Contracts\Console\Kernel;
|
||||||
use Illuminate\Database\DatabaseManager;
|
use Illuminate\Database\DatabaseManager;
|
||||||
use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
|
use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
|
||||||
|
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||||
|
|
||||||
class DatabaseSettingsCommand extends Command
|
class DatabaseSettingsCommand extends Command
|
||||||
{
|
{
|
||||||
use EnvironmentWriterTrait;
|
use EnvironmentWriterTrait;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Config\Repository
|
||||||
|
*/
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Console\Kernel
|
||||||
|
*/
|
||||||
|
protected $console;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Database\DatabaseManager
|
||||||
|
*/
|
||||||
|
protected $database;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Configure database settings for the Panel.';
|
protected $description = 'Configure database settings for the Panel.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:environment:database
|
protected $signature = 'p:environment:database
|
||||||
{--host= : The connection address for the MySQL server.}
|
{--host= : The connection address for the MySQL server.}
|
||||||
{--port= : The connection port for the MySQL server.}
|
{--port= : The connection port for the MySQL server.}
|
||||||
|
@ -20,62 +50,71 @@ class DatabaseSettingsCommand extends Command
|
||||||
{--username= : Username to use when connecting.}
|
{--username= : Username to use when connecting.}
|
||||||
{--password= : Password to use for this database.}';
|
{--password= : Password to use for this database.}';
|
||||||
|
|
||||||
protected array $variables = [];
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $variables = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DatabaseSettingsCommand constructor.
|
* DatabaseSettingsCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Contracts\Config\Repository $config
|
||||||
|
* @param \Illuminate\Database\DatabaseManager $database
|
||||||
|
* @param \Illuminate\Contracts\Console\Kernel $console
|
||||||
*/
|
*/
|
||||||
public function __construct(private DatabaseManager $database, private Kernel $console)
|
public function __construct(ConfigRepository $config, DatabaseManager $database, Kernel $console)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->config = $config;
|
||||||
|
$this->console = $console;
|
||||||
|
$this->database = $database;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle command execution.
|
* Handle command execution.
|
||||||
*
|
*
|
||||||
|
* @return int
|
||||||
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\PterodactylException
|
* @throws \Pterodactyl\Exceptions\PterodactylException
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle()
|
||||||
{
|
{
|
||||||
$this->output->note('It is highly recommended to not use "localhost" as your database host as we have seen frequent socket connection issues. If you want to use a local connection you should be using "127.0.0.1".');
|
$this->output->note(trans('command/messages.environment.database.host_warning'));
|
||||||
$this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
|
$this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
|
||||||
'Database Host',
|
trans('command/messages.environment.database.host'), $this->config->get('database.connections.mysql.host', '127.0.0.1')
|
||||||
config('database.connections.mysql.host', '127.0.0.1')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
|
$this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
|
||||||
'Database Port',
|
trans('command/messages.environment.database.port'), $this->config->get('database.connections.mysql.port', 3306)
|
||||||
config('database.connections.mysql.port', 3306)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
|
$this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
|
||||||
'Database Name',
|
trans('command/messages.environment.database.database'), $this->config->get('database.connections.mysql.database', 'panel')
|
||||||
config('database.connections.mysql.database', 'panel')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->output->note('Using the "root" account for MySQL connections is not only highly frowned upon, it is also not allowed by this application. You\'ll need to have created a MySQL user for this software.');
|
$this->output->note(trans('command/messages.environment.database.username_warning'));
|
||||||
$this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
|
$this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
|
||||||
'Database Username',
|
trans('command/messages.environment.database.username'), $this->config->get('database.connections.mysql.username', 'pterodactyl')
|
||||||
config('database.connections.mysql.username', 'pterodactyl')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$askForMySQLPassword = true;
|
$askForMySQLPassword = true;
|
||||||
if (!empty(config('database.connections.mysql.password')) && $this->input->isInteractive()) {
|
if (! empty($this->config->get('database.connections.mysql.password')) && $this->input->isInteractive()) {
|
||||||
$this->variables['DB_PASSWORD'] = config('database.connections.mysql.password');
|
$this->variables['DB_PASSWORD'] = $this->config->get('database.connections.mysql.password');
|
||||||
$askForMySQLPassword = $this->confirm('It appears you already have a MySQL connection password defined, would you like to change it?');
|
$askForMySQLPassword = $this->confirm(trans('command/messages.environment.database.password_defined'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($askForMySQLPassword) {
|
if ($askForMySQLPassword) {
|
||||||
$this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
|
$this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret(trans('command/messages.environment.database.password'));
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->testMySQLConnection();
|
$this->testMySQLConnection();
|
||||||
} catch (\PDOException $exception) {
|
} catch (PDOException $exception) {
|
||||||
$this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
|
$this->output->error(trans('command/messages.environment.database.connection_error', ['error' => $exception->getMessage()]));
|
||||||
$this->output->error('Your connection credentials have NOT been saved. You will need to provide valid connection information before proceeding.');
|
$this->output->error(trans('command/messages.environment.database.creds_not_saved'));
|
||||||
|
|
||||||
if ($this->confirm('Go back and try again?')) {
|
if ($this->confirm(trans('command/messages.environment.database.try_again'))) {
|
||||||
$this->database->disconnect('_pterodactyl_command_test');
|
$this->database->disconnect('_pterodactyl_command_test');
|
||||||
|
|
||||||
return $this->handle();
|
return $this->handle();
|
||||||
|
@ -96,16 +135,16 @@ class DatabaseSettingsCommand extends Command
|
||||||
*/
|
*/
|
||||||
private function testMySQLConnection()
|
private function testMySQLConnection()
|
||||||
{
|
{
|
||||||
config()->set('database.connections._pterodactyl_command_test', [
|
$this->config->set('database.connections._pterodactyl_command_test', [
|
||||||
'driver' => 'mysql',
|
'driver' => 'mysql',
|
||||||
'host' => $this->variables['DB_HOST'],
|
'host' => $this->variables['DB_HOST'],
|
||||||
'port' => $this->variables['DB_PORT'],
|
'port' => $this->variables['DB_PORT'],
|
||||||
'database' => $this->variables['DB_DATABASE'],
|
'database' => $this->variables['DB_DATABASE'],
|
||||||
'username' => $this->variables['DB_USERNAME'],
|
'username' => $this->variables['DB_USERNAME'],
|
||||||
'password' => $this->variables['DB_PASSWORD'],
|
'password' => $this->variables['DB_PASSWORD'],
|
||||||
'charset' => 'utf8mb4',
|
'charset' => 'utf8mb4',
|
||||||
'collation' => 'utf8mb4_unicode_ci',
|
'collation' => 'utf8mb4_unicode_ci',
|
||||||
'strict' => true,
|
'strict' => true,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->database->connection('_pterodactyl_command_test')->getPdo();
|
$this->database->connection('_pterodactyl_command_test')->getPdo();
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Environment;
|
namespace Pterodactyl\Console\Commands\Environment;
|
||||||
|
|
||||||
|
@ -10,8 +17,19 @@ class EmailSettingsCommand extends Command
|
||||||
{
|
{
|
||||||
use EnvironmentWriterTrait;
|
use EnvironmentWriterTrait;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Config\Repository
|
||||||
|
*/
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Set or update the email sending configuration for the Panel.';
|
protected $description = 'Set or update the email sending configuration for the Panel.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:environment:mail
|
protected $signature = 'p:environment:mail
|
||||||
{--driver= : The mail driver to use.}
|
{--driver= : The mail driver to use.}
|
||||||
{--email= : Email address that messages from the Panel will originate from.}
|
{--email= : Email address that messages from the Panel will originate from.}
|
||||||
|
@ -19,37 +37,40 @@ class EmailSettingsCommand extends Command
|
||||||
{--encryption=}
|
{--encryption=}
|
||||||
{--host=}
|
{--host=}
|
||||||
{--port=}
|
{--port=}
|
||||||
{--endpoint=}
|
|
||||||
{--username=}
|
{--username=}
|
||||||
{--password=}';
|
{--password=}';
|
||||||
|
|
||||||
protected array $variables = [];
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $variables = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EmailSettingsCommand constructor.
|
* EmailSettingsCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Contracts\Config\Repository $config
|
||||||
*/
|
*/
|
||||||
public function __construct(private ConfigRepository $config)
|
public function __construct(ConfigRepository $config)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle command execution.
|
* Handle command execution.
|
||||||
*
|
|
||||||
* @throws \Pterodactyl\Exceptions\PterodactylException
|
* @throws \Pterodactyl\Exceptions\PterodactylException
|
||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
|
$this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
|
||||||
trans('command/messages.environment.mail.ask_driver'),
|
trans('command/messages.environment.mail.ask_driver'), [
|
||||||
[
|
|
||||||
'smtp' => 'SMTP Server',
|
'smtp' => 'SMTP Server',
|
||||||
'sendmail' => 'sendmail Binary',
|
'mail' => 'PHP\'s Internal Mail Function',
|
||||||
'mailgun' => 'Mailgun Transactional Email',
|
'mailgun' => 'Mailgun Transactional Email',
|
||||||
'mandrill' => 'Mandrill Transactional Email',
|
'mandrill' => 'Mandrill Transactional Email',
|
||||||
'postmark' => 'Postmark Transactional Email',
|
'postmark' => 'Postmarkapp Transactional Email',
|
||||||
],
|
], $this->config->get('mail.driver', 'smtp')
|
||||||
$this->config->get('mail.default', 'smtp')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
|
$method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
|
||||||
|
@ -57,14 +78,16 @@ class EmailSettingsCommand extends Command
|
||||||
$this->{$method}();
|
$this->{$method}();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
|
$this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_mail_from'),
|
trans('command/messages.environment.mail.ask_mail_from'), $this->config->get('mail.from.address')
|
||||||
$this->config->get('mail.from.address')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['MAIL_FROM_NAME'] = $this->option('from') ?? $this->ask(
|
$this->variables['MAIL_FROM_NAME'] = $this->option('from') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_mail_name'),
|
trans('command/messages.environment.mail.ask_mail_name'), $this->config->get('mail.from.name')
|
||||||
$this->config->get('mail.from.name')
|
);
|
||||||
|
|
||||||
|
$this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
|
||||||
|
trans('command/messages.environment.mail.ask_encryption'), ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'], $this->config->get('mail.encryption', 'tls')
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->writeToEnvironment($this->variables);
|
$this->writeToEnvironment($this->variables);
|
||||||
|
@ -79,29 +102,20 @@ class EmailSettingsCommand extends Command
|
||||||
private function setupSmtpDriverVariables()
|
private function setupSmtpDriverVariables()
|
||||||
{
|
{
|
||||||
$this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
|
$this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_smtp_host'),
|
trans('command/messages.environment.mail.ask_smtp_host'), $this->config->get('mail.host')
|
||||||
$this->config->get('mail.mailers.smtp.host')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['MAIL_PORT'] = $this->option('port') ?? $this->ask(
|
$this->variables['MAIL_PORT'] = $this->option('port') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_smtp_port'),
|
trans('command/messages.environment.mail.ask_smtp_port'), $this->config->get('mail.port')
|
||||||
$this->config->get('mail.mailers.smtp.port')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['MAIL_USERNAME'] = $this->option('username') ?? $this->ask(
|
$this->variables['MAIL_USERNAME'] = $this->option('username') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_smtp_username'),
|
trans('command/messages.environment.mail.ask_smtp_username'), $this->config->get('mail.username')
|
||||||
$this->config->get('mail.mailers.smtp.username')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
|
$this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
|
||||||
trans('command/messages.environment.mail.ask_smtp_password')
|
trans('command/messages.environment.mail.ask_smtp_password')
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
|
|
||||||
trans('command/messages.environment.mail.ask_encryption'),
|
|
||||||
['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
|
|
||||||
$this->config->get('mail.mailers.smtp.encryption', 'tls')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -110,18 +124,11 @@ class EmailSettingsCommand extends Command
|
||||||
private function setupMailgunDriverVariables()
|
private function setupMailgunDriverVariables()
|
||||||
{
|
{
|
||||||
$this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask(
|
$this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_mailgun_domain'),
|
trans('command/messages.environment.mail.ask_mailgun_domain'), $this->config->get('services.mailgun.domain')
|
||||||
$this->config->get('services.mailgun.domain')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->variables['MAILGUN_SECRET'] = $this->option('password') ?? $this->ask(
|
$this->variables['MAILGUN_SECRET'] = $this->option('password') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_mailgun_secret'),
|
trans('command/messages.environment.mail.ask_mailgun_secret'), $this->config->get('services.mailgun.secret')
|
||||||
$this->config->get('services.mailgun.secret')
|
|
||||||
);
|
|
||||||
|
|
||||||
$this->variables['MAILGUN_ENDPOINT'] = $this->option('endpoint') ?? $this->ask(
|
|
||||||
trans('command/messages.environment.mail.ask_mailgun_endpoint'),
|
|
||||||
$this->config->get('services.mailgun.endpoint')
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,8 +138,7 @@ class EmailSettingsCommand extends Command
|
||||||
private function setupMandrillDriverVariables()
|
private function setupMandrillDriverVariables()
|
||||||
{
|
{
|
||||||
$this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask(
|
$this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_mandrill_secret'),
|
trans('command/messages.environment.mail.ask_mandrill_secret'), $this->config->get('services.mandrill.secret')
|
||||||
$this->config->get('services.mandrill.secret')
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,8 +151,7 @@ class EmailSettingsCommand extends Command
|
||||||
$this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com';
|
$this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com';
|
||||||
$this->variables['MAIL_PORT'] = 587;
|
$this->variables['MAIL_PORT'] = 587;
|
||||||
$this->variables['MAIL_USERNAME'] = $this->variables['MAIL_PASSWORD'] = $this->option('username') ?? $this->ask(
|
$this->variables['MAIL_USERNAME'] = $this->variables['MAIL_PASSWORD'] = $this->option('username') ?? $this->ask(
|
||||||
trans('command/messages.environment.mail.ask_postmark_username'),
|
trans('command/messages.environment.mail.ask_postmark_username'), $this->config->get('mail.username')
|
||||||
$this->config->get('mail.username')
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands;
|
namespace Pterodactyl\Console\Commands;
|
||||||
|
|
||||||
|
@ -8,16 +15,38 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||||
|
|
||||||
class InfoCommand extends Command
|
class InfoCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Displays the application, database, and email configurations along with the panel version.';
|
protected $description = 'Displays the application, database, and email configurations along with the panel version.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Config\Repository
|
||||||
|
*/
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:info';
|
protected $signature = 'p:info';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* VersionCommand constructor.
|
* @var \Pterodactyl\Services\Helpers\SoftwareVersionService
|
||||||
*/
|
*/
|
||||||
public function __construct(private ConfigRepository $config, private SoftwareVersionService $softwareVersionService)
|
protected $versionService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* VersionCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Contracts\Config\Repository $config
|
||||||
|
* @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService
|
||||||
|
*/
|
||||||
|
public function __construct(ConfigRepository $config, SoftwareVersionService $versionService)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->config = $config;
|
||||||
|
$this->versionService = $versionService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,16 +56,16 @@ class InfoCommand extends Command
|
||||||
{
|
{
|
||||||
$this->output->title('Version Information');
|
$this->output->title('Version Information');
|
||||||
$this->table([], [
|
$this->table([], [
|
||||||
['Panel Version', $this->softwareVersionService->getCurrentVersion()],
|
['Panel Version', $this->config->get('app.version')],
|
||||||
['Latest Version', $this->softwareVersionService->getLatestPanel()],
|
['Latest Version', $this->versionService->getPanel()],
|
||||||
['Up-to-Date', $this->softwareVersionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
|
['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
|
||||||
['Unique Identifier', $this->config->get('pterodactyl.service.author')],
|
['Unique Identifier', $this->config->get('pterodactyl.service.author')],
|
||||||
], 'compact');
|
], 'compact');
|
||||||
|
|
||||||
$this->output->title('Application Configuration');
|
$this->output->title('Application Configuration');
|
||||||
$this->table([], [
|
$this->table([], [
|
||||||
['Environment', $this->formatText($this->config->get('app.env'), $this->config->get('app.env') === 'production' ?: 'bg=red')],
|
['Environment', $this->formatText($this->config->get('app.env'), $this->config->get('app.env') === 'production' ?: 'bg=red')],
|
||||||
['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', !$this->config->get('app.debug') ?: 'bg=red')],
|
['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', ! $this->config->get('app.debug') ?: 'bg=red')],
|
||||||
['Installation URL', $this->config->get('app.url')],
|
['Installation URL', $this->config->get('app.url')],
|
||||||
['Installation Directory', base_path()],
|
['Installation Directory', base_path()],
|
||||||
['Timezone', $this->config->get('app.timezone')],
|
['Timezone', $this->config->get('app.timezone')],
|
||||||
|
@ -52,29 +81,32 @@ class InfoCommand extends Command
|
||||||
$driver = $this->config->get('database.default');
|
$driver = $this->config->get('database.default');
|
||||||
$this->table([], [
|
$this->table([], [
|
||||||
['Driver', $driver],
|
['Driver', $driver],
|
||||||
['Host', $this->config->get("database.connections.$driver.host")],
|
['Host', $this->config->get("database.connections.{$driver}.host")],
|
||||||
['Port', $this->config->get("database.connections.$driver.port")],
|
['Port', $this->config->get("database.connections.{$driver}.port")],
|
||||||
['Database', $this->config->get("database.connections.$driver.database")],
|
['Database', $this->config->get("database.connections.{$driver}.database")],
|
||||||
['Username', $this->config->get("database.connections.$driver.username")],
|
['Username', $this->config->get("database.connections.{$driver}.username")],
|
||||||
], 'compact');
|
], 'compact');
|
||||||
|
|
||||||
// TODO: Update this to handle other mail drivers
|
|
||||||
$this->output->title('Email Configuration');
|
$this->output->title('Email Configuration');
|
||||||
$this->table([], [
|
$this->table([], [
|
||||||
['Driver', $this->config->get('mail.default')],
|
['Driver', $this->config->get('mail.driver')],
|
||||||
['Host', $this->config->get('mail.mailers.smtp.host')],
|
['Host', $this->config->get('mail.host')],
|
||||||
['Port', $this->config->get('mail.mailers.smtp.port')],
|
['Port', $this->config->get('mail.port')],
|
||||||
['Username', $this->config->get('mail.mailers.smtp.username')],
|
['Username', $this->config->get('mail.username')],
|
||||||
['From Address', $this->config->get('mail.from.address')],
|
['From Address', $this->config->get('mail.from.address')],
|
||||||
['From Name', $this->config->get('mail.from.name')],
|
['From Name', $this->config->get('mail.from.name')],
|
||||||
['Encryption', $this->config->get('mail.mailers.smtp.encryption')],
|
['Encryption', $this->config->get('mail.encryption')],
|
||||||
], 'compact');
|
], 'compact');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format output in a Name: Value manner.
|
* Format output in a Name: Value manner.
|
||||||
|
*
|
||||||
|
* @param string $value
|
||||||
|
* @param string $opts
|
||||||
|
* @return string
|
||||||
*/
|
*/
|
||||||
private function formatText(string $value, string $opts = ''): string
|
private function formatText($value, $opts = '')
|
||||||
{
|
{
|
||||||
return sprintf('<%s>%s</>', $opts, $value);
|
return sprintf('<%s>%s</>', $opts, $value);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,28 +1,59 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Location;
|
namespace Pterodactyl\Console\Commands\Location;
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use Pterodactyl\Services\Locations\LocationDeletionService;
|
use Pterodactyl\Services\Locations\LocationDeletionService;
|
||||||
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
|
||||||
|
|
||||||
class DeleteLocationCommand extends Command
|
class DeleteLocationCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Locations\LocationDeletionService
|
||||||
|
*/
|
||||||
|
protected $deletionService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Deletes a location from the Panel.';
|
protected $description = 'Deletes a location from the Panel.';
|
||||||
|
|
||||||
protected $signature = 'p:location:delete {--short= : The short code of the location to delete.}';
|
/**
|
||||||
|
* @var \Illuminate\Support\Collection
|
||||||
|
*/
|
||||||
|
protected $locations;
|
||||||
|
|
||||||
protected Collection $locations;
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'p:location:delete {--short= : The short code of the location to delete.}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DeleteLocationCommand constructor.
|
* DeleteLocationCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository
|
||||||
|
* @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private LocationDeletionService $deletionService,
|
LocationDeletionService $deletionService,
|
||||||
private LocationRepositoryInterface $repository
|
LocationRepositoryInterface $repository
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->deletionService = $deletionService;
|
||||||
|
$this->repository = $repository;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -35,8 +66,7 @@ class DeleteLocationCommand extends Command
|
||||||
{
|
{
|
||||||
$this->locations = $this->locations ?? $this->repository->all();
|
$this->locations = $this->locations ?? $this->repository->all();
|
||||||
$short = $this->option('short') ?? $this->anticipate(
|
$short = $this->option('short') ?? $this->anticipate(
|
||||||
trans('command/messages.location.ask_short'),
|
trans('command/messages.location.ask_short'), $this->locations->pluck('short')->toArray()
|
||||||
$this->locations->pluck('short')->toArray()
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$location = $this->locations->where('short', $short)->first();
|
$location = $this->locations->where('short', $short)->first();
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Location;
|
namespace Pterodactyl\Console\Commands\Location;
|
||||||
|
|
||||||
|
@ -7,18 +14,33 @@ use Pterodactyl\Services\Locations\LocationCreationService;
|
||||||
|
|
||||||
class MakeLocationCommand extends Command
|
class MakeLocationCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Locations\LocationCreationService
|
||||||
|
*/
|
||||||
|
protected $creationService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:location:make
|
protected $signature = 'p:location:make
|
||||||
{--short= : The shortcode name of this location (ex. us1).}
|
{--short= : The shortcode name of this location (ex. us1).}
|
||||||
{--long= : A longer description of this location.}';
|
{--long= : A longer description of this location.}';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Creates a new location on the system via the CLI.';
|
protected $description = 'Creates a new location on the system via the CLI.';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new command instance.
|
* Create a new command instance.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Services\Locations\LocationCreationService $creationService
|
||||||
*/
|
*/
|
||||||
public function __construct(private LocationCreationService $creationService)
|
public function __construct(LocationCreationService $creationService)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->creationService = $creationService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -2,23 +2,34 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Maintenance;
|
namespace Pterodactyl\Console\Commands\Maintenance;
|
||||||
|
|
||||||
|
use SplFileInfo;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Contracts\Filesystem\Filesystem;
|
|
||||||
use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
|
use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
|
||||||
|
|
||||||
class CleanServiceBackupFilesCommand extends Command
|
class CleanServiceBackupFilesCommand extends Command
|
||||||
{
|
{
|
||||||
public const BACKUP_THRESHOLD_MINUTES = 5;
|
const BACKUP_THRESHOLD_MINUTES = 5;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Clean orphaned .bak files created when modifying services.';
|
protected $description = 'Clean orphaned .bak files created when modifying services.';
|
||||||
|
|
||||||
protected $signature = 'p:maintenance:clean-service-backups';
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Filesystem\Filesystem
|
||||||
|
*/
|
||||||
|
protected $disk;
|
||||||
|
|
||||||
protected Filesystem $disk;
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'p:maintenance:clean-service-backups';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CleanServiceBackupFilesCommand constructor.
|
* CleanServiceBackupFilesCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Contracts\Filesystem\Factory $filesystem
|
||||||
*/
|
*/
|
||||||
public function __construct(FilesystemFactory $filesystem)
|
public function __construct(FilesystemFactory $filesystem)
|
||||||
{
|
{
|
||||||
|
@ -34,7 +45,7 @@ class CleanServiceBackupFilesCommand extends Command
|
||||||
{
|
{
|
||||||
$files = $this->disk->files('services/.bak');
|
$files = $this->disk->files('services/.bak');
|
||||||
|
|
||||||
collect($files)->each(function (\SplFileInfo $file) {
|
collect($files)->each(function (SplFileInfo $file) {
|
||||||
$lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
|
$lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
|
||||||
if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
|
if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
|
||||||
$this->disk->delete($file->getPath());
|
$this->disk->delete($file->getPath());
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Maintenance;
|
|
||||||
|
|
||||||
use Carbon\CarbonImmutable;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Pterodactyl\Repositories\Eloquent\BackupRepository;
|
|
||||||
|
|
||||||
class PruneOrphanedBackupsCommand extends Command
|
|
||||||
{
|
|
||||||
protected $signature = 'p:maintenance:prune-backups {--prune-age=}';
|
|
||||||
|
|
||||||
protected $description = 'Marks all backups older than "n" minutes that have not yet completed as being failed.';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* PruneOrphanedBackupsCommand constructor.
|
|
||||||
*/
|
|
||||||
public function __construct(private BackupRepository $backupRepository)
|
|
||||||
{
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
$since = $this->option('prune-age') ?? config('backups.prune_age', 360);
|
|
||||||
if (!$since || !is_digit($since)) {
|
|
||||||
throw new \InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$query = $this->backupRepository->getBuilder()
|
|
||||||
->whereNull('completed_at')
|
|
||||||
->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());
|
|
||||||
|
|
||||||
$count = $query->count();
|
|
||||||
if (!$count) {
|
|
||||||
$this->info('There are no orphaned backups to be marked as failed.');
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->warn("Marking $count uncompleted backups that are older than $since minutes as failed.");
|
|
||||||
|
|
||||||
$query->update([
|
|
||||||
'is_successful' => false,
|
|
||||||
'completed_at' => CarbonImmutable::now(),
|
|
||||||
'updated_at' => CarbonImmutable::now(),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Console\Commands\Migration;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\ApiKey;
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
|
||||||
|
|
||||||
|
class CleanOrphanedApiKeysCommand extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface
|
||||||
|
*/
|
||||||
|
private $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'p:migration:clean-orphaned-keys';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'Cleans API keys from the database that are not assigned a specific role.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CleanOrphanedApiKeysCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository
|
||||||
|
*/
|
||||||
|
public function __construct(ApiKeyRepositoryInterface $repository)
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->repository = $repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7.
|
||||||
|
*
|
||||||
|
* @return null|void
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
$count = $this->repository->findCountWhere([['key_type', '=', ApiKey::TYPE_NONE]]);
|
||||||
|
$continue = $this->confirm(
|
||||||
|
'This action will remove ' . $count . ' keys from the database. Are you sure you wish to continue?', false
|
||||||
|
);
|
||||||
|
|
||||||
|
if (! $continue) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->info('Deleting keys...');
|
||||||
|
$this->repository->deleteWhere([['key_type', '=', ApiKey::TYPE_NONE]]);
|
||||||
|
$this->info('Keys were successfully deleted.');
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,69 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Node;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Pterodactyl\Services\Nodes\NodeCreationService;
|
|
||||||
|
|
||||||
class MakeNodeCommand extends Command
|
|
||||||
{
|
|
||||||
protected $signature = 'p:node:make
|
|
||||||
{--name= : A name to identify the node.}
|
|
||||||
{--description= : A description to identify the node.}
|
|
||||||
{--locationId= : A valid locationId.}
|
|
||||||
{--fqdn= : The domain name (e.g node.example.com) to be used for connecting to the daemon. An IP address may only be used if you are not using SSL for this node.}
|
|
||||||
{--public= : Should the node be public or private? (public=1 / private=0).}
|
|
||||||
{--scheme= : Which scheme should be used? (Enable SSL=https / Disable SSL=http).}
|
|
||||||
{--proxy= : Is the daemon behind a proxy? (Yes=1 / No=0).}
|
|
||||||
{--maintenance= : Should maintenance mode be enabled? (Enable Maintenance mode=1 / Disable Maintenance mode=0).}
|
|
||||||
{--maxMemory= : Set the max memory amount.}
|
|
||||||
{--overallocateMemory= : Enter the amount of ram to overallocate (% or -1 to overallocate the maximum).}
|
|
||||||
{--maxDisk= : Set the max disk amount.}
|
|
||||||
{--overallocateDisk= : Enter the amount of disk to overallocate (% or -1 to overallocate the maximum).}
|
|
||||||
{--uploadSize= : Enter the maximum upload filesize.}
|
|
||||||
{--daemonListeningPort= : Enter the wings listening port.}
|
|
||||||
{--daemonSFTPPort= : Enter the wings SFTP listening port.}
|
|
||||||
{--daemonBase= : Enter the base folder.}';
|
|
||||||
|
|
||||||
protected $description = 'Creates a new node on the system via the CLI.';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* MakeNodeCommand constructor.
|
|
||||||
*/
|
|
||||||
public function __construct(private NodeCreationService $creationService)
|
|
||||||
{
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle the command execution process.
|
|
||||||
*
|
|
||||||
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
$data['name'] = $this->option('name') ?? $this->ask('Enter a short identifier used to distinguish this node from others');
|
|
||||||
$data['description'] = $this->option('description') ?? $this->ask('Enter a description to identify the node');
|
|
||||||
$data['location_id'] = $this->option('locationId') ?? $this->ask('Enter a valid location id');
|
|
||||||
$data['scheme'] = $this->option('scheme') ?? $this->anticipate(
|
|
||||||
'Please either enter https for SSL or http for a non-ssl connection',
|
|
||||||
['https', 'http'],
|
|
||||||
'https'
|
|
||||||
);
|
|
||||||
$data['fqdn'] = $this->option('fqdn') ?? $this->ask('Enter a domain name (e.g node.example.com) to be used for connecting to the daemon. An IP address may only be used if you are not using SSL for this node');
|
|
||||||
$data['public'] = $this->option('public') ?? $this->confirm('Should this node be public? As a note, setting a node to private you will be denying the ability to auto-deploy to this node.', true);
|
|
||||||
$data['behind_proxy'] = $this->option('proxy') ?? $this->confirm('Is your FQDN behind a proxy?');
|
|
||||||
$data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm('Should maintenance mode be enabled?');
|
|
||||||
$data['memory'] = $this->option('maxMemory') ?? $this->ask('Enter the maximum amount of memory');
|
|
||||||
$data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask('Enter the amount of memory to over allocate by, -1 will disable checking and 0 will prevent creating new servers');
|
|
||||||
$data['disk'] = $this->option('maxDisk') ?? $this->ask('Enter the maximum amount of disk space');
|
|
||||||
$data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask('Enter the amount of memory to over allocate by, -1 will disable checking and 0 will prevent creating new server');
|
|
||||||
$data['upload_size'] = $this->option('uploadSize') ?? $this->ask('Enter the maximum filesize upload', '100');
|
|
||||||
$data['daemonListen'] = $this->option('daemonListeningPort') ?? $this->ask('Enter the wings listening port', '8080');
|
|
||||||
$data['daemonSFTP'] = $this->option('daemonSFTPPort') ?? $this->ask('Enter the wings SFTP listening port', '2022');
|
|
||||||
$data['daemonBase'] = $this->option('daemonBase') ?? $this->ask('Enter the base folder', '/var/lib/pterodactyl/volumes');
|
|
||||||
|
|
||||||
$node = $this->creationService->handle($data);
|
|
||||||
$this->line('Successfully created a new node on the location ' . $data['location_id'] . ' with the name ' . $data['name'] . ' and has an id of ' . $node->id . '.');
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,44 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Node;
|
|
||||||
|
|
||||||
use Pterodactyl\Models\Node;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
|
|
||||||
class NodeConfigurationCommand extends Command
|
|
||||||
{
|
|
||||||
protected $signature = 'p:node:configuration
|
|
||||||
{node : The ID or UUID of the node to return the configuration for.}
|
|
||||||
{--format=yaml : The output format. Options are "yaml" and "json".}';
|
|
||||||
|
|
||||||
protected $description = 'Displays the configuration for the specified node.';
|
|
||||||
|
|
||||||
public function handle(): int
|
|
||||||
{
|
|
||||||
$column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
|
|
||||||
|
|
||||||
/** @var \Pterodactyl\Models\Node $node */
|
|
||||||
$node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
|
|
||||||
$this->error('The selected node does not exist.');
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
$format = $this->option('format');
|
|
||||||
if (!in_array($format, ['yaml', 'yml', 'json'])) {
|
|
||||||
$this->error('Invalid format specified. Valid options are "yaml" and "json".');
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($format === 'json') {
|
|
||||||
$this->output->write($node->getJsonConfiguration(true));
|
|
||||||
} else {
|
|
||||||
$this->output->write($node->getYamlConfiguration());
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->output->newLine();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,34 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Node;
|
|
||||||
|
|
||||||
use Pterodactyl\Models\Node;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
|
|
||||||
class NodeListCommand extends Command
|
|
||||||
{
|
|
||||||
protected $signature = 'p:node:list {--format=text : The output format: "text" or "json". }';
|
|
||||||
|
|
||||||
public function handle(): int
|
|
||||||
{
|
|
||||||
$nodes = Node::query()->with('location')->get()->map(function (Node $node) {
|
|
||||||
return [
|
|
||||||
'id' => $node->id,
|
|
||||||
'uuid' => $node->uuid,
|
|
||||||
'name' => $node->name,
|
|
||||||
'location' => $node->location->short,
|
|
||||||
'host' => $node->getConnectionAddress(),
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
if ($this->option('format') === 'json') {
|
|
||||||
$this->output->write($nodes->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
|
|
||||||
} else {
|
|
||||||
$this->table(['ID', 'UUID', 'Name', 'Location', 'Host'], $nodes->toArray());
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->output->newLine();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -12,13 +12,13 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
|
||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
if (!empty(config('app.key')) && $this->input->isInteractive()) {
|
if (! empty(config('app.key')) && $this->input->isInteractive()) {
|
||||||
$this->output->warning('It appears you have already configured an application encryption key. Continuing with this process with overwrite that key and cause data corruption for any existing encrypted data. DO NOT CONTINUE UNLESS YOU KNOW WHAT YOU ARE DOING.');
|
$this->output->warning(trans('command/messages.key.warning'));
|
||||||
if (!$this->confirm('I understand the consequences of performing this command and accept all responsibility for the loss of encrypted data.')) {
|
if (! $this->confirm(trans('command/messages.key.confirm'))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->confirm('Are you sure you wish to continue? Changing the application encryption key WILL CAUSE DATA LOSS.')) {
|
if (! $this->confirm(trans('command/messages.key.final_confirm'))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Overrides;
|
|
||||||
|
|
||||||
use Pterodactyl\Console\RequiresDatabaseMigrations;
|
|
||||||
use Illuminate\Database\Console\Seeds\SeedCommand as BaseSeedCommand;
|
|
||||||
|
|
||||||
class SeedCommand extends BaseSeedCommand
|
|
||||||
{
|
|
||||||
use RequiresDatabaseMigrations;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Block someone from running this seed command if they have not completed
|
|
||||||
* the migration process.
|
|
||||||
*/
|
|
||||||
public function handle(): int
|
|
||||||
{
|
|
||||||
if (!$this->hasCompletedMigrations()) {
|
|
||||||
$this->showMigrationWarning();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return parent::handle();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Overrides;
|
|
||||||
|
|
||||||
use Pterodactyl\Console\RequiresDatabaseMigrations;
|
|
||||||
use Illuminate\Foundation\Console\UpCommand as BaseUpCommand;
|
|
||||||
|
|
||||||
class UpCommand extends BaseUpCommand
|
|
||||||
{
|
|
||||||
use RequiresDatabaseMigrations;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Block someone from running this up command if they have not completed
|
|
||||||
* the migration process.
|
|
||||||
*/
|
|
||||||
public function handle(): int
|
|
||||||
{
|
|
||||||
if (!$this->hasCompletedMigrations()) {
|
|
||||||
$this->showMigrationWarning();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return parent::handle();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,76 +1,86 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Schedule;
|
namespace Pterodactyl\Console\Commands\Schedule;
|
||||||
|
|
||||||
use Exception;
|
use Cake\Chronos\Chronos;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Pterodactyl\Models\Schedule;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
|
||||||
use Pterodactyl\Services\Schedules\ProcessScheduleService;
|
use Pterodactyl\Services\Schedules\ProcessScheduleService;
|
||||||
|
use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
|
||||||
|
|
||||||
class ProcessRunnableCommand extends Command
|
class ProcessRunnableCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'Process schedules in the database and determine which are ready to run.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Schedules\ProcessScheduleService
|
||||||
|
*/
|
||||||
|
protected $processScheduleService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:schedule:process';
|
protected $signature = 'p:schedule:process';
|
||||||
|
|
||||||
protected $description = 'Process schedules in the database and determine which are ready to run.';
|
/**
|
||||||
|
* ProcessRunnableCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository
|
||||||
|
*/
|
||||||
|
public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository)
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->processScheduleService = $processScheduleService;
|
||||||
|
$this->repository = $repository;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle command execution.
|
* Handle command execution.
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle()
|
||||||
{
|
{
|
||||||
$schedules = Schedule::query()
|
$schedules = $this->repository->getSchedulesToProcess(Chronos::now()->toAtomString());
|
||||||
->with('tasks')
|
|
||||||
->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
|
|
||||||
->where('is_active', true)
|
|
||||||
->where('is_processing', false)
|
|
||||||
->whereRaw('next_run_at <= NOW()')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
if ($schedules->count() < 1) {
|
if ($schedules->count() < 1) {
|
||||||
$this->line('There are no scheduled tasks for servers that need to be run.');
|
$this->line('There are no scheduled tasks for servers that need to be run.');
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$bar = $this->output->createProgressBar(count($schedules));
|
|
||||||
foreach ($schedules as $schedule) {
|
|
||||||
$bar->clear();
|
|
||||||
$this->processSchedule($schedule);
|
|
||||||
$bar->advance();
|
|
||||||
$bar->display();
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->line('');
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes a given schedule and logs and errors encountered the console output. This should
|
|
||||||
* never throw an exception out, otherwise you'll end up killing the entire run group causing
|
|
||||||
* any other schedules to not process correctly.
|
|
||||||
*
|
|
||||||
* @see https://github.com/pterodactyl/panel/issues/2609
|
|
||||||
*/
|
|
||||||
protected function processSchedule(Schedule $schedule)
|
|
||||||
{
|
|
||||||
if ($schedule->tasks->isEmpty()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
$bar = $this->output->createProgressBar(count($schedules));
|
||||||
$this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);
|
$schedules->each(function ($schedule) use ($bar) {
|
||||||
|
if ($schedule->tasks instanceof Collection && count($schedule->tasks) > 0) {
|
||||||
|
$this->processScheduleService->handle($schedule);
|
||||||
|
|
||||||
$this->line(trans('command/messages.schedule.output_line', [
|
if ($this->input->isInteractive()) {
|
||||||
'schedule' => $schedule->name,
|
$bar->clear();
|
||||||
'hash' => $schedule->hashid,
|
$this->line(trans('command/messages.schedule.output_line', [
|
||||||
]));
|
'schedule' => $schedule->name,
|
||||||
} catch (\Throwable|\Exception $exception) {
|
'hash' => $schedule->hashid,
|
||||||
Log::error($exception, ['schedule_id' => $schedule->id]);
|
]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->error("An error was encountered while processing Schedule #$schedule->id: " . $exception->getMessage());
|
$bar->advance();
|
||||||
}
|
$bar->display();
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->line('');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,35 +2,67 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\Server;
|
namespace Pterodactyl\Console\Commands\Server;
|
||||||
|
|
||||||
use Pterodactyl\Models\Server;
|
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use GuzzleHttp\Exception\RequestException;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
use Illuminate\Validation\Factory as ValidatorFactory;
|
use Illuminate\Validation\Factory as ValidatorFactory;
|
||||||
use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
|
use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
|
||||||
|
|
||||||
class BulkPowerActionCommand extends Command
|
class BulkPowerActionCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface
|
||||||
|
*/
|
||||||
|
private $powerRepository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
|
||||||
|
*/
|
||||||
|
private $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Validation\Factory
|
||||||
|
*/
|
||||||
|
private $validator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:server:bulk-power
|
protected $signature = 'p:server:bulk-power
|
||||||
{action : The action to perform (start, stop, restart, kill)}
|
{action : The action to perform (start, stop, restart, kill)}
|
||||||
{--servers= : A comma separated list of servers.}
|
{--servers= : A comma separated list of servers.}
|
||||||
{--nodes= : A comma separated list of nodes.}';
|
{--nodes= : A comma separated list of nodes.}';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
|
protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BulkPowerActionCommand constructor.
|
* BulkPowerActionCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface $powerRepository
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
|
||||||
|
* @param \Illuminate\Validation\Factory $validator
|
||||||
*/
|
*/
|
||||||
public function __construct(private DaemonPowerRepository $powerRepository, private ValidatorFactory $validator)
|
public function __construct(
|
||||||
{
|
PowerRepositoryInterface $powerRepository,
|
||||||
|
ServerRepositoryInterface $repository,
|
||||||
|
ValidatorFactory $validator
|
||||||
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->powerRepository = $powerRepository;
|
||||||
|
$this->repository = $repository;
|
||||||
|
$this->validator = $validator;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle the bulk power request.
|
* Handle the bulk power request.
|
||||||
*
|
*
|
||||||
* @throws \Illuminate\Validation\ValidationException
|
* @throws \Illuminate\Validation\ValidationException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException
|
||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
|
@ -58,19 +90,23 @@ class BulkPowerActionCommand extends Command
|
||||||
throw new ValidationException($validator);
|
throw new ValidationException($validator);
|
||||||
}
|
}
|
||||||
|
|
||||||
$count = $this->getQueryBuilder($servers, $nodes)->count();
|
$count = $this->repository->getServersForPowerActionCount($servers, $nodes);
|
||||||
if (!$this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count])) && $this->input->isInteractive()) {
|
if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count]))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$bar = $this->output->createProgressBar($count);
|
$bar = $this->output->createProgressBar($count);
|
||||||
$powerRepository = $this->powerRepository;
|
$servers = $this->repository->getServersForPowerAction($servers, $nodes);
|
||||||
$this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
|
|
||||||
|
foreach ($servers as $server) {
|
||||||
$bar->clear();
|
$bar->clear();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$powerRepository->setServer($server)->send($action);
|
$this->powerRepository
|
||||||
} catch (DaemonConnectionException $exception) {
|
->setNode($server->node)
|
||||||
|
->setServer($server)
|
||||||
|
->sendSignal($action);
|
||||||
|
} catch (RequestException $exception) {
|
||||||
$this->output->error(trans('command/messages.server.power.action_failed', [
|
$this->output->error(trans('command/messages.server.power.action_failed', [
|
||||||
'name' => $server->name,
|
'name' => $server->name,
|
||||||
'id' => $server->id,
|
'id' => $server->id,
|
||||||
|
@ -81,26 +117,8 @@ class BulkPowerActionCommand extends Command
|
||||||
|
|
||||||
$bar->advance();
|
$bar->advance();
|
||||||
$bar->display();
|
$bar->display();
|
||||||
});
|
}
|
||||||
|
|
||||||
$this->line('');
|
$this->line('');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the query builder instance that will return the servers that should be affected.
|
|
||||||
*/
|
|
||||||
protected function getQueryBuilder(array $servers, array $nodes): Builder
|
|
||||||
{
|
|
||||||
$instance = Server::query()->whereNull('status');
|
|
||||||
|
|
||||||
if (!empty($nodes) && !empty($servers)) {
|
|
||||||
$instance->whereIn('id', $servers)->orWhereIn('node_id', $nodes);
|
|
||||||
} elseif (empty($nodes) && !empty($servers)) {
|
|
||||||
$instance->whereIn('id', $servers);
|
|
||||||
} elseif (!empty($nodes) && empty($servers)) {
|
|
||||||
$instance->whereIn('node_id', $nodes);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $instance->with('node');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
109
app/Console/Commands/Server/RebuildServerCommand.php
Normal file
109
app/Console/Commands/Server/RebuildServerCommand.php
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Console\Commands\Server;
|
||||||
|
|
||||||
|
use Webmozart\Assert\Assert;
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use GuzzleHttp\Exception\RequestException;
|
||||||
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
|
use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
|
||||||
|
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
|
||||||
|
|
||||||
|
class RebuildServerCommand extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
|
||||||
|
*/
|
||||||
|
protected $configurationStructureService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $daemonRepository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'Rebuild a single server, all servers on a node, or all servers on the panel.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'p:server:rebuild
|
||||||
|
{server? : The ID of the server to rebuild.}
|
||||||
|
{--node= : ID of the node to rebuild all servers on. Ignored if server is passed.}';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* RebuildServerCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
|
||||||
|
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
DaemonServerRepositoryInterface $daemonRepository,
|
||||||
|
ServerConfigurationStructureService $configurationStructureService,
|
||||||
|
ServerRepositoryInterface $repository
|
||||||
|
) {
|
||||||
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->configurationStructureService = $configurationStructureService;
|
||||||
|
$this->daemonRepository = $daemonRepository;
|
||||||
|
$this->repository = $repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle command execution.
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
$servers = $this->getServersToProcess();
|
||||||
|
$bar = $this->output->createProgressBar(count($servers));
|
||||||
|
|
||||||
|
$servers->each(function ($server) use ($bar) {
|
||||||
|
$bar->clear();
|
||||||
|
$json = array_merge($this->configurationStructureService->handle($server), ['rebuild' => true]);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->daemonRepository->setServer($server)->update($json);
|
||||||
|
} catch (RequestException $exception) {
|
||||||
|
$this->output->error(trans('command/messages.server.rebuild_failed', [
|
||||||
|
'name' => $server->name,
|
||||||
|
'id' => $server->id,
|
||||||
|
'node' => $server->node->name,
|
||||||
|
'message' => $exception->getMessage(),
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
$bar->advance();
|
||||||
|
$bar->display();
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->line('');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the servers to be rebuilt.
|
||||||
|
*
|
||||||
|
* @return \Illuminate\Database\Eloquent\Collection
|
||||||
|
*/
|
||||||
|
private function getServersToProcess()
|
||||||
|
{
|
||||||
|
Assert::nullOrIntegerish($this->argument('server'), 'Value passed in server argument must be null or an integer, received %s.');
|
||||||
|
Assert::nullOrIntegerish($this->option('node'), 'Value passed in node option must be null or integer, received %s.');
|
||||||
|
|
||||||
|
return $this->repository->getDataForRebuild($this->argument('server'), $this->option('node'));
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,34 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Symfony\Component\VarDumper\VarDumper;
|
|
||||||
use Pterodactyl\Services\Telemetry\TelemetryCollectionService;
|
|
||||||
|
|
||||||
class TelemetryCommand extends Command
|
|
||||||
{
|
|
||||||
protected $description = 'Displays all the data that would be sent to the Pterodactyl Telemetry Service if telemetry collection is enabled.';
|
|
||||||
|
|
||||||
protected $signature = 'p:telemetry';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TelemetryCommand constructor.
|
|
||||||
*/
|
|
||||||
public function __construct(private TelemetryCollectionService $telemetryCollectionService)
|
|
||||||
{
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle execution of command.
|
|
||||||
*
|
|
||||||
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
$this->output->info('Collecting telemetry data, this may take a while...');
|
|
||||||
|
|
||||||
VarDumper::dump($this->telemetryCollectionService->collect());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,195 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Pterodactyl\Console\Kernel;
|
|
||||||
use Symfony\Component\Process\Process;
|
|
||||||
use Symfony\Component\Console\Helper\ProgressBar;
|
|
||||||
|
|
||||||
class UpgradeCommand extends Command
|
|
||||||
{
|
|
||||||
protected const DEFAULT_URL = 'https://github.com/pterodactyl/panel/releases/%s/panel.tar.gz';
|
|
||||||
|
|
||||||
protected $signature = 'p:upgrade
|
|
||||||
{--user= : The user that PHP runs under. All files will be owned by this user.}
|
|
||||||
{--group= : The group that PHP runs under. All files will be owned by this group.}
|
|
||||||
{--url= : The specific archive to download.}
|
|
||||||
{--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.}
|
|
||||||
{--skip-download : If set no archive will be downloaded.}';
|
|
||||||
|
|
||||||
protected $description = 'Downloads a new archive for Pterodactyl from GitHub and then executes the normal upgrade commands.';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executes an upgrade command which will run through all of our standard
|
|
||||||
* commands for Pterodactyl and enable users to basically just download
|
|
||||||
* the archive and execute this and be done.
|
|
||||||
*
|
|
||||||
* This places the application in maintenance mode as well while the commands
|
|
||||||
* are being executed.
|
|
||||||
*
|
|
||||||
* @throws \Exception
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
$skipDownload = $this->option('skip-download');
|
|
||||||
if (!$skipDownload) {
|
|
||||||
$this->output->warning('This command does not verify the integrity of downloaded assets. Please ensure that you trust the download source before continuing. If you do not wish to download an archive, please indicate that using the --skip-download flag, or answering "no" to the question below.');
|
|
||||||
$this->output->comment('Download Source (set with --url=):');
|
|
||||||
$this->line($this->getUrl());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (version_compare(PHP_VERSION, '7.4.0') < 0) {
|
|
||||||
$this->error('Cannot execute self-upgrade process. The minimum required PHP version required is 7.4.0, you have [' . PHP_VERSION . '].');
|
|
||||||
}
|
|
||||||
|
|
||||||
$user = 'www-data';
|
|
||||||
$group = 'www-data';
|
|
||||||
if ($this->input->isInteractive()) {
|
|
||||||
if (!$skipDownload) {
|
|
||||||
$skipDownload = !$this->confirm('Would you like to download and unpack the archive files for the latest version?', true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_null($this->option('user'))) {
|
|
||||||
$userDetails = posix_getpwuid(fileowner('public'));
|
|
||||||
$user = $userDetails['name'] ?? 'www-data';
|
|
||||||
|
|
||||||
if (!$this->confirm("Your webserver user has been detected as <fg=blue>[{$user}]:</> is this correct?", true)) {
|
|
||||||
$user = $this->anticipate(
|
|
||||||
'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
|
|
||||||
[
|
|
||||||
'www-data',
|
|
||||||
'nginx',
|
|
||||||
'apache',
|
|
||||||
]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_null($this->option('group'))) {
|
|
||||||
$groupDetails = posix_getgrgid(filegroup('public'));
|
|
||||||
$group = $groupDetails['name'] ?? 'www-data';
|
|
||||||
|
|
||||||
if (!$this->confirm("Your webserver group has been detected as <fg=blue>[{$group}]:</> is this correct?", true)) {
|
|
||||||
$group = $this->anticipate(
|
|
||||||
'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
|
|
||||||
[
|
|
||||||
'www-data',
|
|
||||||
'nginx',
|
|
||||||
'apache',
|
|
||||||
]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$this->confirm('Are you sure you want to run the upgrade process for your Panel?')) {
|
|
||||||
$this->warn('Upgrade process terminated by user.');
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ini_set('output_buffering', '0');
|
|
||||||
$bar = $this->output->createProgressBar($skipDownload ? 9 : 10);
|
|
||||||
$bar->start();
|
|
||||||
|
|
||||||
if (!$skipDownload) {
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line("\$upgrader> curl -L \"{$this->getUrl()}\" | tar -xzv");
|
|
||||||
$process = Process::fromShellCommandline("curl -L \"{$this->getUrl()}\" | tar -xzv");
|
|
||||||
$process->run(function ($type, $buffer) {
|
|
||||||
$this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> php artisan down');
|
|
||||||
$this->call('down');
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> chmod -R 755 storage bootstrap/cache');
|
|
||||||
$process = new Process(['chmod', '-R', '755', 'storage', 'bootstrap/cache']);
|
|
||||||
$process->run(function ($type, $buffer) {
|
|
||||||
$this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$command = ['composer', 'install', '--no-ansi'];
|
|
||||||
if (config('app.env') === 'production' && !config('app.debug')) {
|
|
||||||
$command[] = '--optimize-autoloader';
|
|
||||||
$command[] = '--no-dev';
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->line('$upgrader> ' . implode(' ', $command));
|
|
||||||
$process = new Process($command);
|
|
||||||
$process->setTimeout(10 * 60);
|
|
||||||
$process->run(function ($type, $buffer) {
|
|
||||||
$this->line($buffer);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
/** @var \Illuminate\Foundation\Application $app */
|
|
||||||
$app = require __DIR__ . '/../../../bootstrap/app.php';
|
|
||||||
/** @var \Pterodactyl\Console\Kernel $kernel */
|
|
||||||
$kernel = $app->make(Kernel::class);
|
|
||||||
$kernel->bootstrap();
|
|
||||||
$this->setLaravel($app);
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> php artisan view:clear');
|
|
||||||
$this->call('view:clear');
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> php artisan config:clear');
|
|
||||||
$this->call('config:clear');
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> php artisan migrate --force --seed');
|
|
||||||
$this->call('migrate', ['--force' => true, '--seed' => true]);
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () use ($user, $group) {
|
|
||||||
$this->line("\$upgrader> chown -R {$user}:{$group} *");
|
|
||||||
$process = Process::fromShellCommandline("chown -R {$user}:{$group} *", $this->getLaravel()->basePath());
|
|
||||||
$process->setTimeout(10 * 60);
|
|
||||||
$process->run(function ($type, $buffer) {
|
|
||||||
$this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> php artisan queue:restart');
|
|
||||||
$this->call('queue:restart');
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->withProgress($bar, function () {
|
|
||||||
$this->line('$upgrader> php artisan up');
|
|
||||||
$this->call('up');
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->newLine(2);
|
|
||||||
$this->info('Panel has been successfully upgraded. Please ensure you also update any Wings instances: https://pterodactyl.io/wings/1.0/upgrading.html');
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function withProgress(ProgressBar $bar, \Closure $callback)
|
|
||||||
{
|
|
||||||
$bar->clear();
|
|
||||||
$callback();
|
|
||||||
$bar->advance();
|
|
||||||
$bar->display();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getUrl(): string
|
|
||||||
{
|
|
||||||
if ($this->option('url')) {
|
|
||||||
return $this->option('url');
|
|
||||||
}
|
|
||||||
|
|
||||||
return sprintf(self::DEFAULT_URL, $this->option('release') ? 'download/v' . $this->option('release') : 'latest/download');
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,71 +1,99 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\User;
|
namespace Pterodactyl\Console\Commands\User;
|
||||||
|
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
use Webmozart\Assert\Assert;
|
use Webmozart\Assert\Assert;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Pterodactyl\Services\Users\UserDeletionService;
|
use Pterodactyl\Services\Users\UserDeletionService;
|
||||||
|
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
||||||
|
|
||||||
class DeleteUserCommand extends Command
|
class DeleteUserCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Users\UserDeletionService
|
||||||
|
*/
|
||||||
|
protected $deletionService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Deletes a user from the Panel if no servers are attached to their account.';
|
protected $description = 'Deletes a user from the Panel if no servers are attached to their account.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:user:delete {--user=}';
|
protected $signature = 'p:user:delete {--user=}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DeleteUserCommand constructor.
|
* DeleteUserCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Services\Users\UserDeletionService $deletionService
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
|
||||||
*/
|
*/
|
||||||
public function __construct(private UserDeletionService $deletionService)
|
public function __construct(
|
||||||
{
|
UserDeletionService $deletionService,
|
||||||
|
UserRepositoryInterface $repository
|
||||||
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->deletionService = $deletionService;
|
||||||
|
$this->repository = $repository;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handle(): int
|
/**
|
||||||
|
* @return bool
|
||||||
|
* @throws \Pterodactyl\Exceptions\DisplayException
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
{
|
{
|
||||||
$search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
|
$search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
|
||||||
Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
|
Assert::notEmpty($search, 'Search term must be a non-null value, received %s.');
|
||||||
|
|
||||||
$results = User::query()
|
|
||||||
->where('id', 'LIKE', "$search%")
|
|
||||||
->orWhere('username', 'LIKE', "$search%")
|
|
||||||
->orWhere('email', 'LIKE', "$search%")
|
|
||||||
->get();
|
|
||||||
|
|
||||||
|
$results = $this->repository->setSearchTerm($search)->all();
|
||||||
if (count($results) < 1) {
|
if (count($results) < 1) {
|
||||||
$this->error(trans('command/messages.user.no_users_found'));
|
$this->error(trans('command/messages.user.no_users_found'));
|
||||||
if ($this->input->isInteractive()) {
|
if ($this->input->isInteractive()) {
|
||||||
return $this->handle();
|
return $this->handle();
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->input->isInteractive()) {
|
if ($this->input->isInteractive()) {
|
||||||
$tableValues = [];
|
$tableValues = [];
|
||||||
foreach ($results as $user) {
|
foreach ($results as $user) {
|
||||||
$tableValues[] = [$user->id, $user->email, $user->username];
|
$tableValues[] = [$user->id, $user->email, $user->name];
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->table(['User ID', 'Email', 'Username'], $tableValues);
|
$this->table(['User ID', 'Email', 'Name'], $tableValues);
|
||||||
if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
|
if (! $deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
|
||||||
return $this->handle();
|
return $this->handle();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (count($results) > 1) {
|
if (count($results) > 1) {
|
||||||
$this->error(trans('command/messages.user.multiple_found'));
|
$this->error(trans('command/messages.user.multiple_found'));
|
||||||
|
|
||||||
return 1;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$deleteUser = $results->first();
|
$deleteUser = $results->first();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) {
|
if ($this->confirm(trans('command/messages.user.confirm_delete')) || ! $this->input->isInteractive()) {
|
||||||
$this->deletionService->handle($deleteUser);
|
$this->deletionService->handle($deleteUser);
|
||||||
$this->info(trans('command/messages.user.deleted'));
|
$this->info(trans('command/messages.user.deleted'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\User;
|
namespace Pterodactyl\Console\Commands\User;
|
||||||
|
|
||||||
|
@ -7,16 +14,31 @@ use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
||||||
|
|
||||||
class DisableTwoFactorCommand extends Command
|
class DisableTwoFactorCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Disable two-factor authentication for a specific user in the Panel.';
|
protected $description = 'Disable two-factor authentication for a specific user in the Panel.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:user:disable2fa {--email= : The email of the user to disable 2-Factor for.}';
|
protected $signature = 'p:user:disable2fa {--email= : The email of the user to disable 2-Factor for.}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DisableTwoFactorCommand constructor.
|
* DisableTwoFactorCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
|
||||||
*/
|
*/
|
||||||
public function __construct(private UserRepositoryInterface $repository)
|
public function __construct(UserRepositoryInterface $repository)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->repository = $repository;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Console\Commands\User;
|
namespace Pterodactyl\Console\Commands\User;
|
||||||
|
|
||||||
|
@ -7,16 +14,31 @@ use Pterodactyl\Services\Users\UserCreationService;
|
||||||
|
|
||||||
class MakeUserCommand extends Command
|
class MakeUserCommand extends Command
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Users\UserCreationService
|
||||||
|
*/
|
||||||
|
protected $creationService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $description = 'Creates a user on the system via the CLI.';
|
protected $description = 'Creates a user on the system via the CLI.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
protected $signature = 'p:user:make {--email=} {--username=} {--name-first=} {--name-last=} {--password=} {--admin=} {--no-password}';
|
protected $signature = 'p:user:make {--email=} {--username=} {--name-first=} {--name-last=} {--password=} {--admin=} {--no-password}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MakeUserCommand constructor.
|
* MakeUserCommand constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Services\Users\UserCreationService $creationService
|
||||||
*/
|
*/
|
||||||
public function __construct(private UserCreationService $creationService)
|
public function __construct(UserCreationService $creationService)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->creationService = $creationService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,18 +52,21 @@ class MakeUserCommand extends Command
|
||||||
$root_admin = $this->option('admin') ?? $this->confirm(trans('command/messages.user.ask_admin'));
|
$root_admin = $this->option('admin') ?? $this->confirm(trans('command/messages.user.ask_admin'));
|
||||||
$email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
|
$email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
|
||||||
$username = $this->option('username') ?? $this->ask(trans('command/messages.user.ask_username'));
|
$username = $this->option('username') ?? $this->ask(trans('command/messages.user.ask_username'));
|
||||||
|
$name_first = $this->option('name-first') ?? $this->ask(trans('command/messages.user.ask_name_first'));
|
||||||
|
$name_last = $this->option('name-last') ?? $this->ask(trans('command/messages.user.ask_name_last'));
|
||||||
|
|
||||||
if (is_null($password = $this->option('password')) && !$this->option('no-password')) {
|
if (is_null($password = $this->option('password')) && ! $this->option('no-password')) {
|
||||||
$this->warn(trans('command/messages.user.ask_password_help'));
|
$this->warn(trans('command/messages.user.ask_password_help'));
|
||||||
$this->line(trans('command/messages.user.ask_password_tip'));
|
$this->line(trans('command/messages.user.ask_password_tip'));
|
||||||
$password = $this->secret(trans('command/messages.user.ask_password'));
|
$password = $this->secret(trans('command/messages.user.ask_password'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = $this->creationService->handle(compact('email', 'username', 'password', 'root_admin'));
|
$user = $this->creationService->handle(compact('email', 'username', 'name_first', 'name_last', 'password', 'root_admin'));
|
||||||
$this->table(['Field', 'Value'], [
|
$this->table(['Field', 'Value'], [
|
||||||
['UUID', $user->uuid],
|
['UUID', $user->uuid],
|
||||||
['Email', $user->email],
|
['Email', $user->email],
|
||||||
['Username', $user->username],
|
['Username', $user->username],
|
||||||
|
['Name', $user->name],
|
||||||
['Admin', $user->root_admin ? 'Yes' : 'No'],
|
['Admin', $user->root_admin ? 'Yes' : 'No'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,75 +2,27 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Console;
|
namespace Pterodactyl\Console;
|
||||||
|
|
||||||
use Ramsey\Uuid\Uuid;
|
|
||||||
use Pterodactyl\Models\ActivityLog;
|
|
||||||
use Illuminate\Console\Scheduling\Schedule;
|
use Illuminate\Console\Scheduling\Schedule;
|
||||||
use Illuminate\Database\Console\PruneCommand;
|
|
||||||
use Pterodactyl\Repositories\Eloquent\SettingsRepository;
|
|
||||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||||
use Pterodactyl\Services\Telemetry\TelemetryCollectionService;
|
|
||||||
use Pterodactyl\Console\Commands\Schedule\ProcessRunnableCommand;
|
|
||||||
use Pterodactyl\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
|
|
||||||
use Pterodactyl\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
|
|
||||||
|
|
||||||
class Kernel extends ConsoleKernel
|
class Kernel extends ConsoleKernel
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Register the commands for the application.
|
* Register the commands for the application.
|
||||||
*/
|
*/
|
||||||
protected function commands(): void
|
protected function commands()
|
||||||
{
|
{
|
||||||
$this->load(__DIR__ . '/Commands');
|
$this->load(__DIR__ . '/Commands');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Define the application's command schedule.
|
* Define the application's command schedule.
|
||||||
*/
|
|
||||||
protected function schedule(Schedule $schedule): void
|
|
||||||
{
|
|
||||||
// https://laravel.com/docs/10.x/upgrade#redis-cache-tags
|
|
||||||
$schedule->command('cache:prune-stale-tags')->hourly();
|
|
||||||
|
|
||||||
// Execute scheduled commands for servers every minute, as if there was a normal cron running.
|
|
||||||
$schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
|
|
||||||
$schedule->command(CleanServiceBackupFilesCommand::class)->daily();
|
|
||||||
|
|
||||||
if (config('backups.prune_age')) {
|
|
||||||
// Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
|
|
||||||
$schedule->command(PruneOrphanedBackupsCommand::class)->everyThirtyMinutes();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config('activity.prune_days')) {
|
|
||||||
$schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config('pterodactyl.telemetry.enabled')) {
|
|
||||||
$this->registerTelemetry($schedule);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* I wonder what this does.
|
|
||||||
*
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
* @param \Illuminate\Console\Scheduling\Schedule $schedule
|
||||||
* @throws \Illuminate\Contracts\Container\BindingResolutionException
|
|
||||||
*/
|
*/
|
||||||
private function registerTelemetry(Schedule $schedule): void
|
protected function schedule(Schedule $schedule)
|
||||||
{
|
{
|
||||||
$settingsRepository = app()->make(SettingsRepository::class);
|
$schedule->command('p:schedule:process')->everyMinute()->withoutOverlapping();
|
||||||
|
$schedule->command('p:maintenance:clean-service-backups')->daily();
|
||||||
$uuid = $settingsRepository->get('app:telemetry:uuid');
|
|
||||||
if (is_null($uuid)) {
|
|
||||||
$uuid = Uuid::uuid4()->toString();
|
|
||||||
$settingsRepository->set('app:telemetry:uuid', $uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate a fixed time to run the data push at, this will be the same time every day.
|
|
||||||
$time = hexdec(str_replace('-', '', substr($uuid, 27))) % 1440;
|
|
||||||
$hour = floor($time / 60);
|
|
||||||
$minute = $time % 60;
|
|
||||||
|
|
||||||
// Run the telemetry collector.
|
|
||||||
$schedule->call(app()->make(TelemetryCollectionService::class))->description('Collect Telemetry')->dailyAt("$hour:$minute");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,55 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Console;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @mixin \Illuminate\Console\Command
|
|
||||||
*/
|
|
||||||
trait RequiresDatabaseMigrations
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Checks if the migrations have finished running by comparing the last migration file.
|
|
||||||
*/
|
|
||||||
protected function hasCompletedMigrations(): bool
|
|
||||||
{
|
|
||||||
/** @var \Illuminate\Database\Migrations\Migrator $migrator */
|
|
||||||
$migrator = $this->getLaravel()->make('migrator');
|
|
||||||
|
|
||||||
$files = $migrator->getMigrationFiles(database_path('migrations'));
|
|
||||||
|
|
||||||
if (!$migrator->repositoryExists()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (array_diff(array_keys($files), $migrator->getRepository()->getRan())) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Throw a massive error into the console to hopefully catch the users attention and get
|
|
||||||
* them to properly run the migrations rather than ignoring all of the other previous
|
|
||||||
* errors...
|
|
||||||
*/
|
|
||||||
protected function showMigrationWarning(): void
|
|
||||||
{
|
|
||||||
$this->getOutput()->writeln('<options=bold>
|
|
||||||
| @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
|
|
||||||
| |
|
|
||||||
| Your database has not been properly migrated! |
|
|
||||||
| |
|
|
||||||
| @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |</>
|
|
||||||
|
|
||||||
You must run the following command to finish migrating your database:
|
|
||||||
|
|
||||||
<fg=green;options=bold>php artisan migrate --step --force</>
|
|
||||||
|
|
||||||
You will not be able to use Pterodactyl Panel as expected without fixing your
|
|
||||||
database state by running the command above.
|
|
||||||
');
|
|
||||||
|
|
||||||
$this->getOutput()->error('You must correct the error above before continuing.');
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -8,6 +8,8 @@ interface ReceivesEvents
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Handles receiving an event from the application.
|
* Handles receiving an event from the application.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Events\Event $notification
|
||||||
*/
|
*/
|
||||||
public function handle(Event $notification): void;
|
public function handle(Event $notification): void;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,24 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Criteria;
|
namespace Pterodactyl\Contracts\Criteria;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Pterodactyl\Repositories\Repository;
|
use Pterodactyl\Repositories\Repository;
|
||||||
|
|
||||||
interface CriteriaInterface
|
interface CriteriaInterface
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Apply selected criteria to a repository call.
|
* Apply selected criteria to a repository call.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Database\Eloquent\Model $model
|
||||||
|
* @param \Pterodactyl\Repositories\Repository $repository
|
||||||
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
public function apply(Model $model, Repository $repository): mixed;
|
public function apply($model, Repository $repository);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Extensions;
|
namespace Pterodactyl\Contracts\Extensions;
|
||||||
|
|
||||||
|
@ -9,7 +16,11 @@ interface HashidsInterface extends VendorHashidsInterface
|
||||||
/**
|
/**
|
||||||
* Decode an encoded hashid and return the first result.
|
* Decode an encoded hashid and return the first result.
|
||||||
*
|
*
|
||||||
|
* @param string $encoded
|
||||||
|
* @param null $default
|
||||||
|
* @return mixed
|
||||||
|
*
|
||||||
* @throws \InvalidArgumentException
|
* @throws \InvalidArgumentException
|
||||||
*/
|
*/
|
||||||
public function decodeFirst(string $encoded, string $default = null): mixed;
|
public function decodeFirst($encoded, $default = null);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Http;
|
|
||||||
|
|
||||||
interface ClientPermissionsRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Returns the permissions string indicating which permission should be used to
|
|
||||||
* validate that the authenticated user has permission to perform this action against
|
|
||||||
* the given resource (server).
|
|
||||||
*/
|
|
||||||
public function permission(): string;
|
|
||||||
}
|
|
|
@ -2,18 +2,82 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Repository;
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
use Pterodactyl\Models\Allocation;
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
|
||||||
|
|
||||||
interface AllocationRepositoryInterface extends RepositoryInterface
|
interface AllocationRepositoryInterface extends RepositoryInterface
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return all the allocations that exist for a node that are not currently
|
* Set an array of allocation IDs to be assigned to a specific server.
|
||||||
|
*
|
||||||
|
* @param int|null $server
|
||||||
|
* @param array $ids
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function assignAllocationsToServer(int $server = null, array $ids): int;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return all of the allocations for a specific node.
|
||||||
|
*
|
||||||
|
* @param int $node
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
|
*/
|
||||||
|
public function getAllocationsForNode(int $node): Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return all of the allocations for a node in a paginated format.
|
||||||
|
*
|
||||||
|
* @param int $node
|
||||||
|
* @param int $perPage
|
||||||
|
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
|
||||||
|
*/
|
||||||
|
public function getPaginatedAllocationsForNode(int $node, int $perPage = 100): LengthAwarePaginator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return all of the unique IPs that exist for a given node.
|
||||||
|
*
|
||||||
|
* @param int $node
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
|
*/
|
||||||
|
public function getUniqueAllocationIpsForNode(int $node): Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return all of the allocations that exist for a node that are not currently
|
||||||
* allocated.
|
* allocated.
|
||||||
|
*
|
||||||
|
* @param int $node
|
||||||
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getUnassignedAllocationIds(int $node): array;
|
public function getUnassignedAllocationIds(int $node): array;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a single allocation from those meeting the requirements.
|
* Get an array of all allocations that are currently assigned to a given server.
|
||||||
|
*
|
||||||
|
* @param int $server
|
||||||
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false): ?Allocation;
|
public function getAssignedAllocationIds(int $server): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a concatenated result set of node ips that already have at least one
|
||||||
|
* server assigned to that IP. This allows for filtering out sets for
|
||||||
|
* dedicated allocation IPs.
|
||||||
|
*
|
||||||
|
* If an array of nodes is passed the results will be limited to allocations
|
||||||
|
* in those nodes.
|
||||||
|
*
|
||||||
|
* @param array $nodes
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getDiscardableDedicatedAllocations(array $nodes = []): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a single allocation from those meeting the requirements.
|
||||||
|
*
|
||||||
|
* @param array $nodes
|
||||||
|
* @param array $ports
|
||||||
|
* @param bool $dedicated
|
||||||
|
* @return \Pterodactyl\Models\Allocation|null
|
||||||
|
*/
|
||||||
|
public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,22 +8,36 @@ use Illuminate\Support\Collection;
|
||||||
interface ApiKeyRepositoryInterface extends RepositoryInterface
|
interface ApiKeyRepositoryInterface extends RepositoryInterface
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Get all the account API keys that exist for a specific user.
|
* Get all of the account API keys that exist for a specific user.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\User $user
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getAccountKeys(User $user): Collection;
|
public function getAccountKeys(User $user): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all the application API keys that exist for a specific user.
|
* Get all of the application API keys that exist for a specific user.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\User $user
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getApplicationKeys(User $user): Collection;
|
public function getApplicationKeys(User $user): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete an account API key from the panel for a specific user.
|
* Delete an account API key from the panel for a specific user.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\User $user
|
||||||
|
* @param string $identifier
|
||||||
|
* @return int
|
||||||
*/
|
*/
|
||||||
public function deleteAccountKey(User $user, string $identifier): int;
|
public function deleteAccountKey(User $user, string $identifier): int;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete an application API key from the panel for a specific user.
|
* Delete an application API key from the panel for a specific user.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\User $user
|
||||||
|
* @param string $identifier
|
||||||
|
* @return int
|
||||||
*/
|
*/
|
||||||
public function deleteApplicationKey(User $user, string $identifier): int;
|
public function deleteApplicationKey(User $user, string $identifier): int;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Repository;
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
|
|
38
app/Contracts/Repository/Attributes/SearchableInterface.php
Normal file
38
app/Contracts/Repository/Attributes/SearchableInterface.php
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Attributes;
|
||||||
|
|
||||||
|
interface SearchableInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Set the search term.
|
||||||
|
*
|
||||||
|
* @param string|null $term
|
||||||
|
* @return $this
|
||||||
|
* @deprecated
|
||||||
|
*/
|
||||||
|
public function search($term);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the search term to use when requesting all records from
|
||||||
|
* the model.
|
||||||
|
*
|
||||||
|
* @param string|null $term
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setSearchTerm(string $term = null);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if a valid search term is set on this repository.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasSearchTerm(): bool;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the search term.
|
||||||
|
*
|
||||||
|
* @return string|null
|
||||||
|
*/
|
||||||
|
public function getSearchTerm();
|
||||||
|
}
|
65
app/Contracts/Repository/Daemon/BaseRepositoryInterface.php
Normal file
65
app/Contracts/Repository/Daemon/BaseRepositoryInterface.php
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Daemon;
|
||||||
|
|
||||||
|
use GuzzleHttp\Client;
|
||||||
|
use Pterodactyl\Models\Node;
|
||||||
|
use Pterodactyl\Models\Server;
|
||||||
|
|
||||||
|
interface BaseRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Set the node model to be used for this daemon connection.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\Node $node
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setNode(Node $node);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the node model being used.
|
||||||
|
*
|
||||||
|
* @return \Pterodactyl\Models\Node|null
|
||||||
|
*/
|
||||||
|
public function getNode();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the Server model to use when requesting information from the Daemon.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\Server $server
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setServer(Server $server);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the Server model.
|
||||||
|
*
|
||||||
|
* @return \Pterodactyl\Models\Server|null
|
||||||
|
*/
|
||||||
|
public function getServer();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the token to be used in the X-Access-Token header for requests to the daemon.
|
||||||
|
*
|
||||||
|
* @param string $token
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setToken(string $token);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the access token being used for requests.
|
||||||
|
*
|
||||||
|
* @return string|null
|
||||||
|
*/
|
||||||
|
public function getToken();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return an instance of the Guzzle HTTP Client to be used for requests.
|
||||||
|
*
|
||||||
|
* @param array $headers
|
||||||
|
* @return \GuzzleHttp\Client
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
|
*/
|
||||||
|
public function getHttpClient(array $headers = []): Client;
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Daemon;
|
||||||
|
|
||||||
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
|
||||||
|
interface CommandRepositoryInterface extends BaseRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Send a command to a server.
|
||||||
|
*
|
||||||
|
* @param string $command
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function send(string $command): ResponseInterface;
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Daemon;
|
||||||
|
|
||||||
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
|
||||||
|
interface ConfigurationRepositoryInterface extends BaseRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Update the configuration details for the specified node using data from the database.
|
||||||
|
*
|
||||||
|
* @param array $overrides
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function update(array $overrides = []): ResponseInterface;
|
||||||
|
}
|
50
app/Contracts/Repository/Daemon/FileRepositoryInterface.php
Normal file
50
app/Contracts/Repository/Daemon/FileRepositoryInterface.php
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Daemon;
|
||||||
|
|
||||||
|
use stdClass;
|
||||||
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
|
||||||
|
interface FileRepositoryInterface extends BaseRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Return stat information for a given file.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @return \stdClass
|
||||||
|
*
|
||||||
|
* @throws \GuzzleHttp\Exception\RequestException
|
||||||
|
*/
|
||||||
|
public function getFileStat(string $path): stdClass;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the contents of a given file if it can be edited in the Panel.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @throws \GuzzleHttp\Exception\RequestException
|
||||||
|
*/
|
||||||
|
public function getContent(string $path): string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save new contents to a given file.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @param string $content
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*
|
||||||
|
* @throws \GuzzleHttp\Exception\RequestException
|
||||||
|
*/
|
||||||
|
public function putContent(string $path, string $content): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a directory listing for a given path.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @throws \GuzzleHttp\Exception\RequestException
|
||||||
|
*/
|
||||||
|
public function getDirectory(string $path): array;
|
||||||
|
}
|
23
app/Contracts/Repository/Daemon/PowerRepositoryInterface.php
Normal file
23
app/Contracts/Repository/Daemon/PowerRepositoryInterface.php
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Daemon;
|
||||||
|
|
||||||
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
|
||||||
|
interface PowerRepositoryInterface extends BaseRepositoryInterface
|
||||||
|
{
|
||||||
|
const SIGNAL_START = 'start';
|
||||||
|
const SIGNAL_STOP = 'stop';
|
||||||
|
const SIGNAL_RESTART = 'restart';
|
||||||
|
const SIGNAL_KILL = 'kill';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send a power signal to a server.
|
||||||
|
*
|
||||||
|
* @param string $signal
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException
|
||||||
|
*/
|
||||||
|
public function sendSignal(string $signal): ResponseInterface;
|
||||||
|
}
|
|
@ -0,0 +1,80 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository\Daemon;
|
||||||
|
|
||||||
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
|
||||||
|
interface ServerRepositoryInterface extends BaseRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Create a new server on the daemon for the panel.
|
||||||
|
*
|
||||||
|
* @param array $structure
|
||||||
|
* @param array $overrides
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*
|
||||||
|
* @throws \GuzzleHttp\Exception\RequestException
|
||||||
|
*/
|
||||||
|
public function create(array $structure, array $overrides = []): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update server details on the daemon.
|
||||||
|
*
|
||||||
|
* @param array $data
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function update(array $data): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark a server to be reinstalled on the system.
|
||||||
|
*
|
||||||
|
* @param array|null $data
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function reinstall(array $data = null): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark a server as needing a container rebuild the next time the server is booted.
|
||||||
|
*
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function rebuild(): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Suspend a server on the daemon.
|
||||||
|
*
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function suspend(): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Un-suspend a server on the daemon.
|
||||||
|
*
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function unsuspend(): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete a server on the daemon.
|
||||||
|
*
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function delete(): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return details on a specific server.
|
||||||
|
*
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*/
|
||||||
|
public function details(): ResponseInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Revoke an access key on the daemon before the time is expired.
|
||||||
|
*
|
||||||
|
* @param string|array $key
|
||||||
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
|
*
|
||||||
|
* @throws \GuzzleHttp\Exception\RequestException
|
||||||
|
*/
|
||||||
|
public function revokeAccessKey($key): ResponseInterface;
|
||||||
|
}
|
52
app/Contracts/Repository/DaemonKeyRepositoryInterface.php
Normal file
52
app/Contracts/Repository/DaemonKeyRepositoryInterface.php
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\User;
|
||||||
|
use Pterodactyl\Models\DaemonKey;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
interface DaemonKeyRepositoryInterface extends RepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* String prepended to keys to identify that they are managed internally and not part of the user API.
|
||||||
|
*/
|
||||||
|
const INTERNAL_KEY_IDENTIFIER = 'i_';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load the server and user relations onto a key model.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\DaemonKey $key
|
||||||
|
* @param bool $refresh
|
||||||
|
* @return \Pterodactyl\Models\DaemonKey
|
||||||
|
*/
|
||||||
|
public function loadServerAndUserRelations(DaemonKey $key, bool $refresh = false): DaemonKey;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a daemon key with the associated server relation attached.
|
||||||
|
*
|
||||||
|
* @param string $key
|
||||||
|
* @return \Pterodactyl\Models\DaemonKey
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
|
*/
|
||||||
|
public function getKeyWithServer(string $key): DaemonKey;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get all of the keys for a specific user including the information needed
|
||||||
|
* from their server relation for revocation on the daemon.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Models\User $user
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
|
*/
|
||||||
|
public function getKeysForRevocation(User $user): Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete an array of daemon keys from the database. Used primarily in
|
||||||
|
* conjunction with getKeysForRevocation.
|
||||||
|
*
|
||||||
|
* @param array $ids
|
||||||
|
* @return bool|int
|
||||||
|
*/
|
||||||
|
public function deleteKeys(array $ids);
|
||||||
|
}
|
|
@ -9,6 +9,8 @@ interface DatabaseHostRepositoryInterface extends RepositoryInterface
|
||||||
/**
|
/**
|
||||||
* Return database hosts with a count of databases and the node
|
* Return database hosts with a count of databases and the node
|
||||||
* information for which it is attached.
|
* information for which it is attached.
|
||||||
|
*
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getWithViewDetails(): Collection;
|
public function getWithViewDetails(): Collection;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,60 +2,107 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Repository;
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\Database;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
|
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
|
||||||
|
|
||||||
interface DatabaseRepositoryInterface extends RepositoryInterface
|
interface DatabaseRepositoryInterface extends RepositoryInterface
|
||||||
{
|
{
|
||||||
public const DEFAULT_CONNECTION_NAME = 'dynamic';
|
const DEFAULT_CONNECTION_NAME = 'dynamic';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the connection name to execute statements against.
|
* Set the connection name to execute statements against.
|
||||||
|
*
|
||||||
|
* @param string $connection
|
||||||
|
* @return $this
|
||||||
*/
|
*/
|
||||||
public function setConnection(string $connection): self;
|
public function setConnection(string $connection);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the connection to execute statements against.
|
* Return the connection to execute statements against.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getConnection(): string;
|
public function getConnection(): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all the databases belonging to a server.
|
* Return all of the databases belonging to a server.
|
||||||
|
*
|
||||||
|
* @param int $server
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getDatabasesForServer(int $server): Collection;
|
public function getDatabasesForServer(int $server): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all the databases for a given host with the server relationship loaded.
|
* Return all of the databases for a given host with the server relationship loaded.
|
||||||
|
*
|
||||||
|
* @param int $host
|
||||||
|
* @param int $count
|
||||||
|
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
|
||||||
*/
|
*/
|
||||||
public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
|
public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new database if it does not already exist on the host with
|
||||||
|
* the provided details.
|
||||||
|
*
|
||||||
|
* @param array $data
|
||||||
|
* @return \Pterodactyl\Models\Database
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException
|
||||||
|
*/
|
||||||
|
public function createIfNotExists(array $data): Database;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new database on a given connection.
|
* Create a new database on a given connection.
|
||||||
|
*
|
||||||
|
* @param string $database
|
||||||
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function createDatabase(string $database): bool;
|
public function createDatabase(string $database): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new database user on a given connection.
|
* Create a new database user on a given connection.
|
||||||
|
*
|
||||||
|
* @param string $username
|
||||||
|
* @param string $remote
|
||||||
|
* @param string $password
|
||||||
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function createUser(string $username, string $remote, string $password, ?int $max_connections): bool;
|
public function createUser(string $username, string $remote, string $password): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Give a specific user access to a given database.
|
* Give a specific user access to a given database.
|
||||||
|
*
|
||||||
|
* @param string $database
|
||||||
|
* @param string $username
|
||||||
|
* @param string $remote
|
||||||
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function assignUserToDatabase(string $database, string $username, string $remote): bool;
|
public function assignUserToDatabase(string $database, string $username, string $remote): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Flush the privileges for a given connection.
|
* Flush the privileges for a given connection.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function flush(): bool;
|
public function flush(): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Drop a given database on a specific connection.
|
* Drop a given database on a specific connection.
|
||||||
|
*
|
||||||
|
* @param string $database
|
||||||
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function dropDatabase(string $database): bool;
|
public function dropDatabase(string $database): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Drop a given user on a specific connection.
|
* Drop a given user on a specific connection.
|
||||||
|
*
|
||||||
|
* @param string $username
|
||||||
|
* @param string $remote
|
||||||
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
public function dropUser(string $username, string $remote): bool;
|
public function dropUser(string $username, string $remote): bool;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Repository;
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
|
@ -10,22 +17,34 @@ interface EggRepositoryInterface extends RepositoryInterface
|
||||||
/**
|
/**
|
||||||
* Return an egg with the variables relation attached.
|
* Return an egg with the variables relation attached.
|
||||||
*
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return \Pterodactyl\Models\Egg
|
||||||
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
public function getWithVariables(int $id): Egg;
|
public function getWithVariables(int $id): Egg;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all eggs and their relations to be used in the daemon API.
|
* Return all eggs and their relations to be used in the daemon API.
|
||||||
|
*
|
||||||
|
* @return \Illuminate\Database\Eloquent\Collection
|
||||||
*/
|
*/
|
||||||
public function getAllWithCopyAttributes(): Collection;
|
public function getAllWithCopyAttributes(): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return an egg with the scriptFrom and configFrom relations loaded onto the model.
|
* Return an egg with the scriptFrom and configFrom relations loaded onto the model.
|
||||||
|
*
|
||||||
|
* @param int|string $value
|
||||||
|
* @param string $column
|
||||||
|
* @return \Pterodactyl\Models\Egg
|
||||||
*/
|
*/
|
||||||
public function getWithCopyAttributes(int|string $value, string $column = 'id'): Egg;
|
public function getWithCopyAttributes($value, string $column = 'id'): Egg;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all the data needed to export a service.
|
* Return all of the data needed to export a service.
|
||||||
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return \Pterodactyl\Models\Egg
|
||||||
*
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
|
@ -33,6 +52,10 @@ interface EggRepositoryInterface extends RepositoryInterface
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Confirm a copy script belongs to the same nest as the item trying to use it.
|
* Confirm a copy script belongs to the same nest as the item trying to use it.
|
||||||
|
*
|
||||||
|
* @param int $copyFromId
|
||||||
|
* @param int $service
|
||||||
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isCopyableScript(int $copyFromId, int $service): bool;
|
public function isCopyableScript(int $copyFromId, int $service): bool;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Repository;
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
|
@ -9,6 +16,9 @@ interface EggVariableRepositoryInterface extends RepositoryInterface
|
||||||
/**
|
/**
|
||||||
* Return editable variables for a given egg. Editable variables must be set to
|
* Return editable variables for a given egg. Editable variables must be set to
|
||||||
* user viewable in order to be picked up by this function.
|
* user viewable in order to be picked up by this function.
|
||||||
|
*
|
||||||
|
* @param int $egg
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getEditableVariables(int $egg): Collection;
|
public function getEditableVariables(int $egg): Collection;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,21 +4,29 @@ namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
use Pterodactyl\Models\Location;
|
use Pterodactyl\Models\Location;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
|
||||||
|
|
||||||
interface LocationRepositoryInterface extends RepositoryInterface
|
interface LocationRepositoryInterface extends RepositoryInterface, SearchableInterface
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return locations with a count of nodes and servers attached to it.
|
* Return locations with a count of nodes and servers attached to it.
|
||||||
|
*
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getAllWithDetails(): Collection;
|
public function getAllWithDetails(): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all the available locations with the nodes as a relationship.
|
* Return all of the available locations with the nodes as a relationship.
|
||||||
|
*
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function getAllWithNodes(): Collection;
|
public function getAllWithNodes(): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all the nodes and their respective count of servers for a location.
|
* Return all of the nodes and their respective count of servers for a location.
|
||||||
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return mixed
|
||||||
*
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
|
@ -27,6 +35,9 @@ interface LocationRepositoryInterface extends RepositoryInterface
|
||||||
/**
|
/**
|
||||||
* Return a location and the count of nodes in that location.
|
* Return a location and the count of nodes in that location.
|
||||||
*
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return mixed
|
||||||
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
public function getWithNodeCount(int $id): Location;
|
public function getWithNodeCount(int $id): Location;
|
||||||
|
|
|
@ -1,29 +1,44 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* This software is licensed under the terms of the MIT license.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Contracts\Repository;
|
namespace Pterodactyl\Contracts\Repository;
|
||||||
|
|
||||||
use Pterodactyl\Models\Nest;
|
use Pterodactyl\Models\Nest;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
|
||||||
|
|
||||||
interface NestRepositoryInterface extends RepositoryInterface
|
interface NestRepositoryInterface extends RepositoryInterface
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return a nest or all nests with their associated eggs and variables.
|
* Return a nest or all nests with their associated eggs, variables, and packs.
|
||||||
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
|
||||||
*
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
public function getWithEggs(int $id = null): Collection|Nest;
|
public function getWithEggs(int $id = null);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a nest or all nests and the count of eggs and servers for that nest.
|
* Return a nest or all nests and the count of eggs, packs, and servers for that nest.
|
||||||
|
*
|
||||||
|
* @param int|null $id
|
||||||
|
* @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
|
||||||
*
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
public function getWithCounts(int $id = null): Collection|Nest;
|
public function getWithCounts(int $id = null);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a nest along with its associated eggs and the servers relation on those eggs.
|
* Return a nest along with its associated eggs and the servers relation on those eggs.
|
||||||
*
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return \Pterodactyl\Models\Nest
|
||||||
|
*
|
||||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
*/
|
*/
|
||||||
public function getWithEggServers(int $id): Nest;
|
public function getWithEggServers(int $id): Nest;
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue