Commit Graph

532 Commits

Author SHA1 Message Date
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
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
e5f3678c62 Fix login routes 2017-04-01 21:18:56 -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
0a95d97d7f Better support for redis as a backend 2017-04-01 16:31:18 -04:00
Dane Everitt
cbeecfe5e4 Implement front-end server searching 🍬 2017-04-01 13:14:49 -04:00