Commit graph

366 commits

Author SHA1 Message Date
Sir3lit
531029b534
Fixed building of older versions
Older versions of spigot used "bash" during the install,  added `bash` package
2018-11-16 02:16:19 -05:00
Fabian
34ff6511a6
Remove \r
Removed \r
2018-10-28 21:13:03 +01:00
Fabian
10f37adca8
Updated Teamspeak 3 Server Egg
Changed to alpine container
2018-10-28 20:51:36 +01:00
Fabian
f5d701cbc8
Updated TS3 Server egg
New minimal Script based on bash.
ts3server.ini is not needed, because its only used when the server get started with the inifile=ts3server.ini parameter.
Also the license aggrement moved to the parameter.
2018-10-28 20:34:56 +01:00
Sir3lit
80839f3397
Update to latest version
Use latest version to prevent issues with invalid licensekey.dat file
2018-10-13 04:14:17 -04:00
Dane Everitt
e404918bff
Dont limit length of variable values, closes #1264 2018-09-03 14:43:05 -07:00
ViViV_
ac71a56fd1 Adding variable for Server Map Selection [ARK SERVER] (#1230) 2018-07-21 10:40:51 -07:00
Dane Everitt
1df3efdfb0
Fix eggs (#1224) 2018-06-30 18:52:32 -07:00
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
Dane Everitt
e3bbd85f3f
Merge branch 'develop' into pr/1129 2018-05-26 10:34:29 -07:00
Michael (Parker) Parker
52ae3f1062 Parkervcp patch 1 (#1169) 2018-05-23 22:00:57 -07:00
Michael (Parker) Parker
5fddf02247 Update to build spigot (#1168) 2018-05-23 21:58:16 -07:00
Jakob
4d91cc697b no longer lie about spigot being built when no url provided (#1104) 2018-05-23 21:38:39 -07: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
bde4d4187f
Merge branch 'develop' into feature/api-integration-testing 2018-03-21 22:25:16 -05:00
William Cody Ardoin
0c07577d3b Allow for 3 decimals, future proof (#999)
The GET_VERSIONS Grep Command will fail with 1.12.2 but will work with 1.12. Added optional check for 3rd decimal place in the MC Version of Forge and future proofed the forge version for Double Numeric SubMinor version.
2018-03-06 23:11:58 -06:00
arajdon
1d623a319b Update Teamspeak 3.1.1 (#1022)
Added "\n\ntouch \/mnt\/server\/.ts3server_license_accepted" and changed version number.
I've tested this changes on my installation. Works fine.

Thats my first PR. Hope thats ok so.
2018-03-06 23:11:05 -06:00
Dane Everitt
e8ea218f20
Add integration test for remaining application api user endpoints 2018-03-04 22:35:57 -06:00
Dane Everitt
9905358bc3
Add integration tests for remote user endpoint 2018-03-04 16:56:05 -06:00
Dane Everitt
e2aa01c9cc
First go at integration tests 2018-03-04 16:30:16 -06: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
William Cody Ardoin
e1d6980c0b Add the MAP Varible (#903)
The MAP Var was added to startup config but never to the user config options.
2018-02-09 18:50:56 -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
407120a854
Merge branch 'develop' into feature/api-v1 2018-01-21 17:06:31 -06:00
Dane Everitt
655d2485b5
Fix error causing inability to save variables. 2018-01-21 17:02:25 -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
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
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
Bl4ckSpr4y
d1806d9d29 Fix a typo (#856)
Changed 'custo' to 'custom'.
2018-01-06 20:09:20 -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
ffc8d4875f
Fix unability to store '-1' in the database properly 2018-01-01 12:32:33 -06:00
Dane Everitt
b9d67459b2
Update to Laravel 5.5 (#814) 2017-12-17 13:07:38 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings (#809) 2017-12-14 21:05:26 -06:00
Franco Sanllehi
75eb506dab Solution for "SteamInternal_ContextInit" (#802)
Add required package to apt install

Solution for: error=/home/container/garrysmod/bin/server_srv.so: undefined symbol: SteamInternal_ContextInit
2017-12-13 21:03:54 -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
tenten8401
5d98fc327b
Workaround for improper boolean handling
Since laravel only takes 1, 0, true, false, "1", and "0" instead of allowing "true" and "false".
2017-11-20 09:47:49 -05:00
Dane Everitt
9a588cb6dc
Merge branch 'develop' into develop 2017-11-18 16:29:52 -05:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system (#761) 2017-11-18 13:35:33 -05:00
Unknown
e3c5d50994 Add Rust 2017-11-05 21:24:58 -05:00
Dane Everitt
f5b20e38c4
Fix failing tests due to way nest creation worked 2017-11-04 13:01:54 -05:00
Dane Everitt
f8c89f8331
Add support for seeding nests and eggs 2017-11-03 23:07:18 -05:00
Dane Everitt
7882250baf
Add more middleware tests 2017-11-03 18:16:49 -05:00
Dane Everitt
fa62a0982e
Refactor startup modification and environment variable services
Better setup, more flexibility, more tests.
2017-10-26 23:49:54 -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
532025a348
Fix tests 2017-10-23 20:12:15 -05:00
Dane Everitt
c19c423568
More fixes 2017-10-07 18:08:19 -05:00
Dane Everitt
17642bffe7
More code updates 2017-10-07 17:21:41 -05: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
609bf32843
Add test for service option exporter 2017-10-04 23:42:04 -05:00
Dane Everitt
d95a63c09b
Today Dane learned about Mockery::subset, tomorrow we take over Canada.
In other news, why could no one have mentioned this a few months ago. Would have been nice.
2017-10-04 22:41:15 -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
774c9680a3
More test suite coverage 2017-09-26 22:16:26 -05:00
Dane Everitt
8908a758ca
More tests for daemon keys 2017-09-26 20:49:05 -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
dd456a4c9c
Fix all currently failing tests 2017-09-24 22:28:16 -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
4e5398fb6b
Add tests for schedule stuff 2017-09-14 23:02:31 -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
0e3729851c
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-09 23:55:23 -05:00
Dane Everitt
bab28dbc85
Initial implementation of new task mgmt system 👮 2017-09-09 23:55:21 -05:00
Jakob
3f380987c1 remove auto enabled query port from minecraft services
fix #620
2017-09-08 10:00:36 +02:00
Dane Everitt
f451e4dc47
Begin unit tests for repositories 2017-08-26 19:58:24 -05:00
Dane Everitt
2cabb61b54
Add subuser deletion service 2017-08-26 13:31:18 -05:00
Dane Everitt
74ea1aa0aa
Push subuser creation service 2017-08-23 21:34:11 -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
2e3476298d
Add test for pack exporting 2017-08-20 20:02:24 -05:00
Dane Everitt
cdfbc60030
Push pack services and fix for failing tests 2017-08-20 19:23:50 -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
6d1b994b7d
More tests 2017-08-13 14:55:09 -05:00
Dane Everitt
fd24729ab9
Merge branch 'feature/PTDL-472' of https://github.com/Pterodactyl/Panel into feature/PTDL-472 2017-08-12 16:30:29 -05:00
Dane Everitt
364adb1f84
Add tests for service option services 2017-08-12 16:30:27 -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
acbc52506c
Finish unit tests for all server services 2017-07-22 20:15:01 -05:00
Dane Everitt
736a323eff
Merge branch 'develop' into feature/PTDL-472 2017-07-15 11:52:39 -05:00
Jakob
0def41740a Merge pull request #537 from tenten8401/develop
Add Rust Service
2017-07-13 17:32:20 +02:00
Jakob
ff89c6c0cd Merge pull request #543 from udeva/develop
Add Forge Service Option
2017-07-13 17:29:23 +02:00
Michael (Parker) Parker
265817bda8 latest TS3
Updating to latest TS3 server
2017-07-10 20:19:08 -04:00
Unknown
093114e5c2 Absolute paths in install script 2017-07-10 10:34:26 -04:00
Unknown
c746baf416 Remove pesky newline for StyleCI 2017-07-09 22:06:14 -04:00
Unknown
4957c95189 OxideMod support 2017-07-09 22:05:08 -04:00
Unknown
ee0211eadd Change docker container to quay.io/pterodactyl/core:rust 2017-07-09 21:20:09 -04:00
Polarcraft
63deed9193 Quick Fix
With this fix, I removed the installation of Java 8 from the container and set the script container to be java8.
2017-07-09 20:01:45 -05:00
Polarcraft
501f4f9a83 Renamed funny variable 2017-07-08 22:04:14 -05:00
Polarcraft
23d6907c9c Remove pesky space 2017-07-08 21:41:39 -05:00
Polarcraft
7993202689 Added a Forge Service Option 2017-07-08 21:40:14 -05:00
Polarcraft
e26a7ac262 Created a GMOD Service Option (#542) 2017-07-08 16:17:36 -10:00
Unknown
951baaca54 Specify ubuntu version & add string validation 2017-07-08 17:09:01 -04:00
Polarcraft
4c639906b4 Add CS:GO to Source Service Option (#538)
* Added CS:GO

This allows users to select rather or not to use cs:go for a server.

* Removed debugging outputs

* Replace tabs with spaces to pass StyleCI

* Remove more pesky tabs

I apparently missed them the first time.

* Fix pesky issues with starts

This fix is to repair the startup for csgo and remove the required accounts.

* Better explanation for STEAM_ACC

* Removed dupe ips

* Added and fixed lines

* Set a default map to be loaded in.
* Set the variables rules to match what they would need to be
* Removed a pesky space
2017-07-08 10:52:40 -10:00
Dane Everitt
8953f83f87
Add migrations to handle cascade deletions for servers and users 2017-07-08 15:51:13 -05:00
Unknown
a6bef1b71b Fix StyleCI complaints 2017-07-06 22:17:51 -04:00
Unknown
f230b194ff Add Rust to seeder & rename class to appropriate name 2017-07-06 22:08:49 -04:00
Unknown
2a6b48753a Add Rust service 2017-07-06 21:51:38 -04: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
a527949939
Add more location tests, more travis CI fix attempts 2017-06-16 00:29:19 -05:00
Dane Everitt
760525a673
Push more tests for location services, setup travis CI integration 2017-06-15 23:03:22 -05:00
Dane Everitt
26e476a794
Push updates, removes repositories, begins moving functionality to services.
First integration tests included.
2017-06-13 23:25:37 -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
Michael (Parker) Parker
1b3d9eb683 Fixing TS3 service 2017-05-15 09:38:41 -04:00
Dane Everitt
ee309b095e
Fix the unholy disaster that is steamcmd within containers.
This honestly took like 3 hours to debug and fix, and TBH its all
because +app_update is not the same as update, and I didn’t notice I
had mistyped at some point.

Many keys were violently smashed. R.I.P. Keyboard, you were decent.
👻
2017-05-05 19:15:18 -04: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
91ce97a326
Fix missing service file, closes #390 2017-04-17 19:26:03 -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
6fb44f7d7b
Set config item to correct boolean value 2017-04-14 00:51:36 -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