Commit Graph

427 Commits

Author SHA1 Message Date
Dane Everitt 65630bdcce
Move API to use JSON:API standards and fractal serializer
Makes the data slightly more complex, but forces a standard and can
always be changed down the road simply by changing the default
serializer.
2017-04-02 16:51:56 -04:00
Dane Everitt c071efd008
Finish API routes for users. 2017-04-02 15:52:53 -04:00
Dane Everitt 97773300ed
Better middleware for routes, cleaned up API, removed old API calls
New API routes for Server allow specifying which fractal objects to
load into the request, thus making it possible to fine-tune what data
is returned.
2017-04-02 13:19:39 -04:00
Dane Everitt ddb82ac3ca
Add initial user server transformer for API. 2017-04-02 00:49:53 -04:00
Dane Everitt 87530cdc01
Initial moves to new API scheme.
Implements a better middleware for handling API authentication, as well
as cleaner route handling.
2017-04-02 00:11:52 -04:00
Dane Everitt 5927e0e12a
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/Http/Controllers/Base/LanguageController.php
#	app/Http/Kernel.php
#	app/Http/Middleware/TrimStrings.php
#	app/Providers/RouteServiceProvider.php
2017-04-01 21:03:10 -04:00
Dane Everitt d80c59aad3
Cleanup routing mechanisms 2017-04-01 21:01:10 -04:00
Dane Everitt 9c303456fb Update codebase to L5.4 (#367) 2017-04-01 17:59:43 -04:00
Dane Everitt cbeecfe5e4
Implement front-end server searching 🍬 2017-04-01 13:14:49 -04:00
Dane Everitt edaa270a33
Add server descriptions, closes #338 🐖
🐷 https://s3.kelp.in/D0n2Z.png
2017-03-31 23:07:19 -04:00
Dane Everitt 536865b22a
Remove deletion queue for servers. Just immediately delete. 2017-03-31 22:12:31 -04:00
Dane Everitt 2dec659dd1
Fix syntax error. 2017-03-31 21:47:53 -04:00
Dane Everitt c7d4c3aa76
Send default response 2017-03-31 21:16:00 -04:00
Dane Everitt ff57e2ff85
Cleanup recaptcha middleware 2017-03-31 21:12:49 -04:00
Dane Everitt 451dd7ebc8 Apply fixes from StyleCI (#364) 2017-03-31 20:48:35 -04:00
Jakob Schrettenbrunner e613e44749 fix #363 2017-04-01 01:58:05 +02:00
Jakob Schrettenbrunner 0ee80b1fec fix captcha middleware using wrong function when disabled 2017-04-01 01:54:42 +02:00
Jakob Schrettenbrunner 207e0131fc Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset 2017-03-31 12:20:41 +02:00
Jakob Schrettenbrunner 142cbb0641 Add invisible ReCAPTCHA to login and password reset 2017-03-31 12:19:44 +02:00
Dane Everitt 1f0e95790a
🔒 Don't disclose if account exists when resetting passwords, closes #358 2017-03-30 17:44:20 -04:00
Dane Everitt 95c739a3f3
Update subusers view 2017-03-30 15:31:02 -04:00
Dane Everitt f0057353ad Apply fixes from StyleCI 2017-03-19 23:52:11 +00:00
Dane Everitt 0312c974f5
Update doc blocks for all app/ 2017-03-19 19:36:50 -04:00
Dane Everitt 5e27772fef
Very rough go at getting API back into operational state.
Not spending a lot of time on this as its a pre-release and I have
plans to overhaul the API to actually work and be easy to maintain.
2017-03-19 13:20:33 -04:00
Dane Everitt 377fe92f5b
Don't try to render 200 lines per second in the console... 💣
Corrects a math mistake on my end, and makes the console speed
configurable again. Now sends 50 messages per second.

Console will notify when being throttled, and refreshing the page will
clear the queue if necessary.
2017-03-19 11:13:17 -04:00
Dane Everitt 4f16509447
Use env() properly throughout panel to avoid cache issues. 2017-03-18 15:56:19 -04:00
Dane Everitt 03e0de28d9
Initial implementation of option scripts on panel side. 2017-03-18 13:09:30 -04:00
Dane Everitt 202dd52e2b
Fixes bug causing MySQL user accounts to be corrupted when resetting a password via the panel.
closes #352
2017-03-17 17:17:36 -04:00
Dane Everitt 7e45f917c7
Fix subuser permissions in file manager 2017-03-17 16:19:45 -04:00
Dane Everitt 4ad09c5435
Fixes bug introduced during admin rewrite that broke server creation 2017-03-16 21:11:15 -04:00
Dane Everitt b8c3ab6960
closes #339 2017-03-16 19:56:58 -04:00
Dane Everitt 1aa191210a
closes #344 2017-03-16 19:54:31 -04:00
Dane Everitt 198a021a97
Add database host management to panel. 2017-03-16 19:35:29 -04:00
Dane Everitt 05d2a6d370
Add back locations with new theme 2017-03-16 18:09:02 -04:00
Dane Everitt 1852018397
Add back missing node creation page. 2017-03-15 21:38:09 -04:00
Dane Everitt 436ba814a9 Apply fixes from StyleCI (#351) 2017-03-15 20:53:49 -04:00
Dane Everitt 1c47b2ed55
Finish pack management in Admin CP 2017-03-15 20:52:37 -04:00
Dane Everitt 50558db7c3
Add initial pack creation and overview pages 2017-03-14 21:18:36 -04:00
Dane Everitt 2d90187c83
StyleCI fixes 2017-03-12 19:38:50 -04:00
Dane Everitt fcadee7e67
Fix front and backend views with new service variable setups 2017-03-12 19:34:06 -04:00
Dane Everitt 1897741381
StyleCI cleanup 2017-03-12 16:34:43 -04:00
Dane Everitt f5a4ec981d
Add ability to create new service variable. 2017-03-12 16:28:38 -04:00
Dane Everitt b1b1f448e9
Send the correct information to daemon for new index.js setup 2017-03-12 16:04:47 -04:00
Dane Everitt 419031e0cd
Add function file editing, and move all service file items into database 2017-03-12 15:59:17 -04:00
Dane Everitt d7682bb7c9
Complete new service, option, and variable management interface in Admin CP 2017-03-12 00:00:06 -05:00
Dane Everitt 70db461075
Start push of service changes.
Changes the way service files are stored and allows for much easier
updates in the future that won’t affect custom services.

Also stores more configurations in the database to make life easier for
everyone.
2017-03-10 18:25:12 -05:00
Dane Everitt 5bf2e2686a Apply fixes from StyleCI (#335) 2017-03-05 20:28:29 -05:00
Dane Everitt 3355554704
Fix frontend database password reset 2017-03-05 16:46:44 -05:00
Dane Everitt 32dec97e46
Improved database mechanics in admin CP for server view 2017-03-05 16:37:40 -05:00
Dane Everitt 349b36d38a
Added startup management, cleaned up code.
Refactored entire startup repository code block to be more efficient
and cleaner. Also includes modifications to front-end to make it match
backend name and design.
2017-03-04 23:45:25 -05:00
Dane Everitt d51ae5ec23 Apply fixes from StyleCI (#332) 2017-03-04 19:28:23 -05:00
Dane Everitt e688468920
Push updated server views 2017-03-04 19:03:49 -05:00
Dane Everitt b1564389d8 Apply fixes from StyleCI (#331) 2017-03-03 23:38:21 -05:00
Dane Everitt e6d3663b3b
Model and template cleanup 2017-03-03 23:37:41 -05:00
Dane Everitt d38f89a468
Cleanup node routes, cleanup remote token 2017-03-03 23:14:25 -05:00
Jakob Schrettenbrunner 6df573e50c retheme admin users list 2017-03-04 00:16:11 +01:00
Dane Everitt fd5b74c873
Use usernames for @schrej 2017-03-03 17:53:35 -05:00
Dane Everitt fd9f1a68eb
Implement node view, cleanup other files.
Still in progress, need to do a lot of controller cleanup first and add
node deletion as well.
2017-03-03 17:30:41 -05:00
Dane Everitt fb21bf9282
Begin implementation of server admin view
Currently completed tabs: About, Details, Build Configuration
2017-02-25 00:48:14 -05:00
Dane Everitt bbf9fd12ae Apply fixes from StyleCI (#325) 2017-02-24 18:23:03 -05:00
Dane Everitt cb6b44d4f0
Completed new server page with new theme. 2017-02-24 18:19:03 -05:00
Dane Everitt 58999913ba
More improvements to add server page. 2017-02-23 22:52:05 -05:00
Dane Everitt 8f96b35db1
Merge branch 'develop' into feature/admin-retheme 2017-02-23 21:24:17 -05:00
Dane Everitt b11029a666 Apply fixes from StyleCI (#312)
* Bump for release

* Apply fixes from StyleCI
2017-02-18 22:57:50 -05:00
Dane Everitt ed4068bdb9
Fix bug preventing server container rebuilds. 2017-02-18 22:33:15 -05:00
Dane Everitt 644c07ea3a
Fix broken port deletion 2017-02-18 22:32:16 -05:00
Dane Everitt b926d432e8
Thats enough re-theming for the day... 2017-02-18 19:31:44 -05:00
Dane Everitt 99497adcb2
Show proper server status when viewing listing.
closes #308
2017-02-17 20:34:57 -05:00
Dane Everitt e9762b4277
Fixes port deletion for node allocations as well as server notes on allocations.
closes #305
2017-02-17 19:59:40 -05:00
Dane Everitt 008cccb098
Fix up email sending and add more notifications to the panel.
Closes #265
2017-02-17 19:23:27 -05:00
Dane Everitt 9af06b4b59
Add in query caching on server view 2017-02-17 18:19:53 -05:00
Dane Everitt 73996d3154
Fix bug in node update 2017-02-16 15:57:02 -05:00
Dane Everitt 59f9ab6e90
Help @schrej not have an aneurysm. 2017-02-16 15:49:14 -05:00
Dane Everitt 5e63ac0baa
Fix double encoding of JSON 2017-02-16 15:38:56 -05:00
Dane Everitt 4e66ba078d
Fix locations error on create 2017-02-16 14:56:28 -05:00
Jakob d230ee179a Merge pull request #299 from Pterodactyl/feature/allow-login-with-username
allow to use the username for login as well
2017-02-16 20:47:25 +01:00
Jakob Schrettenbrunner 4fc832838b use ‚required|string‘ to validate usernames 2017-02-16 20:45:36 +01:00
Jakob Schrettenbrunner 0b2c5279a8 allow to use the username for login as well
add translation strings
2017-02-16 20:40:21 +01:00
Dane Everitt c8ae776ab8
Fix settings redirection for server 2017-02-16 14:04:15 -05:00
Dane Everitt 2e134b7a55
Set out some roach traps to catch all these 🐛 2017-02-16 13:56:28 -05:00
Dane Everitt 516e2dc5ee
Add back API key deletion 2017-02-16 12:57:48 -05:00
Dane Everitt 19d352619e
More singularization and correct file names. 2017-02-12 16:03:17 -05:00
Dane Everitt 8ba479e51f
Singularize model names. 2017-02-12 16:02:23 -05:00
Dane Everitt 7c916ad38f Apply fixes from StyleCI (#294) 2017-02-12 15:10:39 -05:00
Dane Everitt a14df81f27 Merge branch 'develop' into feature/updated-models 2017-02-10 20:30:20 -05:00
Dane Everitt 32a1dc17ed
API model updates, as well as general model updates and code fixes. 2017-02-10 20:26:38 -05:00
Dane Everitt c70d31c08f
More model updates. 2017-02-10 17:36:58 -05:00
Dane Everitt 3b3002b77a
API Model updates. 2017-02-10 17:29:10 -05:00
Dane Everitt efef356870
Assorted model code updates. 2017-02-10 17:18:46 -05:00
Dane Everitt ba175e6b55
Cleanup location model and controller for Admin. 2017-02-10 17:09:56 -05:00
Dane Everitt 0720bfe62f
Cleanup database query code. 2017-02-10 17:03:58 -05:00
Dane Everitt 99812b0407
More subuser Model updates. 2017-02-09 19:38:54 -05:00
Dane Everitt 4f61637284
More model updates to more places than I anticipated.
This probably broke a lot of things.
2017-02-09 17:43:54 -05:00
Dane Everitt 02458c909d
Improves server model and cleans up model code calls. 2017-02-05 19:19:46 -05:00
Dane Everitt 323f1d943f
Completed model updates for Services 2017-02-05 17:58:17 -05:00
Dane Everitt 09d23deed6
New models for node and location admin pages. 2017-02-03 16:50:28 -05:00
Dane Everitt 96d3aa767f
Model updates for Database Management in ACP 2017-02-03 15:19:14 -05:00
Dane Everitt 9c2d34d6e6
Mo' StyleCI fixes... 🦀 2017-02-02 19:48:15 -05:00
Dane Everitt 533e2bcafb
Fix database column references in ACP 2017-02-02 19:46:46 -05:00
Dane Everitt 3baa21a6eb
StyleCI fixes. 2017-02-02 19:43:55 -05:00
Dane Everitt 3114b7e52a
Complete implementation of new Server model. 2017-02-02 19:41:38 -05:00
Jakob 19567ee311 Merge branch 'develop' into fix/trusted-proxies 2017-02-03 00:38:58 +01:00
Dane Everitt d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -05:00
Dane Everitt 7f51e5df62
API tweaks to return more relevant information on server listing 2017-02-02 16:24:08 -05:00
Dane Everitt 32c21baab0
Return packs associated with a service when viewing it on the API. 2017-02-02 16:01:18 -05:00
Dane Everitt a93adce303
Only allow up to 30 seconds of overlap on comparing the 2FA tokens. 2017-02-01 23:02:54 -05:00
Dane Everitt 4abdee0efb
Better 2FA implementation on logins 2017-02-01 22:58:48 -05:00
Jakob Schrettenbrunner 24650b67be Merge branch 'develop' into fix/trusted-proxies
sorry
2017-02-01 20:35:10 +01:00
Jakob Schrettenbrunner 8ab4faad8a remove TRUSTED_PROXIES from .env.example
make style ci happy
2017-02-01 20:31:24 +01:00
Jakob Schrettenbrunner ee26a7e8dd add fideloper/proxy to support reverse proxies and load balancers 2017-02-01 20:10:28 +01:00
Dane Everitt e5ed1c7f6a One day eslint will have a PHP counterpart that works in Atom... 🤔 2017-01-31 20:04:34 -05:00
Dane Everitt 4b0197f2be
Implement basic security policy on daemon remote routes 2017-01-27 16:34:46 -05:00
Dane Everitt 9087feec4f
Remove build settings from packs. 2017-01-27 16:21:25 -05:00
Dane Everitt e6d3e75024
Add new daemon routes for pack handling 2017-01-25 18:25:34 -05:00
Dane Everitt bf7b58470a
Update copyright headers 2017-01-24 17:57:08 -05:00
Dane Everitt b9512dccb8 Apply fixes from StyleCI (#269) 2017-01-23 17:11:25 -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 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
Dane Everitt 355697dbb5 Apply fixes from StyleCI (#260) 2017-01-21 15:56:32 -05:00
Dane Everitt 0e23f87724
Add task management views 2017-01-21 15:40:46 -05:00
Dane Everitt db7b741b28
Show server status in sidebar properly on subuser views 2017-01-21 13:49:14 -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 994588c82d
Set the old theme on admin center until new theme is done 2017-01-20 17:19:42 -05:00
Dane Everitt 91178d78a4
Add support for creating files via file manager 2017-01-20 17:10:14 -05:00
Dane Everitt 83c776fc82
Fix up most of the file manager 2017-01-19 16:58:57 -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 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
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 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 a5aa089d66 Apply fixes from StyleCI 2017-01-12 20:48:12 +00:00
Dane Everitt e91362eee6
Update user controller 2017-01-12 15:40:24 -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 f70b33d69c one more styleci fix. don’t be that picky! 🙈 2017-01-07 18:40:55 +01:00
Jakob Schrettenbrunner a661f71974 fix styleci issues 2017-01-07 18:39:41 +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 e1e159b7de add ability to generate a token to retrieve the config for a specific node 2017-01-07 18:10:11 +01:00
Dane Everitt d9de884de3 Apply fixes from StyleCI 2017-01-03 22:46:30 +00:00
Dane Everitt c1bf757623
Fix service option name being set wrongly after adding a new variable. closes #208 2017-01-03 17:44:48 -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 39731f99da Merge pull request #226 from hammerdawn/APICHANGE
Allow listing a user by both ID and email. Useful for checking if a u…
2017-01-02 22:00:45 -05:00
Emmet Young 3f5bf099ae Use DaneEveritt's shortened query call. 2017-01-03 13:40:35 +11:00
Dane Everitt a1dff5cda0
Push updated languages 2016-12-30 17:17:36 -05:00
Emmet Young b5d3417167 Allow listing a user by both ID and email. Useful for checking if a user exists by its email. 2016-12-29 22:56:45 +11:00
Dane Everitt a49dee2416
Add base implementation of service retrieval. 🏇
There is currently no authentication middleware on this route.
2016-12-14 18:54:43 -05:00