Dane Everitt
6c20ea9881
Add tests for changed controllers
2018-07-04 19:20:33 -07:00
Dane Everitt
5010c0c756
Merge branch 'feature/vuejs' into feature/vuejs-account
2018-07-04 18:12:57 -07:00
Dane Everitt
af9af78938
Merge branch 'develop' into feature/vuejs
2018-07-04 18:09:07 -07:00
Dane Everitt
8f5bd214a4
[Security] Address 2FA bypass in password reset functionality
...
Thanks to Trixter#0001 on Discord for this security report.
There was a two-factor authentication bypass present in all previous versions of Pterodactyl that would allow a user to login without providing a token by going through the password reset process. A person would still have to have access to the targeted account's email, but if they did manage to get a password reset link they would be able to reset the account password and then proceede to login without a token being required.
This logic has since been changed to check if 2FA is enabled on an account, and if so they will NOT be logged in when their password is changed. This will force them to continue through the normal login pathway where a token will be needed.
Overall the impact of this issue is minor, but I am still addressing it and disclosing the mechanism behind it.
2018-07-04 11:41:56 -07:00
Dane Everitt
603b8a3094
Merge branch 'feature/vuejs' into feature/vuejs-account
2018-07-02 21:01:04 -07:00
Dane Everitt
48cb01f438
Merge branch 'develop' into feature/vuejs
2018-07-02 21:00:42 -07:00
Stan
1ffb5acfad
Send an email when a server is marked as installed ( #1213 )
...
Co-authored-by: @stanjg
2018-07-01 14:34:40 -07:00
Dane Everitt
304d947536
Allow creating subuser with no permissions
2018-06-30 18:25:46 -07:00
Dane Everitt
974318ffb4
Logout other sessions when password is changed
...
closes #1222
2018-06-30 17:50:58 -07:00
Dane Everitt
7711b697ad
Finalize two-factor handling on account.
2018-06-20 23:05:35 -07:00
Dane Everitt
0cc895f2d5
Finalize email/password changing in UI
2018-06-17 16:53:24 -07:00
Dane Everitt
fce394f6bd
Change email handling and logout function
2018-06-16 14:30:20 -07:00
Dane Everitt
e7faf979a1
Change login handling to automatically redirect a user if their session will need renewal.
2018-06-16 14:05:39 -07:00
Dane Everitt
b8b9acd0e6
Get the base email update working through the API.
...
Still going to need to determine the best course of action to update the token on the client side.
2018-06-11 22:56:57 -07:00
Jakob Schrettenbrunner
05478e3277
Merge branch 'feature/vuejs' into feature/vue-serverview
2018-06-11 21:06:12 +02:00
Dane Everitt
03c83c084a
Revert use of cookies, go back to using a JWT
2018-06-06 22:49:44 -07:00
Dane Everitt
5bcabbde35
Get dashboard in a more working state
2018-06-05 23:42:34 -07:00
Dane Everitt
e948d81d8a
Base attempt at using vuex to handle logins
2018-06-05 23:00:01 -07:00
Dane Everitt
e65854c8c2
Merge branch 'feature/vuejs' into feature/vue-serverview
2018-06-02 23:28:55 -07:00
Dane Everitt
02b29a66ea
Use client API to get resource use for a server
2018-06-02 19:08:53 -07:00
Jacob Gee-Clarke
d73e5a2274
Fixed my fix to fix the 500 error on /api/application/nodes when not specifying a daemon_base ( #1182 )
2018-06-02 14:34:01 -07:00
Dane Everitt
969b16a563
Apply fixes from StyleCI
...
[ci skip] [skip ci]
2018-06-02 21:32:26 +00:00
stanjg
b56f3a8671
Expanded the middleware test
2018-06-01 16:22:06 +02:00
stanjg
e9ac014bf4
Removed the use of Auth facade and removed unnecesary option
2018-06-01 16:10:32 +02:00
stanjg
3bb9e5e8a8
Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language
2018-06-01 15:58:09 +02:00
Dane Everitt
e0d67ff857
Merge branch 'feature/vuejs' into feature/vue-serverview
2018-05-31 23:01:24 -07:00
Dane Everitt
6c598f9100
Merge branch 'feature/vuejs' into feature/vuejs-serverlist
2018-05-31 22:59:39 -07:00
Dane Everitt
5f70502f20
Merge branch 'develop' into feature/vuejs
2018-05-31 22:59:16 -07:00
Dane Everitt
fd8d7c3571
Merge pull request #1130 from stanjg/feature/stats-page
...
Added a statistics page to monitor the panel usage
2018-05-31 22:56:58 -07:00
stanjg
ccf3e3511f
Renamed middleware, and fixed the test
2018-05-31 16:40:18 +02:00
stanjg
013dde75ae
Renamed the field and made some improvements
2018-05-31 16:34:35 +02:00
Jakob Schrettenbrunner
11d96c44d1
Merge branch 'feature/vuejs-serverlist' into feature/vue-serverview
2018-05-29 00:04:51 +02:00
Jakob Schrettenbrunner
378a1859cf
Merge branch 'feature/vuejs-serverlist' into feature/vue-serverview
2018-05-29 00:04:41 +02:00
Dane Everitt
a1444b047e
Fix JWT handling for API access when logging in
2018-05-28 14:59:48 -07:00
Dane Everitt
6e5c365018
Use the client API to load servers on the listing page
2018-05-28 13:23:40 -07:00
Dane Everitt
ad69193ac0
Add JWT to login forms
2018-05-28 12:48:42 -07:00
Jakob Schrettenbrunner
89f47c6dbb
mocked server page and better navigation and overall layout
2018-05-28 00:37:03 +02:00
Dane Everitt
6f2fcabf22
Add very basic server search and dynamic rendering functionality
2018-05-26 23:17:02 -07:00
Dane Everitt
9d8830a2d7
Get initial mockup of new server list up
2018-05-26 17:20:36 -07:00
stanjg
60e1ffa564
Added a test for the controller and cleaned up the controller
2018-05-27 00:16:13 +02:00
Dane Everitt
cf90f56777
Merge branch 'develop' into feature/vuejs-auth
2018-05-26 12:17:14 -07:00
stanjg
7a81c61ad8
Wording changes and fix of major fail last commit
2018-05-26 21:02:47 +02:00
stanjg
86e7085396
Cleaned up the controller and prepared for tests
2018-05-26 20:58:49 +02:00
Dane Everitt
e648e50d90
Write some example tests for @stanjg
2018-05-26 11:00:28 -07:00
Dane Everitt
e3bbd85f3f
Merge branch 'develop' into pr/1129
2018-05-26 10:34:29 -07:00
Dane Everitt
0e1b4661ce
Don't allow access to manage page if server failed installing
2018-05-23 22:23:26 -07:00
Dane Everitt
6967b9ba12
Fix exception thrown due to lack of pre-validation on the model.
...
closes #1158
2018-05-20 17:11:52 -07:00
Dane Everitt
b4e510fbe3
Fixes before release
2018-05-20 16:49:54 -07:00
Dane Everitt
7e2e5fd7c1
Merge branch 'develop' into feature/upgrade-laravel-to-5.6
2018-05-20 16:30:42 -07:00
Dane Everitt
00df0b66a6
Merge pull request #1148 from pterodactyl/feature/doc-block-improvements
...
@throws docblock improvements
2018-05-20 16:25:59 -07:00
Dane Everitt
002efddc96
Merge pull request #1146 from pterodactyl/feature/windows-pathinfo-support
...
Add support for Windows, replace all backslashes with forwardslashes
2018-05-20 16:24:58 -07:00
Lance Pioch
71257c67bf
Add more throwing
2018-05-13 12:42:22 -04:00
Lance Pioch
3bc2397795
Library doesn't exist anymore
2018-05-13 12:42:16 -04:00
Lance Pioch
f82b419d47
Update php doc blocks
2018-05-13 12:42:11 -04:00
Lance Pioch
53829399de
Make sure this trust proxies is also changed
2018-05-13 11:59:25 -04:00
Lance Pioch
f42f211e65
Add support for Windows, replace all back slashes with forward slashes
2018-05-13 11:39:44 -04:00
Lance Pioch
e2dc0638d9
Fix app/ spelling errors
2018-05-13 11:12:41 -04:00
stanjg
095d85bb60
Added the server as argument, and improved the bug fix
2018-05-06 17:59:11 +02:00
stanjg
06a67bb4bb
Cleaned up some duplicate code
2018-05-05 10:39:20 +02:00
stanjg
28a97fea54
Polished it up
2018-05-04 22:48:43 +02:00
stanjg
93a7d11c28
Made a base
2018-05-04 18:45:37 +02:00
stanjg
86c8ecdcdf
Added the actual logic
2018-05-04 15:02:51 +02:00
stanjg
17a72d0895
StyleCI fixes
2018-05-04 14:05:42 +02:00
stanjg
9ae25538c3
Made it so users can switch languages themselves
2018-05-04 13:08:41 +02:00
stanjg
9a06647435
Added support for user specific languages
2018-05-04 12:56:30 +02:00
Dane Everitt
4fad244073
Show correct auth error.
2018-04-08 16:16:04 -05:00
Dane Everitt
b6e94d9a1e
Code cleanup
2018-04-08 16:00:52 -05:00
Dane Everitt
6d970a4cc3
Finalize login page!
2018-04-08 15:46:32 -05:00
Dane Everitt
d63624f607
Working login form with password reset functionality.
2018-04-08 15:18:13 -05:00
Dane Everitt
c3e462ab2f
Cleanup login/reset functionality, address security issue with 2FA pathways
2018-04-07 16:17:51 -05:00
Dane Everitt
4f3c668420
Refactor auth controllers to be cleaner and easier to maintain
2018-04-07 12:35:15 -05:00
Dane Everitt
324b989a29
Get a working rough copy of the login page
2018-04-01 17:46:16 -05:00
Dane Everitt
791cbaa5ce
Get things into a somewhat working state on the login form
2018-03-31 15:52:11 -05:00
Dane Everitt
3e2ac981a9
Add API endpoint for getting server resource utilization, closes #900
...
This endpoint is throttled to 15 requests per minute to avoid destroying the daemon since clients can use it.
2018-03-17 14:01:53 -05:00
Dane Everitt
f8e98e9c9e
Add ability to change server name, closes #563
2018-03-10 14:44:21 -06:00
Dane Everitt
e55d3c1a9a
Add check on SFTP page to make sure the permission is assigned before showing
2018-03-10 14:26:00 -06:00
Dane Everitt
40c74ae1e7
Add validation to prevent invalid ports, closes #1034
2018-03-10 13:10:40 -06:00
Dane Everitt
ef371a508d
Change check on debugbar to use debug not environment
2018-03-10 12:03:23 -06:00
Dane Everitt
4964d294f6
Throw 504 where necessary
2018-03-06 22:17:01 -06:00
Dane Everitt
a4f03f5d02
Handle missing daemon keys better and fix subuser missing key errors
2018-03-03 21:31:44 -06:00
Dane Everitt
c739f292e4
paginate databases when viewing a host
2018-03-03 17:52:35 -06:00
Dane Everitt
dff7e8f734
Fix server creation in UI and API
2018-03-02 23:11:30 -06:00
Dane Everitt
c6137db529
Fix build limit management in Admin CP
2018-03-02 19:49:09 -06:00
Dane Everitt
bcb69603ad
Add support for user management of databases
2018-03-02 19:03:55 -06:00
Dane Everitt
07893effa3
Add initial go at user created databases for servers, still needs cleaning
2018-03-01 21:27:37 -06:00
Dane Everitt
87b96bdfc8
Add core logic to allow for limited databases and allocations
2018-03-01 20:08:27 -06:00
Dane Everitt
5f6c153537
Validate resource existence before validating data sent
2018-03-01 20:00:14 -06:00
Dane Everitt
070239abcf
Fix inability to edit certain environment vars and start line, closes #1008
2018-03-01 19:26:11 -06:00
Dane Everitt
85bdbdce14
Better handling of file download requests
2018-03-01 19:19:19 -06:00
Dane Everitt
838b9a9093
Add support for filesystem caching, closes #993
2018-03-01 18:46:59 -06:00
Dane Everitt
0a39a9b6bf
Don't require an environment variable to be present if none are required anyways, closes #1007
2018-03-01 18:35:53 -06:00
Dane Everitt
8f72571895
Fix IP access middleware
2018-02-28 23:39:59 -06:00
Dane Everitt
9b93629f45
Add UI for client API keys
2018-02-28 23:30:39 -06:00
Dane Everitt
2017e640b6
Add client API
2018-02-28 22:51:04 -06:00
Dane Everitt
4e12c289ed
Add command sending
2018-02-27 22:09:34 -06:00
Dane Everitt
cef3e4ced4
Add base routes for managing servers as a client
2018-02-27 21:28:43 -06:00
Dane Everitt
9a32b9fd03
Merge branch 'develop' into feature/client-api
2018-02-27 21:04:18 -06:00
Dane Everitt
23e07689a7
Handle 404 errors in API bindings correctly to avoid explosing that a resource exists before validating a key
2018-02-27 21:04:04 -06:00
Dane Everitt
e28973bcae
Move everything around as needed to get things setup for the client API
2018-02-25 15:30:56 -06:00
Dane Everitt
8daf97021a
Add ability to modify external id for a server
2018-02-25 14:45:16 -06:00
Dane Everitt
6a4b5e04e2
Fix broken external_id handling when creating servers
2018-02-25 14:43:40 -06:00
Dane Everitt
fb1b2406b5
Add API endpoint to get a server by external ID
2018-02-24 14:09:09 -06:00
Dane Everitt
a1e704d3a7
Add back server sidebar list
2018-02-24 13:58:48 -06:00
Dane Everitt
5b6d3b8325
Slightly more clear errors
2018-02-24 12:27:41 -06:00
Dane Everitt
baeffef24b
Fix bad permissions check on server API route
2018-02-24 12:15:21 -06:00
Dane Everitt
807521b97c
Fix schedules with no names being uneditable
2018-02-24 12:04:14 -06:00
Dane Everitt
633bba6d6e
Add support for external_id on servers, closes #975
2018-02-24 11:57:12 -06:00
Dane Everitt
f655188c58
Fix searching servers
2018-02-24 11:48:24 -06:00
Dane Everitt
620c624e6f
Fix exception thrown when accessing /nests/:id/eggs/:id API endpoint
2018-02-24 11:11:57 -06:00
Dane Everitt
4b9f025e98
Fix exception when trying to edit a host, ref #957
2018-02-18 14:10:12 -06:00
Dane Everitt
3fb02a4b3c
Fix FQDN failing validation in database host UI, ref #957
2018-02-18 13:43:54 -06:00
Dane Everitt
50809cad36
Fix exception when no 2FA token is entered when enabling or disabling
2018-02-18 13:15:10 -06:00
Dane Everitt
d52f8d9215
Fix behavior of validation when creating egg variables
2018-02-17 13:09:54 -06:00
Dane Everitt
8e1aa15dba
Fixes a bug that would cause non-editable variables on the front-end to throw a validation error
2018-02-15 20:58:51 -06:00
Dane Everitt
bf537922a3
Fix username validation and auto-generation, closes #927
2018-02-11 16:39:50 -06:00
Dane Everitt
cfb7415e2a
Fix data integrity exception, closes #922
2018-02-10 14:01:49 -06:00
Dane Everitt
db29b04c39
Fix improper allocation id validation on API
2018-02-07 22:50:22 -06:00
Dane Everitt
a9c1946319
Add support for finding a user by external ID.
2018-02-07 21:56:11 -06:00
Dane Everitt
2e693067b8
Add search to API endpoints
2018-02-07 21:33:44 -06:00
Dane Everitt
dd54c5abb1
Fix user password handling in Admin CP
2018-02-07 21:13:40 -06:00
Dane Everitt
2ec76d283b
Fix bad API behavior
2018-02-04 15:38:38 -06:00
Dane Everitt
d4d9eda57a
Add schedule edit support
2018-02-04 13:51:24 -06:00
Dane Everitt
ff8b5fc5a3
Fix exception when modifying existing DB host, closes #910
2018-02-04 12:59:14 -06:00
Dane Everitt
0b00895261
fix saving of egg variable values, closes #905
2018-02-03 12:36:57 -06:00
Dane Everitt
d9355b93b4
Fix exception when adjusting mail settings, closes #907
2018-02-03 12:28:39 -06:00
Dane Everitt
48c933fa0f
fix exception when deleting allocations, closes #908
2018-02-03 12:22:10 -06:00
Dane Everitt
ffa09d81e2
Pass strings for deletion of user sessions, closes #906
2018-02-03 12:18:18 -06:00
Dane Everitt
7a19019980
Fix suspension/installed handling for servers
...
closes Pterodactyl/Panel#891
2018-01-30 22:40:21 -06:00
Dane Everitt
c599112021
Finalize server management API
2018-01-30 20:36:59 -06:00
Dane Everitt
5ed164e13e
Implement server creation though the API.
...
Also implements auto-deployment to specific locations and ports.
2018-01-28 17:14:14 -06:00
Dane Everitt
97ee95b4da
Fix some error handling
2018-01-27 13:26:43 -06:00
Dane Everitt
8afced3410
Add nests & eggs
...
Cleanup middleware handling and parameters on controllers...
2018-01-27 12:38:56 -06:00
Dane Everitt
de07b3cc7f
Add server database management support to API.
2018-01-25 22:34:53 -06:00
Dane Everitt
2bd691efad
Add database list endpoint, add more resource name magic
2018-01-25 21:26:06 -06:00
Dane Everitt
407120a854
Merge branch 'develop' into feature/api-v1
2018-01-21 17:06:31 -06:00
Dane Everitt
655d2485b5
Fix error causing inability to save variables.
2018-01-21 17:02:25 -06:00
Dane Everitt
aca0819bcd
Add server build management to API
2018-01-21 16:02:03 -06:00
Dane Everitt
d3dba3fcf9
Fix bug when modifying server descriptions
2018-01-21 14:45:20 -06:00
Dane Everitt
8dcab927e5
Merge branch 'develop' into feature/api-v1
2018-01-21 14:31:32 -06:00
Dane Everitt
c369151397
Allow editing symlinked files
2018-01-21 14:24:59 -06:00
Dane Everitt
2212f28351
Don't break the page if no variable rules are provided.
2018-01-21 11:58:59 -06:00
Dane Everitt
17f6f3eeb6
Add server details modification endpoint to API.
2018-01-20 16:03:23 -06:00
Dane Everitt
3e327b8b0e
Use more logical route binding to not reveal resources on the API unless authenticated.
2018-01-20 15:33:04 -06:00
Dane Everitt
17544481b5
More server management via the API
2018-01-20 13:48:02 -06:00
Dane Everitt
3724559468
Forgotten changes
2018-01-19 21:48:26 -06:00
Dane Everitt
a497a3d153
Make server listing and single server view API endpoints work
2018-01-19 21:47:06 -06:00
Dane Everitt
74bdbea6a4
Sneaky files
2018-01-19 20:01:56 -06:00
Dane Everitt
0e7f8cedf0
Reorganize API files
2018-01-19 19:58:57 -06:00
Dane Everitt
c3b9738364
Implement application API Keys
2018-01-18 21:36:15 -06:00
Dane Everitt
f9fc3f4370
Update interface to begin change to seperate account API keys and application keys
...
Main difference is permissions, cleaner UI for normal users, and account keys use permissions assigned to servers and subusers while application keys use R/W ACLs stored in the key table.
2018-01-14 13:30:55 -06:00
Dane Everitt
ad3a954256
Rename APIKey to ApiKey
2018-01-14 12:06:15 -06:00
Dane Everitt
7aa540b895
Remove api permissions table
2018-01-14 12:05:18 -06:00
Dane Everitt
e3df0738da
Change the way API keys are stored and validated; clarify API namespacing
...
Previously, a single key was used to access the API, this has not changed in terms of what the user sees. However, API keys now use an identifier and token internally. The identifier is the first 16 characters of the key, and the token is the remaining 32. The token is stored encrypted at rest in the database and the identifier is used by the API middleware to grab that record and make a timing attack safe comparison.
2018-01-13 16:06:19 -06:00
Dane Everitt
11c4f3f6f2
Finish putting permissions on the API
2018-01-13 14:08:19 -06:00
Dane Everitt
d644a53951
Update users & locations to use new permissions format
2018-01-12 20:39:15 -06:00
Dane Everitt
a31e5875dc
First round of changes to API to support simpler permissions.
2018-01-11 22:49:46 -06:00
Dane Everitt
0e24c669c4
docblock
2018-01-11 20:08:49 -06:00
Dane Everitt
cf21fd5a4b
More API updates, better support for node config edits
2018-01-10 23:19:03 -06:00
Dane Everitt
800e2df6b2
Merge branch 'develop' into feature/api-v1
...
# Conflicts:
# app/Contracts/Repository/RepositoryInterface.php
# app/Repositories/Eloquent/EloquentRepository.php
# app/Services/Nodes/NodeUpdateService.php
# tests/Unit/Services/Nodes/NodeUpdateServiceTest.php
2018-01-10 20:55:22 -06:00
Dane Everitt
22511c8e24
Fix allocation behavior, closes #712
2018-01-08 22:12:19 -06:00
Dane Everitt
036bea2b94
Update schedule process to allow toggling/triggering via UI
2018-01-08 21:43:10 -06:00
Dane Everitt
adcab5969a
Fix server description nullablility
2018-01-06 12:58:30 -06:00
Dane Everitt
a75b15cd8d
closes #852
2018-01-06 12:53:17 -06:00
Dane Everitt
d2afc29a80
Refactor how repositories for the daemon work.
2018-01-05 18:27:47 -06:00
Dane Everitt
60eb60013c
Update repository base code to be cleaner and make use of PHP 7 features
2018-01-04 22:49:50 -06:00
Dane Everitt
f32cee3ae5
Add location control through API
2018-01-03 21:14:53 -06:00
Dane Everitt
15289b76a7
Finish first round of User/Node API additions
...
Will still need some tweaking and improvements to allow everything to be used.
2018-01-01 15:11:44 -06:00
Dane Everitt
d21f70c04b
Merge branch 'develop' into feature/api-v1
2018-01-01 13:33:06 -06:00
Dane Everitt
0ec5a4e08c
Fix some file management bugs, closes #621
2018-01-01 13:21:10 -06:00
Dane Everitt
4457634127
Fix user creation to use UUIDs correctly
...
Also updates the notification send method to be cleaner and more maintainable
2018-01-01 12:13:08 -06:00
Dane Everitt
8a38a8af4a
Update file manager to account for new API error responses
2017-12-31 10:39:07 -06:00
Dane Everitt
46d7ba7585
Merge branch 'develop' into feature/api-v1
2017-12-31 10:32:28 -06:00
Dane Everitt
5efee34378
close #840
2017-12-30 20:25:04 -06:00
Dane Everitt
54b6fb5ebd
More work on the API utilizing Laravel 5.5 exception rendering
...
Also corrects API format to maintain JSONAPI spec
2017-12-17 14:57:05 -06:00
Dane Everitt
b9d67459b2
Update to Laravel 5.5 ( #814 )
2017-12-17 13:07:38 -06:00
Dane Everitt
f30f4b45ba
Merge branch 'feature/laravel-55-update' into feature/api-v1
2017-12-16 17:19:35 -06:00
Dane Everitt
631b5eb1b2
Fix form requests
2017-12-16 13:44:30 -06:00
Dane Everitt
c6cece51ee
Fix the surprisingly few broken tests
2017-12-16 13:35:32 -06:00
Dane Everitt
3c48947f9d
Fix known issues from the upgrade guide
2017-12-16 13:15:09 -06:00
Dane Everitt
0dcf2aaed6
Inital upgrade to 5.5
...
This simply updates dependencies and gets all of the providers and config files updated based on what the laravel/laravel currently ships with
2017-12-16 12:20:09 -06:00
Dane Everitt
4a65dff940
Implement admin user management API routes
2017-12-16 11:31:18 -06:00
Dane Everitt
a1da8a3c9d
Merge branch 'develop' into feature/api-v1
2017-12-14 21:12:17 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings ( #809 )
2017-12-14 21:05:26 -06:00
Dane Everitt
285485d7b0
Change how API keys are validated ( #771 )
2017-12-03 14:29:14 -06:00
Dane Everitt
975597b4d0
Implement changes to administrative user revocation, closes #733
2017-12-03 14:00:47 -06:00
Dane Everitt
20beb2f280
Fix error causing tasks to be un-deletable.
...
closes #786
2017-12-01 20:10:06 -06:00
Dane Everitt
fb7d8a9626
Merge branch 'feature/api-key-changes' into feature/api-v1
2017-11-26 13:27:39 -06:00
Dane Everitt
a10db204ab
Misc fixes
2017-11-26 13:26:38 -06:00
Dane Everitt
4c57b5e8ee
Merge branch 'develop' into feature/api-v1
2017-11-26 13:22:25 -06:00
Dane Everitt
80ddd5b659
Merge branch 'develop' into feature/api-key-changes
2017-11-26 13:20:25 -06:00
Dane Everitt
47f2ca0673
Fix incorrect CPU usage display for limited servers, closes #758
2017-11-26 13:17:40 -06:00
Dane Everitt
a710bdf457
Make a todo a todid, closes #774
2017-11-25 13:45:47 -06:00
Dane Everitt
0bb44a4972
Fix server startup dropdown for egg being incorrect, fixes #778
2017-11-25 12:27:08 -06:00
Dane Everitt
698c121e11
First round of API additions
2017-11-19 16:30:00 -06:00
Dane Everitt
bf9708fe4f
Add permissions checking to API middleware list
2017-11-19 15:23:37 -06:00
Dane Everitt
49379bd115
Pop some tests for new middleware in there.
2017-11-19 14:34:55 -06:00
Dane Everitt
45a153427e
Add new API middleware
2017-11-19 14:05:13 -06:00
Dane Everitt
47e14ccaae
API key UI changes and backend storage of the keys
2017-11-19 13:32:17 -06:00
Dane Everitt
6f52f4a614
Push updates to login page, mostly UI enhancements.
2017-11-18 15:09:58 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system ( #761 )
2017-11-18 13:35:33 -05:00
Dane Everitt
26eeffd764
Fix bug preventing changing of the server startup on first save attempt.
2017-11-11 15:07:01 -06:00
Dane Everitt
81869bd5f2
Fix allocation alias setting
2017-11-10 21:47:43 -06:00
Dane Everitt
88562b5cd6
Fix inability to create a server
2017-11-05 15:36:37 -06:00
Dane Everitt
ac2abd89e6
Fix bug listing allocations when making a new server.
...
closes #730
2017-11-05 14:12:53 -06:00
Dane Everitt
82b7bff7f7
Apply fixes from StyleCI ( #735 )
...
[ci skip] [skip ci]
2017-11-05 13:59:51 -05:00
Dane Everitt
a4cf06ba77
Fix missing HASHIDS_SALT setting in app setup command, closes #724
2017-11-05 12:58:25 -06:00
Dane Everitt
4898d4f9d2
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-11-05 12:43:03 -06:00
Dane Everitt
22ba6cbecb
Fix subuser URL redirect, closes #723
2017-11-05 12:42:58 -06:00
Dane Everitt
aa86fe83e8
Apply fixes from StyleCI ( #732 )
...
[ci skip] [skip ci]
2017-11-05 13:40:12 -05:00
Dane Everitt
6409fffdad
Implement fix to allow root admins to view all servers.
...
closes #722
2017-11-05 12:38:39 -06:00
Dane Everitt
ecdd133b75
Fix daemon auth
2017-11-04 17:16:44 -05:00
Dane Everitt
233cbfda09
Merge branch 'develop' into feature/fixed-seeders
2017-11-04 12:50:32 -05:00
Dane Everitt
71b90650de
Fix failing test suite
2017-11-04 12:49:05 -05:00
Dane Everitt
f8c89f8331
Add support for seeding nests and eggs
2017-11-03 23:07:18 -05:00
Dane Everitt
7882250baf
Add more middleware tests
2017-11-03 18:16:49 -05:00
Dane Everitt
54228e8124
Fix multiple controller unit test failures
2017-11-03 16:43:28 -05:00
Dane Everitt
7b3393aff9
More middleware tests
2017-11-01 20:45:43 -05:00
Dane Everitt
d844a36167
Begin adding unit tests for middleware
2017-10-29 21:40:34 -05:00
Dane Everitt
e9aecfe6db
Shorten imports
2017-10-29 15:57:43 -05:00
Dane Everitt
79decafdc8
Update all the middlewares
2017-10-29 12:37:25 -05:00
Dane Everitt
e0d03513e4
Cleanup frontend controllers and middleware
2017-10-27 21:42:53 -05:00
Dane Everitt
fa62a0982e
Refactor startup modification and environment variable services
...
Better setup, more flexibility, more tests.
2017-10-26 23:49:54 -05:00
Dane Everitt
508ff8cfb3
Finish front-end server modification changes.
...
Everything is back to the point that it was before this massive code overhaul began. FInal steps before merging this into develop will be some unit tests.
2017-10-25 22:33:28 -05:00
Dane Everitt
058e490ec4
Implement Panel changes to support internal SFTP subsystem on Daemon ( #703 )
2017-10-25 00:35:25 -04:00
Dane Everitt
d50ea18598
Add support for changing the server default allocation as a normal user
2017-10-20 21:32:57 -05:00
Dane Everitt
97dc0519d6
Add database management back to front-end and begin some refactoring
...
Here we go again boys...
2017-10-18 22:32:19 -05:00
Dane Everitt
5e712f0bb1
Merge branch 'develop' into feature/service-export-import
2017-10-17 21:31:35 -05:00
arioioio
b3fdf64435
Redirect to users list on user deletion ( #680 )
...
closes #675
2017-10-09 15:13:52 -05:00
Dane Everitt
e01d7497f5
Add ability to update an Egg by re-uploading a file.
2017-10-08 23:50:52 -05:00
Dane Everitt
aaf96669d4
Misc fixes
2017-10-08 21:36:22 -05:00
Dane Everitt
c19c423568
More fixes
2017-10-07 18:08:19 -05:00
Dane Everitt
17642bffe7
More code updates
2017-10-07 17:21:41 -05:00
Dane Everitt
cc297eea09
Misc changes
2017-10-07 16:19:07 -05:00
Dane Everitt
6b8464ea3a
Nest & Egg management working through the ACP now.
2017-10-07 16:16:51 -05:00
Dane Everitt
df87ea0867
This breaks literally the entire panel.
2017-10-06 23:57:53 -05:00
Dane Everitt
38075c6b9f
Update panel to send correct service option configuration to the daemon.
2017-10-05 23:09:43 -05:00
Dane Everitt
3e689cf212
Please fix failing tests? ✋
2017-10-03 23:57:13 -05:00
Dane Everitt
8952043600
Fix some test runner issues
2017-10-03 23:36:39 -05:00
Dane Everitt
6269a08db7
Finalize service option import/export
2017-10-03 23:31:04 -05:00
Dane Everitt
d608c313c3
Complete the service option export configuration
2017-10-03 20:18:27 -05:00
Dane Everitt
0d739257a9
First pass at XML exporter for services
2017-10-03 00:01:04 -05:00
Dane Everitt
ae671e6b19
Begin updating UI
2017-10-02 22:51:13 -05:00
Dane Everitt
92ca84a37f
Remove unused controller
2017-10-02 20:03:47 -05:00
Dane Everitt
b1834307d5
Update demon routes to use /v1/
2017-09-30 21:00:24 -05:00
Dane Everitt
d5bf8734ef
Add unit tests for RunTaskJob.
2017-09-30 12:40:07 -05:00
Dane Everitt
238ce435d6
interface_exists does not work how I expected, switch to is_subclass_of
2017-09-30 12:06:16 -05:00
Dane Everitt
048784607d
Minor bug fixes
2017-09-30 11:45:24 -05:00
Dane Everitt
fb8a26f141
Merge branch 'develop' into feature/api-daemon-changes
2017-09-25 21:46:44 -05:00
Dane Everitt
e56f4cdd33
Update license headers on files.
2017-09-25 21:43:01 -05:00
Lance Pioch
09d958249d
Add togglable 2FA user requirements ( #635 )
2017-09-25 15:58:16 -10:00
Dane Everitt
3aa6e4e74e
Merge pull request #638 from lancepioch/middleware-changes
...
Use proper route name instead of using class in route file
2017-09-24 16:14:22 -10:00
Dane Everitt
7d1c233c49
Final adjustments to Daemon <-> Panel communication change
2017-09-24 21:12:30 -05:00
Lance Pioch
8197b1733f
Fix some more routes
2017-09-24 21:27:57 -04:00
Dane Everitt
8e2b77dc1e
Final touches to new key-rotation service
2017-09-24 12:34:00 -05:00
Dane Everitt
906a699ee2
Begin implementation of new daemon authentication scheme
2017-09-23 20:45:25 -05:00
Lance Pioch
0f07d6bcf5
The nodes create page will redirect you to the locations page if you don't have a location, the concept is the same here ( #640 )
2017-09-21 13:05:55 -10:00
Lance Pioch
8bfebf5b32
Use proper route name instead of using class in route file
2017-09-21 13:48:57 -04:00
Dane Everitt
a498bbc7d5
Move location service to match other services
2017-09-15 00:16:03 -05:00
Dane Everitt
7f76684453
More schedule changes
2017-09-13 21:46:43 -05:00
Dane Everitt
2ac90b50f2
Begin refactoring Tasks to be apart of the Scheduler system
2017-09-12 23:45:19 -05:00
Dane Everitt
1873c1e9b9
Who doesn't love a good mystery novel. 🍞
...
Fix ide helper stubs?
2017-09-11 00:27:43 -05:00
Dane Everitt
131159c246
Fix some forgotten logic checks temporarily
2017-09-10 23:57:18 -05:00
Dane Everitt
7b454980ab
Fix version display in node list
2017-09-10 23:45:27 -05:00
Dane Everitt
bab28dbc85
Initial implementation of new task mgmt system 👮
2017-09-09 23:55:21 -05:00
Dane Everitt
f157c06d04
Fix PHPCS to order by length not alphabetical
2017-09-04 19:07:00 -05:00
Dane Everitt
dc310ffdea
Finish subuser controller
2017-09-04 18:12:13 -05:00
Dane Everitt
7222754580
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-09-04 14:34:40 -05:00
Dane Everitt
b12f6f1156
Tests for RemoteRequestController
2017-09-04 14:34:38 -05:00
Dane Everitt
8f14ee989d
Apply fixes from StyleCI
2017-09-03 21:41:03 +00:00
Dane Everitt
54554465f2
Add more front-end controllers, language file cleanup
2017-09-03 16:32:52 -05:00
Dane Everitt
4532811fcd
Improved middleware, console page now using new setup
2017-09-02 21:35:33 -05:00
Dane Everitt
37508a370d
Finish up unit tests for base controllers
2017-09-02 18:56:15 -05:00
Dane Everitt
4203cdcb77
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-09-02 00:21:17 -05:00
Dane Everitt
53d1182645
Add unit tests for API key controller
2017-09-02 00:21:15 -05:00
Dane Everitt
30660cfac2
Apply fixes from StyleCI ( #609 )
2017-08-30 21:14:20 -05:00
Dane Everitt
e045ef443a
Should wrap up the base landing page stuff for accounts, next step is server rendering
2017-08-30 21:11:14 -05:00
Dane Everitt
67ac36f5ce
Refactor obscure service names to be clearer
2017-08-27 15:10:51 -05:00
Dane Everitt
1e1eac1b9c
Apply fixes from StyleCI ( #607 )
2017-08-27 14:55:25 -05:00
Dane Everitt
f451e4dc47
Begin unit tests for repositories
2017-08-26 19:58:24 -05:00
Dane Everitt
74ea1aa0aa
Push subuser creation service
2017-08-23 21:34:11 -05:00
Dane Everitt
3ee5803416
Massive PHPCS linting
2017-08-21 22:10:48 -05:00
Dane Everitt
cdfbc60030
Push pack services and fix for failing tests
2017-08-20 19:23:50 -05:00
Dane Everitt
280633b28a
More service classes for pack management
2017-08-19 20:40:00 -05:00
Dane Everitt
9d3dca87f2
Begin moving packs to new service mechanisms, refactor exceptions for services
2017-08-18 22:19:06 -05:00
Dane Everitt
46cb71e69d
Apply fixes from StyleCI ( #590 )
2017-08-15 23:21:01 -05:00
Dane Everitt
1260a8384a
Initial implementation of controller unit tests.
2017-08-15 23:16:00 -05:00
Dane Everitt
90bbe57148
Move services onto new services system, includes tests
2017-08-15 22:21:47 -05:00
Dane Everitt
6d1b994b7d
More tests
2017-08-13 14:55:09 -05:00
Dane Everitt
340193c013
Apply fixes from StyleCI ( #581 )
2017-08-12 15:32:34 -05:00
Dane Everitt
b8d7d99096
More repository/service/refactor changes
2017-08-12 15:29:01 -05:00
Dane Everitt
2c77d5c44d
Begin implementation of services for services/service options
2017-08-08 23:24:55 -05:00
Dane Everitt
7277f728a9
Complete migration of node controllers/repositories to new service structure
2017-08-08 21:21:10 -05:00
Dane Everitt
669119c8f8
Handle allocation assignment using services
...
Function is significantly quicker and uses 1 SQL query per IP rather than 1 query per port.
2017-08-05 21:10:32 -05:00
Dane Everitt
a4b61846ac
Apply fixes from StyleCI ( #577 )
2017-08-05 17:26:30 -05:00
Dane Everitt
c1a078bdcf
Add support for node management actions using new services
2017-08-05 17:20:07 -05:00
Dane Everitt
275c01bc37
Update user service to be more separated
2017-08-04 19:11:41 -05:00
Dane Everitt
8daec38622
Complete base implementation of services for administrative server creation
2017-07-24 21:34:10 -05:00
Dane Everitt
f842aae3d3
Add build modification settings, fix exception handling to log to file
2017-07-23 19:57:43 -05:00
Dane Everitt
7f0130100d
Fix routes file
2017-07-23 15:09:25 -05:00
Dane Everitt
5144e0126b
Add support for more server functionality
2017-07-23 14:51:18 -05:00
Dane Everitt
acbc52506c
Finish unit tests for all server services
2017-07-22 20:15:01 -05:00
Dane Everitt
3add44d342
Fix database management for servers
2017-07-22 14:07:51 -05:00
Dane Everitt
63e39fbe58
Fix database management things to actually work correctly.
2017-07-22 13:55:30 -05:00
Dane Everitt
580e5ac569
Begin working on administrative server view changes
...
Also includes tests for the DatabaseCreation service.
2017-07-21 21:17:42 -05:00
Dane Everitt
0c513f24d5
Move server creation over to new service/repository setup.
...
Moves tons of functions around, but the basic implementation is working again.
Some features are still missing, and the service never actually commits the server to the database right now.
This push is mostly just to get the code into Github and backed up.
2017-07-19 20:49:41 -05:00
Dane Everitt
bc3366b10d
Repository interface improvements
2017-07-15 11:52:34 -05:00
Dane Everitt
2588c25b0b
Service refactor to improve organization
2017-07-08 15:04:59 -05:00
Dane Everitt
bd78e3544d
Merge branch 'develop' into feature/PTDL-472
2017-07-08 14:08:02 -05:00
Joost Kwakkel
a1376db4fd
Redirect user to node allocation view after creation, closes #535
2017-07-08 18:14:54 +02:00
Dane Everitt
5c3dc60d1e
Addition of repository to ease testing and maintainability
2017-07-01 15:29:49 -05:00
Dane Everitt
2f4ec64f2a
Merge branch 'develop' into feature/PTDL-472
2017-07-01 12:33:30 -05:00
Dane Everitt
9515128b8a
Respond 401 not 404 when bad request token
2017-06-28 20:05:50 -05:00
Dane Everitt
b7b046c044
Merge branch 'develop' into feature/PTDL-472
2017-06-25 15:36:39 -05:00
Dane Everitt
4ee9d38ad1
Add ApiKey service, cleanup old API key methods
...
https://zube.io/pterodactyl/panel/c/525
2017-06-25 15:31:50 -05:00
Dane Everitt
2235481765
More service structure testing and configuration
...
Tests aren't working as well as I had hoped, so a lot are commented out while I wait to hear back on this bug causing them to fail.
2017-06-24 19:49:09 -05:00
Dane Everitt
cba54637fc
Fixes bug with newly created variables not being assigned to existing servers properly, closes #478
2017-06-18 21:38:00 -05:00
Dane Everitt
1c5f892049
backfill fixes from 65957e7e to address #470 in active release
2017-06-18 20:39:04 -05:00
Dane Everitt
ce2b2447d0
Apply fixes from StyleCI ( #501 )
2017-06-17 20:52:32 -05:00
Dane Everitt
0111ca7768
Push more changes to DBHost service.
...
Currently updating via the frontend is broken if you don't provide an actual node to attach it to.
2017-06-17 19:48:31 -05:00
Dane Everitt
cede747442
Cleanup user and location controllers.
2017-06-17 17:36:39 -05:00
Dane Everitt
fe4977f0fa
Update admin location routes and controller to use service
...
Needs tests written, uses new validation on model.
2017-06-14 23:53:24 -05:00
Dane Everitt
26e476a794
Push updates, removes repositories, begins moving functionality to services.
...
First integration tests included.
2017-06-13 23:25:37 -05:00
Dane Everitt
5c2b9deb09
Push initial implementations of new repository structure
...
This breaks almost the entire panel, do not pull this branch in this state.
Mostly just moved old repository files to a new folder without updating anything else in order to start doing new things. Structure is not finalized.
2017-06-10 22:28:44 -05:00
Dane Everitt
65957e7ea5
Begin implementation of new request validation, closes #470
2017-06-03 18:41:35 -05:00
Dane Everitt
265b697066
Apply fixes from StyleCI ( #471 )
2017-06-03 17:07:50 -05:00
Dane Everitt
8b762cbaf5
Also update service listing to accommodate no variables.
2017-05-24 20:42:31 -05:00
Dane Everitt
9116547e98
allow emptying server description, closes #442
2017-05-23 23:00:31 -05:00
Dane Everitt
f0fca2a681
Fix missing log class on API calls with errors.
2017-05-23 22:56:54 -05:00
Dane Everitt
72c0330486
Fixes 2FA not honoring 'Remember Me' checkbox, closes #439
2017-05-22 19:09:42 -05:00
Dane Everitt
5bdd75eb94
Fix IP checking in API middleware, closes #425
2017-05-06 23:02:12 -04:00
Dane Everitt
4306eaa00e
For english language, will be fixed in 0.6.1 when translations are more complete and better implemented.
2017-05-06 22:06:57 -04:00
Dane Everitt
de0b9beacb
Minor visual tweaking and filemanager backend improvements.
2017-05-05 23:13:42 -04:00
Dane Everitt
a52d9eb0fb
fix error display when server is installing, closes #424
2017-05-05 16:27:38 -04:00
Dane Everitt
5651d9ae2b
Fix authentication code for daemon requests.
2017-05-02 20:11:56 -04:00
Dane Everitt
b3e5565f85
Cleanup auto-deployment functions substantially
...
Also cleans up ServerRepository to use named models more clearly.
2017-05-01 22:59:58 -04:00
Dane Everitt
4eaf858684
Fix inability to set user as non-admin, closes #414
2017-05-01 17:05:30 -04:00
Dane Everitt
c9c0e845b1
Go nuclear on Safari's autocomplete.
2017-05-01 16:41:39 -04:00
Dane Everitt
b539f26dab
Stop browser autofill on user view pages.
2017-05-01 16:17:31 -04:00
Dane Everitt
ae6b0f5c5e
Use the cache tags correctly.
2017-05-01 14:52:14 -04:00
Dane Everitt
d919b2ed40
Pass the token correctly.
2017-05-01 14:26:59 -04:00
Dane Everitt
605c91a9af
Use cache helpers rather than database to handle configuration tokens and downloads.
2017-05-01 14:21:18 -04:00
Dane Everitt
2330c25a8c
Move old /remote routes into /daemon sphere.
2017-05-01 13:59:33 -04:00
Dane Everitt
7eb7377dd5
I really need to stop trying to override PHP reserved keywords...
2017-04-28 10:19:04 -04:00
Dane Everitt
aa6060846d
Actually show errors on password reset page.
2017-04-27 23:44:26 -04:00
Dane Everitt
7e0cbe8db1
Pass behind_proxy properly.
2017-04-27 22:55:42 -04:00
Dane Everitt
3ee7b7cff1
Add ability to mark a node as being over a proxy
2017-04-27 22:52:37 -04:00
Dane Everitt
30b4934013
Include default installation scripts, as well as ability to symlink a script
2017-04-27 16:16:59 -04:00
Dane Everitt
77b1a258d9
Weekly fix of my StyleCI violations...
2017-04-24 16:56:38 -04:00
Fillerino
5cc28a0716
Fixing timing attack vuln. on HMAC comparison ( #409 )
2017-04-24 16:49:03 -04:00
Dane Everitt
147f473eeb
Add back disk limiting!
2017-04-21 22:44:56 -04:00
Dane Everitt
a5a1ea3165
Add ability to change service implementation for a server.
2017-04-21 17:52:44 -04:00
Dane Everitt
8dc24471ae
Add reinstall abilities and cleanup process for new servers
2017-04-20 18:52:43 -04:00
Dane Everitt
3fe5d162f5
Add skip scripting option
2017-04-20 17:57:40 -04:00
Dane Everitt
c8f1335a09
Fixup merge
2017-04-20 17:26:20 -04:00
Dane Everitt
8d24e5f168
Merge branch 'develop' into feature/option-scripts
...
# Conflicts:
# app/Http/Routes/AdminRoutes.php
# app/Http/Routes/DaemonRoutes.php
# app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00
Dane Everitt
33262cf34c
Set correct console frequency
2017-04-17 21:54:26 -04:00
Dane Everitt
619d3fe480
Fix autodeploy time checking.
2017-04-17 21:37:45 -04:00
Dane Everitt
de923bbb83
Fix server deletion logic, and clean up suspend/unsuspend operations
2017-04-17 20:16:05 -04:00
Dane Everitt
f58858206e
Add console popout option.
...
Popout: https://s3.kelp.in/IrTyE.png
Menu: https://s3.kelp.in/JYwlC.png
Menu Hover: https://s3.kelp.in/cPtSf.png
2017-04-15 18:23:29 -04:00
Dane Everitt
1a87943f07
Fix missing CommandRepository statement
2017-04-15 13:54:34 -04:00
Dane Everitt
7f1a97184b
Un-butcher task system.
2017-04-15 13:52:43 -04:00
Dane Everitt
2770e6d1b4
Remove old file, fix autoloading issues
2017-04-15 12:13:29 -04:00
Dane Everitt
f1024ad1a8
Improved login controller func. for 2FA, throws Failed event correctly now
2017-04-14 14:33:15 -04:00
Dane Everitt
26557b6a3f
Fix extraneous MySQL calls being made for each server record listed on page.
2017-04-14 01:25:56 -04:00
Dane Everitt
6fda3b72e4
Display total servers user can access in the Admin CP
...
closes #356
2017-04-13 23:49:47 -04:00
Dane Everitt
9320c26b86
fix misnamed variable, close #377
2017-04-13 22:30:32 -04:00
Dane Everitt
db168e34bd
Merge pull request #371 from Pterodactyl/feature/fractal-api
...
Implement new API and Route Updates
2017-04-09 19:17:06 -04:00
Dane Everitt
93d79994f8
Apply fixes from StyleCI ( #372 )
2017-04-09 19:16:39 -04:00
Dane Everitt
1e43f2049b
Fix up routes and controller names
2017-04-09 19:13:22 -04:00
Dane Everitt
722fd614a1
Add new dynamic view for creating API keys
2017-04-09 18:59:54 -04:00
Dane Everitt
87c09a921b
More defined naming scheme for config
2017-04-09 16:05:18 -04:00
Dane Everitt
de8bbcd098
Configuration for API pagination and includes on listing
2017-04-09 16:04:08 -04:00
Dane Everitt
69dfd380ad
Finalize API routes
2017-04-09 15:53:53 -04:00
Dane Everitt
820d2bf172
Node and user API routes implemented.
...
More attempts at the logic for API permissions, most likely will need
continued tweaking in the future, but base is there.
2017-04-09 15:31:10 -04:00
Dane Everitt
f24b238e30
Base node route implementation
2017-04-09 13:52:31 -04:00
Dane Everitt
c492446513
Implement initial server and location API routes.
...
Also fixes a few exception handler issues causing incorrect HTTP status
codes on authorization errors.
2017-04-09 13:15:15 -04:00
Dane Everitt
4479d3bf19
Improved logic for handling permissions on API routes.
...
Still only partially implemented, however this method will allow the
inclusion of data that is granted with servers (such as viewing more
about the node, node location, allocations, etc) while still limiting
someone from doing `?include=node.servers` and listing all servers when
they don’t have list-servers as a permission.
2017-04-08 12:05:29 -04:00
Dane Everitt
db4df2bfa1
Push basis of new API key policy
...
Will need to revisit this another day when I’m fresh to figure out the
best method to do this.
2017-04-07 21:25:17 -04:00
Dane Everitt
51204b8d9d
Add all of the potential transformers that might be needed for now.
2017-04-07 20:28:58 -04:00
Dane Everitt
faa437b77b
Use the current_password not password field when verifying passwords.
2017-04-04 12:14:24 -04:00
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
Dane Everitt
efda0dd009
Apply fixes from StyleCI
2016-12-14 21:56:25 +00:00
Dane Everitt
fc38b09e1f
Merge branch 'develop' into feature/service-changes
2016-12-14 16:53:53 -05: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
Dane Everitt
c1fb0a665f
Apply fixes from StyleCI
2016-12-07 22:46:38 +00:00
Emmet Young
f687fab9a2
API: ability to search for an allocation based on the assigned server id ( #194 )
2016-12-04 22:17:35 -05: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
3cd0a8337f
Add ability to filter user list
2016-12-02 18:41:52 -05:00
Dane Everitt
ed5b7559ec
Fixes potential for generated password to not meet own validation requirements
2016-12-01 19:16:40 -05:00
Jakob
03c6f986d2
fix api /servers/{id}/build
...
remove unrelated error thrown every time
2016-11-30 12:26:23 +01: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
946512bac9
search for owner:<email> correctly.
2016-11-26 20:18:46 -05:00
Dane Everitt
723b608e0c
Implement node deletion properly, fixes #173
2016-11-26 16:29:13 -05:00
Dane Everitt
0e89ecb427
Handle node:<param> properly when doing server searches
...
Uses the node name rather than the node’s ID by default.
2016-11-26 16:19:25 -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
