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

1031 commits

Author SHA1 Message Date
Dane Everitt
675e780946
Fix test failures 2017-10-06 00:16:22 -05:00
Dane Everitt
38075c6b9f
Update panel to send correct service option configuration to the daemon. 2017-10-05 23:09:43 -05:00
Dane Everitt
29cfae86b1 Merge branch 'develop' into feature/service-export-import 2017-10-05 00:17:17 -05:00
Dane Everitt
fbd5c25ed0
Finalize tests 2017-10-04 23:52:25 -05:00
Dane Everitt
609bf32843
Add test for service option exporter 2017-10-04 23:42:04 -05:00
Dane Everitt
3e689cf212
Please fix failing tests? ✋ 2017-10-03 23:57:13 -05:00
Dane Everitt
8952043600
Fix some test runner issues 2017-10-03 23:36:39 -05:00
Dane Everitt
6269a08db7
Finalize service option import/export 2017-10-03 23:31:04 -05:00
Dane Everitt
d608c313c3
Complete the service option export configuration 2017-10-03 20:18:27 -05:00
TrixterTheTux
6482f79088 Grant execute privilege (#655) 
closes #654
 2017-10-03 12:53:28 -10:00
Dane Everitt
0d739257a9
First pass at XML exporter for services 2017-10-03 00:01:04 -05:00
Dane Everitt
ae671e6b19
Begin updating UI 2017-10-02 22:51:13 -05:00
Dane Everitt
92ca84a37f
Remove unused controller 2017-10-02 20:03:47 -05:00
Dane Everitt
b1834307d5
Update demon routes to use /v1/ 2017-09-30 21:00:24 -05:00
Dane Everitt
15d38ce823
Add ability to switch between new and existing daemon 2017-09-30 19:23:44 -05:00
Dane Everitt
281337943f
Fix SQL call 2017-09-30 19:04:36 -05:00
Dane Everitt
1216f950e2
Prevent deletion of options that have children attached to them. 
closes #562
 2017-09-30 12:54:09 -05:00
Dane Everitt
d5bf8734ef
Add unit tests for RunTaskJob. 2017-09-30 12:40:07 -05:00
Dane Everitt
238ce435d6
interface_exists does not work how I expected, switch to is_subclass_of 2017-09-30 12:06:16 -05:00
Dane Everitt
048784607d
Minor bug fixes 2017-09-30 11:45:24 -05:00
Dane Everitt
28d838eccd
Fix subuser auth token again 2017-09-29 21:57:36 -05:00
Dane Everitt
0e0a8d4347
Fix 404 when trying to view a server 2017-09-29 21:54:00 -05:00
Dane Everitt
fb7ef2d775
test post please ignore 2017-09-26 22:54:34 -05:00
Dane Everitt
774c9680a3
More test suite coverage 2017-09-26 22:16:26 -05:00
Dane Everitt
6efecaeb69
Merge branch 'develop' into feature/api-daemon-changes 2017-09-25 21:55:02 -05:00
Dane Everitt
6915ecb4f1
Literally fix everything. 💯 2017-09-25 21:53:44 -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
75fd3d985c Merge pull request #643 from lancepioch/class-string 
Use class string instead of magic string
 2017-09-25 16:03:36 -10:00
Lance Pioch
09d958249d Add togglable 2FA user requirements (#635) 2017-09-25 15:58:16 -10:00
Lance Pioch
6ffa4e62e0 Merge branch 'develop' into class-string 2017-09-25 11:10:50 -04:00
Dane Everitt
55ae9138f6
Fix failing builds due to SQL changes 2017-09-24 22:34:30 -05:00
Dane Everitt
dd456a4c9c
Fix all currently failing tests 2017-09-24 22:28:16 -05:00
Lance Pioch
02cabf73a0 Use class string instead of magic string 2017-09-24 22:59:34 -04:00
Dane Everitt
3aa6e4e74e Merge pull request #638 from lancepioch/middleware-changes 
Use proper route name instead of using class in route file
 2017-09-24 16:14:22 -10:00
Dane Everitt
7d1c233c49
Final adjustments to Daemon <-> Panel communication change 2017-09-24 21:12:30 -05:00
Lance Pioch
8197b1733f Fix some more routes 2017-09-24 21:27:57 -04:00
Dane Everitt
8e2b77dc1e
Final touches to new key-rotation service 2017-09-24 12:34:00 -05:00
Dane Everitt
0f0c319ec0
Allow exceptions to throw their own error codes from within. 
Temp work-around for tons of logic until upgrade to 5.5 is done.
 2017-09-24 12:32:29 -05:00
Dane Everitt
c43ab595cf
Fix error in console scheduler spamming logs. 2017-09-24 12:31:31 -05:00
Dane Everitt
906a699ee2
Begin implementation of new daemon authentication scheme 2017-09-23 20:45:25 -05:00
Dane Everitt
8722571037
Finish console command cleanup 2017-09-22 21:19:57 -05:00
Dane Everitt
68cc71ecfe
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-22 00:30:11 -05:00
Dane Everitt
6e5b0b8027
Update command unit tests to use helper functions 2017-09-22 00:30:09 -05:00
Lance Pioch
0f07d6bcf5 The nodes create page will redirect you to the locations page if you don't have a location, the concept is the same here (#640) 2017-09-21 13:05:55 -10:00
Lance Pioch
0c21d401e3 Combine Locations and Nodes on Create Server page (#641) 2017-09-21 13:03:29 -10:00
Lance Pioch
8bfebf5b32 Use proper route name instead of using class in route file 2017-09-21 13:48:57 -04:00
Lance Pioch
afa328577f Add missing cli descriptions (#632) 2017-09-20 19:16:01 -10:00
Dane Everitt
8df5d5beaf
Remove unnecessary test and cleanup rebuild command 2017-09-19 22:15:52 -05:00
Dane Everitt
ccda2b63fa
Add more CLI commands for panel management 2017-09-19 22:10:14 -05:00
Dane Everitt
c5f2dfd6f6
Begin adding schedule processing jobs. 2017-09-16 23:10:00 -05:00
Dane Everitt
c0d7e02481
Add a better panel info output command 2017-09-16 19:47:14 -05:00
Dane Everitt
4de326ad02
Add command to disable 2FA for a user account. 2017-09-16 18:50:12 -05:00
Dane Everitt
c46f2cb274
More command tests 2017-09-16 17:39:52 -05:00
Dane Everitt
12ba96bd42
Add unit tests for user management commands 2017-09-16 01:45:56 -05:00
Dane Everitt
22459a877a
Add test for make user command and add admin option 2017-09-15 23:46:22 -05:00
Dane Everitt
542d1f8db7
Add new location and user management via CLI 2017-09-15 22:13:33 -05:00
Dane Everitt
a498bbc7d5
Move location service to match other services 2017-09-15 00:16:03 -05:00
Dane Everitt
4e5398fb6b
Add tests for schedule stuff 2017-09-14 23:02:31 -05:00
Dane Everitt
a8c4d6afdb
Update random ID method to use str_random and not random_bytes 
The use of random_bytes in combination with bin2hex was producing a lot of duplicate keys when tested in batches of 10k (anywhere from 2 to 6). The use of str_random yielded no duplicates even at scales of 100k keys that were 8 characters.
 2017-09-13 23:07:02 -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
1873c1e9b9
Who doesn't love a good mystery novel. 🍞 
Fix ide helper stubs?
 2017-09-11 00:27:43 -05:00
Dane Everitt
f9bf8603b2
wot ❓ 2017-09-11 00:15:48 -05:00
Dane Everitt
131159c246
Fix some forgotten logic checks temporarily 2017-09-10 23:57:18 -05:00
Dane Everitt
97d87ff57c
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-10 23:45:33 -05:00
Dane Everitt
7b454980ab
Fix version display in node list 2017-09-10 23:45:27 -05:00
Dane Everitt
6c6a3c9458 Merge pull request #615 from Pterodactyl/feature/customized-theme 
Feature/customized theme
 2017-09-10 18:14:15 -10:00
Dane Everitt
bab28dbc85
Initial implementation of new task mgmt system 👮 2017-09-09 23:55:21 -05:00
Dane Everitt
f157c06d04
Fix PHPCS to order by length not alphabetical 2017-09-04 19:07:00 -05:00
Jakob Schrettenbrunner
2ac1e08f47 Merge branch 'develop' into feature/customized-theme 2017-09-05 01:47:43 +02:00
Dane Everitt
dc310ffdea
Finish subuser controller 2017-09-04 18:12:13 -05:00
Jakob Schrettenbrunner
73d153cacb fix pterodactyl:user command 2017-09-04 23:50:21 +02:00
Dane Everitt
7222754580
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-04 14:34:40 -05:00
Dane Everitt
b12f6f1156
Tests for RemoteRequestController 2017-09-04 14:34:38 -05:00
Dane Everitt
8f14ee989d Apply fixes from StyleCI 2017-09-03 21:41:03 +00:00
Dane Everitt
54554465f2
Add more front-end controllers, language file cleanup 2017-09-03 16:32:52 -05:00
Dane Everitt
4532811fcd
Improved middleware, console page now using new setup 2017-09-02 21:35:33 -05:00
Dane Everitt
37508a370d
Finish up unit tests for base controllers 2017-09-02 18:56:15 -05:00
Dane Everitt
4203cdcb77
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-09-02 00:21:17 -05:00
Dane Everitt
53d1182645
Add unit tests for API key controller 2017-09-02 00:21:15 -05:00
Georgiy Slobodenyuk
7feb8bcedc Fix typo 2017-09-01 23:39:10 -04:00
Dane Everitt
30660cfac2 Apply fixes from StyleCI (#609) 2017-08-30 21:14:20 -05:00
Dane Everitt
e045ef443a
Should wrap up the base landing page stuff for accounts, next step is server rendering 2017-08-30 21:11:14 -05:00
Dane Everitt
67ac36f5ce
Refactor obscure service names to be clearer 2017-08-27 15:10:51 -05:00
Dane Everitt
1e1eac1b9c Apply fixes from StyleCI (#607) 2017-08-27 14:55:25 -05:00
Dane Everitt
f451e4dc47
Begin unit tests for repositories 2017-08-26 19:58:24 -05:00
Dane Everitt
72735c24f7
Complete move from old repository to new repository structure! 2017-08-26 18:08:11 -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
Dane Everitt
3ee5803416
Massive PHPCS linting 2017-08-21 22:10:48 -05:00
Dane Everitt
b2ec9960a1
Unit tests for pack service 2017-08-21 21:00:14 -05:00
Dane Everitt
cdfbc60030
Push pack services and fix for failing tests 2017-08-20 19:23:50 -05:00
Dane Everitt
280633b28a
More service classes for pack management 2017-08-19 20:40:00 -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
46cb71e69d Apply fixes from StyleCI (#590) 2017-08-15 23:21:01 -05:00
Dane Everitt
1260a8384a
Initial implementation of controller unit tests. 2017-08-15 23:16:00 -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
b8d7d99096
More repository/service/refactor changes 2017-08-12 15:29:01 -05:00
Dane Everitt
2c77d5c44d
Begin implementation of services for services/service options 2017-08-08 23:24:55 -05:00
Dane Everitt
7277f728a9
Complete migration of node controllers/repositories to new service structure 2017-08-08 21:21:10 -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
396b5c22d9
Fix formatting issue 2017-08-05 17:29:15 -05:00
Dane Everitt
a4b61846ac Apply fixes from StyleCI (#577) 2017-08-05 17:26:30 -05:00
Dane Everitt
4da7922de6
Code cleanup to use new findCountWhere function 2017-08-05 17:23:02 -05:00
Dane Everitt
c1a078bdcf
Add support for node management actions using new services 2017-08-05 17:20:07 -05:00
Dane Everitt
275c01bc37
Update user service to be more separated 2017-08-04 19:11:41 -05:00
Dane Everitt
8daec38622
Complete base implementation of services for administrative server creation 2017-07-24 21:34:10 -05:00
Dane Everitt
f842aae3d3
Add build modification settings, fix exception handling to log to file 2017-07-23 19:57:43 -05:00
Dane Everitt
ebb3a01036
Should fix failing travis builds 2017-07-23 17:55:38 -05:00
Dane Everitt
7f0130100d
Fix routes file 2017-07-23 15:09:25 -05:00
Dane Everitt
5144e0126b
Add support for more server functionality 2017-07-23 14:51:18 -05:00
Dane Everitt
acbc52506c
Finish unit tests for all server services 2017-07-22 20:15:01 -05:00
Dane Everitt
3add44d342
Fix database management for servers 2017-07-22 14:07:51 -05:00
Dane Everitt
63e39fbe58
Fix database management things to actually work correctly. 2017-07-22 13:55:30 -05:00
Dane Everitt
580e5ac569
Begin working on administrative server view changes 
Also includes tests for the DatabaseCreation service.
 2017-07-21 21:17:42 -05:00
Dane Everitt
0c513f24d5
Move server creation over to new service/repository setup. 
Moves tons of functions around, but the basic implementation is working again.

Some features are still missing, and the service never actually commits the server to the database right now.

This push is mostly just to get the code into Github and backed up.
 2017-07-19 20:49:41 -05:00
Dane Everitt
bc3366b10d
Repository interface improvements 2017-07-15 11:52:34 -05:00
Dane Everitt
1f4f6024cc
Refactor (again) 2017-07-09 12:29:18 -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
2588c25b0b
Service refactor to improve organization 2017-07-08 15:04:59 -05:00
Dane Everitt
761d34f178
don't try to apply columns in the relations field... 2017-07-08 14:17:07 -05:00
Dane Everitt
bd78e3544d
Merge branch 'develop' into feature/PTDL-472 2017-07-08 14:08:02 -05:00
Dane Everitt
0deb022093
Update last of existing services to use repositories, includes unit tests 
Also update PHPDocs on all the repository interfaces and classes to be correct.
 2017-07-08 14:07:51 -05:00
Joost Kwakkel
a1376db4fd Redirect user to node allocation view after creation, closes #535 2017-07-08 18:14:54 +02:00
Dane Everitt
50588a1f54
Update location and databasehost services to use repositories 
Includes unit tests for both services
 2017-07-02 21:29:58 -05:00
Dane Everitt
5c3dc60d1e
Addition of repository to ease testing and maintainability 2017-07-01 15:29:49 -05:00
Dane Everitt
2f4ec64f2a
Merge branch 'develop' into feature/PTDL-472 2017-07-01 12:33:30 -05:00
Dane Everitt
9515128b8a
Respond 401 not 404 when bad request token 2017-06-28 20:05:50 -05:00
Dane Everitt
d908672644 Apply fixes from StyleCI (#519) 2017-06-25 15:37:45 -05:00
Dane Everitt
b7b046c044
Merge branch 'develop' into feature/PTDL-472 2017-06-25 15:36:39 -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
2235481765
More service structure testing and configuration 
Tests aren't working as well as I had hoped, so a lot are commented out while I wait to hear back on this bug causing them to fail.
 2017-06-24 19:49:09 -05:00
Dane Everitt
cba54637fc
Fixes bug with newly created variables not being assigned to existing servers properly, closes #478 2017-06-18 21:38:00 -05:00
Dane Everitt
dcab84b1da
Fix bug with server default ports not being updated properly 2017-06-18 21:03:39 -05:00
Dane Everitt
1c5f892049
backfill fixes from 65957e7e to address #470 in active release 2017-06-18 20:39:04 -05:00
Dane Everitt
32b639e3eb
Return a 404 if attempting to delete a user that does not exist; closes #503 2017-06-18 20:27:24 -05:00
Dane Everitt
ce2b2447d0 Apply fixes from StyleCI (#501) 2017-06-17 20:52:32 -05:00
Dane Everitt
0111ca7768
Push more changes to DBHost service. 
Currently updating via the frontend is broken if you don't provide an actual node to attach it to.
 2017-06-17 19:48:31 -05:00
Dane Everitt
cede747442
Cleanup user and location controllers. 2017-06-17 17:36:39 -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
fe4977f0fa
Update admin location routes and controller to use service 
Needs tests written, uses new validation on model.
 2017-06-14 23:53:24 -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
Dane Everitt
65957e7ea5 Begin implementation of new request validation, closes #470 2017-06-03 18:41:35 -05:00
Dane Everitt
265b697066 Apply fixes from StyleCI (#471) 2017-06-03 17:07:50 -05:00
Dane Everitt
8b762cbaf5
Also update service listing to accommodate no variables. 2017-05-24 20:42:31 -05:00
Dane Everitt
9116547e98
allow emptying server description, closes #442 2017-05-23 23:00:31 -05:00
Dane Everitt
f0fca2a681
Fix missing log class on API calls with errors. 2017-05-23 22:56:54 -05:00
Dane Everitt
8144535b82
Prevent invalid service tag names, ref #443 2017-05-23 21:59:47 -05:00
Dane Everitt
cce27dfff1
Fix API response to show correct error. 2017-05-22 19:25:26 -05:00
Dane Everitt
72c0330486
Fixes 2FA not honoring 'Remember Me' checkbox, closes #439 2017-05-22 19:09:42 -05:00
Dane Everitt
999411da29
Fix inability to assign services with no variables, closes #447 2017-05-22 18:43:52 -05:00
Dane Everitt
5bdd75eb94
Fix IP checking in API middleware, closes #425 2017-05-06 23:02:12 -04:00
Dane Everitt
4306eaa00e
For english language, will be fixed in 0.6.1 when translations are more complete and better implemented. 2017-05-06 22:06:57 -04:00
Dane Everitt
de0b9beacb
Minor visual tweaking and filemanager backend improvements. 2017-05-05 23:13:42 -04:00
Dane Everitt
9343ac7b7d
add more default variables, closes #427 2017-05-05 17:15:13 -04:00
Dane Everitt
a52d9eb0fb
fix error display when server is installing, closes #424 2017-05-05 16:27:38 -04:00
Dane Everitt
4f127b95f0 close #421 2017-05-02 22:41:10 -04:00
Dane Everitt
5651d9ae2b
Fix authentication code for daemon requests. 2017-05-02 20:11:56 -04:00
Dane Everitt
9ccefbec44 Apply fixes from StyleCI (#417) 2017-05-01 23:00:34 -04:00
Dane Everitt
b3e5565f85
Cleanup auto-deployment functions substantially 
Also cleans up ServerRepository to use named models more clearly.
 2017-05-01 22:59:58 -04:00
Dane Everitt
c59cfce72c Apply fixes from StyleCI (#416) 2017-05-01 20:58:36 -04:00
Dane Everitt
4eaf858684
Fix inability to set user as non-admin, closes #414 2017-05-01 17:05:30 -04:00
Dane Everitt
43df6533b0
Ensure reserved environment names aren't changed, fix undefined variable, ref #412 2017-05-01 17:01:46 -04:00
Dane Everitt
5545075302
Fix docker image field being required for inheritance, closes #413 2017-05-01 16:51:50 -04:00
Dane Everitt
c9c0e845b1
Go nuclear on Safari's autocomplete. 2017-05-01 16:41:39 -04:00
Dane Everitt
b539f26dab
Stop browser autofill on user view pages. 2017-05-01 16:17:31 -04:00
Dane Everitt
6dc1c15739
Fix display of associated servers when viewing an administrative user in the Admin CP. 2017-05-01 15:28:43 -04:00
Dane Everitt
ae6b0f5c5e
Use the cache tags correctly. 2017-05-01 14:52:14 -04:00
Dane Everitt
d919b2ed40
Pass the token correctly. 2017-05-01 14:26:59 -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
2330c25a8c
Move old /remote routes into /daemon sphere. 2017-05-01 13:59:33 -04:00
Dane Everitt
7eb7377dd5
I really need to stop trying to override PHP reserved keywords... 2017-04-28 10:19:04 -04:00
Dane Everitt
1c37a8fe1a
Fixes account creation and password reset abilities. 2017-04-28 00:07:38 -04:00
Dane Everitt
aa6060846d
Actually show errors on password reset page. 2017-04-27 23:44:26 -04:00
Dane Everitt
7e0cbe8db1
Pass behind_proxy properly. 2017-04-27 22:55:42 -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
801aae968c
Show git version if panel is installed with git 2017-04-27 22:28:01 -04:00
Dane Everitt
e4c341795d
Try to automatically quote strings. 
Incredibly basic checking, only checks if there is a space and no quote
character.

Also includes comments on edited lines to avoid users changing things
that get overwritten again later.
 2017-04-27 16:26:22 -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
Fillerino
5cc28a0716 Fixing timing attack vuln. on HMAC comparison (#409) 2017-04-24 16:49:03 -04:00
Dane Everitt
147f473eeb
Add back disk limiting! 2017-04-21 22:44:56 -04:00
Dane Everitt
a5a1ea3165
Add ability to change service implementation for a server. 2017-04-21 17:52:44 -04:00
Dane Everitt
e0958414d7
Fix server deletion 2017-04-21 17:21:00 -04:00
Dane Everitt
8dc24471ae
Add reinstall abilities and cleanup process for new servers 2017-04-20 18:52:43 -04:00
Dane Everitt
3fe5d162f5
Add skip scripting option 2017-04-20 17:57:40 -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
33262cf34c
Set correct console frequency 2017-04-17 21:54:26 -04:00
Dane Everitt
e4ef8caf2d
Fix model not found error when editing an existing subuser. 2017-04-17 21:47:11 -04:00
Dane Everitt
619d3fe480
Fix autodeploy time checking. 2017-04-17 21:37:45 -04:00
Dane Everitt
3acc7b338b
Allow deleting default allocation and setting new default at the same time. 2017-04-17 21:07:37 -04:00
Dane Everitt
de923bbb83
Fix server deletion logic, and clean up suspend/unsuspend operations 2017-04-17 20:16:05 -04:00
kasper Franz
f5810f068a change server to server_id since that is the new name 2017-04-16 13:37:40 +02:00
Dane Everitt
f58858206e
Add console popout option. 
Popout: https://s3.kelp.in/IrTyE.png
Menu: https://s3.kelp.in/JYwlC.png
Menu Hover: https://s3.kelp.in/cPtSf.png
 2017-04-15 18:23:29 -04:00
Dane Everitt
1a87943f07
Fix missing CommandRepository statement 2017-04-15 13:54:34 -04:00
Dane Everitt
7f1a97184b
Un-butcher task system. 2017-04-15 13:52:43 -04:00
Dane Everitt
0fe9a4566e
Improve server and user model code to accept a specific user 2017-04-15 12:48:47 -04:00
Dane Everitt
2770e6d1b4
Remove old file, fix autoloading issues 2017-04-15 12:13:29 -04:00
Dane Everitt
d20cb144be
Fix misnamed class 2017-04-14 20:46:50 -04:00
Dane Everitt
97cc30e502
Assorted fixes 2017-04-14 20:10:09 -04:00
Dane Everitt
7cead2635a
Spelling. 2017-04-14 17:55:25 -04:00
Dane Everitt
6a1c1c1215
Needle is not haystack. 2017-04-14 17:54:11 -04:00
Dane Everitt
5a95a3a044
Fix environment script to not explode when default option isn't in array. 2017-04-14 17:52:36 -04:00
Dane Everitt
2564276657
Seems the 'r' key is loosing its sensitivity... 👀 2017-04-14 17:11:54 -04:00
Dane Everitt
52fb4f58d5
Ship with support for login notifications 2017-04-14 17:10:01 -04:00
Dane Everitt
f1024ad1a8
Improved login controller func. for 2FA, throws Failed event correctly now 2017-04-14 14:33:15 -04:00
Dane Everitt
26557b6a3f
Fix extraneous MySQL calls being made for each server record listed on page. 2017-04-14 01:25:56 -04:00
Dane Everitt
6fda3b72e4
Display total servers user can access in the Admin CP 
closes #356
 2017-04-13 23:49:47 -04:00
Dane Everitt
23e6e0510b
Move config::set calls into single helper function 2017-04-13 23:19:01 -04:00
Dane Everitt
9320c26b86
fix misnamed variable, close #377 2017-04-13 22:30:32 -04:00
Emmet Young
16b8480325 Repair php artisan pterodactyl:env 2017-04-11 02:49:37 +10:00
Dane Everitt
2c1b332fee
Minor API handling fixes. 2017-04-09 19:22:49 -04:00
Dane Everitt
db168e34bd Merge pull request #371 from Pterodactyl/feature/fractal-api 
Implement new API and Route Updates
 2017-04-09 19:17:06 -04:00
Dane Everitt
93d79994f8 Apply fixes from StyleCI (#372) 2017-04-09 19:16:39 -04:00
Dane Everitt
1e43f2049b
Fix up routes and controller names 2017-04-09 19:13:22 -04:00
Dane Everitt
722fd614a1
Add new dynamic view for creating API keys 2017-04-09 18:59:54 -04:00
Dane Everitt
87c09a921b
More defined naming scheme for config 2017-04-09 16:05:18 -04:00
Dane Everitt
de8bbcd098
Configuration for API pagination and includes on listing 2017-04-09 16:04:08 -04:00
Dane Everitt
69dfd380ad
Finalize API routes 2017-04-09 15:53:53 -04:00
Dane Everitt
f0c3f6f9b6
Fix location permission name 2017-04-09 15:39:44 -04:00
Dane Everitt
a2a4ab05c8
Corrected permissions to go with the more logical thought process 2017-04-09 15:35:49 -04:00
Dane Everitt
820d2bf172
Node and user API routes implemented. 
More attempts at the logic for API permissions, most likely will need
continued tweaking in the future, but base is there.
 2017-04-09 15:31:10 -04:00
Dane Everitt
f24b238e30
Base node route implementation 2017-04-09 13:52:31 -04:00
Dane Everitt
75b8753533
Simplify server and api key policy. 2017-04-09 13:34:47 -04:00
Dane Everitt
c492446513
Implement initial server and location API routes. 
Also fixes a few exception handler issues causing incorrect HTTP status
codes on authorization errors.
 2017-04-09 13:15:15 -04:00
Dane Everitt
463f465dea
Block viewing node allocations and location unless user has permission 
Blocks viewing the allocation list and location for a node unless a
user has permission to view the node in the first place.
 2017-04-08 12:07:17 -04:00
Dane Everitt
4479d3bf19
Improved logic for handling permissions on API routes. 
Still only partially implemented, however this method will allow the
inclusion of data that is granted with servers (such as viewing more
about the node, node location, allocations, etc) while still limiting
someone from doing `?include=node.servers` and listing all servers when
they don’t have list-servers as a permission.
 2017-04-08 12:05:29 -04:00
Dane Everitt
db4df2bfa1
Push basis of new API key policy 
Will need to revisit this another day when I’m fresh to figure out the
best method to do this.
 2017-04-07 21:25:17 -04:00
Dane Everitt
51204b8d9d
Add all of the potential transformers that might be needed for now. 2017-04-07 20:28:58 -04:00
Dane Everitt
faa437b77b Use the current_password not password field when verifying passwords. 2017-04-04 12:14:24 -04:00
Dane Everitt
65630bdcce
Move API to use JSON:API standards and fractal serializer 
Makes the data slightly more complex, but forces a standard and can
always be changed down the road simply by changing the default
serializer.
 2017-04-02 16:51:56 -04:00
Dane Everitt
c071efd008
Finish API routes for users. 2017-04-02 15:52:53 -04:00
Dane Everitt
97773300ed
Better middleware for routes, cleaned up API, removed old API calls 
New API routes for Server allow specifying which fractal objects to
load into the request, thus making it possible to fine-tune what data
is returned.
 2017-04-02 13:19:39 -04:00
Dane Everitt
ddb82ac3ca
Add initial user server transformer for API. 2017-04-02 00:49:53 -04:00
Dane Everitt
87530cdc01
Initial moves to new API scheme. 
Implements a better middleware for handling API authentication, as well
as cleaner route handling.
 2017-04-02 00:11:52 -04:00
Dane Everitt
e5f3678c62
Fix login routes 2017-04-01 21:18:56 -04:00
Dane Everitt
5927e0e12a
Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	app/Http/Controllers/Base/LanguageController.php
#	app/Http/Kernel.php
#	app/Http/Middleware/TrimStrings.php
#	app/Providers/RouteServiceProvider.php
 2017-04-01 21:03:10 -04:00
Dane Everitt
d80c59aad3
Cleanup routing mechanisms 2017-04-01 21:01:10 -04:00
Dane Everitt
9c303456fb Update codebase to L5.4 (#367) 2017-04-01 17:59:43 -04:00
Dane Everitt
0a95d97d7f
Better support for redis as a backend 2017-04-01 16:31:18 -04:00
Dane Everitt
cbeecfe5e4
Implement front-end server searching 🍬 2017-04-01 13:14:49 -04:00
Dane Everitt
27d472195f
Misc. bug fixes 2017-04-01 12:29:56 -04:00
Dane Everitt
844ebfaf64
Add support for starting server on creation. 2017-04-01 12:29:49 -04:00
Dane Everitt
edaa270a33
Add server descriptions, closes #338 🐖 
🐷 https://s3.kelp.in/D0n2Z.png
 2017-03-31 23:07:19 -04:00
Dane Everitt
536865b22a
Remove deletion queue for servers. Just immediately delete. 2017-03-31 22:12:31 -04:00
Dane Everitt
2dec659dd1
Fix syntax error. 2017-03-31 21:47:53 -04:00
Dane Everitt
c7d4c3aa76
Send default response 2017-03-31 21:16:00 -04:00
Dane Everitt
ff57e2ff85
Cleanup recaptcha middleware 2017-03-31 21:12:49 -04:00
Dane Everitt
451dd7ebc8 Apply fixes from StyleCI (#364) 2017-03-31 20:48:35 -04:00
Jakob Schrettenbrunner
e613e44749 fix #363 2017-04-01 01:58:05 +02:00
Jakob Schrettenbrunner
0ee80b1fec fix captcha middleware using wrong function when disabled 2017-04-01 01:54:42 +02:00
Jakob Schrettenbrunner
ec0b55bcfe fix missing path for Permission model in SubuserRepository 2017-03-31 12:50:58 +02:00
Jakob Schrettenbrunner
207e0131fc Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset 2017-03-31 12:20:41 +02:00
Jakob Schrettenbrunner
142cbb0641 Add invisible ReCAPTCHA to login and password reset 2017-03-31 12:19:44 +02:00
Dane Everitt
1f0e95790a
🔒 Don't disclose if account exists when resetting passwords, closes #358 2017-03-30 17:44:20 -04:00
Dane Everitt
9106971565
closes #362 2017-03-30 16:30:22 -04:00
Dane Everitt
95c739a3f3
Update subusers view 2017-03-30 15:31:02 -04:00
Dane Everitt
f0057353ad Apply fixes from StyleCI 2017-03-19 23:52:11 +00:00
Dane Everitt
0312c974f5
Update doc blocks for all app/ 2017-03-19 19:36:50 -04:00
Dane Everitt
5e27772fef
Very rough go at getting API back into operational state. 
Not spending a lot of time on this as its a pre-release and I have
plans to overhaul the API to actually work and be easy to maintain.
 2017-03-19 13:20:33 -04:00
Dane Everitt
4e916cbf08
Fix auto-deploy checkbox triggering error 2017-03-19 12:39:22 -04:00
Dane Everitt
da19749098
Fix phraseapp and move config location 2017-03-19 11:55:36 -04:00
Dane Everitt
e8a80c6a20
Fix allocation parsing bug. 2017-03-19 11:13:18 -04:00
Dane Everitt
377fe92f5b
Don't try to render 200 lines per second in the console... 💣 
Corrects a math mistake on my end, and makes the console speed
configurable again. Now sends 50 messages per second.

Console will notify when being throttled, and refreshing the page will
clear the queue if necessary.
 2017-03-19 11:13:17 -04:00
Dane Everitt
82b3cbc246
Minor fixes 2017-03-18 20:52:02 -04:00
Dane Everitt
6ee878080b
Fix rebuild to pass things that are needed. 2017-03-18 19:03:05 -04:00
Dane Everitt
4f16509447
Use env() properly throughout panel to avoid cache issues. 2017-03-18 15:56:19 -04:00
Dane Everitt
9a581ef536
Add support for rebuilding servers from the console. 2017-03-18 15:26:08 -04:00
Dane Everitt
03e0de28d9
Initial implementation of option scripts on panel side. 2017-03-18 13:09:30 -04:00
Dane Everitt
5d990dcb06
Revert "Rename startup command to add deprecation support to containers." 
This reverts commit fdd1d11038.
 2017-03-17 19:35:48 -04:00
Dane Everitt
fdd1d11038
Rename startup command to add deprecation support to containers. 2017-03-17 19:09:54 -04:00
Dane Everitt
202dd52e2b
Fixes bug causing MySQL user accounts to be corrupted when resetting a password via the panel. 
closes #352
 2017-03-17 17:17:36 -04:00
Dane Everitt
7e45f917c7
Fix subuser permissions in file manager 2017-03-17 16:19:45 -04:00
Dane Everitt
4ad09c5435
Fixes bug introduced during admin rewrite that broke server creation 2017-03-16 21:11:15 -04:00
Dane Everitt
be60299089
Send correct container to daemon 2017-03-16 20:49:11 -04:00
Dane Everitt
b8c3ab6960
closes #339 2017-03-16 19:56:58 -04:00
Dane Everitt
1aa191210a
closes #344 2017-03-16 19:54:31 -04:00
Dane Everitt
198a021a97
Add database host management to panel. 2017-03-16 19:35:29 -04:00
Dane Everitt
5bbded2c03
Correctly json_encode validation errors. 2017-03-16 19:30:04 -04:00
Dane Everitt
05d2a6d370
Add back locations with new theme 2017-03-16 18:09:02 -04:00
Dane Everitt
db072025d4
Reference the correct column in the DB 2017-03-15 21:39:50 -04:00
Dane Everitt
1852018397
Add back missing node creation page. 2017-03-15 21:38:09 -04:00
Dane Everitt
436ba814a9 Apply fixes from StyleCI (#351) 2017-03-15 20:53:49 -04:00
Dane Everitt
1c47b2ed55
Finish pack management in Admin CP 2017-03-15 20:52:37 -04:00
Dane Everitt
4730309589
Add IDE helper for all functions 2017-03-15 19:47:44 -04:00
Dane Everitt
50558db7c3
Add initial pack creation and overview pages 2017-03-14 21:18:36 -04:00
Dane Everitt
2d90187c83
StyleCI fixes 2017-03-12 19:38:50 -04:00
Dane Everitt
fcadee7e67
Fix front and backend views with new service variable setups 2017-03-12 19:34:06 -04:00
Dane Everitt
66e94dd7c0
combine validation 2017-03-12 18:31:56 -04:00
Dane Everitt
97cad1d55e
Update seeders to not error out and allow updating values quickly. 2017-03-12 18:02:15 -04:00
Dane Everitt
e791d561ba
More StyleCI... 2017-03-12 16:35:25 -04:00
Dane Everitt
1897741381
StyleCI cleanup 2017-03-12 16:34:43 -04:00
Dane Everitt
f5a4ec981d
Add ability to create new service variable. 2017-03-12 16:28:38 -04:00
Dane Everitt
b1b1f448e9
Send the correct information to daemon for new index.js setup 2017-03-12 16:04:47 -04:00
Dane Everitt
419031e0cd
Add function file editing, and move all service file items into database 2017-03-12 15:59:17 -04:00
Dane Everitt
d7682bb7c9
Complete new service, option, and variable management interface in Admin CP 2017-03-12 00:00:06 -05:00
Dane Everitt
bccbb309b2
Fix broken descriptors 2017-03-11 15:02:04 -05:00
Dane Everitt
70db461075
Start push of service changes. 
Changes the way service files are stored and allows for much easier
updates in the future that won’t affect custom services.

Also stores more configurations in the database to make life easier for
everyone.
 2017-03-10 18:25:12 -05:00
Dane Everitt
5bf2e2686a Apply fixes from StyleCI (#335) 2017-03-05 20:28:29 -05:00
Dane Everitt
3355554704
Fix frontend database password reset 2017-03-05 16:46:44 -05:00
Dane Everitt
32dec97e46
Improved database mechanics in admin CP for server view 2017-03-05 16:37:40 -05:00
Dane Everitt
349b36d38a
Added startup management, cleaned up code. 
Refactored entire startup repository code block to be more efficient
and cleaner. Also includes modifications to front-end to make it match
backend name and design.
 2017-03-04 23:45:25 -05:00
Dane Everitt
d51ae5ec23 Apply fixes from StyleCI (#332) 2017-03-04 19:28:23 -05:00
Dane Everitt
cbbd3704fe
Add a second check here *just* to make sure someone doesn't break this. 2017-03-04 19:27:24 -05:00
Dane Everitt
cd0a45a777
Fixes caching to actually clear the cache for *all* users, rather than the logged in user by using cache tags. 2017-03-04 19:24:46 -05:00
Dane Everitt
5d59d364f8
Fixes bug preventing proper updating of caches and models due to undefined Auth::user() 2017-03-04 19:04:11 -05:00
Dane Everitt
e688468920
Push updated server views 2017-03-04 19:03:49 -05:00
Dane Everitt
b1564389d8 Apply fixes from StyleCI (#331) 2017-03-03 23:38:21 -05:00
Dane Everitt
e6d3663b3b
Model and template cleanup 2017-03-03 23:37:41 -05:00
Dane Everitt
d38f89a468
Cleanup node routes, cleanup remote token 2017-03-03 23:14:25 -05:00
Jakob Schrettenbrunner
6df573e50c retheme admin users list 2017-03-04 00:16:11 +01:00
Dane Everitt
fd5b74c873
Use usernames for @schrej 2017-03-03 17:53:35 -05:00
Dane Everitt
fd9f1a68eb
Implement node view, cleanup other files. 
Still in progress, need to do a lot of controller cleanup first and add
node deletion as well.
 2017-03-03 17:30:41 -05:00
Dane Everitt
fb21bf9282
Begin implementation of server admin view 
Currently completed tabs: About, Details, Build Configuration
 2017-02-25 00:48:14 -05:00
Dane Everitt
bbf9fd12ae Apply fixes from StyleCI (#325) 2017-02-24 18:23:03 -05:00
Dane Everitt
cb6b44d4f0
Completed new server page with new theme. 2017-02-24 18:19:03 -05:00
Dane Everitt
58999913ba
More improvements to add server page. 2017-02-23 22:52:05 -05:00
Dane Everitt
8f96b35db1
Merge branch 'develop' into feature/admin-retheme 2017-02-23 21:24:17 -05:00
Dane Everitt
b11029a666 Apply fixes from StyleCI (#312) 
* Bump for release

* Apply fixes from StyleCI
 2017-02-18 22:57:50 -05:00
Dane Everitt
ed4068bdb9
Fix bug preventing server container rebuilds. 2017-02-18 22:33:15 -05:00
Dane Everitt
644c07ea3a
Fix broken port deletion 2017-02-18 22:32:16 -05:00
Dane Everitt
efdc3e6fd8
Add cache policy for ServerPolicy 
10 second cache, just long enough to handle the page load without
making more than one MySQL call.
 2017-02-18 22:26:07 -05:00
Dane Everitt
f91e4c511e
Attach user to cache to prevent showing servers they can't access. 2017-02-18 21:45:11 -05:00
Dane Everitt
b926d432e8
Thats enough re-theming for the day... 2017-02-18 19:31:44 -05:00
Dane Everitt
824041f6ca
Fix service creation/updates, closes #306 2017-02-17 20:40:50 -05:00
Dane Everitt
99497adcb2
Show proper server status when viewing listing. 
closes #308
 2017-02-17 20:34:57 -05:00
Dane Everitt
e9762b4277
Fixes port deletion for node allocations as well as server notes on allocations. 
closes #305
 2017-02-17 19:59:40 -05:00
Dane Everitt
22da8d47c8
Auto-fill emails when resetting password 2017-02-17 19:45:14 -05:00
Dane Everitt
6a996c7c0c
Fix account creation email 2017-02-17 19:35:26 -05:00
Dane Everitt
054e65b78f
Fix user deletion 2017-02-17 19:28:23 -05:00
Dane Everitt
397172de3b
Better notification for user creation, only add button if needed. 2017-02-17 19:26:02 -05:00
Dane Everitt
008cccb098
Fix up email sending and add more notifications to the panel. 
Closes #265
 2017-02-17 19:23:27 -05:00
Dane Everitt
95171a3e41
Better user creation email. 2017-02-17 18:48:57 -05:00
Dane Everitt
3240601d03
Fix bug when trying to add new subuser. 2017-02-17 18:26:47 -05:00
Dane Everitt
9af06b4b59
Add in query caching on server view 2017-02-17 18:19:53 -05:00
Dane Everitt
ff9904227b
Fix server editing 2017-02-17 18:17:28 -05:00
Dane Everitt
008b18e19a
Fixes deployment issue with new servers due to DB changes. 2017-02-17 12:08:11 -05:00
Dane Everitt
73996d3154
Fix bug in node update 2017-02-16 15:57:02 -05:00
Dane Everitt
59f9ab6e90
Help @schrej not have an aneurysm. 2017-02-16 15:49:14 -05:00
Dane Everitt
5e63ac0baa
Fix double encoding of JSON 2017-02-16 15:38:56 -05:00
Dane Everitt
d4e1bc6cc0
Discord link via CDN now. 2017-02-16 15:01:26 -05:00
Dane Everitt
4e66ba078d
Fix locations error on create 2017-02-16 14:56:28 -05:00
Jakob
d230ee179a Merge pull request #299 from Pterodactyl/feature/allow-login-with-username 
allow to use the username for login as well
 2017-02-16 20:47:25 +01:00