Commit graph

223 commits

Author SHA1 Message Date
Dane Everitt
969b16a563 Apply fixes from StyleCI
[ci skip] [skip ci]
2018-06-02 21:32:26 +00:00
stanjg
013dde75ae
Renamed the field and made some improvements 2018-05-31 16:34:35 +02:00
stanjg
86c8ecdcdf
Added the actual logic 2018-05-04 15:02:51 +02:00
Lance Pioch
88fd83d413 Remove unused imports (#1102) 2018-04-08 15:37:27 -05:00
Dane Everitt
68f0811273
Merge branch 'feature/api-integration-testing' into develop 2018-03-26 19:55:28 -05:00
Stan
f1a76ec7fd Add description field to nodes (#1065) 2018-03-26 13:57:24 -05:00
Dane Everitt
89db9390df
Fix broken migration rollbacks 2018-03-04 15:21:54 -06:00
Dane Everitt
aaccf38640
Merge branch 'develop' into feature/user-databases 2018-03-02 18:40:38 -06:00
Dane Everitt
d03559080f
Theoretically fix migration issues for api_key table 2018-03-02 18:37:39 -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
aa08498d51
Formatting fix 2018-02-25 16:10:28 -06:00
Dane Everitt
4cfb8941d5
Fix broken users table in database causing validation errors. 2018-02-25 16:08:01 -06:00
Dane Everitt
633bba6d6e
Add support for external_id on servers, closes #975 2018-02-24 11:57:12 -06:00
Dane Everitt
d86c35d80f
Prevent duplicate allocations for servers 2018-02-17 13:53:38 -06:00
Dane Everitt
c3dc376c4c
Fixes #921 2018-02-10 15:58:34 -06:00
Dane Everitt
2ec76d283b
Fix bad API behavior 2018-02-04 15:38:38 -06:00
Dane Everitt
2bd691efad
Add database list endpoint, add more resource name magic 2018-01-25 21:26:06 -06:00
Dane Everitt
c3b9738364
Implement application API Keys 2018-01-18 21:36:15 -06:00
Dane Everitt
d0bce4af97
Apply fixes from StyleCI (#875)
[ci skip] [skip ci]
2018-01-14 12:07:14 -06:00
Dane Everitt
7aa540b895
Remove api permissions table 2018-01-14 12:05:18 -06:00
Dane Everitt
8e8147cc43
Apply fixes from StyleCI (#874)
[ci skip] [skip ci]
2018-01-13 16:06:55 -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
ffc8d4875f
Fix unability to store '-1' in the database properly 2018-01-01 12:32:33 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings (#809) 2017-12-14 21:05:26 -06:00
Dane Everitt
dff2e1ea47
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-12-04 18:43:30 -06:00
Dane Everitt
3f6d782ce1
Fix forgotten migration that caused node deletions to not be cascaded to all allocations.
closes #795
2017-12-04 18:43:19 -06:00
Dane Everitt
285485d7b0
Change how API keys are validated (#771) 2017-12-03 14:29:14 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system (#761) 2017-11-18 13:35:33 -05:00
Dane Everitt
058e490ec4 Implement Panel changes to support internal SFTP subsystem on Daemon (#703) 2017-10-25 00:35:25 -04:00
Dane Everitt
df87ea0867
This breaks literally the entire panel. 2017-10-06 23:57:53 -05:00
Dane Everitt
344c1a9885
First push before 🥚 2017-10-06 21:22:32 -05:00
Dane Everitt
0b3c0f6d5a
Ah yes, lets just spend 30 minutes trying to get a migration to run correctly. 2017-10-06 20:39:11 -05:00
Dane Everitt
9b79d9c756
Delete service variables when the option is deleted. 2017-10-03 23:33:46 -05:00
Dane Everitt
493c5888a3
Migration change 2017-10-02 22:03:01 -05:00
Dane Everitt
220789a4b9
Push migrations to change existing service structure 2017-10-02 20:54:22 -05:00
Dane Everitt
fb8a26f141
Merge branch 'develop' into feature/api-daemon-changes 2017-09-25 21:46:44 -05:00
Dane Everitt
e56f4cdd33
Update license headers on files. 2017-09-25 21:43:01 -05:00
Dane Everitt
bc0d0fd6fa
Fix failing migrations 2017-09-24 21:22:14 -05:00
Dane Everitt
3a8bea9588
Fix failing migrations 2017-09-24 21:20:01 -05:00
Dane Everitt
7d1c233c49
Final adjustments to Daemon <-> Panel communication change 2017-09-24 21:12:30 -05:00
Dane Everitt
906a699ee2
Begin implementation of new daemon authentication scheme 2017-09-23 20:45:25 -05:00
Dane Everitt
7f76684453
More schedule changes 2017-09-13 21:46:43 -05:00
Dane Everitt
2ac90b50f2
Begin refactoring Tasks to be apart of the Scheduler system 2017-09-12 23:45:19 -05:00
Dane Everitt
07965d0ce7
These migrations... work?? 🐋 2017-09-11 01:15:44 -05:00
Dane Everitt
bab28dbc85
Initial implementation of new task mgmt system 👮 2017-09-09 23:55:21 -05:00
Anand Capur
a73e71dd81
Fix DB migrations to allow rollbacks 2017-08-23 12:34:34 -07:00
Dane Everitt
3ee5803416
Massive PHPCS linting 2017-08-21 22:10:48 -05:00
Dane Everitt
9d3dca87f2
Begin moving packs to new service mechanisms, refactor exceptions for services 2017-08-18 22:19:06 -05:00
Dane Everitt
90bbe57148
Move services onto new services system, includes tests 2017-08-15 22:21:47 -05:00
Dane Everitt
340193c013 Apply fixes from StyleCI (#581) 2017-08-12 15:32:34 -05:00
Dane Everitt
669119c8f8
Handle allocation assignment using services
Function is significantly quicker and uses 1 SQL query per IP rather than 1 query per port.
2017-08-05 21:10:32 -05:00
Dane Everitt
c1a078bdcf
Add support for node management actions using new services 2017-08-05 17:20:07 -05:00
Dane Everitt
8daec38622
Complete base implementation of services for administrative server creation 2017-07-24 21:34:10 -05:00
Dane Everitt
8953f83f87
Add migrations to handle cascade deletions for servers and users 2017-07-08 15:51:13 -05:00
Dane Everitt
4ee9d38ad1
Add ApiKey service, cleanup old API key methods
https://zube.io/pterodactyl/panel/c/525
2017-06-25 15:31:50 -05:00
Dane Everitt
5c2b9deb09
Push initial implementations of new repository structure
This breaks almost the entire panel, do not pull this branch in this state.

Mostly just moved old repository files to a new folder without updating anything else in order to start doing new things. Structure is not finalized.
2017-06-10 22:28:44 -05:00
Dane Everitt
605c91a9af
Use cache helpers rather than database to handle configuration tokens and downloads. 2017-05-01 14:21:18 -04:00
Dane Everitt
3ee7b7cff1
Add ability to mark a node as being over a proxy 2017-04-27 22:52:37 -04:00
Dane Everitt
30b4934013
Include default installation scripts, as well as ability to symlink a script 2017-04-27 16:16:59 -04:00
Dane Everitt
77b1a258d9 Weekly fix of my StyleCI violations... 2017-04-24 16:56:38 -04:00
Belldandu
fc2b7b5982 Update 2017_04_20_171943_AddScriptsToServiceOptions.php (#404)
Currently mysql does not support defaults for text and blobs without disabling strict mode in 5.7. https://dev.mysql.com/doc/refman/5.7/en/blob.html

Mariadb (a drop in replacement for mysql my by the same team of devs as mysql) also doesnt support defaults text and blobs until 10.2.1 (there is no stable release, 10.2.5 is a release candidate) which isnt available on non-bleeding edge distro's. No one is going to install an unstable release of mariadb on production servers. https://mariadb.com/kb/en/mariadb/text/
Latest release for ubuntu xenial is 10.0.29-MariaDB

So for now we change text to string for values that have defaults until defaults are more widely supported for TEXT and BLOB mysql values.
2017-04-23 16:29:54 -04:00
Dane Everitt
a5a1ea3165
Add ability to change service implementation for a server. 2017-04-21 17:52:44 -04:00
Dane Everitt
8dc24471ae
Add reinstall abilities and cleanup process for new servers 2017-04-20 18:52:43 -04:00
Dane Everitt
c8f1335a09
Fixup merge 2017-04-20 17:26:20 -04:00
Dane Everitt
8d24e5f168
Merge branch 'develop' into feature/option-scripts
# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00
Dane Everitt
d695532aa2
Fixes migrations to actually rollback all the way. 2017-04-19 18:43:32 -04:00
Dane Everitt
dcc2257fa7
Do things correctly... 2017-04-15 23:40:11 -04:00
Dane Everitt
b000b4da43
Fixes task migration issue, closes #378 2017-04-15 23:17:45 -04:00
Dane Everitt
7f1a97184b
Un-butcher task system. 2017-04-15 13:52:43 -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
edaa270a33
Add server descriptions, closes #338 🐖
🐷 https://s3.kelp.in/D0n2Z.png
2017-03-31 23:07:19 -04:00
Dane Everitt
a554f242a8
Fix typo in migration script that deleted regex from non-required vars 2017-03-19 11:21:05 -04:00
Dane Everitt
82b3cbc246
Minor fixes 2017-03-18 20:52:02 -04:00
Dane Everitt
abaff455b4
Add missing semicolon 2017-03-18 16:05:19 -04:00
Dane Everitt
9a803e61ec
Update seeder and migrations to use new docker images. 2017-03-18 14:49:48 -04:00
Dane Everitt
710d5f111a
Actually save the changes so we don't end up with duplicates... 2017-03-18 13:53:22 -04:00
Dane Everitt
c2d630cfb5
Fix migration 2017-03-18 13:45:38 -04:00
Dane Everitt
03e0de28d9
Initial implementation of option scripts on panel side. 2017-03-18 13:09:30 -04:00
Dane Everitt
198a021a97
Add database host management to panel. 2017-03-16 19:35:29 -04:00
Dane Everitt
50558db7c3
Add initial pack creation and overview pages 2017-03-14 21:18:36 -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
d67f65bb71
Attempt to properly handle new start lines on servers for migration 2017-03-12 18:26:36 -04:00
Dane Everitt
63029bb396
Clean old migration.
New seeder method allows most all of this migration to occur in the
seeder, aside from renaming a few duplicate keys.
2017-03-12 18:05:30 -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
419031e0cd
Add function file editing, and move all service file items into database 2017-03-12 15:59:17 -04:00
Dane Everitt
d585294289
Misc. file removal and migration cleanup 2017-03-12 00:03:04 -05: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
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
b1564389d8 Apply fixes from StyleCI (#331) 2017-03-03 23:38:21 -05:00
Dane Everitt
d38f89a468
Cleanup node routes, cleanup remote token 2017-03-03 23:14:25 -05:00
Jakob Schrettenbrunner
cea2d040eb fix @DaneEveritt grepping arround 2017-02-13 23:20:49 +01:00
Dane Everitt
afb0451bcd
Drop a forgotten foreign key 2017-02-12 20:27:06 -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
Jakob Schrettenbrunner
a10e235beb revert accidental changes to migrations 2017-02-12 17:38:15 +01:00
Dane Everitt
3b3002b77a
API Model updates. 2017-02-10 17:29:10 -05:00
Dane Everitt
99812b0407
More subuser Model updates. 2017-02-09 19:38:54 -05:00