Commit Graph

608 Commits

Author SHA1 Message Date
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