Merge branch 'release/v0.6.13'

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 This file is a running track of new features and fixes to each version of the daemon released starting with `v0.2.0`.
 
+## v0.6.13 (Elasticized Elanodactylus)
+### Fixed
+* **[Security]** Fixes a bug in the websocket authorization process that could allow a malcious authenticated user
+to connect and send commands to a server they do not have permission to access.
+* Fixes utilization metrics to send the correct CPU and memory usage calculations for servers. This now matches the
+logic used by `docker stats`.
+* Files with a colon in their name can be properly decompressed.
+
+### Added
+* Installation docker images can now be prefixed with `~` to use a local image. 
+
+### Changed
+* General dependency upgrades to reduce the number of audit warnings on installation.
+
 ## v0.6.12 (Elasticized Elanodactylus)
 ### Fixed
 * Fixes a bug with the packs system that would not properly handle an error response from the panel resulting in the server

LICENSE

@@ -1,5 +1,5 @@
 Pterodactyl - Daemon
-Copyright (c) 2015 - 2018 Dane Everitt <dane@daneeveritt.com>.
+Copyright (c) 2015 - 2020 Dane Everitt <dane@daneeveritt.com>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-[![Logo Image](https://cdn.pterodactyl.io/logos/Banner%20Logo%20Black@2x.png)](https://pterodactyl.io)
+[![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
 
 [![Build Status](https://travis-ci.org/pterodactyl/daemon.svg?branch=develop)](https://travis-ci.org/pterodactyl/daemon) [![Dependencies Status](https://david-dm.org/pterodactyl/daemon/status.svg)](https://david-dm.org/pterodactyl/daemon)
 
@@ -11,7 +11,7 @@ Please see `CONTRIBUTING.md` for information needed if you want to contribute to
 # License
 ```
 Pterodactyl - Daemon
-Copyright (c) 2015 - 2018 Dane Everitt <dane@daneeveritt.com>.
+Copyright (c) 2015 - 2020 Dane Everitt <dane@daneeveritt.com>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docker-compose.yml

@@ -10,8 +10,9 @@ services:
     tty: true
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
+      - "/var/lib/docker/containers:/var/lib/docker/containers"
       - "/srv/daemon/config/:/srv/daemon/config/"
       - "/srv/daemon-data/:/srv/daemon-data/"
       - "/tmp/pterodactyl/:/tmp/pterodactyl"
       ## Required for ssl if you user let's encrypt. uncomment to use.
-      ## - "/etc/letsencrypt/:/etc/letsencrypt/"
+      ## - "/etc/letsencrypt/:/etc/letsencrypt/"