Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Require node use SSL if Panel is using SSL. closes #806

Browse source
This commit is contained in:
Dane Everitt 2017-12-30 16:54:07 -06:00
parent e4feee6932
commit 89dbb9d0d9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -18,12 +18,11 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account. * Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account.
* Updated core framework to Laravel 5.5. This includes many dependency updates. * Updated core framework to Laravel 5.5. This includes many dependency updates.
* Certain AWS specific environment keys were changed, this should have minimal impact on users unless you specifically enabled AWS specific features. The renames are: `AWS_KEY -> AWS_ACCESS_KEY_ID`, `AWS_SECRET -> AWS_SECRET_ACCESS_KEY`, `AWS_REGION -> AWS_DEFAULT_REGION` * Certain AWS specific environment keys were changed, this should have minimal impact on users unless you specifically enabled AWS specific features. The renames are: `AWS_KEY -> AWS_ACCESS_KEY_ID`, `AWS_SECRET -> AWS_SECRET_ACCESS_KEY`, `AWS_REGION -> AWS_DEFAULT_REGION`
* API keys have been changed to only use a single public key passed in a bearer token. All existing keys can continue being used, however only the first 32 characters should be sent.
### Added ### Added
* Added star indicators to user listing in Admin CP to indicate users who are set as a root admin. * Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.
* Creating a new node will now requires a SSL connection if the Panel is configured to use SSL as well.
### Changed
* API keys have been changed to only use a single public key passed in a bearer token. All existing keys can continue being used, however only the first 32 characters should be sent.
## v0.7.0-beta.2 (Derelict Dermodactylus) ## v0.7.0-beta.2 (Derelict Dermodactylus)
### Fixed ### Fixed

6
resources/themes/pterodactyl/admin/nodes/new.blade.php
View file

@ -72,11 +72,15 @@
<label for="pSSLTrue"> Use SSL Connection</label> <label for="pSSLTrue"> Use SSL Connection</label>
</div> </div>
<div class="radio radio-danger radio-inline"> <div class="radio radio-danger radio-inline">
<input type="radio" id="pSSLFalse" value="http" name="scheme"> <input type="radio" id="pSSLFalse" value="http" name="scheme" @if(request()->isSecure()) disabled @endif>
<label for="pSSLFalse"> Use HTTP Connection</label> <label for="pSSLFalse"> Use HTTP Connection</label>
</div> </div>
</div> </div>
@if(request()->isSecure())
<p class="text-danger small">Your Panel is currently configured to use a secure connection. In order for browsers to connect to your node it <strong>must</strong> use a SSL connection.</p>
@else
<p class="text-muted small">In most cases you should select to use a SSL connection. If using an IP Address or you do not wish to use SSL at all, select a HTTP connection.</p> <p class="text-muted small">In most cases you should select to use a SSL connection. If using an IP Address or you do not wish to use SSL at all, select a HTTP connection.</p>
@endif
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="form-label">Behind Proxy</label> <label class="form-label">Behind Proxy</label>