Merge branch 'release/v0.7.12'

Author: DaneEveritt

.dev/docker/default_ssl.conf

@@ -11,7 +11,7 @@ server {
     listen 443 ssl http2;
     server_name <domain>;
 
-    root /var/www/pterodactyl/public;
+    root /app/public;
     index index.php;
 
     access_log /var/log/nginx/pterodactyl.app-access.log;
@@ -49,7 +49,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/run/php/pterodactyl.sock;
+        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";

.dev/docker/entrypoint.sh

@@ -3,26 +3,50 @@
 
 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"
+  echo "external vars exist."
   rm /app/.env
 
   ln -s /app/var/.env /app/
 else
-  echo "external vars don't exist"
+  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"
+  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
@@ -34,13 +58,13 @@ do
 done
 
 ## make sure the db is set up
-echo -e "Migrating and Seeding DB"
+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
+echo -e "Starting cron jobs."
+crond -L /var/log/crond -l 5
 
-echo -e "Starting supervisord"
+echo -e "Starting supervisord."
 exec "$@"

CHANGELOG.md

@@ -3,6 +3,25 @@ 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.
 
+## v0.7.12 (Derelict Dermodactylus)
+### Fixed
+* Fixes an issue with the locations API endpoint referencing an invalid namespace.
+* Fixes the `store()` function on the locations API not working due to an incorrect return typehint.
+* Fixes daemon secrets not being able to be reset on a Node.
+* Fixes an issue where files were not editable due to missing URL encoding in the file manager.
+* Fixed checking of language changes
+* Fixed Spigot egg not building versions other than `latest`.
+* Fixed the Forge egg install script.
+* Fixes a bug that would ignore the `skip_scripts` setting when creating or editing a server.
+
+### Updated
+* Upgraded core to use Laravel `5.7.14`.
+* Updated Simplified Chinese translation pack.
+
+### Added
+* Added support for opening and editing Python files through the web editor.
+* Adds Russian translation.
+
 ## v0.7.11 (Derelict Dermodactylus)
 ### Fixed
 * Fixes an issue with certain systems not handling an API folder that was named `API` but referenced as `Api` in the namespace.

Dockerfile

@@ -15,9 +15,9 @@ RUN cp .env.example .env \
 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/pterodactyl/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
- && mkdir -p /var/run/php /var/run/nginx \
- && mkdir -p /var/log/supervisord/
+ && 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
 

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -132,7 +132,7 @@ public function handle()
         );
 
         $selected = $this->config->get('queue.default', 'redis');
-        $this->variables['QUEUE_DRIVER'] = $this->option('queue') ?? $this->choice(
+        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
             trans('command/messages.environment.app.queue_driver'),
             self::ALLOWED_QUEUE_DRIVERS,
             array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null

app/Http/Controllers/Admin/NodesController.php

@@ -263,7 +263,7 @@ public function viewServers($node)
      */
     public function updateSettings(NodeFormRequest $request, Node $node)
     {
-        $this->updateService->handle($node, $request->normalize());
+        $this->updateService->handle($node, $request->normalize(), $request->input('reset_secret') === 'on');
         $this->alert->success(trans('admin/node.notices.node_updated'))->flash();
 
         return redirect()->route('admin.nodes.view.settings', $node->id)->withInput();
@@ -289,7 +289,7 @@ public function allocationRemoveSingle(int $node, Allocation $allocation): Respo
      * Removes multiple individual allocations from a node.
      *
      * @param \Illuminate\Http\Request $request
-     * @param int $node
+     * @param int                      $node
      * @return \Illuminate\Http\Response
      *
      * @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException

app/Http/Controllers/Api/Application/Locations/LocationController.php

@@ -13,6 +13,7 @@
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
+use Pterodactyl\Http\Requests\Api\Application\Locations\StoreLocationRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest;
 
@@ -92,7 +93,7 @@ public function view(GetLocationRequest $request): array
      * Store a new location on the Panel and return a HTTP/201 response code with the
      * new location attached.
      *
-     * @param \Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Application\Locations\StoreLocationRequest $request
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException

app/Http/Controllers/Api/Application/Nodes/AllocationController.php

@@ -71,14 +71,14 @@ public function index(GetAllocationsRequest $request): array
      * Store new allocations for a given node.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Allocations\StoreAllocationRequest $request
-     * @return array
+     * @return \Illuminate\Http\Response
      *
      * @throws \Pterodactyl\Exceptions\Service\Allocation\CidrOutOfRangeException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\InvalidPortMappingException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\PortOutOfRangeException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\TooManyPortsInRangeException
      */
-    public function store(StoreAllocationRequest $request): array
+    public function store(StoreAllocationRequest $request): Response
     {
         $this->assignmentService->handle($request->getModel(Node::class), $request->validated());
 

app/Http/Controllers/Api/Application/Nodes/NodeController.php

@@ -125,7 +125,7 @@ public function store(StoreNodeRequest $request): JsonResponse
     public function update(UpdateNodeRequest $request): array
     {
         $node = $this->updateService->handle(
-            $request->getModel(Node::class), $request->validated()
+            $request->getModel(Node::class), $request->validated(), $request->input('reset_secret') === true
         );
 
         return $this->fractal->item($node)

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -27,6 +27,6 @@ protected function sendResetLinkFailedResponse(Request $request, $response): Red
         // exist on the system.
         event(new FailedPasswordReset($request->ip(), $request->input('email')));
 
-        return $this->sendResetLinkResponse(Password::RESET_LINK_SENT);
+        return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
     }
 }