Skip to content

Commit 2f4ec64

Browse files
DaneEverittDaneEveritt
committed
Merge branch 'develop' into feature/PTDL-472
2 parents d908672 + db2a804 commit 2f4ec64

File tree

20 files changed

+632
-462
lines changed

20 files changed

+632
-462
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@ This file is a running track of new features and fixes to each version of the pa
33

44
This project follows [Semantic Versioning](http://semver.org) guidelines.
55

6+
## v0.6.4 (Courageous Carniadactylus)
7+
### Fixed
8+
* Fixed the console rendering on page load, I guess people don't like watching it load line-by-line for 10 minutes. Who would have guessed...
9+
* Re-added support for up/down arrows loading previous commands in the console window.
10+
11+
### Changed
12+
* Panel API for Daemon now responds with a `HTTP/401 Unauthorized` error when unable to locate a node with a given authentication token, rather than a `HTTP/404 Not Found` response.
13+
* Added better colors and styling for the terminal that can be adjusted per-theme.
14+
* Session timeout adjusted to be 7 days by default.
15+
16+
## v0.6.3 (Courageous Carniadactylus)
17+
### Fixed
18+
* **[Security]** — Addresses an oversight in how the terminal rendered information sent from the server feed which allowed a malicious user to execute arbitrary commands on the game-server process itself by using a specifically crafted in-game command.
19+
20+
### Changed
21+
* Removed `jquery.terminal` and replaced it with an in-house developed terminal with less potential for security issues.
22+
623
## v0.6.2 (Courageous Carniadactylus)
724
### Fixed
825
* Fixes a few typos throughout the panel, there are more don't worry.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ AdminLTE - [license](https://github.com/almasaeed2010/AdminLTE/blob/master/LICEN
3939

4040
Animate.css - [license](https://github.com/daneden/animate.css/blob/master/LICENSE) - [homepage](http://daneden.github.io/animate.css/)
4141

42+
AnsiUp - [license](https://github.com/drudru/ansi_up/blob/master/Readme.md#license) - [homepage](https://github.com/drudru/ansi_up)
43+
4244
Async.js - [license](https://github.com/caolan/async/blob/master/LICENSE) - [homepage](https://github.com/caolan/async/)
4345

4446
Bootstrap - [license](https://github.com/twbs/bootstrap/blob/master/LICENSE) - [homepage](http://getbootstrap.com)
@@ -53,8 +55,6 @@ FontAwesome Animations - [license](https://github.com/l-lin/font-awesome-animati
5355

5456
jQuery - [license](https://github.com/jquery/jquery/blob/master/LICENSE.txt) - [homepage](http://jquery.com)
5557

56-
jQuery Terminal - [license](https://github.com/jcubic/jquery.terminal/blob/master/LICENSE) - [homepage](http://terminal.jcubic.pl)
57-
5858
Laravel Framework - [license](https://github.com/laravel/framework/blob/5.4/LICENSE.md) - [homepage](https://laravel.com)
5959

6060
Lodash - [license](https://github.com/lodash/lodash/blob/master/LICENSE) - [homepage](https://lodash.com/)

‎app/Http/Middleware/DaemonAuthenticate.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function handle($request, Closure $next)
7676

7777
$node = Node::where('daemonSecret', $request->header('X-Access-Node'))->first();
7878
if (! $node) {
79-
return abort(404);
79+
return abort(401);
8080
}
8181

8282
return $next($request);

‎config/session.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
|
3030
*/
3131

32-
'lifetime' => 120,
32+
'lifetime' => 10080,
3333

3434
'expire_on_close' => false,
3535

public/themes/pterodactyl/vendor/terminal/keyboard.polyfill.js renamed to public/js/keyboard.polyfill.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* global define, KeyboardEvent, module */
2-
// https://github.com/cvan/keyboardevent-key-polyfill/blob/master/LICENSE.md
2+
33
(function () {
44

55
var keyboardeventKeyPolyfill = {

‎public/themes/pterodactyl/css/pterodactyl.css‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -257,22 +257,6 @@ span[aria-labelledby="select2-pUserId-container"] {
257257
position: relative;
258258
}
259259

260-
.terminal-notify {
261-
position: absolute;
262-
right: 27px;
263-
bottom: 10px;
264-
padding: 3.5px 7px;
265-
border-radius: 3px 3px 0 0;
266-
background: #ccc;
267-
color: #000;
268-
opacity: .5;
269-
cursor: pointer;
270-
}
271-
272-
.terminal-notify:hover {
273-
opacity: .9;
274-
}
275-
276260
.no-margin-bottom {
277261
margin-bottom: 0 !important;
278262
}

‎public/themes/pterodactyl/css/terminal.css‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/*Design for Terminal*/
2+
@import url('https://fonts.googleapis.com/css?family=Source+Code+Pro');
3+
4+
#terminal-body {
5+
background: rgb(26, 26, 26);
6+
margin: 0;
7+
width: 100%;
8+
height: 100%;
9+
overflow: hidden;
10+
}
11+
12+
#terminal {
13+
font-family: 'Source Code Pro', monospace;
14+
color: rgb(223, 223, 223);
15+
background: rgb(26, 26, 26);
16+
font-size: 12px;
17+
line-height: 14px;
18+
padding: 10px 10px 0;
19+
box-sizing: border-box;
20+
height: 500px;
21+
max-height: 500px;
22+
overflow-y: auto;
23+
overflow-x: hidden;
24+
border-radius: 5px 5px 0 0;
25+
}
26+
27+
#terminal > .cmd {
28+
padding: 1px 0;
29+
}
30+
31+
#terminal_input {
32+
width: 100%;
33+
background: rgb(26, 26, 26);
34+
border-radius: 0 0 5px 5px;
35+
padding: 0 0 0 10px !important;
36+
}
37+
38+
.terminal_input--input, .terminal_input--prompt {
39+
font-family: 'Source Code Pro', monospace;
40+
margin-bottom: 0;
41+
border: 0 !important;
42+
background: transparent !important;
43+
color: rgb(223, 223, 223);
44+
font-size: 12px;
45+
padding: 1px 0 4px !important;
46+
}
47+
.terminal_input--input {
48+
margin-left: 6px;
49+
line-height: 1;
50+
outline: none !important;
51+
}
52+
53+
.terminal-notify {
54+
position: absolute;
55+
right: 30px;
56+
bottom: 30px;
57+
padding: 3.5px 7px;
58+
border-radius: 3px;
59+
background: #fff;
60+
color: #000;
61+
opacity: .5;
62+
font-size: 16px;
63+
cursor: pointer;
64+
}
65+
66+
.terminal-notify:hover {
67+
opacity: .9;
68+
}
69+
70+
.ansi-black-fg { color: rgb(0, 0, 0); }
71+
.ansi-red-fg { color: rgb(166, 0, 44); }
72+
.ansi-green-fg { color: rgb(55, 106, 27); }
73+
.ansi-yellow-fg { color: rgb(241, 133, 24); }
74+
.ansi-blue-fg { color: rgb(17, 56, 163); }
75+
.ansi-magenta-fg { color: rgb(67, 0, 117); }
76+
.ansi-cyan-fg { color: rgb(18, 95, 105); }
77+
.ansi-white-fg { color: rgb(255, 255, 255); }
78+
.ansi-bright-black-fg { color: rgb(51, 51, 51); }
79+
.ansi-bright-red-fg { color: rgb(223, 45, 39); }
80+
.ansi-bright-green-fg { color: rgb(105, 175, 45); }
81+
.ansi-bright-yellow-fg { color: rgb(254, 232, 57); }
82+
.ansi-bright-blue-fg { color: rgb(68, 145, 240); }
83+
.ansi-bright-magenta-fg { color: rgb(151, 50, 174); }
84+
.ansi-bright-cyan-fg{ color: rgb(37, 173, 98); }
85+
.ansi-bright-white-fg { color: rgb(208, 208, 208); }
86+
87+
.ansi-black-bg { background: rgb(0, 0, 0); }
88+
.ansi-red-bg { background: rgb(166, 0, 44); }
89+
.ansi-green-bg { background: rgb(55, 106, 27); }
90+
.ansi-yellow-bg { background: rgb(241, 133, 24); }
91+
.ansi-blue-bg { background: rgb(17, 56, 163); }
92+
.ansi-magenta-bg { background: rgb(67, 0, 117); }
93+
.ansi-cyan-bg { background: rgb(18, 95, 105); }
94+
.ansi-white-bg { background: rgb(255, 255, 255); }
95+
.ansi-bright-black-bg { background: rgb(51, 51, 51); }
96+
.ansi-bright-red-bg { background: rgb(223, 45, 39); }
97+
.ansi-bright-green-bg { background: rgb(105, 175, 45); }
98+
.ansi-bright-yellow-bg { background: rgb(254, 232, 57); }
99+
.ansi-bright-blue-bg { background: rgb(68, 145, 240); }
100+
.ansi-bright-magenta-bg { background: rgb(151, 50, 174); }
101+
.ansi-bright-cyan-bg { background: rgb(37, 173, 98); }
102+
.ansi-bright-white-bg { background: rgb(208, 208, 208); }

0 commit comments

Comments
 (0)