Commit graph

750 commits

Author SHA1 Message Date
Dane Everitt
0720bfe62f
Cleanup database query code. 2017-02-10 17:03:58 -05:00
Dane Everitt
99812b0407
More subuser Model updates. 2017-02-09 19:38:54 -05:00
Dane Everitt
c8f6c93d26
Modify subusers model setup 2017-02-09 18:44:07 -05:00
Dane Everitt
4f61637284
More model updates to more places than I anticipated.
This probably broke a lot of things.
2017-02-09 17:43:54 -05:00
Jakob
c7d48d73c1 Merge pull request #284 from Pterodactyl/fix/trusted-proxies
Allow to set trusted proxies to allow usage of load balancers and reverse proxies
2017-02-09 13:32:23 +01:00
Dane Everitt
0d61417814
Addresses security flaw allowing unauthenticated access to server overview. 2017-02-05 19:59:16 -05:00
Dane Everitt
02458c909d
Improves server model and cleans up model code calls. 2017-02-05 19:19:46 -05:00
Dane Everitt
b1389262e2
Use belongsTo versus hasOne when more logical. 2017-02-05 18:00:39 -05:00
Dane Everitt
323f1d943f
Completed model updates for Services 2017-02-05 17:58:17 -05:00
Dane Everitt
09d23deed6
New models for node and location admin pages. 2017-02-03 16:50:28 -05:00
Dane Everitt
96d3aa767f
Model updates for Database Management in ACP 2017-02-03 15:19:14 -05:00
Dane Everitt
9c2d34d6e6
Mo' StyleCI fixes... 🦀 2017-02-02 19:48:15 -05:00
Dane Everitt
242294598f Merge branch 'develop' into feature/updated-models 2017-02-02 19:47:10 -05:00
Dane Everitt
533e2bcafb
Fix database column references in ACP 2017-02-02 19:46:46 -05:00
Dane Everitt
3baa21a6eb
StyleCI fixes. 2017-02-02 19:43:55 -05:00
Dane Everitt
3114b7e52a
Complete implementation of new Server model. 2017-02-02 19:41:38 -05:00
Jakob
19567ee311 Merge branch 'develop' into fix/trusted-proxies 2017-02-03 00:38:58 +01:00
Jakob
8cac2a3669 Merge pull request #285 from Pterodactyl/feature/phrase-in-context
add phraseapp in context editor
2017-02-03 00:36:50 +01:00
Jakob Schrettenbrunner
600cc75637 update changelog 2017-02-03 00:29:50 +01:00
Dane Everitt
644ee85f59
Fix for StyleCI 2017-02-02 18:25:46 -05:00
Dane Everitt
c4b76bf48e
Remove FKs correctly 2017-02-02 18:25:11 -05:00
Dane Everitt
d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -05:00
Jakob Schrettenbrunner
7f1000dd8a make dane and styleci happy 2017-02-03 00:08:10 +01:00
Jakob Schrettenbrunner
7b659a773e handle * and ** for TRUSTED_PROXIES 2017-02-02 23:31:42 +01:00
Jakob Schrettenbrunner
7f0608d412 better naming of PhraseApp related stuff 2017-02-02 23:14:53 +01:00
Dane Everitt
fb589a7f4e
Fix session timeout issues on browser close. 2017-02-02 16:29:37 -05:00
Dane Everitt
7f51e5df62
API tweaks to return more relevant information on server listing 2017-02-02 16:24:08 -05:00
Dane Everitt
32c21baab0
Return packs associated with a service when viewing it on the API. 2017-02-02 16:01:18 -05:00
Dane Everitt
6220f710df
Cache configuration file when editing environment or mail settings. 2017-02-02 15:06:35 -05:00
Dane Everitt
e18391e98a
Commit composer lock and use config:cache for security purposes. 2017-02-02 15:01:15 -05:00
Jakob Schrettenbrunner
d9225e65df move phraseapp js into own file 2017-02-02 15:30:40 +01:00
Jakob Schrettenbrunner
8fc30fbe3a add phraseapp in context editor 2017-02-02 15:05:33 +01:00
Dane Everitt
4be9e30eee
Include that 30 second limit on other 2FA checks 2017-02-01 23:05:19 -05:00
Dane Everitt
a93adce303
Only allow up to 30 seconds of overlap on comparing the 2FA tokens. 2017-02-01 23:02:54 -05:00
Dane Everitt
4abdee0efb
Better 2FA implementation on logins 2017-02-01 22:58:48 -05:00
Dane Everitt
a1a81ac980
Fix auth page not remembering users. 2017-02-01 22:28:50 -05:00
Jakob Schrettenbrunner
24650b67be Merge branch 'develop' into fix/trusted-proxies
sorry
2017-02-01 20:35:10 +01:00
Jakob Schrettenbrunner
8ab4faad8a remove TRUSTED_PROXIES from .env.example
make style ci happy
2017-02-01 20:31:24 +01:00
Jakob Schrettenbrunner
ee26a7e8dd add fideloper/proxy to support reverse proxies and load balancers 2017-02-01 20:10:28 +01:00
Dane Everitt
e5ed1c7f6a One day eslint will have a PHP counterpart that works in Atom... 🤔 2017-01-31 20:04:34 -05:00
Dane Everitt
1679d866a5
Improved gzip detection 2017-01-27 16:47:50 -05:00
Dane Everitt
4b0197f2be
Implement basic security policy on daemon remote routes 2017-01-27 16:34:46 -05:00
Dane Everitt
9087feec4f
Remove build settings from packs. 2017-01-27 16:21:25 -05:00
Dane Everitt
4a6d62fded
Fix fatal error when trying to send server creation notification 2017-01-27 16:21:15 -05:00
Dane Everitt
e6d3e75024
Add new daemon routes for pack handling 2017-01-25 18:25:34 -05:00
Dane Everitt
95d0c646f9
Require packs to be a tarball 2017-01-25 18:25:34 -05:00
Dane Everitt
95730da419
Fix pack edit display 2017-01-25 18:25:34 -05:00
Dane Everitt
96e50506a1
Move notification email of server created into the event listener 2017-01-25 18:25:34 -05:00
Dane Everitt
b8271cf8f6 Merge pull request #272 from hammerdawn/ErrorImprovement
Location should be validated on creation of a server,
2017-01-25 14:10:59 -05:00
Emmet Young
58de6125c2 Location should be validated on creation of a server, 2017-01-25 22:01:57 +11:00