Commit graph

1997 commits

Author SHA1 Message Date
Dane Everitt
6419b1cf81
Handle password reset logic change for 2fa 2018-07-04 18:11:43 -07:00
Dane Everitt
af9af78938
Merge branch 'develop' into feature/vuejs 2018-07-04 18:09:07 -07:00
Dane Everitt
d9948f2876
Update changelog 2018-07-04 11:42:57 -07:00
Dane Everitt
8f5bd214a4
[Security] Address 2FA bypass in password reset functionality
Thanks to Trixter#0001 on Discord for this security report.

There was a two-factor authentication bypass present in all previous versions of Pterodactyl that would allow a user to login without providing a token by going through the password reset process. A person would still have to have access to the targeted account's email, but if they did manage to get a password reset link they would be able to reset the account password and then proceede to login without a token being required.

This logic has since been changed to check if 2FA is enabled on an account, and if so they will NOT be logged in when their password is changed. This will force them to continue through the normal login pathway where a token will be needed.

Overall the impact of this issue is minor, but I am still addressing it and disclosing the mechanism behind it.
2018-07-04 11:41:56 -07:00
Dane Everitt
48cb01f438
Merge branch 'develop' into feature/vuejs 2018-07-02 21:00:42 -07:00
Jan
422e5dd99f Update strings.php (#1227)
Fixed typo.
2018-07-02 15:04:16 -07:00
Dane Everitt
8915c3ec28
Update dependencies 2018-07-01 14:50:11 -07:00
Lance Pioch
b5022766df Do not keep processing the file/folder paths if the user has cancelled the operation and fix #1124 (#1177) 2018-07-01 14:42:01 -07:00
Stan
1ffb5acfad Send an email when a server is marked as installed (#1213)
Co-authored-by: @stanjg
2018-07-01 14:34:40 -07:00
Dane Everitt
c42605e495
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2018-07-01 13:50:56 -07:00
Dane Everitt
eeb4d88cbd
Disable codecov failing PRs 2018-07-01 13:50:55 -07:00
Isaac A
b6d18b0a36 Add support for authentication via Unix socket (#1206)
Co-authored-by: @tenten8401
2018-07-01 13:47:00 -07:00
Dane Everitt
1df3efdfb0
Fix eggs (#1224) 2018-06-30 18:52:32 -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
Dane Everitt
96699b192e
Don't verify SSL signatures in dev
[skip ci]
2018-06-30 18:24:35 -07:00
Dane Everitt
59730dcbc9
Speed up tests, allow coverage to fail since thats a slow process 2018-06-30 18:01:23 -07:00
Dane Everitt
5a97f54013
Try concurrent build process for travis 2018-06-30 17:55:41 -07:00
Dane Everitt
974318ffb4
Logout other sessions when password is changed
closes #1222
2018-06-30 17:50:58 -07:00
Matthew Penner
1da05a2ee2 Fix typo (#1210) 2018-06-30 13:25:51 -07:00
Sergzy
bad9ae58e8 Fix environment_variables name (#1212) 2018-06-30 13:25:40 -07:00
Stan
ad9ed5ea00 Fixed the permission (#1217) 2018-06-30 13:23:48 -07:00
Dane Everitt
e5e66fdb58
Fix error handling in dashboard 2018-06-11 20:42:01 -07:00
Jakob Schrettenbrunner
f971cdf9ca add v:serve shortcut for vagrant
automatically install nodejs and yarn
add some info on change detection in vagrant to BUILDING.md
2018-06-11 00:32:54 +02:00
Jakob Schrettenbrunner
5e3f705a4c add postcss for proper css compiling 2018-06-11 00:32:07 +02:00
Dane Everitt
03c83c084a
Revert use of cookies, go back to using a JWT 2018-06-06 22:49:44 -07:00
Dane Everitt
871147f2d9
Remove old storage 2018-06-06 22:18:43 -07:00
Dane Everitt
a6441169b1
Add build directions that are more useful 2018-06-06 21:59:45 -07:00
Dane Everitt
48982ecc00
Dont track ziggy, compiled asset 2018-06-06 21:46:14 -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
Jakob Schrettenbrunner
cbdf4d4e1a Merge branch 'feature/vuejs' into feature/move-to-webpack 2018-06-06 22:41:15 +02:00
Jakob Schrettenbrunner
6ed46c2e75 start adding webpack-serve for hot reloading 2018-06-06 22:33:24 +02:00
Dane Everitt
5bcabbde35
Get dashboard in a more working state 2018-06-05 23:42:34 -07:00
Dane Everitt
e948d81d8a
Base attempt at using vuex to handle logins 2018-06-05 23:00:01 -07:00
Jayden Downes
5f90d841d0 Fixed Search Bar Scaling in Firefox (#1187)
Fixed scaling issue with Firefox where it would scale the search bar to 30% of the width of the box-tools container instead of 30% of the row container. (Note this is not a fix for the issue with it appearing on a separate line on mobiles).
2018-06-04 19:33:34 -07:00
Lance Pioch
f54dc24cf4 Remove dupe issues thanks Microsoft (#1189)
* Delete bug-report.md

* Delete feature-request.md
2018-06-03 20:40:38 -07:00
Lance Pioch
8f0c740a15 Update issue templates (#1188)
* Update issue templates

* Delete ISSUE_TEMPLATE.md
2018-06-03 20:36:35 -07:00
Dane Everitt
cc58bc9bd5
Switch to uglifyjs for speed improvement, leverage caching 2018-06-03 20:34:30 -07:00
Dane Everitt
9d624d2c39
Fix things I broke when cleaning 2018-06-03 20:09:41 -07:00
Dane Everitt
680e8f22d9
Somehow this made node_modules bigger. 2018-06-03 20:02:08 -07:00
Dane Everitt
b32078d83c
Add helpers for building 2018-06-03 19:56:45 -07:00
Dane Everitt
daf9a20e62
Make that css smol 2018-06-03 19:50:58 -07:00
Dane Everitt
aea6944f16
Fix postcss plugin order 2018-06-03 19:40:05 -07:00
Dane Everitt
80b0816718
Better support for CSS and JS 2018-06-03 19:35:50 -07:00
Dane Everitt
bbdade398a
Name files correctly 2018-06-03 18:53:27 -07:00
Dane Everitt
8673a061ac
Remove gulp, move entirely to webpack 2018-06-03 18:46:27 -07:00
Dane Everitt
e84d2d6ae1
Get webpack working with the JS build 2018-06-03 18:03:46 -07:00
Dane Everitt
c5f6b1a919
Push what I have I guess 2018-06-03 17:40:35 -07:00
Dane Everitt
ee9a34716d
Add navigation to vue, improve responsiveness of the design 2018-06-02 23:15:10 -07:00
Dane Everitt
be5a9108f9
Dont refresh server statuses unless the page is active
Reduces the number of polling requests happening on the server by only sending those requests if the user is actively viewing the dashboard.

There was no point in updating the resource usage if no one is viewing it. After 30 seconds away from the window when a user comes back it will update instantenously, otherwise it'll just update after 5 seconds.
2018-06-02 22:23:54 -07:00