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
Dane Everitt
27d472195f
Misc. bug fixes
2017-04-01 12:29:56 -04:00
Dane Everitt
844ebfaf64
Add support for starting server on creation.
2017-04-01 12:29: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
ec0b55bcfe
fix missing path for Permission model in SubuserRepository
2017-03-31 12:50:58 +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
9106971565
closes #362
2017-03-30 16:30:22 -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
4e916cbf08
Fix auto-deploy checkbox triggering error
2017-03-19 12:39:22 -04:00
Dane Everitt
da19749098
Fix phraseapp and move config location
2017-03-19 11:55:36 -04:00
Dane Everitt
e8a80c6a20
Fix allocation parsing bug.
2017-03-19 11:13:18 -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
82b3cbc246
Minor fixes
2017-03-18 20:52:02 -04:00
Dane Everitt
6ee878080b
Fix rebuild to pass things that are needed.
2017-03-18 19:03:05 -04:00
Dane Everitt
4f16509447
Use env() properly throughout panel to avoid cache issues.
2017-03-18 15:56:19 -04:00
Dane Everitt
9a581ef536
Add support for rebuilding servers from the console.
2017-03-18 15:26:08 -04:00
Dane Everitt
03e0de28d9
Initial implementation of option scripts on panel side.
2017-03-18 13:09:30 -04:00
Dane Everitt
5d990dcb06
Revert "Rename startup command to add deprecation support to containers."
...
This reverts commit fdd1d11038
2017-03-17 19:35:48 -04:00
Dane Everitt
fdd1d11038
Rename startup command to add deprecation support to containers.
2017-03-17 19:09:54 -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
be60299089
Send correct container to daemon
2017-03-16 20:49:11 -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
5bbded2c03
Correctly json_encode validation errors.
2017-03-16 19:30:04 -04:00
Dane Everitt
05d2a6d370
Add back locations with new theme
2017-03-16 18:09:02 -04:00
Dane Everitt
db072025d4
Reference the correct column in the DB
2017-03-15 21:39:50 -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
4730309589
Add IDE helper for all functions
2017-03-15 19:47:44 -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
66e94dd7c0
combine validation
2017-03-12 18:31:56 -04:00
Dane Everitt
97cad1d55e
Update seeders to not error out and allow updating values quickly.
2017-03-12 18:02:15 -04:00
Dane Everitt
e791d561ba
More StyleCI...
2017-03-12 16:35:25 -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
bccbb309b2
Fix broken descriptors
2017-03-11 15:02:04 -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
cbbd3704fe
Add a second check here *just* to make sure someone doesn't break this.
2017-03-04 19:27:24 -05:00
Dane Everitt
cd0a45a777
Fixes caching to actually clear the cache for *all* users, rather than the logged in user by using cache tags.
2017-03-04 19:24:46 -05:00
Dane Everitt
5d59d364f8
Fixes bug preventing proper updating of caches and models due to undefined Auth::user()
2017-03-04 19:04:11 -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
efdc3e6fd8
Add cache policy for ServerPolicy
...
10 second cache, just long enough to handle the page load without
making more than one MySQL call.
2017-02-18 22:26:07 -05:00
Dane Everitt
f91e4c511e
Attach user to cache to prevent showing servers they can't access.
2017-02-18 21:45:11 -05:00
Dane Everitt
b926d432e8
Thats enough re-theming for the day...
2017-02-18 19:31:44 -05:00
Dane Everitt
824041f6ca
Fix service creation/updates, closes #306
2017-02-17 20:40:50 -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
22da8d47c8
Auto-fill emails when resetting password
2017-02-17 19:45:14 -05:00
Dane Everitt
6a996c7c0c
Fix account creation email
2017-02-17 19:35:26 -05:00
Dane Everitt
054e65b78f
Fix user deletion
2017-02-17 19:28:23 -05:00
Dane Everitt
397172de3b
Better notification for user creation, only add button if needed.
2017-02-17 19:26:02 -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
95171a3e41
Better user creation email.
2017-02-17 18:48:57 -05:00
Dane Everitt
3240601d03
Fix bug when trying to add new subuser.
2017-02-17 18:26:47 -05:00
Dane Everitt
9af06b4b59
Add in query caching on server view
2017-02-17 18:19:53 -05:00
Dane Everitt
ff9904227b
Fix server editing
2017-02-17 18:17:28 -05:00
Dane Everitt
008b18e19a
Fixes deployment issue with new servers due to DB changes.
2017-02-17 12:08:11 -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
d4e1bc6cc0
Discord link via CDN now.
2017-02-16 15:01:26 -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
10164f5a51
Require admin to update startup argument.
2017-02-16 14:23:22 -05:00
Dane Everitt
8740be05b3
Fix adding variables
2017-02-16 14:07:10 -05: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
336234843d
Remove deprecated function calls
2017-02-16 13:31:25 -05:00
Dane Everitt
38feac9f0b
Fix server deletion mechanics
2017-02-16 13:26:39 -05:00
Dane Everitt
516e2dc5ee
Add back API key deletion
2017-02-16 12:57:48 -05:00
Dane Everitt
2fdde75f9c
Fix boolean flipping
2017-02-15 16:59:50 -05:00
Dane Everitt
788de1b23a
Fix grepping about.
2017-02-15 16:57:45 -05:00
Dane Everitt
24a8bfab97
Update server observer to use new model code.
2017-02-12 16:26:55 -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
