Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4218 commits 62 branches 124 tags 29 MiB
Commit graph

1814 commits

Author SHA1 Message Date
Dane Everitt
c522935403
Fix logic when generating recovery codes and update migration 2020-07-02 22:11:07 -07:00
Dane Everitt
a998b463e3
Generate recovery tokens when enabling 2FA on an account 2020-07-02 21:55:25 -07:00
Dane Everitt
7ee509d8c2
urlencode company name; closes #1690 2020-07-02 21:14:53 -07:00
Dane Everitt
e95a532da9
Make rate limit configurable; closes #1695 2020-07-02 21:11:16 -07:00
Dane Everitt
fde8465f35
Show a better error when JSON data cannot be parsed in the request 2020-06-30 20:05:11 -07:00
Dane Everitt
2ed3763d21
cs fix 2020-06-28 15:43:44 -07:00
Dane Everitt
28c5729e48
Add test coverage for creating tasks 2020-06-28 14:41:22 -07:00
Dane Everitt
b9a451b528
Add test coverage for schedules 2020-06-28 13:50:07 -07:00
Dane Everitt
63bc4080d5
Add test coverage for reinstall & server renaming 2020-06-28 10:40:41 -07:00
Dane Everitt
4cb4dfecc8
Add test coverage for generating JWTs to connect to websocket 2020-06-28 10:16:15 -07:00
Dane Everitt
8cfdb3acce
Add test cases for sending a command to a server 2020-06-27 12:04:41 -07:00
Dane Everitt
4cb95d8063
Add test coverage for 2fa 2020-06-27 11:06:35 -07:00
Dane Everitt
fc261fe20c
Add test cases for client servers endpoint 2020-06-27 10:35:02 -07:00
Dane Everitt
a81f6882f7
Add test coverage for API key generation and deletion 2020-06-25 22:36:58 -07:00
Dane Everitt
7a5f7b99a7
Add integration test covering account endpoint 2020-06-25 22:12:09 -07:00
Dane Everitt
8fb21a5048
Fix error while updating user 2020-06-25 21:42:21 -07:00
Dane Everitt
da39d9177e
Fix seed imports 2020-06-25 21:16:59 -07:00
Dane Everitt
b55767426f
Update some server service tests 2020-06-24 22:18:48 -07:00
Dane Everitt
83a59cdf4f
Fix node update tests 2020-06-24 21:54:56 -07:00
Dane Everitt
756a21ff04
Remove unused code 2020-06-24 20:38:13 -07:00
Dane Everitt
536180ed0c
Return Http test cases to a passing state 2020-06-23 21:59:37 -07:00
Dane Everitt
c3aa257a2b
Update dependencies to latest versions 2020-06-23 21:24:37 -07:00
Dane Everitt
066ed5cdda
Don't prevent deletion if a DB host is unreachable and it is a force delete; closes #2085 2020-06-23 20:26:48 -07:00
Dane Everitt
4a0627d182
Don't trigger a 500 error due to unchecked data being inserted; closes #2087 
This also clears up allowed values for the disk input and normalizes the messaging between edit and create screens.
 2020-06-23 20:24:09 -07:00
Dane Everitt
b78aa180ea
Prevent creating a new database via the application API if server is at its limit; closes #2129 2020-06-23 20:07:37 -07:00
Dane Everitt
16e14621c8
Better error messaging when server is suspended 2020-06-22 20:22:52 -07:00
Dane Everitt
693b9eab0c
Fix handling of backup tasks; closes #2067 2020-06-18 21:00:04 -07:00
Dane Everitt
be91913f23
Return a null resource if an allocation has no server; closes #2117 2020-06-13 09:56:40 -07:00
Matthew Penner
0bec5b8581 Merge branch 'develop' into feature/server-mounts 2020-06-06 11:41:18 -06:00
Matthew Penner
3338c49831 Fix Validable class on ServerTransfer.php 2020-06-06 11:37:43 -06:00
Matthew Penner
f255399171 Fix StyleCI issues 2020-05-21 15:16:16 -06:00
Matthew Penner
65393914c3 Send mounts when wings fetches server information, fix issue with mount fields not being updated 2020-05-21 15:14:09 -06:00
Matthew Penner
e601b35f2f Fix even more StyleCI issues 2020-05-21 14:27:23 -06:00
Matthew Penner
0eb29dac9c Add mount_server table, fix wrong field type on other many to many tables, add routes for mounting and unmounting mounts on a server, finish server admin mounts page 2020-05-21 14:23:12 -06:00
Matthew Penner
a0900b8b94 Fix StyleCI issues 2020-05-21 13:22:32 -06:00
Matthew Penner
fa902cc074 Add mounts page to server admin view 2020-05-21 13:19:59 -06:00
Matthew Penner
34f718a8b1 Finish mount admin view page, add unique index to migration 2020-05-20 20:50:56 -06:00
Matthew Penner
0db7debb46 Add mount update and deletion services, add MountController@update and MountController@delete 2020-05-20 19:35:30 -06:00
Matthew Penner
77150b2551 Add increment id to mount, add basic mount view page 2020-05-20 19:17:35 -06:00
Matthew Penner
976b669059 Make StyleCI happy 2020-05-20 18:57:30 -06:00
Matthew Penner
a4af8ec977 Add the ability to create mounts 2020-05-20 18:55:59 -06:00
Matthew Penner
a750362e5a Move MountController.php 2020-05-20 18:45:00 -06:00
Matthew Penner
00d1b5861a Properly setup Mount model, add database migration, get mount admin page added 2020-05-20 18:07:56 -06:00
Matthew Penner
59a150148a feature/server-mounts initial commit 2020-05-20 17:29:03 -06:00
Charles Morgan
4ab32498d4
Save request to DB 
Fixes #2047
 2020-05-19 04:14:36 -04:00
Dane Everitt
5dbcddc862
Decode URL fragments correctly before sending to the daemon; ref #2040 ref #2038 2020-05-17 15:07:32 -07:00
Dane Everitt
086abb2a55
Actually delete the backup in the DB 2020-05-09 20:01:45 -07:00
Dane Everitt
225ef2917a
Support downloading and deleting S3 backups 2020-05-09 19:43:58 -07:00
Dane Everitt
d4e037db9c
Don't abort deleting a backup if the daemon cannot find it 2020-05-09 19:19:45 -07:00
Dane Everitt
52966ede89
Clean this code up, just use the updated model's FQDN; references #1931 2020-05-09 16:26:37 -07:00
Dane Everitt
33a7762152
Fix connection issues when changing node FQDN; closes #1931 2020-05-09 16:25:22 -07:00
Dane Everitt
3b2e2c63c6
Only show relevant configuration; update default path to be what the daemon expects 2020-05-09 15:44:13 -07:00
Dane Everitt
a342df8c13
Merge pull request #2010 from Sir3lit/patch1 
Remove timezone from config
 2020-05-09 15:40:27 -07:00
Dane Everitt
b94781e40e
Merge pull request #2008 from Sir3lit/emailfix 
Fix Subuser welcome email
 2020-05-09 14:47:47 -07:00
Charles Morgan
c3da5f0c0c
Update Node.php 
No longer needed in wings config.
 2020-05-09 01:03:36 -04:00
Dane Everitt
6967b76ae6
Remove any confusing legacy sizing files; everything in the panel is true MB (1000) not MiB 2020-05-08 21:13:39 -07:00
Charles Morgan
5eed8b1fe9
Fix Subuser welcome email 
When calling `route('server.index')` it appends `/api/servers`

Not sure if this is a proper solution or not, but it fixes the issue.
 2020-05-08 19:31:20 -04:00
Dane Everitt
49dee28eb8
Support using pipe characters within egg validation rules; closes #1960 2020-05-07 20:40:19 -07:00
Dane Everitt
41845ffdad
Backups cannot be nullable 2020-05-04 19:06:20 -07:00
Dane Everitt
c4e9c0a4ba
Better S3 backup generation support 2020-05-03 20:49:09 -07:00
Oreo Oreoniv
2dbfe232f1
fixed typo, close #1986 2020-05-03 00:38:26 +03:00
Dane Everitt
53b451e8bf
Remove unused code 2020-04-26 16:20:51 -07:00
Dane Everitt
b774622faa
Add base support for AWS/Wings backup adapters 2020-04-26 16:07:36 -07:00
Dane Everitt
6056b6f45d
Show console when an admin is viewing an installing server 2020-04-26 13:21:39 -07:00
Dane Everitt
446dc8b33d
Block creation of backups if it would put the server over it's limit 2020-04-26 12:21:14 -07:00
Dane Everitt
f1c3762f4d
Add base support for definining the number of backups that can be created for a server 2020-04-26 12:12:29 -07:00
Dane Everitt
c4f4f1f5c8
Don't show an error in the listing if the server is still installing or suspended 2020-04-25 17:58:09 -07:00
Dane Everitt
9eb31a16d9
Fix 2FA handling; closes #1962 2020-04-25 13:01:16 -07:00
Dane Everitt
2cf1c7f712
Fix handling of SFTP authorization; closes #1972 2020-04-25 11:48:49 -07:00
Dane Everitt
72ecac5236
Merge pull request #1963 from Sir3lit/maxconn 
Add Max Concurrent Connections for database users
 2020-04-25 11:01:01 -07:00
Dane Everitt
0385d2a05c
Merge pull request #1939 from Sir3lit/optionaldesc 
Allow description fields to be optional
 2020-04-23 20:37:02 -07:00
Charles Morgan
e3303f7a60 Change validation rule 
Change validation rule to
 2020-04-23 14:59:47 -04:00
Charles Morgan
82dd7dc8e3 Allow Null = 0 
Allow Value to be nullable, will autofill 0 if value is null or 0, to facilitate "unlimited" connections.
 2020-04-23 10:45:44 -04:00
AreYouScared
0ecfb40f5e Add variable to API endpoint 
Allow API to retrun max_connections for frontend database page
 2020-04-22 06:17:26 -04:00
AreYouScared
f0e4764a11 Add Max Concurrent Connections for database users 
Closes #1849

Allows database users to be limited to a number of concurrent connections to prevent one user from connecting hundreds of time and bottlenecking the MySQL server.
 2020-04-22 06:00:04 -04:00
Dane Everitt
973591d86e
Add basic support for backups via the scheduled tasks system 2020-04-19 19:43:41 -07:00
Dane Everitt
a1c3730861
Update frontend to only allow selection of valid permissions for subusers 2020-04-19 11:58:26 -07:00
Dane Everitt
00b0d30c60
Fix handling for backups; correctly send along ignored files & directories 2020-04-18 23:26:59 -07:00
AreYouScared
d55af822e3 Typo 
Removed un-neede |
 2020-04-17 20:55:01 -04:00
AreYouScared
21491e3aaa Allow descrition field to be optional 
Allows for Nest, Node, Location and Egg description fields to be blank / nullable.
Removed "required" wording next to them aswell
 2020-04-17 20:52:40 -04:00
Dane Everitt
81f7734df2
Update endpoints for managing backups 2020-04-17 10:21:51 -07:00
Dane Everitt
0a20c6b857
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2020-04-17 10:21:20 -07:00
Dane Everitt
e969344f3b
Fix display of navbar links to admins, closes #1920 2020-04-17 10:21:15 -07:00
AreYouScared
93a62ac637 Fixed UUID on node creation 
Fixed nodes not getting a UUID during creation causing a 500

Closes https://github.com/pterodactyl/panel/issues/1930
 2020-04-16 20:47:53 -04:00
Dane Everitt
4193c5f664
Return the wings version from the CDN 2020-04-12 18:14:59 -07:00
Dane Everitt
fda88940f7
Fix up node autodeployment 2020-04-12 17:20:09 -07:00
Dane Everitt
7115209b60
Hide statistics page for now 2020-04-12 16:03:41 -07:00
Dane Everitt
df140184e6
Correctly return the updated key 2020-04-12 15:56:50 -07:00
Dane Everitt
4ed7b26f89
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2020-04-12 12:22:53 -07:00
Dane Everitt
eafb0c061d
Return a less obtuse structure for config file editing 2020-04-12 12:22:50 -07:00
Dane Everitt
72c144e309
Merge pull request #1909 from pterodactyl/enhancement/new-server-admin 
Enhancements to new server admin
 2020-04-12 10:13:03 -07:00
Matthew Penner
ea8f7bb5b6
Merge branch 'develop' into enhancement/new-server-admin 2020-04-11 23:04:48 -06:00
Matthew Penner
a4d49ebe31 Fix encryption issue when creating new nodes 2020-04-11 20:49:56 -06:00
Dane Everitt
3d224993cd
Fix logic for parsing egg data to not explode with nested objects 2020-04-11 18:27:47 -07:00
Dane Everitt
1327bbbbe5
Fix logic to update a daemon's configuration 2020-04-11 16:33:15 -07:00
Dane Everitt
60f6e86b8b
Remove all of the old references to unused interfaces outside the test code 2020-04-11 15:35:32 -07:00
Matthew Penner
432e28b6bb Fix all StyleCI errors and probably break everything in the process 2020-04-11 14:07:40 -06:00
Matthew Penner
b5e50719ac Remove old Theme::js calls in blade layouts. Persist checkboxes, Server Owner, Node, Default Allocation, and Additional Allocations on servers/new.blade.php 2020-04-11 13:56:03 -06:00
Matthew Penner
658a959e5d Fix trailing comma in DaemonAuthenticate.php, change ServerDetailsController.php to use node authentication 2020-04-10 17:54:50 -06:00
Matthew Penner
1564f38d5c
Merge branch 'develop' into enhancement/wings-improved-server-loading 2020-04-10 16:53:38 -06:00
Dane Everitt
2532a73425
Don't throw errors if bad data is sent in the header 2020-04-10 15:53:19 -07:00
Matthew Penner
0c12b78772
Merge branch 'develop' into enhancement/wings-improved-server-loading 2020-04-10 16:29:03 -06:00
Matthew Penner
c9ad4ea811
Merge branch 'develop' into issues/1902 2020-04-10 16:23:58 -06:00
Matthew Penner
94d46affb8
Merge branch 'develop' into enhancement/wings-improved-server-loading 2020-04-10 16:23:46 -06:00
Dane Everitt
7557dddf49
Store node daemon tokens in an encrypted manner 2020-04-10 15:15:38 -07:00
Matthew Penner
c46ece0d6b Fix stupid query that makes me want to punch my monitor 2020-04-10 13:47:08 -06:00
Matthew Penner
87e95f4195 Fix StyleCI 2020-04-10 13:08:43 -06:00
Matthew Penner
3163517f8d Add linebreak because code style is important 2020-04-10 13:06:10 -06:00
Matthew Penner
42fb9fdbd9 Add the ability for a node to fetch a list of all servers it has been assigned 2020-04-10 13:04:11 -06:00
Dane Everitt
558f7ba6dd
Merge pull request #1901 from pterodactyl/feature/auto-deploy 
re-enable auto-deploy daemon endpoint
 2020-04-10 09:54:11 -07:00
Jakob Schrettenbrunner
a1f4baa800 re-enable auto-deploy daemon endpoint 2020-04-10 17:38:20 +02:00
Dane Everitt
06707fd33a
Better throttling of backup generation 2020-04-09 22:35:38 -07:00
Dane Everitt
c1a7e4ebe1
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2020-04-09 22:08:16 -07:00
Dane Everitt
9ba6aaebde
Move actions into context menu, add support for deleting a backup 2020-04-09 22:08:09 -07:00
Lance Pioch
53c7ec9126
Update UpdatePasswordRequest.php 2020-04-08 03:00:03 -04:00
Lance Pioch
78e03cb9b2
Update AccountController.php 2020-04-08 02:59:38 -04:00
Lance Pioch
f9e6df5d71
Change to new password instead 2020-04-07 19:25:11 -04:00
Lance Pioch
d6640eacec
Require new password 2020-04-07 19:22:50 -04:00
Dane Everitt
f9878d842c
Fix error handling for large files (and endpoints called as non-json) 2020-04-06 21:59:14 -07:00
Dane Everitt
b1e7e0b8b0
Simplify handling of permissions for websocket, only send permissions the user actually has 2020-04-06 21:03:00 -07:00
Dane Everitt
a924eb56cc
Fix file and backup downloading to use URL returned by server 2020-04-06 20:28:14 -07:00
Dane Everitt
e7784bf024
Merge branch 'develop' into feature/server-transfers-actually 2020-04-05 11:06:40 -07:00
Dane Everitt
7b69b4b824
Hit the daemon endpoints to actually generate a backup 2020-04-04 20:09:33 -07:00
Matthew Penner
2f506d564b
Merge branch 'develop' into feature/server-transfers-actually 2020-04-04 20:56:37 -06:00
Dane Everitt
be05d2df81
Add support for generating a signed URL for downloading a file from the daemon 2020-04-04 19:54:59 -07:00
Matthew Penner
c9c98b87a6 Fix issue with listing users due to removed 'subuserOf' method 2020-04-04 18:41:24 -06:00
Matthew Penner
b395440e4e Check that the selected daemon is online for a transfer, delete the server from the old node when a transfer is successful 2020-04-04 18:28:09 -06:00
Matthew Penner
7b518325c4
Merge branch 'develop' into feature/server-transfers-actually 2020-04-04 17:09:39 -06:00
Dane Everitt
15b436d26e
Add endpoints required to store the results of a backup 2020-04-04 16:07:09 -07:00
Matthew Penner
fd4de9168a
Merge branch 'develop' into feature/server-transfers-actually 2020-04-04 16:28:02 -06:00
Matthew Penner
5c7c1f60cf Fix StyleCI issues #2 2020-04-04 16:25:41 -06:00
Matthew Penner
142bf16aae Fix StyleCI issues 2020-04-04 16:24:58 -06:00
Matthew Penner
454ce6ce45 Add successful column to server_transfers table, get server transfers working properly :) 2020-04-04 16:16:18 -06:00
Matthew Penner
6ba6c34252 Add ServerTransfer relation in Models/Server.php, notify the new daemon about the incoming server transfer 2020-04-04 14:10:18 -06:00
Dane Everitt
44ff99e83d
Use correct time, not an empty time 2020-04-04 12:31:21 -07:00
Dane Everitt
25b0e86730
backup names don't actually matter all that much, they don't get used as file names 2020-04-04 12:30:29 -07:00
Dane Everitt
d27f0c6f2a
Basic backend support to at least store a backup model in the DB 2020-04-04 12:26:39 -07:00
Dane Everitt
6d426e45d9
Whoops, remove this too 2020-04-04 11:57:50 -07:00
Dane Everitt
5f42325284
Don't trigger a recursive nesting call 2020-04-04 11:37:10 -07:00
Dane Everitt
9991989f89
Very basic implemention of frontend logic required to display backups and create a new one 2020-04-04 10:59:25 -07:00
Matthew Penner
86b7b6ecc3 Add Models/ServerTransfer.php 2020-04-04 11:37:44 -06:00
Matthew Penner
5007ce0b1c Get to the point where we can start notifying the other daemon, remove TransferJob.php, add DaemonTransferRepository.php 2020-04-04 00:50:12 -06:00
Dane Everitt
17ec4efd3b
Add base migration and model for server backups 2020-04-03 23:40:20 -07:00
Dane Everitt
f51d65229b
Add support for immutable carbon dates in models 2020-04-03 23:22:35 -07:00
Matthew Penner
a2eab3ca43 Add ui elements for handling server transfers, add TransferJob.php and TransferService.php 2020-04-03 21:45:37 -06:00
Matthew Penner
49f0421e90 Fix issue with regex rule on 'threads' column, fix StyleCI issues on migration 2020-04-03 18:59:47 -06:00
Matthew Penner
829f05a2c7 Add migration for 'threads' column, fix errors on some admin pages, add validation rule for 'threads' column 2020-04-03 18:50:07 -06:00
Dane Everitt
85e3945cd7
Add support for client-side server reinstallation 2020-04-03 14:43:24 -07:00
Dane Everitt
78d6e59fc5
Merge branch 'develop' into cputhreads 2020-04-03 13:48:06 -07:00
Dane Everitt
7d45379f31
Add back support for reinstalling a server 2020-04-03 13:46:45 -07:00
Dane Everitt
171b21e7ee
Add permissions handling to the console; remove kill permission (wrapped in with stop) 2020-03-29 22:12:50 -07:00
AreYouScared
5f90e5f104 Update Server.php 
Fails rules, will look at later in time.
 2020-03-29 17:00:50 -04:00
AreYouScared
b351c07d34 Fix server transformer 
Properly pass the value to wings
 2020-03-29 16:55:06 -04:00
AreYouScared
2561e3e8d5 Add CPU Thread assignments 
Added CPU Thread assignments for each server
 2020-03-29 14:41:55 -04:00
Dane Everitt
1f92a7de33
Authenticate that the request is coming from someone that should even know about the server 2020-03-28 16:23:18 -07:00
Dane Everitt
5717a705a8
Fix authorization checking for subusers 2020-03-28 16:18:56 -07:00
Dane Everitt
e4e5dea6b8
Fix API key creation logic 2020-03-28 16:06:36 -07:00
Dane Everitt
cb945b1f13
Fix permissions handling; do not allow a subuser to assign permissions they do not have 2020-03-27 16:57:49 -07:00
Dane Everitt
39f79a8f3c
Finish cleaning up subuser view 2020-03-27 16:42:27 -07:00
Dane Everitt
1270e51248
Add support for deleting a subuser from a server 2020-03-27 15:32:33 -07:00
Dane Everitt
a6f46d36ba
Implement basic code for creating/updating a subuser 2020-03-27 14:23:13 -07:00
Dane Everitt
51c5cf4dbb
Get basic modal view for editing/creating a new subuser working 2020-03-25 21:58:37 -07:00
Dane Everitt
8d52e2e1a7
Finalize API key management for accounts 2020-03-22 19:10:49 -07:00
Dane Everitt
933a4733e8
Add base support for creating a new API key for an account 2020-03-22 18:15:38 -07:00
Dane Everitt
32f25170f1
Pass at removing extraneous permissions table and using native MySQL JSON 2020-03-22 16:56:00 -07:00
Dane Everitt
23d594f655
Update all of the permissions checking to be constant based 2020-03-22 15:31:25 -07:00
Dane Everitt
605c154812
Remove unused controllers 2020-03-22 15:15:42 -07:00
Dane Everitt
fd2ceacfe2
Remove unused code 2020-03-22 14:16:12 -07:00
Dane Everitt
cf7f36c950
Always include the tasks with a schedule 2020-03-22 13:57:31 -07:00
Dane Everitt
1e0d630e1f
Finish building out schedule management functionality 2020-03-22 13:56:15 -07:00
Dane Everitt
ef38a51d6d
Add base support for editing an existing task 2020-03-18 22:28:32 -07:00
Dane Everitt
78ed343a34
Support deleting a task from a schedule 2020-03-18 21:08:32 -07:00
Dane Everitt
5345a2a3e1
Add initial task listing for schedules 2020-03-17 23:33:53 -07:00
Dane Everitt
b3fb658511
Merge branch '0.7-develop' into develop 2020-03-15 17:30:28 -07:00
Dane Everitt
468d426ebd
Limit to 5 API keys at a time. 
Ref advisory #GHSA-pjmh-7xfm-r4x9
 2020-03-15 17:05:53 -07:00
Dane Everitt
41cbdb8d59
Dont require an IP address for hostnames; closes #1728 2020-03-15 16:29:05 -07:00
Dane Everitt
05d859c985
Ensure password used when creating a database is valid; closes #1852 2020-03-15 16:25:29 -07:00
Dane Everitt
1b1c95d8ce
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2020-02-08 15:23:11 -08:00
Dane Everitt
32e9fb0346
Add basic listing of server schedules 2020-02-08 15:23:08 -08:00
SmokingIsBadMkay
bf6da15fba
Improved non-interactive command support (#1824) 
The following commands no longer need confirmation when the input is not interactive:

 - server:bulk-power
 - server:reinstall
 2020-02-08 13:30:49 -08:00
Dane Everitt
11c430cf69
Correctly mark server as installed 2020-01-19 14:08:28 -08:00
Dane Everitt
dbc7c597d0
Route and handle install state updates 2020-01-19 13:50:38 -08:00
Dane Everitt
3b11ba9fca
Basic support for installation process 2020-01-18 15:26:15 -08:00
Dane Everitt
158958d82d
Password change needs to require user login to reset some cookies 
closes #1793
 2019-12-28 12:07:42 -08:00
Dane Everitt
5f13531c69
Fix up subuser API response for clients 2019-12-28 12:03:19 -08:00
Dane Everitt
51defae917
Merge branch 'master' into develop 2019-12-28 11:49:08 -08:00
Dane Everitt
66ead2f682
Update subuser API output to work correctly 2019-12-28 11:39:44 -08:00
Dane Everitt
e6008d6392
Merge branch 'develop' into lancepioch-patch-3 2019-12-28 11:16:14 -08:00
Dane Everitt
245f8e85e7
Merge branch '0.7-develop' into api-fixes 2019-12-28 11:12:45 -08:00
Stepan Fedotov
c377be2a7c Include the egg name in egg model's response from the application API (#1684) 2019-12-28 11:12:01 -08:00
Oreo Oreoniv
741ae27f18 Fixed TooManyLoginAttempts not work correctly (#1668) 2019-12-28 11:10:39 -08:00
Stepan Fedotov
5f60a6c735
Fix the resource key for subusers 2019-12-28 13:53:33 +02:00
Dane Everitt
63918cb549
Use the correct certificate key in the config 2019-12-24 16:48:50 -08:00
Dane Everitt
9a0ed6b291
Add ability to disable two factor authentication 2019-12-22 20:41:25 -08:00
Dane Everitt
eb39826f46
Add base logic to configure two factor on account 2019-12-22 17:03:44 -08:00
Dane Everitt
edf27a5542
Don't cache the manifest like this, pointless 2019-12-22 15:41:38 -08:00
Dane Everitt
c96bad4080
FIx force deletion 2019-12-22 15:08:11 -08:00
Dane Everitt
6276a03a4e
Fix links in admin area 2019-12-22 14:03:49 -08:00
Dane Everitt
34ffcdae7a
Remove unnecessary API calls to daemon 2019-12-22 13:45:40 -08:00
Dane Everitt
59bfc212c9
Include all server information in details endpoints for daemon to use 2019-12-22 13:28:51 -08:00
Dane Everitt
ef5d0fb4a2
Add deletion code to the panel 2019-12-21 23:26:15 -08:00
Dane Everitt
e87db889e9
Fix server data not updating correctly on daemon 2019-12-21 21:01:38 -08:00
Dane Everitt
03f2c61431
Fix error when creating user 2019-12-16 21:25:48 -08:00
Dane Everitt
2a92304023
Fix server creation logic 2019-12-16 21:02:30 -08:00
Dane Everitt
2cabfeec15
Daemon secret is not a thing anymore 2019-12-15 18:31:15 -08:00
Dane Everitt
14b1f13fe0
Obliterate swaths of old template code 2019-12-15 18:11:56 -08:00
Dane Everitt
66410a35f1
Fix recaptcha on login forms 2019-12-15 18:05:44 -08:00
Dane Everitt
d9d4c0590c
Fix silent failure mode when recaptcha is enabled 2019-12-15 16:13:44 -08:00
Dane Everitt
81bd67cc76
Add ability for user to change server's name 2019-12-09 22:03:10 -08:00
Dane Everitt
564d947f7e
[#3c9g25] Add support for new endpoint to collect node information 2019-12-09 21:05:39 -08:00
Dane Everitt
979bdc1f9f
Use YAML for configuration file 2019-12-08 11:29:46 -08:00
Dane Everitt
c087f6429f
Temporary patch to get user management pages displaying correctly 2019-12-08 11:02:59 -08:00
Dane Everitt
06e5a05f22
Don't cause an endless loop 2019-12-08 10:44:58 -08:00
Dane Everitt
24f340c9a1
Fix up SFTP endpoint 2019-12-07 16:14:04 -08:00
Dane Everitt
2570b4e2d0
Base code for settings and schedules 2019-12-07 15:58:37 -08:00
Dane Everitt
ed50259484
[#3896cn] Clean up code handling server suspension 2019-11-30 15:37:13 -08:00
Dane Everitt
2eee6f35d4
Pass along the data in a more logical format 2019-11-24 20:40:29 -08:00
Dane Everitt
2af653733c
Insane number of changes required to get the build to post 2019-11-24 20:19:31 -08:00
Dane Everitt
547e8840e2
Untested code to perform an update of server build settings 2019-11-24 15:08:54 -08:00
Dane Everitt
c17f9ba8a9
Move server view management parts to new controller and clean up code 2019-11-24 12:50:16 -08:00
Dane Everitt
8f0044575f
Update server creation data logic 2019-11-16 13:33:01 -08:00
Dane Everitt
2848d182ef
Break server creation logic into own controller 2019-11-16 13:08:46 -08:00
Dane Everitt
01d81bd548
Getting somewhere on subuser stuff, adds i18n packages 2019-11-16 12:46:19 -08:00
Arnaud Lier
88c5bb4f97 Added a return in DatabaseController when a error occurs (#1742) 
* Added a return in DatabaseController when a error occurs

* add return on database update too
 2019-11-11 09:01:38 -08:00
Dane Everitt
d69f816d9d
Add handler to fetch all of the system permissions and load them into the state 2019-11-03 17:37:06 -08:00
Dane Everitt
867dbf3bd2
Update all the client API endpoints to use new permissions codes 2019-11-03 17:13:47 -08:00
Dane Everitt
543884876f
Add basic subuser listing for servers 2019-11-03 12:20:11 -08:00
Dane Everitt
0b9c6bd21d
Proxy file downloads through the panel rather than having to get creative with download tokens 2019-10-26 14:36:37 -07:00
AreYouScared
03dba1a00a Fixed has servers error message 
Fixed "Nest has active servers error"
 2019-10-04 01:14:47 -04:00
Dane Everitt
ac52810ef6
Don't try to parse JSON being returned from the API 2019-09-29 15:32:22 -07:00
Dane Everitt
c66d2cd123
A few adjustments for chunking the new file edit page 2019-09-28 14:59:05 -07:00
Dane Everitt
326d346f92
Handle errors sent back over the sockt 2019-09-28 13:09:47 -07:00
Lance Pioch
ce614ad54f
Clean sensitive email connection info 2019-09-25 15:53:38 -04:00
Dane Everitt
030b8ed4fd
Change to support websocket JWT connections 2019-09-24 21:22:11 -07:00
Dane Everitt
18c4b951e6
First pass at converting websocket to send a token along with every call 2019-09-24 20:20:29 -07:00
Lance Pioch
513965dac7 Update syntax for styleci (#1700) 2019-09-23 12:30:51 -07:00
Dane Everitt
67ff67a1bd
Add endpoints to return a server's egg configuration 2019-09-22 15:30:53 -07:00
Dane Everitt
086018751d
Add underlying code to handle authenticating websocket credentials 2019-09-08 17:48:37 -07:00
Dane Everitt
54339c1344
Add property information to common models 2019-09-05 21:53:33 -07:00
Dane Everitt
b99ea53ca1
Update client API endpoints to not use deprecated function 2019-09-05 21:41:20 -07:00
Dane Everitt
7543ef085d
Format files 2019-09-05 21:32:57 -07:00
Dane Everitt
26e4ff1f62
Update to use new repository and standard laravel notation for controllers 2019-09-05 21:31:12 -07:00
Dane Everitt
62cd03d684
Fix command sending error handling and bad assertion order 2019-09-05 21:16:36 -07:00
Dane Everitt
ee0da206c1
Update command sending from server API to use new daemon code 2019-09-05 21:11:19 -07:00
Dane Everitt
161e0f6165
Deprecate old way of using repositories for daemon things 2019-09-05 20:33:27 -07:00
Dane Everitt
a9976c723e
[L6] Temporarily hack around theme system to maintain views without having to edit tons of code 2019-09-05 20:17:40 -07:00
Dane Everitt
0d6cf54314
[L6] Update even more areas of codebase using custom model validation logic 2019-09-04 22:26:28 -07:00
Dane Everitt
c586157dc4
[L6] Add support for custom model validation logic 2019-09-04 22:19:57 -07:00
Dane Everitt
5b4a65a60c
[L6] Break search functionality without breaking the entire app 2019-09-04 21:21:07 -07:00
Dane Everitt
1c5b9dbb87
[L6] Update cursor() calls to work with new lazy collections 2019-09-04 21:05:46 -07:00
Dane Everitt
08bdc9705f
[L6] Update composer dependencies to support L6 
Drops all of the eloquence requirements, this is going to break a shit load of code, needs to happen tired of this package always holding us back.

Quite confident in my ability to write custom code to do the basic validation we need.

Searching should be a fun nightmare to deal with later...
 2019-09-04 21:00:34 -07:00
Dane Everitt
7ecb28b598
[L6] No longer necessary with L5.8 2019-09-04 20:28:37 -07:00
Dane Everitt
bd8b708c32
[L6] Update cache methods to use defined times and not ints 2019-09-04 20:24:46 -07:00
Dane Everitt
2c0503c593
[L6] Initial run, getting all dependencies in line 2019-09-04 20:19:01 -07:00
TrixterTheTux
ab09c7db28 Fix couple of issues with /api/application/servers 2019-08-31 11:29:44 +03:00
TrixterTheTux
20c594ae3b Include the egg name in egg model's response from the application API 2019-08-24 15:47:11 +03:00
Dane Everitt
fb9c106448
Update server listing and associated logic to pull from the panel dynamiacally 2019-08-17 16:03:10 -07:00
Lance Pioch
37631a1d49 Missing return statement (#1673) 
Otherwise this errors out with $host not being found
 2019-08-10 13:19:52 -07:00
Dane Everitt
1769d191d2
Correct behavior of date formatting 2019-08-05 22:22:31 -07:00
Dane Everitt
81143e231a
Merge branch 'master' into develop 2019-08-04 13:49:26 -07:00
Dane Everitt
d430acf768
LOCK TABLES not LOCK 2019-08-03 14:57:01 -07:00
Dane Everitt
e200277655
Add LOCK permission 2019-08-03 14:52:35 -07:00
Dane Everitt
eb81e1ed20
Support special characters in database password, closes #1508 2019-08-03 14:42:32 -07:00
Dane Everitt
e7e41d8ee8
Fix bulk power when spanning multiple nodes, closes #1526 2019-08-03 14:04:31 -07:00
Dane Everitt
81409947cf
Default to OOM killer being disabled, add back configuration option per-server 2019-08-03 13:41:24 -07:00
Dane Everitt
2198269a65
Fix allocations requiring an alias when generated via API. 2019-08-03 13:03:54 -07:00
Dane Everitt
58796e7441
Fix Server model to use correct relationship when returning subusers, closes #1589 2019-08-03 12:56:32 -07:00
Dane Everitt
fe9d86b66b
Add support for filtering servers in client list-all endpoint 
closes #1608
 2019-08-03 12:44:15 -07:00
Dane Everitt
47c12929c4
Fix two-factor token creation for iOS devices, closes #1624 2019-08-03 12:37:02 -07:00
Dane Everitt
02ac308042
Fix database host modification not properly showing SQL errors 
This is caused by an old bug relating to not rolling back transactions properly causing session data to not be flashed back to the user properly.
 2019-08-03 12:33:28 -07:00
Dane Everitt
c90fcea519
Add basic file listing functionality 2019-07-27 20:23:51 -07:00
Dane Everitt
b69ebb0790
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2019-07-27 15:17:55 -07:00
Dane Everitt
48c39abfcb
Add database password rotation to view 2019-07-27 15:17:50 -07:00
PiggyPiglet
349114c960 Add a --settings-ui option for AppSettingsCommand (#1446) 
* Add a --settings-ui option for AppSettingsCommand

Sorry if my code is below par, I don't know php. All this does is allow the APP_ENVIRONMENT_ONLY to be set via an option, which as far as I can tell, isn't currently possible. I've tested this on a local installation and it works.
 2019-07-26 11:05:57 -04:00
Dane Everitt
215351eeb3
Merge branch 'develop' into feature/bulk-reinstall-command 2019-07-26 11:04:48 -04:00
Dane Everitt
ad61774171
Whoops, dont mess up logging in if the code starts with 0 2019-06-22 13:54:36 -07:00
Dane Everitt
212773d63c
Finish authentication flow for 2FA 2019-06-22 13:33:11 -07:00
Dane Everitt
56640253b9
Merge branch 'release/v0.7.14' into feature/react 2019-06-22 12:28:44 -07:00
Dane Everitt
092e7e79ff
Change 2FA service to generate the secret on our own and use an external QR service to display the image 2019-06-21 21:55:09 -07:00
Dane Everitt
2db7928b76
Don't expose existence of account when an incorrect password is provided and the user has 2FA enabled 2019-06-21 21:39:24 -07:00
Dane Everitt
19ef901768
Show success message to the user 2019-06-11 23:19:43 -07:00
Dane Everitt
bfdc1f766b
Support saving existing files 2019-05-27 15:30:49 -07:00
Dane Everitt
a8462bf109
Add initial support for opening a file in the file manager, still needs more work 2019-05-25 16:24:13 -07:00
Dane Everitt
d79fe6982f
Add support for file copy and deletion 2019-05-04 17:26:24 -07:00
Dane Everitt
811026895b
Update support for moving/renaming files and folders 2019-05-04 16:04:59 -07:00
Dane Everitt
eed4be49ab
Fix data being passed along to daemon 2019-05-01 21:58:35 -07:00
Dane Everitt
95d19bf09e
Update logic that handles creation of folders for a server 2019-05-01 21:45:39 -07:00
Dane Everitt
71eae1eb68
Update TwoFactorSetupService.php 2019-05-01 20:57:54 -07:00
Dane Everitt
5c99cae779
Merge branch 'develop' into feature/vuejs 2019-05-01 20:57:49 -07:00
Dane Everitt
c80c8564b8
Switch file manager listing to use panel API endpoint 2019-05-01 20:54:40 -07:00
saibotk
7277b6449b Replace 2FA QR Code generation (#1548) 
Due to the Google API for generating the 2FA QR code will be shut down on 14.04.2019, this adds the package "pragmarx/google2fa-qrcode" and updates "pragmarx/google2fa" to version 5.x. 
Due to now using BaconQR, Pterodactyl now needs the php-imagick extension to render the images.
 2019-04-27 14:18:12 -04:00
Dane Everitt
0757d8856b
Add base code to support retrieving allocations as a client 2019-03-23 17:47:20 -07:00
Dane Everitt
d59c38eb4e
Fix a fallback route issue causing API calls to return unauth responses and not 404s 
The fallback handler isn't scoped to a specific group, so the way this was setup caused requests to non-existent API routes to actually try and return the base view for Vue. This caused a mess of issues because that view is behind the middleware that expect sessions to be set, thus leading to very confusing authentication errors rather than a 404 response.
 2019-03-23 17:41:43 -07:00
Arnaud Lier
4460b6835a Match original database password length when doing a password reset (#1509) 2019-03-23 14:04:57 -07:00
Isaac A
38cd8f2962
Allow nodes to be created on privileged ports 2019-03-16 21:18:46 -04:00
Dane Everitt
8955b5a660
Initial attempt trying to get file downloading to work 2019-03-16 17:10:04 -07:00
Dane Everitt
a66d7a3417
Merge branch 'develop' into feature/vuejs 2019-03-09 11:19:07 -08:00
Dane Everitt
3411df784a
Use the HttpExceptionInterface rather than a render function here 2019-03-03 13:57:18 -08:00
Dane Everitt
f15449f17b
Fix servers not being marked as install failed 2019-03-03 13:44:28 -08:00
Dane Everitt
cf31d4276c
Fix a bug causing DataIntegrityExceptions to not be caught correctly and cause a second exception... whoops. 2019-03-03 13:42:32 -08:00
Dane Everitt
114afb8646
Fix error transaction handling when creating a server. 
There is a bug in the design of the application that affects users who encounter an exception under certain code pathways who are using the database to maintain their sessions.

What is happening is that a transaction is started, and I made the mistake of just assuming it would auto-rollback once the exception was caught by the handler. This is technically true, since once the request terminates the transaction is discarded by the SQL server. However, this also means that the session data set on that request would not be persisted as it runs in a middleware termination function, after the transaction is started.

Theoretically this would also affect any other terminable middleware as well, but the session is the only one I can think of right now

Co-Authored-By: Oreo Oreoniv <zkoz210@users.noreply.github.com>
Co-Authored-By: Stepan Fedotov <trixterthetux@users.noreply.github.com>
 2019-03-02 18:28:28 -08:00
Dane Everitt
d9593b23ab
Paginate server results when viewing a node, closes #1404 2019-03-02 15:58:56 -08:00
Dane Everitt
50eb2a10ad
Fixes redis password saving, closes #1428 2019-03-02 15:38:46 -08:00
Dane Everitt
8253246955
Prevent an exception when creating databases with the same name on multiple hosts. 
closes #1456
 2019-03-02 15:31:25 -08:00
Dane Everitt
91c9cbba6f
[#1500] Correctly require disk_overallocate 2019-03-02 14:48:05 -08:00
Dane Everitt
50c5ab92aa
[#1500] Add support for limits array or base level values 2019-03-02 14:44:59 -08:00
Dane Everitt
a4d7985e51
[#1500] Fix allocation limit being required even though it isn't used. 2019-03-02 14:27:01 -08:00
Michael (Parker) Parker
62e68ec66f Fix for Locations PATCH endpoint (#1499) 2019-03-02 13:27:36 -08:00
Lance Pioch
db937af616 Apply fixes from StyleCI 
[ci skip] [skip ci]
 2019-01-26 23:26:15 +00:00
Dane Everitt
136e4b5b7b
Fix some issues 2018-12-30 12:45:57 -08:00
Dane Everitt
21ffa08d66
Merge branch 'develop' into feature/vuejs 2018-12-16 14:20:35 -08:00
Oreo Oreoniv
c1fb38fb5e
Cleanup 2018-12-09 14:40:03 +03:00
Oreo Oreoniv
a4a758e202
Fixed StyleCI 2018-12-09 14:29:43 +03:00
Oreo Oreoniv
fb51659a04
Fixed checking of the language change 2018-12-09 14:27:30 +03:00
Oreo Oreoniv
04326a0786
Fixed PHPUnit test (Coverage) #1393 2018-12-03 21:09:25 +03:00
Jamsheed Mistri
34b166cde9 StyleCI fixes 2018-12-02 23:42:35 -08:00
Jamsheed Mistri
9cf7432835 Adding bulk reinstall command 2018-12-02 23:39:40 -08:00
Dane Everitt
7c73f21b30
Fix Node daemon secret not being reset, closes #1390 2018-12-02 13:40:12 -08:00
Dane Everitt
d6e9770937
Merge branch 'develop' into patch-1 2018-12-02 13:01:31 -08:00
Oreo Oreoniv
adcf0c9fee
Fixed Failed event 
Thank you very much Laravel for not pointing out the changes to be made when upgrading from 5.6 to 5.7
 2018-11-28 23:24:43 +03:00
zKoz210
2d7e889bcc Fixed StyleCI 2018-11-26 03:28:14 +03:00
zKoz210
0b4b1a3443 Initial update 2018-11-26 03:25:18 +03:00
Matthew Penner
0cbedd9c90 Fix LocationController#store() 2018-11-19 22:04:05 -07:00
Matthew Penner
4ad9b2627b Fix StoreLocationRequest namespace 2018-11-19 22:03:03 -07:00
Matthew Penner
afe128042f
Wait a second, that method doesn't return an array 2018-11-19 21:54:15 -07:00
Dane Everitt
9b654d2c76
Fix bug with client API denying access to routes, closes #1366 2018-11-10 15:27:50 -08:00
Dane Everitt
a9fa60a6fb
Respect pagination settings on frontend 
closes #1335
 2018-11-10 12:38:35 -08:00
Dane Everitt
d2991eafa1
Merge pull request #1363 from pterodactyl/feature/remove-phraseapp 
Remove phraseapp because we no longer use it
 2018-11-10 12:16:18 -08:00
mrkrabs
8ef368faa4
Rename app/Http/Controllers/API/Remote/ValidateKeyController.php to app/Http/Controllers/Api/Remote/ValidateKeyController.php 2018-11-07 18:17:27 +02:00
mrkrabs
7c64492557
Rename app/Http/Controllers/API/Remote/SftpController.php to app/Http/Controllers/Api/Remote/SftpController.php 2018-11-07 18:17:08 +02:00
mrkrabs
c9e207c15d
Rename app/Http/Controllers/API/Remote/EggRetrievalController.php to app/Http/Controllers/Api/Remote/EggRetrievalController.php 2018-11-07 18:16:50 +02:00
mrkrabs
cfbdf07b80
Rename app/Http/Controllers/API/Remote/EggInstallController.php to app/Http/Controllers/Api/Remote/EggInstallController.php 2018-11-07 18:16:28 +02:00
Dane Everitt
dd9730b5f8
Return permissions string when authenticating SFTP 2018-11-04 11:09:42 -08:00
Lance Pioch
fb13305641
Delete PhraseAppTranslator.php 2018-10-24 11:34:49 -04:00
Lance Pioch
74ca11c37d
Delete PhraseAppTranslationProvider.php 2018-10-24 11:32:00 -04:00
ayan4m1
c5608b1827 rework UI of mail settings page to allow for saving settings before testing 2018-10-13 21:30:47 -04:00
ayan4m1
8b61175c3b add exception message to fail message for mail test 2018-10-13 21:30:47 -04:00
ayan4m1
df9f0be839 styleci tweaks 2018-10-13 21:30:47 -04:00
ayan4m1
670efa3544 styleci tweaks 2018-10-13 21:30:47 -04:00
ayan4m1
ace58dd1df allow test of mail system no matter the type 2018-10-13 21:30:47 -04:00
ayan4m1
1b03ae2efe remove Log::debug() call 2018-10-13 21:30:47 -04:00
ayan4m1
fd3e5fc73e add SMTP mail tester 2018-10-13 21:30:47 -04:00
Dane Everitt
b6205463db
Merge branch 'develop' into feature/vuejs 2018-09-23 13:14:46 -07:00
Dane Everitt
29237fd1ef
Merge pull request #1330 from ayan4m1/feature/exception-logging 
Simple query exception logging
 2018-09-18 21:44:29 -07:00
Andrew DeLisa
262ef78fae Allow deletion of multiple allocations at once (#1322) 2018-09-18 21:43:18 -07:00
ayan4m1
9f6875ed61 log query exception message during settings boot 2018-09-16 13:20:57 -04:00
Dane Everitt
5ca13839cf
Merge branch 'develop' into feature/vue-serverview 2018-09-05 21:34:59 -07:00
Dane Everitt
f9542c98e2
Fix tests broken by bad namespaces 2018-09-03 15:59:30 -07:00
Dane Everitt
fd49e524c8
Update middleware code 2018-09-03 15:17:53 -07:00
Dane Everitt
4d62e4c7b9
Merge branch 'develop' into pr/1128 2018-09-03 15:10:23 -07:00
Dane Everitt
c6112b4234
Fix tests 2018-09-03 14:59:00 -07:00
Dane Everitt
3bb9bf04e5
Pass the updated model through for updating node config, rather than old model, ref #1237 2018-09-03 14:54:50 -07:00
Dane Everitt
7ed9c7cb93
Correctly store changes to upload size limit, closes #1237 2018-09-03 14:53:58 -07:00
Dane Everitt
5bd3f59455
Fix schedules running twice, closes #1288 2018-09-03 14:32:33 -07:00
Dane Everitt
413a22a3d5
Changes to job running to clean up code 2018-09-03 14:04:25 -07:00
Dane Everitt
bcb3f5d5fa
Fix handling of times 2018-08-31 21:12:10 -07:00
Dane Everitt
178b8f8ce6
More logical time handling 2018-08-31 21:00:13 -07:00
Dane Everitt
e5636405f3
Drop carbon, use chronos 2018-08-31 20:52:15 -07:00
Dane Everitt
f3efe546da
Fix broken namespace for autoloader 2018-08-31 20:34:57 -07:00
Dane Everitt
e906ada528
Better handling when deleting a database 2018-08-26 14:01:00 -07:00
Dane Everitt
0999ec93c3
More logic for deleting databases 2018-08-25 15:07:42 -07:00
Dane Everitt
9be2aa4ca9
Push beginning of DB deletion stuff 2018-08-25 14:43:21 -07:00
Dane Everitt
c28e9c1ab7
Add ability to create new database through the UI 2018-08-22 22:29:20 -07:00
Dane Everitt
17796fb1c4
Add basic database listing for server 2018-08-21 21:47:01 -07:00
Dane Everitt
e9f8751c4c
More filemanager work, directory browsing working 2018-08-13 22:58:58 -07:00
Dane Everitt
92a9146b61
Improve filemanager, get first level folders listing 2018-08-06 23:14:13 -07:00
Dane Everitt
8db9d9bbee
Very rough go at connecting to socket and rendering console data for server 2018-07-20 23:45:07 -07:00
Dane Everitt
f2d2725ca0
Merge branch 'feature/vuejs' into feature/vue-serverview 2018-07-15 16:50:11 -07:00
Dane Everitt
be2c76c24a
Add tests for password changing 2018-07-15 11:44:18 -07:00
Dane Everitt
8bbe6bc279
Add test, fix behavior of model creation 2018-07-14 22:58:33 -07:00
Dane Everitt
550c622d3b
Obliterate JWT from codebase 2018-07-14 22:48:09 -07:00
Dane Everitt
6336e5191f
Strip out JWT usage and use cookies to track the currently logged in user 2018-07-14 22:42:58 -07:00
Dane Everitt
a7fae86e58
Treat unauthenticated exceptions the same as everything else 2018-07-14 22:42:38 -07:00
Dane Everitt
eafc4408eb
Fix broken unit tests 2018-07-14 21:49:49 -07:00
Dane Everitt
c82f273d85
Fix remaining broken tests 2018-07-04 19:38:23 -07:00
Dane Everitt
6c20ea9881
Add tests for changed controllers 2018-07-04 19:20:33 -07:00
Dane Everitt
5010c0c756
Merge branch 'feature/vuejs' into feature/vuejs-account 2018-07-04 18:12:57 -07:00
Dane Everitt
af9af78938
Merge branch 'develop' into feature/vuejs 2018-07-04 18:09:07 -07:00
Dane Everitt
8f5bd214a4
[Security] Address 2FA bypass in password reset functionality 
Thanks to Trixter#0001 on Discord for this security report.

There was a two-factor authentication bypass present in all previous versions of Pterodactyl that would allow a user to login without providing a token by going through the password reset process. A person would still have to have access to the targeted account's email, but if they did manage to get a password reset link they would be able to reset the account password and then proceede to login without a token being required.

This logic has since been changed to check if 2FA is enabled on an account, and if so they will NOT be logged in when their password is changed. This will force them to continue through the normal login pathway where a token will be needed.

Overall the impact of this issue is minor, but I am still addressing it and disclosing the mechanism behind it.
 2018-07-04 11:41:56 -07:00
Dane Everitt
603b8a3094
Merge branch 'feature/vuejs' into feature/vuejs-account 2018-07-02 21:01:04 -07:00
Dane Everitt
48cb01f438
Merge branch 'develop' into feature/vuejs 2018-07-02 21:00:42 -07:00
Stan
1ffb5acfad Send an email when a server is marked as installed (#1213) 
Co-authored-by: @stanjg
 2018-07-01 14:34:40 -07:00
Dane Everitt
d2bc791d74
Fix links sent to users when accounts are created 
closes #1093
 2018-06-30 18:47:31 -07:00
Dane Everitt
304d947536
Allow creating subuser with no permissions 2018-06-30 18:25:46 -07:00
Dane Everitt
96699b192e
Don't verify SSL signatures in dev 
[skip ci]
 2018-06-30 18:24:35 -07:00
Dane Everitt
974318ffb4
Logout other sessions when password is changed 
closes #1222
 2018-06-30 17:50:58 -07:00
Sergzy
bad9ae58e8 Fix environment_variables name (#1212) 2018-06-30 13:25:40 -07:00
Dane Everitt
7711b697ad
Finalize two-factor handling on account. 2018-06-20 23:05:35 -07:00
Dane Everitt
0cc895f2d5
Finalize email/password changing in UI 2018-06-17 16:53:24 -07:00
Dane Everitt
fce394f6bd
Change email handling and logout function 2018-06-16 14:30:20 -07:00
Dane Everitt
e7faf979a1
Change login handling to automatically redirect a user if their session will need renewal. 2018-06-16 14:05:39 -07:00
Dane Everitt
24bb8da43d
Fix CSS issue with login page due to input classes 2018-06-16 12:43:32 -07:00
Dane Everitt
b8b9acd0e6
Get the base email update working through the API. 
Still going to need to determine the best course of action to update the token on the client side.
 2018-06-11 22:56:57 -07:00
Jakob Schrettenbrunner
05478e3277 Merge branch 'feature/vuejs' into feature/vue-serverview 2018-06-11 21:06:12 +02:00
Dane Everitt
03c83c084a
Revert use of cookies, go back to using a JWT 2018-06-06 22:49:44 -07:00
Dane Everitt
4ffe6c96ad
Fix support for hot reloading without requiring anything special in the app 2018-06-06 21:44:52 -07:00
Dane Everitt
5bcabbde35
Get dashboard in a more working state 2018-06-05 23:42:34 -07:00
Dane Everitt
e948d81d8a
Base attempt at using vuex to handle logins 2018-06-05 23:00:01 -07:00
Dane Everitt
80b0816718
Better support for CSS and JS 2018-06-03 19:35:50 -07:00
Dane Everitt
e65854c8c2
Merge branch 'feature/vuejs' into feature/vue-serverview 2018-06-02 23:28:55 -07:00