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