Commit Graph

137 Commits

Author SHA1 Message Date
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
Jakob Schrettenbrunner
d1fdc713f5 improve vagrant provision script 2017-10-01 20:39:59 +02:00
Jakob Schrettenbrunner
e17d96d094 update gitignore 2017-10-01 20:39:48 +02:00
Dane Everitt
90fd485edf
Lets not, please. 2017-09-30 19:25:45 -05:00
Dane Everitt
edc189001f
Remove ignored files 2017-09-30 18:43:01 -05:00
Dane Everitt
39a79add7c
Untrack 2017-09-30 18:42:33 -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
c1054c482f rename tools package to utils 2017-09-24 19:47:40 +02:00
Jakob Schrettenbrunner
8ebc74b3a3 utils: ensure loggin path is used correctly 2017-09-16 14:00:11 +02:00
Jakob Schrettenbrunner
e92e3e4e66 tools: ensure logging path exists 2017-09-16 13:56:20 +02:00
Jakob Schrettenbrunner
5ed3bb2a0c control: change container name prefix to ptdl- as underscores are not valid as hostnames 2017-09-04 00:20:45 +02:00
Jakob Schrettenbrunner
23200339ce travis: disable email notification 2017-09-01 02:34:28 +02:00
Jakob Schrettenbrunner
9268c1e9a8 add webhook notification to travis ci 2017-09-01 01:32:10 +02:00
Jakob Schrettenbrunner
6c58fec7d3 config: fix tests using old config struct 2017-09-01 00:05:36 +02:00
Jakob Schrettenbrunner
4a1682cc96 control: rename server to ServerStruct as it's needed in the api
control: add getServers() function to get a slice of all servers
2017-09-01 00:01:32 +02:00
Jakob Schrettenbrunner
a3fcd7c3e0 config: remove old config struct 2017-09-01 00:00:08 +02:00
Jakob Schrettenbrunner
4800c21be4 wings cmd: add config flag 2017-08-31 23:59:35 +02:00
Jakob Schrettenbrunner
09d2d6ec4a gitignore: ignore built wings executable 2017-08-31 23:59:06 +02: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
5f0804ea53 travis: switch to go 1.9 2017-08-31 20:04:53 +02:00
Jakob Schrettenbrunner
fbf7115fd7 travis: only compile against current stable go version 2017-08-03 00:11:00 +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
38875bcfac travis: limit builds to supported os/arch list 2017-08-02 23:23:13 +02:00
Jakob Schrettenbrunner
1bbad7d24e travis: only create $GOPATH/bin if it doesn't exist 2017-08-02 22:58:26 +02:00
Jakob Schrettenbrunner
91ff924933 api: add first status implementation on / 2017-08-02 22:49:59 +02:00
Jakob Schrettenbrunner
0a2eab96bb travis: add docker service 2017-08-02 22:44:45 +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
6e18e4a1ce fix missing server interface method HasPermission 2017-07-30 20:25:42 +02:00
Jakob Schrettenbrunner
636e75ae1f first implementation of docker environment 2017-07-30 20:05:06 +02:00
Jakob Schrettenbrunner
d9f57ce7ed fix assert.Equal order 2017-07-29 13:09:17 +02:00
Jakob Schrettenbrunner
addafe0137 travis: try different way to install glide 2017-07-06 21:35:55 +02:00
Jakob Schrettenbrunner
f7e371f380 travis: set execute permission on glide command 2017-07-06 21:28:04 +02:00
Jakob Schrettenbrunner
095de7e53d travis: extract correct file on glide install (derp) 2017-07-06 21:24:16 +02:00
Jakob Schrettenbrunner
9fd02667d8 travis: install glide properly 2017-07-06 21:00:56 +02:00
Jakob Schrettenbrunner
9c364970f0 basic api server initialization 2017-07-06 20:55:26 +02:00
Jakob Schrettenbrunner
e356ee5fa8 better logging initialization 2017-07-06 20:52:08 +02:00
Jakob Schrettenbrunner
55ec4af875 add constants package for constants 2017-07-06 20:51:27 +02:00
Jakob Schrettenbrunner
ec937603fd add first Server struct
implement loading of server configs
implement hasPermission on server struct
2017-07-06 20:51:09 +02:00
Jakob Schrettenbrunner
5c8eb31ba0 update dependencies 2017-07-06 20:50:05 +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
260c9d70ab add official wings ascii logo 2017-07-06 19:01:08 +02:00
Jakob Schrettenbrunner
4421349bfd rename main.go to wings.go 2017-07-06 19:00:21 +02:00
Jakob Schrettenbrunner
ae41a0e76e move git repo to github.com/Pterodactyl/wings 2017-07-01 19:26:05 +02:00