Dane Everitt
7b69b4b824
Hit the daemon endpoints to actually generate a backup
2020-04-04 20:09:33 -07:00
Matthew Penner
fd4de9168a
Merge branch 'develop' into feature/server-transfers-actually
2020-04-04 16:28:02 -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
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
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
Matthew Penner
a2eab3ca43
Add ui elements for handling server transfers, add TransferJob.php and TransferService.php
2020-04-03 21:45:37 -06: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
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
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
a6f46d36ba
Implement basic code for creating/updating a subuser
2020-03-27 14:23:13 -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
fd2ceacfe2
Remove unused code
2020-03-22 14:16:12 -07:00
Dane Everitt
b3fb658511
Merge branch '0.7-develop' into develop
2020-03-15 17:30:28 -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
51defae917
Merge branch 'master' into develop
2019-12-28 11:49:08 -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
e87db889e9
Fix server data not updating correctly on daemon
2019-12-21 21:01:38 -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
c087f6429f
Temporary patch to get user management pages displaying correctly
2019-12-08 11:02:59 -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
AreYouScared
03dba1a00a
Fixed has servers error message
...
Fixed "Nest has active servers error"
2019-10-04 01:14:47 -04:00
Dane Everitt
67ff67a1bd
Add endpoints to return a server's egg configuration
2019-09-22 15:30:53 -07:00
Dane Everitt
7543ef085d
Format files
2019-09-05 21:32:57 -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
81143e231a
Merge branch 'master' into develop
2019-08-04 13:49:26 -07:00
Dane Everitt
eb81e1ed20
Support special characters in database password, closes #1508
2019-08-03 14:42:32 -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
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
48c39abfcb
Add database password rotation to view
2019-07-27 15:17:50 -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
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
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
Arnaud Lier
4460b6835a
Match original database password length when doing a password reset ( #1509 )
2019-03-23 14:04:57 -07:00
Dane Everitt
21ffa08d66
Merge branch 'develop' into feature/vuejs
2018-12-16 14:20:35 -08:00
Dane Everitt
7c73f21b30
Fix Node daemon secret not being reset, closes #1390
2018-12-02 13:40:12 -08:00
Dane Everitt
dd9730b5f8
Return permissions string when authenticating SFTP
2018-11-04 11:09:42 -08:00
Dane Everitt
5ca13839cf
Merge branch 'develop' into feature/vue-serverview
2018-09-05 21:34:59 -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
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
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
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
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
24bb8da43d
Fix CSS issue with login page due to input classes
2018-06-16 12:43:32 -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
80b0816718
Better support for CSS and JS
2018-06-03 19:35:50 -07:00
Dane Everitt
cf90f56777
Merge branch 'develop' into feature/vuejs-auth
2018-05-26 12:17:14 -07:00
Dane Everitt
7e2e5fd7c1
Merge branch 'develop' into feature/upgrade-laravel-to-5.6
2018-05-20 16:30:42 -07:00
Dane Everitt
00df0b66a6
Merge pull request #1148 from pterodactyl/feature/doc-block-improvements
...
@throws docblock improvements
2018-05-20 16:25:59 -07:00
Dane Everitt
457e461f45
Merge pull request #1144 from pterodactyl/feature/spelling
...
Spellchecked the whole application
2018-05-20 16:24:09 -07:00
Lance Pioch
6a4443b751
Fix the styling
2018-05-13 17:41:01 -04:00
Lance Pioch
02379b657d
Replace the log writer class with the new one
2018-05-13 16:40:31 -04:00
Lance Pioch
f82b419d47
Update php doc blocks
2018-05-13 12:42:11 -04:00
Lance Pioch
e2dc0638d9
Fix app/ spelling errors
2018-05-13 11:12:41 -04:00
Lance Pioch
ba96829d13
Fix cron jobs by removing the extra unusable argument
2018-05-13 00:42:25 -04:00
Lance Pioch
88fd83d413
Remove unused imports ( #1102 )
2018-04-08 15:37:27 -05:00
Dane Everitt
791cbaa5ce
Get things into a somewhat working state on the login form
2018-03-31 15:52:11 -05:00
Dane Everitt
8d704ae5c8
Inital commit with gulp and base asset setup
2018-03-27 00:44:14 -05:00
Dane Everitt
bde4d4187f
Merge branch 'develop' into feature/api-integration-testing
2018-03-21 22:25:16 -05:00
Dane Everitt
b96c2d16ee
Added validation to variable validation rules to validate that the validation rules are valid
...
closes #988
2018-03-17 15:09:09 -05:00
Dane Everitt
abd2a42471
Fix data integrity exception thrown when attempting to store updated server egg variables
2018-03-10 13:55:24 -06:00
Dane Everitt
40c74ae1e7
Add validation to prevent invalid ports, closes #1034
2018-03-10 13:10:40 -06:00
Dane Everitt
ac9f83a8fe
Fix test to run with new bootstrapping
2018-03-04 22:42:33 -06:00
Dane Everitt
36837df0a6
Use beginning of UUID for server uuidShort
2018-03-03 22:20:53 -06:00
Dane Everitt
a4f03f5d02
Handle missing daemon keys better and fix subuser missing key errors
2018-03-03 21:31:44 -06:00
Dane Everitt
dff7e8f734
Fix server creation in UI and API
2018-03-02 23:11:30 -06:00
Dane Everitt
e39353a18d
Add tests for new service
2018-03-02 19:37:21 -06:00
Dane Everitt
07893effa3
Add initial go at user created databases for servers, still needs cleaning
2018-03-01 21:27:37 -06:00
Dane Everitt
87b96bdfc8
Add core logic to allow for limited databases and allocations
2018-03-01 20:08:27 -06:00
Dane Everitt
a765e0dbb6
closes #991
2018-02-27 19:43:47 -06:00
Dane Everitt
633bba6d6e
Add support for external_id on servers, closes #975
2018-02-24 11:57:12 -06:00
Dane Everitt
541b9ec7f5
Fix database name using d#_ rather than s#_, ref #957
2018-02-18 13:46:42 -06:00
ShadowKitten
d8be167a9c
Add support for allowing subusers to access SFTP. ( #918 )
2018-02-17 16:10:44 -06:00
Dane Everitt
241f7d0125
Fix some data integrity issues
2018-02-17 13:37:53 -06:00
Dane Everitt
8e1aa15dba
Fixes a bug that would cause non-editable variables on the front-end to throw a validation error
2018-02-15 20:58:51 -06:00
Dane Everitt
e2cdb3b4b1
Add test cases for services
2018-02-11 17:32:45 -06:00
Dane Everitt
3ecab82358
Fix exception when empty default value is passed for an egg variable, closes #934
2018-02-11 16:47:50 -06:00
Dane Everitt
bf537922a3
Fix username validation and auto-generation, closes #927
2018-02-11 16:39:50 -06:00
Dane Everitt
cfb7415e2a
Fix data integrity exception, closes #922
2018-02-10 14:01:49 -06:00
Dane Everitt
dd54c5abb1
Fix user password handling in Admin CP
2018-02-07 21:13:40 -06:00
Dane Everitt
d4d9eda57a
Add schedule edit support
2018-02-04 13:51:24 -06:00
Dane Everitt
7a19019980
Fix suspension/installed handling for servers
...
closes Pterodactyl/Panel#891
2018-01-30 22:40:21 -06:00
Dane Everitt
c599112021
Finalize server management API
2018-01-30 20:36:59 -06:00
Dane Everitt
5ed164e13e
Implement server creation though the API.
...
Also implements auto-deployment to specific locations and ports.
2018-01-28 17:14:14 -06:00
Dane Everitt
2bd691efad
Add database list endpoint, add more resource name magic
2018-01-25 21:26:06 -06:00
Dane Everitt
aca0819bcd
Add server build management to API
2018-01-21 16:02:03 -06:00
Dane Everitt
d3dba3fcf9
Fix bug when modifying server descriptions
2018-01-21 14:45:20 -06:00
Dane Everitt
17f6f3eeb6
Add server details modification endpoint to API.
2018-01-20 16:03:23 -06:00
Dane Everitt
17544481b5
More server management via the API
2018-01-20 13:48:02 -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
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
a31e5875dc
First round of changes to API to support simpler permissions.
2018-01-11 22:49:46 -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
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
adcab5969a
Fix server description nullablility
2018-01-06 12:58:30 -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
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
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
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
20c1c74116
Fix issues with validation in admin CP for server variables, closes #780
2017-11-25 13:15:46 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system ( #761 )
2017-11-18 13:35:33 -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
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
Dane Everitt
2f42396317
Fix bug with permissions including more than one dash, closes #727
2017-11-05 13:42:57 -06:00
Dane Everitt
30ab6ed692
Update PHPCS and other dependencies.
2017-11-05 13:33:42 -06: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
f5b20e38c4
Fix failing tests due to way nest creation worked
2017-11-04 13:01:54 -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
