Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
950 commits 62 branches 124 tags 29 MiB
Commit graph

451 commits

Author SHA1 Message Date
Dane Everitt
96d3aa767f
Model updates for Database Management in ACP 2017-02-03 15:19:14 -05:00
Dane Everitt
242294598f Merge branch 'develop' into feature/updated-models 2017-02-02 19:47:10 -05:00
Dane Everitt
3114b7e52a
Complete implementation of new Server model. 2017-02-02 19:41:38 -05:00
Jakob
8cac2a3669 Merge pull request #285 from Pterodactyl/feature/phrase-in-context 
add phraseapp in context editor
 2017-02-03 00:36:50 +01:00
Dane Everitt
d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -05:00
Jakob Schrettenbrunner
d9225e65df move phraseapp js into own file 2017-02-02 15:30:40 +01:00
Jakob Schrettenbrunner
8fc30fbe3a add phraseapp in context editor 2017-02-02 15:05:33 +01:00
Dane Everitt
4abdee0efb
Better 2FA implementation on logins 2017-02-01 22:58:48 -05:00
Dane Everitt
a1a81ac980
Fix auth page not remembering users. 2017-02-01 22:28:50 -05:00
Jakob Schrettenbrunner
1cd9e8ca88 switch to jQuery 3.1.1 on new theme 
will resolve #113
 2017-01-29 01:20:37 +01:00
Dane Everitt
9087feec4f
Remove build settings from packs. 2017-01-27 16:21:25 -05:00
Jakob Schrettenbrunner
c62312b8af redesign parts of the file manager 
ignore yarn.lock file
 2017-01-27 00:44:59 +01:00
Jakob Schrettenbrunner
344e3b4330 add console notification on new output that is out of view 
fix the revealing module pattern (browser cache 😒)
change graph colors to theme primary color
move Socket.on(‚console’) to console.js
 2017-01-26 22:57:33 +01:00
Dane Everitt
95d0c646f9
Require packs to be a tarball 2017-01-25 18:25:34 -05:00
Dane Everitt
95730da419
Fix pack edit display 2017-01-25 18:25:34 -05:00
Dane Everitt
bf7b58470a
Update copyright headers 2017-01-24 17:57:08 -05:00
Dane Everitt
06232b84c2 Merge pull request #268 from hammerdawn/ThemeFixes 
Repair the admin side add user functionality.
 2017-01-23 17:10:32 -05:00
Emmet Young
9c87e03c0c Repair the admin side add user functionality. 2017-01-23 13:24:14 +11:00
Dane Everitt
d21e6b8c90 Merge pull request #267 from hammerdawn/ThemeFixes 
Theme Changes
 2017-01-22 19:59:37 -05:00
Emmet Young
7bd1fbb14c Fix up the configuration token, app.url should already have the protocol included with it. Appending a new one messes it up 2017-01-23 11:02:10 +11:00
Emmet Young
a2b56e865e Make sure where applying strtolower on the users email on the frontend as well. 2017-01-23 10:34:20 +11:00
Dane Everitt
5f1bfcf980
Much cleaner code for updating user details front-end 2017-01-22 16:16:43 -05:00
Dane Everitt
9e54dabe5b
Display if subusers are using 2FA 2017-01-22 16:16:26 -05:00
Emmet Young
7654d3652a Only show admin control menu if the user is a root admin 2017-01-23 01:13:53 +11:00
Dane Everitt
a52290dd76 Merge pull request #259 from Pterodactyl/feature/new-theme 
Implement new AdminLTE theme for front-end of panel.
 2017-01-21 15:58:50 -05:00
Dane Everitt
355697dbb5 Apply fixes from StyleCI (#260) 2017-01-21 15:56:32 -05:00
Dane Everitt
19da4eda04
Update views, remove old theme views 2017-01-21 15:51:05 -05:00
Dane Everitt
0e23f87724
Add task management views 2017-01-21 15:40:46 -05:00
Dane Everitt
aea9b020c5
Use words not symbols for revoking subuser 2017-01-21 13:59:02 -05:00
Dane Everitt
db7b741b28
Show server status in sidebar properly on subuser views 2017-01-21 13:49:14 -05:00
Dane Everitt
8e9069cced
Subuser updates 2017-01-21 00:04:09 -05:00
Dane Everitt
95f574ec67
Sidebar and API View tweaks 2017-01-20 23:48:12 -05:00
Dane Everitt
3d2278ba3e
Add subuser list and new subuser views 
Holy 🐄 translations are annoying to implement for these views.
 2017-01-20 23:39:37 -05:00
Dane Everitt
91178d78a4
Add support for creating files via file manager 2017-01-20 17:10:14 -05:00
Dane Everitt
5567269bf3
Fix menu toggle element element hiding, better mobile support 2017-01-19 23:19:26 -05:00
Dane Everitt
da92796ca1
Better file upload handling, add touch target 2017-01-19 22:58:58 -05:00
Dane Everitt
83c776fc82
Fix up most of the file manager 2017-01-19 16:58:57 -05:00
Dane Everitt
042c28ca43
Add Socket.io alert 2017-01-18 21:12:58 -05:00
Dane Everitt
88378ce983
Add allocations tab 
Strips some core allocation features for now, will be added back with
more features once the theme is done.
 2017-01-18 20:45:10 -05:00
Dane Everitt
758927db8e
Translations are hard 2017-01-18 19:48:12 -05:00
Dane Everitt
ff241abe81
Minor tweaks to new API token page. 2017-01-18 19:41:46 -05:00
Jakob Schrettenbrunner
148e9d1fd5 use adminPermissions[] correctly in api key creation form 2017-01-19 01:24:33 +01:00
Jakob Schrettenbrunner
e81af3afee add csrf token to api key creation form 2017-01-19 01:07:28 +01:00
Jakob Schrettenbrunner
76cef7bf1d add redesigned base.api.new view 
add translations
 2017-01-19 01:06:26 +01:00
Dane Everitt
d3d1b88135
Add 404 and 403 error pages 2017-01-17 20:28:49 -05:00
Jakob Schrettenbrunner
e075b9061e replace {{ trans() }} with @lang() 2017-01-18 02:01:26 +01:00
Dane Everitt
542b919bd1
Add translations for database overview 2017-01-17 19:46:42 -05:00
Dane Everitt
f6600f447f
Add Startup Params view 
Translations might be the end of us.
 2017-01-17 19:30:27 -05:00
Dane Everitt
e2eff27a56 Apply fixes from StyleCI 2017-01-17 23:21:33 +00:00
Jakob
31b4589eab Contribution to feature/new-theme (#254) 
* add translation to navigation

* redesign base.api.index view
add translations

* remove license derp

* translate never in base.api.index view

* simplify user drop down for now
add translations
 2017-01-17 18:21:05 -05:00
Dane Everitt
1a6532d369 Correct link to new Discord channel invite 2017-01-16 16:36:48 -05:00
Dane Everitt
515e543c7f
Add SFTP and Database management pages to new theme. 2017-01-15 20:28:54 -05:00
Dane Everitt
c7f3bb5112
New theme assigned to server console page. 2017-01-15 18:52:22 -05:00
Dane Everitt
2fc852c6a4
Push 'Account' and 'Security' pages as well as 'My Servers' 2017-01-15 14:09:57 -05:00
Dane Everitt
d4adedd4a0
Use template layout for authentication 2017-01-14 23:17:31 -05:00
Dane Everitt
457ed28b0b
Initial change of theme. 
Only themed pages currently are login and reset password pages.
 2017-01-14 21:32:33 -05:00
Dane Everitt
16a3514abf
Cleanup auto-configure stuff 2017-01-14 19:36:47 -05:00
Dane Everitt
af2644cf59
Remove player listing since query is gone 2017-01-14 19:16:55 -05:00
Dane Everitt
e91362eee6
Update user controller 2017-01-12 15:40:24 -05:00
Dane Everitt
8323477d0c
Better display of configuration button for services 2017-01-12 13:38:59 -05:00
Dane Everitt
6bd9663f59
Merge branch 'develop' into feature/service-changes 2017-01-12 13:15:37 -05:00
Jakob Schrettenbrunner
9f2ca17ea4 replace manual json headers with laravel response()->json() 
better Carbon dependency
rename admin.nodes.configuration-token route
style fixes
 2017-01-08 15:21:02 +01:00
Jakob Schrettenbrunner
67bb8fe230 add protocol to the generated node configuration command 2017-01-07 22:16:23 +01:00
Jakob Schrettenbrunner
cc0d54e906 improve wording on token explanation on node configuration tab 2017-01-07 18:33:37 +01:00
Jakob Schrettenbrunner
a1568e5acb add button to generate token to node configuration tab 
add info message after node creation about token generation
 2017-01-07 18:27:19 +01:00
Jakob Schrettenbrunner
24bab6de17 use getConfigurationAsJson in the admin/nodes/view view 2017-01-07 18:09:04 +01:00
Dane Everitt
130aa6cc8a
Transpile ES6 to ES5 for filemanager. Closes #224 2017-01-03 17:32:23 -05:00
Dane Everitt
aa6e733ba5
Switch filemanager and EULA check to use pure Javascript methods 
Removes the need for the javascript to be parsed by Blade template
engine by using a defined javascript variable with the values that are
necessary for checking everything and passing the correct values.

This does make it so that if a user does not have permission to do
something they could theoretically make the option show up in the
context menu, however when they click it, it will simply return an
error by the daemon.
 2017-01-03 16:47:33 -05:00
Dane Everitt
06bdadb92f
Add missing language string in English 2017-01-03 15:02:51 -05:00
Dane Everitt
920ed824d6 Apply fixes from StyleCI 2016-12-30 22:19:23 +00:00
Dane Everitt
a1dff5cda0
Push updated languages 2016-12-30 17:17:36 -05:00
Dane Everitt
9231171fa9
Update link to docker reference for BlockIO 2016-12-30 15:46:26 -05:00
Dane Everitt
9a494d8245
Adjust server name requirements, closes #205 2016-12-30 15:46:10 -05:00
Dane Everitt
fc38b09e1f
Merge branch 'develop' into feature/service-changes 2016-12-14 16:53:53 -05:00
Jakob
d1d473352f fix adding current path to new file in filemanager twice 2016-12-14 17:01:26 +01:00
spaceemotion
a85ac87ae8 Refactor to use more laravel logic and improve compatibility with older PHP versions (#206) 
* Fix @param namespaces for PHPDocs in ServerPolicy

* Reduce permission check duplication in ServerPolicy

This introduces a new checkPermission method to reduce code duplication when checking for permissions.

* Simplify logic to list accessible servers for the user

We can directly use the pluck function that laravel collections provide to simplify the logic.

* Fix pagination issue when databases/servers exceed 20

Laravels strips out the currently selected tab (or any GET query for that matter) by default when using pagination. the appends() methods helps with keeping that information.

* Refactor unnecessary array_merge calls

We can just append to the array instead of constantly merging a new copy.

* Fix accessing “API Access” on some versions of PHP

The “new” word is reserved and should not be used as a method name.

http://stackoverflow.com/questions/9575590/why-am-i-getting-an-unexpected-t-new-error-in-php

* Fix revoking API keys on older versions of php (5.6)

“string” was not a valid function argument type yet, so revoking keys results in an error on older installations.

* Fix issues with API due to methods named “list”

“list” is yet another reserved keyword in PHP and messes up older installations of PHP (5.6).
This renames all methods named “list” to “lists”. The API route names are left untouched (e.g. still called “api.admin.users.list”).

* Refactor and shorten some API logic

Used laravel collection methods where applicable to directly transform the values instead of converting back and forth.
This also removes some dead variables that were never used as well as getting rid of a n+1 problem in the Service API (loading service variables afterwards, not during the model creation).

* Return model save status in repositories where applicable

* Fix typo in ServicePolicy#powerStart

* Apply StyleCI corrections
 2016-12-12 14:30:57 -05:00
Jakob Schrettenbrunner
d844c4135c update jquery.terminal to v0.11.23 
set new scrollBottomOffset to 5 to hopefully resolve issues with chrome
 2016-12-10 13:51:07 +01:00
Jakob Schrettenbrunner
c80c6714a1 add small notification to terminal if new invisible output is available 2016-12-10 00:17:23 +01:00
Jakob Schrettenbrunner
96462a119f disable srcollOnEcho for jquery terminal so it will only scroll at the bottom 2016-12-09 23:50:51 +01:00
Jakob Schrettenbrunner
2a101c0ffd update to jquery terminal v0.11.22 2016-12-09 23:50:22 +01:00
Dane Everitt
c1fb0a665f Apply fixes from StyleCI 2016-12-07 22:46:38 +00:00
Dane Everitt
a1d3bbf73d Merge pull request #202 from hammerdawn/FixSubUserView 
Fix the subuser edit view, large amount of checkboxes were not properly formatted
 2016-12-06 22:35:36 -05:00
Emmet Young
88837f8ac0 Fix the subuser edit view, large amount of checkboxes were not properly formatted causing the first half of the edit screen to be broken. 
Correct the value used for the create files permission.
 2016-12-07 14:31:44 +11:00
Dane Everitt
9ae716ee42
show container ID for server in panel 
Also shows the UID of the user to ease permissions setting

closes #160
 2016-12-02 19:35:08 -05:00
Dane Everitt
2ac734d595
Update node config sent over API 2016-12-02 19:12:29 -05:00
Dane Everitt
e39c750563
Remove link that shouldn't exist in the first place. 2016-12-02 18:47:22 -05:00
Dane Everitt
259b220dfc
misc file cleanup 2016-12-02 18:45:08 -05:00
Dane Everitt
3cd0a8337f
Add ability to filter user list 2016-12-02 18:41:52 -05:00
Dane Everitt
90460bef43
New button in file manager that triggers the right click menu 
Enable’s support on mobile devices and those who cannot right click
(blessed be them)

closes #182
 2016-12-01 19:11:48 -05:00
Dane Everitt
1eb1f96e71
Add support for updating the daemon's configuration file automatically. 2016-12-01 18:33:32 -05:00
Dane Everitt
72ad6d5c87
Show file upload size limit when uploading files 
Also handle errors better.
 2016-12-01 18:32:05 -05:00
Dane Everitt
a2d2069d8c
Merge branch 'develop' into feature/service-changes 2016-11-28 14:02:09 -05:00
Dane Everitt
b4bcc7247f
Add some things to node config block that will be useful to some 2016-11-28 13:55:02 -05:00
Dane Everitt
3549abd5ae
Fix error page when no nodes exist. 2016-11-28 13:51:18 -05:00
Dane Everitt
5c20d0a748
Fix daemon version displaying panel version; closes #184 2016-11-28 13:41:26 -05:00
Dane Everitt
2b16472cd2
Fix data multiplicator on wrong field. 2016-11-28 13:37:36 -05:00
Dane Everitt
75de060a55
Fix pack selector 2016-11-27 14:57:23 -05:00
Dane Everitt
c4a4b84bd3
Add service pack reference to server and send to daemon 2016-11-27 14:50:10 -05:00
Dane Everitt
238f08f222
Add pack selection to view 2016-11-27 14:30:44 -05:00
Dane Everitt
9eb14614c2
Merge branch 'develop' into feature/service-changes 2016-11-27 14:01:13 -05:00
Dane Everitt
c107dbfa74
Fixes database server deletion 2016-11-26 20:26:45 -05:00
Dane Everitt
b7a566a937
Fixes defaulting to Deutsch if no language is assigned yet. 2016-11-26 20:14:13 -05:00
Dane Everitt
783c373100
Default company name if none is assigned. 2016-11-26 20:05:25 -05:00
Dane Everitt
e47bb6ef0f
Add multiplicators to certain inputs, closes #154 
Allows for users to enter `10g` into a memory field and have it
converted to 10GB equivalent in MB.
 2016-11-26 19:56:19 -05:00
Dane Everitt
90cd2b677e
Add version checking to daemon and panel 
Also includes some buttons for users to get help from the panel.
 2016-11-26 19:29:57 -05:00
Dane Everitt
261535d83d
Fix broken block ending for script 2016-11-26 18:52:19 -05:00
Dane Everitt
edaae40df9
Add some quick daemon information when viewing nodes 2016-11-26 18:23:10 -05:00
Dane Everitt
d93f88f471
Properly display node status with newer daemon versions 2016-11-26 17:49:56 -05:00
Dane Everitt
1ad715f1a3
Improve database management for servers, fixes #181 2016-11-26 17:34:14 -05:00
Dane Everitt
5a0f58ce90
Merge branch 'develop' into feature/service-changes 2016-11-19 18:30:15 -05:00
Bent Haase
57d62c4ed3 Fix time axis for node and server view 
Nope, the current month is not a valid minute
 2016-11-19 16:02:47 -05:00
Dane Everitt
ee78a3947b
Grammatical display changes 2016-11-18 18:34:45 -05:00
Dane Everitt
5600f3201c
Add support for deleting service packs. 2016-11-18 17:31:57 -05:00
Dane Everitt
d4729427aa
Support for uploading templates for installing packs 2016-11-16 17:22:22 -05:00
Dane Everitt
e09659a88f
support for pack editing 2016-11-16 16:09:28 -05:00
Dane Everitt
09c2dcc1b6
Support for viewing and exporting packs 2016-11-15 23:12:47 -05:00
Dane Everitt
a1bc6fa2d3
Push changes that support creations of service packs and basic listing 2016-11-15 20:20:32 -05:00
Dane Everitt
cfd5e0e854
Implement base service file modification through panel 2016-11-09 17:58:14 -05:00
Dane Everitt
659c33f0e8
Fixes a bug that allows a user to bypass 2FA authentication requirements 
This bug was reported to us by a user (@Ferry#1704) on Discord on
Monday, November 7th, 2016.

It was disclosed that it was possible to bypass the 2FA checkpoint by
clicking outside of the modal which would prompt the modal to close,
but not submit the form. The user could then press the login button
which would trigger an error. Due to this error being triggered the
authentication attempt was not cancelled. On the next page load the
application recognized the user as logged in and continued on to the
panel.

At no time was it possible to login without using the correct email
address and password.

As a result of this bug we have re-factored the Authentication code for
logins to address the persistent session. Previously accounts were
manually logged back out on 2FA failure. However, as this bug
demonstrated, causing a fatal error in the code would prevent the
logout code from firing, thus preserving their session state.

This commit modifies the code to use a non-persistent login to handle
2FA checking. In order for the session to be saved the application must
complete all portions of the login without any errors, at which point
the user is persistently authenticated using Auth::login().

This resolves the ability to cause an exception and bypass 2FA
verification.
 2016-11-07 15:55:57 -05:00
Dane Everitt
e77b984596
remove beta notice. 🎉🎉🎉 2016-11-04 22:01:30 -04:00
Jakob
6c6a49e709 only push stuff from the terminal outputQueue if there is something inside 
this allows to scroll on the console again
 2016-11-01 23:22:07 +01:00
Jakob
e65dc5708d Validate password on reset according to rules (#158) 
* move password rules to Models\User::PASSWORD_RULES

* validate new password according to rules on password reset

* add password requirements info to auth.passwords.reset view
 2016-10-30 16:02:39 -04:00
Dane Everitt
0741ab6833
Revamped resource graphing, uses chart.js 2016-10-30 00:06:55 -04:00
Dane Everitt
013c36fe81
💣 destroy player listing 2016-10-29 21:46:53 -04:00
Dane Everitt
d3220fa553
Fixes double error display on login forms 2016-10-29 20:29:26 -04:00
Dane Everitt
51c07bf1f2
🎉 Add support for uploading files from file listing! 🎉 
closes #22
 2016-10-28 18:21:12 -04:00
Dane Everitt
63d7062f3c
Make dates a little more user friendly 2016-10-28 16:34:23 -04:00
Dane Everitt
449324fa1c
Show spinner when decompressing files. 2016-10-28 15:54:57 -04:00
Dane Everitt
ac82194ed4
Faster file uploads and less console spam 2016-10-28 15:39:58 -04:00
Dane Everitt
ff93d6ce16
Rebase 2016-10-27 20:14:24 -04:00
Dane Everitt
6fd7c78f0c
Add server deletion to a queue. 
This action allows servers to be deleted, but only be soft-deleted for
10 minutes. After that time period the server will be completely
removed from the database and daemon. This allows some safety if a
server is accidentally deleted.

Force deleting a server will still work. If the daemon is in-accessible
the server will fail to be deleted. When server is soft-deleted admins
can still view its information page in the admin CP, however the server
will be suspended and inaccessible on the front-end or though the
daemon.

Admins can manually delete the server ahead of the delete timer, or if
it failed to delete previously they can do an immediate retry.
 2016-10-27 20:05:29 -04:00
Dane Everitt
0b044b3cc6
fixes bug that would allow deleting the default allocation for a server. 2016-10-23 18:59:13 -04:00
Dane Everitt
0a481b325c
Clean up server display a bit 2016-10-23 18:55:41 -04:00
Dane Everitt
6b011fcd36
Add file manager refresh without reload; ❤️ @parkervcp 2016-10-21 18:09:35 -04:00
Dane Everitt
6b89dbd451
Fix errors on node graphs 
These graphs will be removed in a future release, so I’m not going to
make them look pretty right now.
 2016-10-21 17:37:47 -04:00
Dane Everitt
ad906e0680
FQDN support for allocations, and JS bug fix. 2016-10-21 17:33:26 -04:00
Dane Everitt
6731f7ffbc
Modernize user pages a bit 2016-10-21 15:50:10 -04:00
Dane Everitt
bef717b202
add typeahead support for owner email when adding new server 
closes #144
pic: http://s3.pterodactyl.io/UpPSJ.png
 2016-10-21 15:22:47 -04:00
Dane Everitt
f9f751b7f2
fixes server overview listing location as the node 2016-10-21 14:48:04 -04:00
Dane Everitt
8660fcdc60 Merge pull request #149 from Pterodactyl/feature/better-api 
Implement better API system
 2016-10-20 18:41:16 -04:00
Dane Everitt
f24347d1bd
Remove old admin routes, fix display to non-admins 
Complete!
 2016-10-20 18:40:16 -04:00
Dane Everitt
53ec2c55ec
Add front-end support for adding and deleting API keys. 2016-10-20 18:20:58 -04:00
Dane Everitt
b3f078add2 Merge pull request #146 from ET-Bent/patch-1 
Fix node view in admin panel
 2016-10-17 12:29:51 -04:00
ET-Bent
7d1cba8d52 Better name scheming for console 2016-10-17 00:09:28 +02:00
ET-Bent
ce5374ea6b Fix node view in admin panel 2016-10-17 00:07:55 +02:00
Dane Everitt
745c735b32
Add initial basic API changes 
New route is `/api/me`
 2016-10-14 20:22:23 -04:00
Dane Everitt
7cf7a5a961
Split account things into own controllers. 2016-10-14 17:15:36 -04:00
Dane Everitt
e5ffb15020
Add support for new file upload mechanics 2016-10-13 21:03:49 -04:00
Dane Everitt
649b18c8d1
support for server filtering 
closes #125
 2016-10-12 17:12:27 -04:00
Dane Everitt
0fe0f750c4
node status in list, closes #124 2016-10-07 15:15:04 -04:00