Commit Graph

1346 Commits

Author SHA1 Message Date
Dane Everitt a765e0dbb6
closes #991 2018-02-27 19:43:47 -06:00
Dane Everitt 4cfb8941d5
Fix broken users table in database causing validation errors. 2018-02-25 16:08:01 -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 bdbed7706d
Set much higher throttle limits by default 2018-02-24 16:00:53 -06:00
Dane Everitt 5c4200dc0c
Make external_id fillable 2018-02-24 14:47:53 -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 be6b398e2d
add support for egg variables, closes #974 2018-02-24 11:17:21 -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 e7e50bc45d
Add a few new internal configs to the node config 2018-02-18 20:39:43 -06:00
Dane Everitt 0341dbdfad
Add very basic cache busting 2018-02-18 15:15:53 -06:00
Dane Everitt 1eb76c4457
Log more information for PDOExceptions while also keeping passwords out. 2018-02-18 14:31:40 -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 541b9ec7f5
Fix database name using d#_ rather than s#_, ref #957 2018-02-18 13:46:42 -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 c61c2bc5fd
Fix User model validation behavior, closes #950 2018-02-18 13:29:28 -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 e9680fc29c
Fix for StyleCI 2018-02-17 16:21:37 -06:00
ShadowKitten d8be167a9c Add support for allowing subusers to access SFTP. (#918) 2018-02-17 16:10:44 -06:00
Dane Everitt f61a5fa0cb
Use left join, not inner here 2018-02-17 15:52:41 -06:00
Dane Everitt 7562e501af
Fix an auto deployment bug causing a node to be ignored if it had no servers already attached to it
closes #919
2018-02-17 15:51:28 -06:00
Dane Everitt d86c35d80f
Prevent duplicate allocations for servers 2018-02-17 13:53:38 -06:00
Dane Everitt 241f7d0125
Fix some data integrity issues 2018-02-17 13:37:53 -06:00
Dane Everitt d52f8d9215
Fix behavior of validation when creating egg variables 2018-02-17 13:09:54 -06:00
Dane Everitt 303b64ced1
Fix improperly named mailgun environment variable, closes #942 2018-02-17 13:00:11 -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 e2cdb3b4b1
Add test cases for services 2018-02-11 17:32:45 -06:00
Dane Everitt 3ecab82358
Fix exception when empty default value is passed for an egg variable, closes #934 2018-02-11 16:47:50 -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 f42bc8a031
Cleanup exception reporting, stop logging PDO exception stacks.
PDOException stacks include the MySQL password for the connection attempt and many people do not realize this when providing logs.
2018-02-04 13:31:39 -06:00
Dane Everitt ff8b5fc5a3
Fix exception when modifying existing DB host, closes #910 2018-02-04 12:59:14 -06:00
Dane Everitt de1d9502c1
fix error when resetting daemon secret, closes #915 2018-02-04 12:55:50 -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 1be7805481
Add line? 2018-01-28 17:14:34 -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 faaf27632c
Fix behavior on automatic resource name setter 2018-01-21 14:37:57 -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 c69f48ad83
Fix filemanager file edit bug, closes #867 2018-01-21 12:31:41 -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 62fd299fa2
Fix some egregious search and replace action... 2018-01-21 11:38:16 -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 bdadec002c
Push updates to server transformer 2018-01-18 21:56:12 -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 14f9e1ad43
More permission removal cleanup 2018-01-14 12:11:04 -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 e0fb7fa30c
Fix failing ApiKeyCreationService test 2018-01-13 16:23:43 -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 bd238c7555
No more OOME checkboxes 2018-01-08 23:03:14 -06:00
Dane Everitt 02e4c1424e
Select less data from servers 2018-01-08 22:23:12 -06:00
Dane Everitt 0acc260b81
Change order that allocations are loaded in on the allocation listing 2018-01-08 22:21:35 -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 94809b953c
Fix server setting bug 2018-01-06 15:20:47 -06:00
Dane Everitt 4b5ee920bd
Fix logic mistake with findOrFail 2018-01-06 13:08:20 -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 59f8ae4b50
Too much grep 2018-01-06 12:49:32 -06:00
Dane Everitt b3d7c6f1af
Fix search weighting for servers 2018-01-05 18:49:00 -06:00
Dane Everitt 21a78f465b
Fix node return being too strict 2018-01-05 18:44:20 -06:00
Dane Everitt d2afc29a80
Refactor how repositories for the daemon work. 2018-01-05 18:27:47 -06:00
Dane Everitt 5f9fe4a69b
Update calls to missing function 2018-01-05 16:33:50 -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 ffc8d4875f
Fix unability to store '-1' in the database properly 2018-01-01 12:32:33 -06:00
Dane Everitt 958c29cfbf
Fix empty server descriptions throwing SQL errors, closes #842 2018-01-01 12:23:45 -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 6b2d7b6488
If folder does not exist, reload the file manager index 2017-12-31 10:30:19 -06:00
Dane Everitt 8ce0863559
Fix settings service provider to actually work when no migrations have been run. 2017-12-30 20:53:34 -06:00
Dane Everitt 5efee34378
close #840 2017-12-30 20:25:04 -06:00
Dane Everitt 10e2e6e379
close #841 2017-12-30 19:56:42 -06:00
Dane Everitt e4feee6932
Fix setting of environment variable 2017-12-30 16:34:22 -06:00
Dane Everitt 1b9b92ac62
Cleanup settings use in panel. 2017-12-30 16:33:00 -06:00
Lance Pioch 59b50ca75e Allow the environment setup without loading the database (settings provider) first (#823) 2017-12-30 17:16:49 -05: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
Anand Capur e085b8e109 enable php 7.2 in travis and fix repository (#797)
This was really amusing to watch @arcdigital attempt to do.
2017-12-05 09:26:29 -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 20c1c74116 Fix issues with validation in admin CP for server variables, closes #780 2017-11-25 13:15:46 -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 166c43c259 Apply fixes from StyleCI
[ci skip] [skip ci]
2017-11-23 21:08:43 +00:00
Dane Everitt d4758efef8 Implement fix for console spam when using invalid environment variable values 2017-11-23 15:08:35 -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 3e8514b966
Merge pull request #768 from Pterodactyl/feature/auth-controller-cleanup
Push updates to login page, mostly UI enhancements.
2017-11-18 18:00:01 -05:00
Dane Everitt 24d0ae18fd
Include permission for subusers to access the server console. 2017-11-18 16:50:58 -06:00
Dane Everitt 897338bfa7
Show socketio error messages 2017-11-18 16:50:08 -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 a0c96f2c15
Merge pull request #763 from Pterodactyl/feature/unused-imports
Remove unused imports
2017-11-18 13:35:00 -05:00
Lance Pioch c7f01d66d5 Fix namespace 2017-11-17 20:02:09 -05:00
Lance Pioch c2408a28d8 Remove unused imports 2017-11-17 18:08:10 -05:00
Lance Pioch f94e4c15b0 Replace magic numbers with constants (#754)
* Replace magic numbers with constants
2017-11-12 18:16:54 -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 1740b8dfb5
Revert change to node allocation selection query 2017-11-10 21:42:24 -06:00
Dane Everitt 4dfc7a0053
Cleanup pagination CSS and UI 2017-11-10 21:41:39 -06:00
Dane Everitt b1f6058e31
Fix daemon key provider service
Handles missing keys if user is an admin or the server owner. Step in the right direction for #733 where all users have their own keys now. Still need to address admin status revocation in order to fully address that issue.
2017-11-05 16:07:50 -06:00
Dane Everitt 88562b5cd6
Fix inability to create a server 2017-11-05 15:36:37 -06:00
Dane Everitt 5170bcf41a
Remove server creation notification temporarily 2017-11-05 14:24:54 -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 2f42396317
Fix bug with permissions including more than one dash, closes #727 2017-11-05 13:42:57 -06:00
Dane Everitt 30ab6ed692
Update PHPCS and other dependencies. 2017-11-05 13:33:42 -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 799b8a7f5f
database command fixes 2017-11-04 17:41:52 -05:00
Dane Everitt ecdd133b75
Fix daemon auth 2017-11-04 17:16:44 -05:00
Dane Everitt 1438a50ae9
More fixes 2017-11-04 16:46:18 -05:00
Dane Everitt bda42b673f
Unset redis password if empty. 2017-11-04 16:40:48 -05:00
Dane Everitt 69cd330eb8
Fix setup command issues 2017-11-04 16:27:15 -05:00
Dane Everitt 6a2cb72ede
Fix debug bar getting loaded in production 2017-11-04 14:21:30 -05:00
Dane Everitt f5b20e38c4
Fix failing tests due to way nest creation worked 2017-11-04 13:01:54 -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 133fd17da6
Fix subuser unit tests 2017-11-03 16:52:18 -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 57db949a9c
Tests a'hoy 2017-10-23 21:10:32 -05:00
Dane Everitt 532025a348
Fix tests 2017-10-23 20:12:15 -05: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 b602ea1f66
Trying to make tests not fail for random reasons? 2017-10-09 00:02:33 -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 e2cb789b2b
Stop Dane from submitting invalid arrays and breaking the entire application... 2017-10-08 23:44:27 -05:00
Dane Everitt aaf96669d4
Misc fixes 2017-10-08 21:36:22 -05:00
Dane Everitt 864513c44b
Fix failing test suite 2017-10-08 20:57:59 -05:00
Dane Everitt 6e02e9491a
Egg tests updated 2017-10-08 15:29:46 -05:00
Dane Everitt 787346525b
Update a batch of failing tests 2017-10-07 23:29:08 -05:00
Anand Capur b08d6a4b9d
Make config caching less aggressive 2017-10-07 20:00:44 -07: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 344c1a9885
First push before 🥚 2017-10-06 21:22:32 -05:00
Dane Everitt 675e780946
Fix test failures 2017-10-06 00:16:22 -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 29cfae86b1 Merge branch 'develop' into feature/service-export-import 2017-10-05 00:17:17 -05:00
Dane Everitt fbd5c25ed0
Finalize tests 2017-10-04 23:52:25 -05:00
Dane Everitt 609bf32843
Add test for service option exporter 2017-10-04 23:42:04 -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
TrixterTheTux 6482f79088 Grant execute privilege (#655)
closes #654
2017-10-03 12:53:28 -10: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 15d38ce823
Add ability to switch between new and existing daemon 2017-09-30 19:23:44 -05:00
Dane Everitt 281337943f
Fix SQL call 2017-09-30 19:04:36 -05:00
Dane Everitt 1216f950e2
Prevent deletion of options that have children attached to them.
closes #562
2017-09-30 12:54:09 -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 28d838eccd
Fix subuser auth token again 2017-09-29 21:57:36 -05:00
Dane Everitt 0e0a8d4347
Fix 404 when trying to view a server 2017-09-29 21:54:00 -05:00
Dane Everitt fb7ef2d775
test post please ignore 2017-09-26 22:54:34 -05:00
Dane Everitt 774c9680a3
More test suite coverage 2017-09-26 22:16:26 -05:00
Dane Everitt 6efecaeb69
Merge branch 'develop' into feature/api-daemon-changes 2017-09-25 21:55:02 -05:00
Dane Everitt 6915ecb4f1
Literally fix everything. 💯 2017-09-25 21:53:44 -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
Dane Everitt 75fd3d985c Merge pull request #643 from lancepioch/class-string
Use class string instead of magic string
2017-09-25 16:03:36 -10:00
Lance Pioch 09d958249d Add togglable 2FA user requirements (#635) 2017-09-25 15:58:16 -10:00
Lance Pioch 6ffa4e62e0 Merge branch 'develop' into class-string 2017-09-25 11:10:50 -04:00
Dane Everitt 55ae9138f6
Fix failing builds due to SQL changes 2017-09-24 22:34:30 -05:00
Dane Everitt dd456a4c9c
Fix all currently failing tests 2017-09-24 22:28:16 -05:00
Lance Pioch 02cabf73a0 Use class string instead of magic string 2017-09-24 22:59:34 -04: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 0f0c319ec0
Allow exceptions to throw their own error codes from within.
Temp work-around for tons of logic until upgrade to 5.5 is done.
2017-09-24 12:32:29 -05:00
Dane Everitt c43ab595cf
Fix error in console scheduler spamming logs. 2017-09-24 12:31:31 -05:00
Dane Everitt 906a699ee2
Begin implementation of new daemon authentication scheme 2017-09-23 20:45:25 -05:00
Dane Everitt 8722571037
Finish console command cleanup 2017-09-22 21:19:57 -05:00
Dane Everitt 68cc71ecfe
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-22 00:30:11 -05:00
Dane Everitt 6e5b0b8027
Update command unit tests to use helper functions 2017-09-22 00:30:09 -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 0c21d401e3 Combine Locations and Nodes on Create Server page (#641) 2017-09-21 13:03:29 -10:00
Lance Pioch 8bfebf5b32 Use proper route name instead of using class in route file 2017-09-21 13:48:57 -04:00
Lance Pioch afa328577f Add missing cli descriptions (#632) 2017-09-20 19:16:01 -10:00
Dane Everitt 8df5d5beaf
Remove unnecessary test and cleanup rebuild command 2017-09-19 22:15:52 -05:00
Dane Everitt ccda2b63fa
Add more CLI commands for panel management 2017-09-19 22:10:14 -05:00
Dane Everitt c5f2dfd6f6
Begin adding schedule processing jobs. 2017-09-16 23:10:00 -05:00
Dane Everitt c0d7e02481
Add a better panel info output command 2017-09-16 19:47:14 -05:00
Dane Everitt 4de326ad02
Add command to disable 2FA for a user account. 2017-09-16 18:50:12 -05:00
Dane Everitt c46f2cb274
More command tests 2017-09-16 17:39:52 -05:00
Dane Everitt 12ba96bd42
Add unit tests for user management commands 2017-09-16 01:45:56 -05:00
Dane Everitt 22459a877a
Add test for make user command and add admin option 2017-09-15 23:46:22 -05:00
Dane Everitt 542d1f8db7
Add new location and user management via CLI 2017-09-15 22:13:33 -05:00
Dane Everitt a498bbc7d5
Move location service to match other services 2017-09-15 00:16:03 -05:00
Dane Everitt 4e5398fb6b
Add tests for schedule stuff 2017-09-14 23:02:31 -05:00
Dane Everitt a8c4d6afdb
Update random ID method to use str_random and not random_bytes
The use of random_bytes in combination with bin2hex was producing a lot of duplicate keys when tested in batches of 10k (anywhere from 2 to 6). The use of str_random yielded no duplicates even at scales of 100k keys that were 8 characters.
2017-09-13 23:07:02 -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 f9bf8603b2
wot 2017-09-11 00:15:48 -05:00
Dane Everitt 131159c246
Fix some forgotten logic checks temporarily 2017-09-10 23:57:18 -05:00
Dane Everitt 97d87ff57c
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-10 23:45:33 -05:00
Dane Everitt 7b454980ab
Fix version display in node list 2017-09-10 23:45:27 -05:00
Dane Everitt 6c6a3c9458 Merge pull request #615 from Pterodactyl/feature/customized-theme
Feature/customized theme
2017-09-10 18:14:15 -10: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
Jakob Schrettenbrunner 2ac1e08f47 Merge branch 'develop' into feature/customized-theme 2017-09-05 01:47:43 +02:00
Dane Everitt dc310ffdea
Finish subuser controller 2017-09-04 18:12:13 -05:00
Jakob Schrettenbrunner 73d153cacb fix pterodactyl:user command 2017-09-04 23:50:21 +02: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
Georgiy Slobodenyuk 7feb8bcedc Fix typo 2017-09-01 23:39:10 -04: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 72735c24f7
Complete move from old repository to new repository structure! 2017-08-26 18:08:11 -05:00
Dane Everitt 2cabb61b54
Add subuser deletion service 2017-08-26 13:31:18 -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 b2ec9960a1
Unit tests for pack service 2017-08-21 21:00:14 -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 fd24729ab9
Merge branch 'feature/PTDL-472' of https://github.com/Pterodactyl/Panel into feature/PTDL-472 2017-08-12 16:30:29 -05:00
Dane Everitt 364adb1f84
Add tests for service option services 2017-08-12 16:30:27 -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 396b5c22d9
Fix formatting issue 2017-08-05 17:29:15 -05:00
Dane Everitt a4b61846ac Apply fixes from StyleCI (#577) 2017-08-05 17:26:30 -05:00
Dane Everitt 4da7922de6
Code cleanup to use new findCountWhere function 2017-08-05 17:23:02 -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 ebb3a01036
Should fix failing travis builds 2017-07-23 17:55:38 -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 1f4f6024cc
Refactor (again) 2017-07-09 12:29:18 -05:00
Dane Everitt 8953f83f87
Add migrations to handle cascade deletions for servers and users 2017-07-08 15:51:13 -05:00
Dane Everitt 2588c25b0b
Service refactor to improve organization 2017-07-08 15:04:59 -05:00
Dane Everitt 761d34f178
don't try to apply columns in the relations field... 2017-07-08 14:17:07 -05:00
Dane Everitt bd78e3544d
Merge branch 'develop' into feature/PTDL-472 2017-07-08 14:08:02 -05:00
Dane Everitt 0deb022093
Update last of existing services to use repositories, includes unit tests
Also update PHPDocs on all the repository interfaces and classes to be correct.
2017-07-08 14:07:51 -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 50588a1f54
Update location and databasehost services to use repositories
Includes unit tests for both services
2017-07-02 21:29:58 -05: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 d908672644 Apply fixes from StyleCI (#519) 2017-06-25 15:37:45 -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 dcab84b1da
Fix bug with server default ports not being updated properly 2017-06-18 21:03:39 -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 32b639e3eb
Return a 404 if attempting to delete a user that does not exist; closes #503 2017-06-18 20:27:24 -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 760525a673
Push more tests for location services, setup travis CI integration 2017-06-15 23:03:22 -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 8144535b82
Prevent invalid service tag names, ref #443 2017-05-23 21:59:47 -05:00
Dane Everitt cce27dfff1
Fix API response to show correct error. 2017-05-22 19:25:26 -05:00
Dane Everitt 72c0330486
Fixes 2FA not honoring 'Remember Me' checkbox, closes #439 2017-05-22 19:09:42 -05:00
Dane Everitt 999411da29
Fix inability to assign services with no variables, closes #447 2017-05-22 18:43:52 -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 9343ac7b7d
add more default variables, closes #427 2017-05-05 17:15:13 -04:00
Dane Everitt a52d9eb0fb
fix error display when server is installing, closes #424 2017-05-05 16:27:38 -04:00
Dane Everitt 4f127b95f0 close #421 2017-05-02 22:41:10 -04:00
Dane Everitt 5651d9ae2b
Fix authentication code for daemon requests. 2017-05-02 20:11:56 -04:00
Dane Everitt 9ccefbec44 Apply fixes from StyleCI (#417) 2017-05-01 23:00:34 -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 c59cfce72c Apply fixes from StyleCI (#416) 2017-05-01 20:58:36 -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 43df6533b0
Ensure reserved environment names aren't changed, fix undefined variable, ref #412 2017-05-01 17:01:46 -04:00
Dane Everitt 5545075302
Fix docker image field being required for inheritance, closes #413 2017-05-01 16:51:50 -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 6dc1c15739
Fix display of associated servers when viewing an administrative user in the Admin CP. 2017-05-01 15:28:43 -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 1c37a8fe1a
Fixes account creation and password reset abilities. 2017-04-28 00:07:38 -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 801aae968c
Show git version if panel is installed with git 2017-04-27 22:28:01 -04:00
Dane Everitt e4c341795d
Try to automatically quote strings.
Incredibly basic checking, only checks if there is a space and no quote
character.

Also includes comments on edited lines to avoid users changing things
that get overwritten again later.
2017-04-27 16:26:22 -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 e0958414d7
Fix server deletion 2017-04-21 17:21:00 -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 e4ef8caf2d
Fix model not found error when editing an existing subuser. 2017-04-17 21:47:11 -04:00
Dane Everitt 619d3fe480
Fix autodeploy time checking. 2017-04-17 21:37:45 -04:00
Dane Everitt 3acc7b338b
Allow deleting default allocation and setting new default at the same time. 2017-04-17 21:07:37 -04:00
Dane Everitt de923bbb83
Fix server deletion logic, and clean up suspend/unsuspend operations 2017-04-17 20:16:05 -04:00
kasper Franz f5810f068a change server to server_id since that is the new name 2017-04-16 13:37:40 +02: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 0fe9a4566e
Improve server and user model code to accept a specific user 2017-04-15 12:48:47 -04:00
Dane Everitt 2770e6d1b4
Remove old file, fix autoloading issues 2017-04-15 12:13:29 -04:00
Dane Everitt d20cb144be
Fix misnamed class 2017-04-14 20:46:50 -04:00
Dane Everitt 97cc30e502
Assorted fixes 2017-04-14 20:10:09 -04:00
Dane Everitt 7cead2635a
Spelling. 2017-04-14 17:55:25 -04:00
Dane Everitt 6a1c1c1215
Needle is not haystack. 2017-04-14 17:54:11 -04:00
Dane Everitt 5a95a3a044
Fix environment script to not explode when default option isn't in array. 2017-04-14 17:52:36 -04:00
Dane Everitt 2564276657
Seems the 'r' key is loosing its sensitivity... 👀 2017-04-14 17:11:54 -04:00
Dane Everitt 52fb4f58d5
Ship with support for login notifications 2017-04-14 17:10:01 -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 23e6e0510b
Move config::set calls into single helper function 2017-04-13 23:19:01 -04:00
Dane Everitt 9320c26b86
fix misnamed variable, close #377 2017-04-13 22:30:32 -04:00
Emmet Young 16b8480325 Repair php artisan pterodactyl:env 2017-04-11 02:49:37 +10:00
Dane Everitt 2c1b332fee
Minor API handling fixes. 2017-04-09 19:22:49 -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 f0c3f6f9b6
Fix location permission name 2017-04-09 15:39:44 -04:00
Dane Everitt a2a4ab05c8
Corrected permissions to go with the more logical thought process 2017-04-09 15:35:49 -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 75b8753533
Simplify server and api key policy. 2017-04-09 13:34:47 -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 463f465dea
Block viewing node allocations and location unless user has permission
Blocks viewing the allocation list and location for a node unless a
user has permission to view the node in the first place.
2017-04-08 12:07:17 -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