Commit Graph

72 Commits

Author SHA1 Message Date
Dane Everitt
bacdfae768
Probably breaks everything, lowercase pterodactyl 2018-02-20 13:33:32 -06:00
Jakob Schrettenbrunner
72ac95267b fix some merge fails 2017-10-09 21:01:24 +02:00
Jakob Schrettenbrunner
44f42eec8c Merge branch 'develop' of github.com:Pterodactyl/wings into develop
# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go
2017-10-01 20:59:32 +02:00
Jakob Schrettenbrunner
c979285eb9 current state of api & docker env implementation 2017-10-01 20:42:17 +02:00
Dane Everitt
90fd485edf
Lets not, please. 2017-09-30 19:25:45 -05:00
Dane Everitt
339d2d286d
Forgotten routes into v1 namespace 2017-09-30 18:37:08 -05:00
Dane Everitt
1bfc016e1b
Clean up route handling 2017-09-30 18:35:44 -05:00
Dane Everitt
256c566dfe
Change to using yml for configuration files 2017-09-30 17:25:04 -05:00
Jakob Schrettenbrunner
7b9c67d508 api: improve routes 2017-08-31 23:57:33 +02:00
Jakob Schrettenbrunner
ef28b61136 config: use constants with config keys instead of struct as its easier to handle 2017-08-31 20:13:01 +02:00
Jakob Schrettenbrunner
40836a5ec4 api: rewrite auth to handle new routes
api: add functions to retrieve auth handler and server from a gin.Context
2017-08-02 23:47:09 +02:00
Jakob Schrettenbrunner
3d789c0541 api: better routes 2017-08-02 23:23:41 +02:00
Jakob Schrettenbrunner
91ff924933 api: add first status implementation on / 2017-08-02 22:49:59 +02:00
Jakob Schrettenbrunner
059ea8a047 add all old routes and handlers
add html index page when not authenticated
fixed auth's handling of empty permissions
2017-08-02 22:02:34 +02:00
Jakob Schrettenbrunner
3a65f409d1 rewrite auth
don't disclose auth denial reasons in response
2017-08-02 21:35:15 +02:00
Jakob Schrettenbrunner
d9f57ce7ed fix assert.Equal order 2017-07-29 13:09:17 +02:00
Jakob Schrettenbrunner
9c364970f0 basic api server initialization 2017-07-06 20:55:26 +02:00
Jakob Schrettenbrunner
d856081483 add test files for auth middleware 2017-07-06 20:49:50 +02:00
Jakob Schrettenbrunner
0bceb409e5 implement auth middleware 2017-07-06 20:49:36 +02:00
Jakob Schrettenbrunner
7055f0c9b2 update import paths
update Readme with shields
2017-06-26 20:44:37 +02:00
Jakob Schrettenbrunner
06055d6265 unmarshal config into struct with viper for consistent access 2017-06-26 11:07:53 +02:00
Jakob Schrettenbrunner
326fdcae6e very basic thoughts on module and file structure
basic configuration
basic logger
2017-06-19 00:01:44 +02:00