Tests for Minecraft, minor refactoring
This commit is contained in:
parent
5651b05301
commit
30168c503f
|
@ -19,6 +19,7 @@ tasks:
|
||||||
sudo touch /etc/subuid /etc/subgid
|
sudo touch /etc/subuid /etc/subgid
|
||||||
sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 build
|
sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 build
|
||||||
- build: |
|
- build: |
|
||||||
|
cd minecraft-server-invites
|
||||||
podman build . -t icr.gmem.ca/wlm
|
podman build . -t icr.gmem.ca/wlm
|
||||||
- push: |
|
- push: |
|
||||||
sudo systemctl start tailscaled
|
sudo systemctl start tailscaled
|
||||||
|
|
4
main.go
4
main.go
|
@ -5,6 +5,7 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"whitelistmanager/invite"
|
"whitelistmanager/invite"
|
||||||
|
"whitelistmanager/minecraft"
|
||||||
"whitelistmanager/store"
|
"whitelistmanager/store"
|
||||||
"whitelistmanager/transport"
|
"whitelistmanager/transport"
|
||||||
)
|
)
|
||||||
|
@ -17,7 +18,8 @@ func main() {
|
||||||
}
|
}
|
||||||
defer db.Close()
|
defer db.Close()
|
||||||
im := invite.NewManager(db)
|
im := invite.NewManager(db)
|
||||||
handlers := transport.New(db, im)
|
mc := minecraft.NewCom()
|
||||||
|
handlers := transport.New(db, im, mc)
|
||||||
// Auth endpoints
|
// Auth endpoints
|
||||||
mux.Group(func(mux *flow.Mux) {
|
mux.Group(func(mux *flow.Mux) {
|
||||||
mux.HandleFunc("/api/v1/auth/redirect", handlers.AuthRedirect)
|
mux.HandleFunc("/api/v1/auth/redirect", handlers.AuthRedirect)
|
||||||
|
|
|
@ -13,7 +13,18 @@ const (
|
||||||
RconCommandError = "command failed"
|
RconCommandError = "command failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Whitelist(user string, server store.Server) (string, error) {
|
type MinecraftCom struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
type Minecraft interface {
|
||||||
|
Whitelist(user string, server store.Server) (string, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewCom() *MinecraftCom {
|
||||||
|
return &MinecraftCom{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MinecraftCom) Whitelist(user string, server store.Server) (string, error) {
|
||||||
conn := new(mcrcon.MCConn)
|
conn := new(mcrcon.MCConn)
|
||||||
err := conn.Open(server.Rcon.Address, server.Rcon.Password)
|
err := conn.Open(server.Rcon.Address, server.Rcon.Password)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -3,3 +3,48 @@
|
||||||
|
|
||||||
// Package mock_minecraft is a generated GoMock package.
|
// Package mock_minecraft is a generated GoMock package.
|
||||||
package mock_minecraft
|
package mock_minecraft
|
||||||
|
|
||||||
|
import (
|
||||||
|
reflect "reflect"
|
||||||
|
store "whitelistmanager/store"
|
||||||
|
|
||||||
|
gomock "github.com/golang/mock/gomock"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MockMinecraft is a mock of Minecraft interface.
|
||||||
|
type MockMinecraft struct {
|
||||||
|
ctrl *gomock.Controller
|
||||||
|
recorder *MockMinecraftMockRecorder
|
||||||
|
}
|
||||||
|
|
||||||
|
// MockMinecraftMockRecorder is the mock recorder for MockMinecraft.
|
||||||
|
type MockMinecraftMockRecorder struct {
|
||||||
|
mock *MockMinecraft
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewMockMinecraft creates a new mock instance.
|
||||||
|
func NewMockMinecraft(ctrl *gomock.Controller) *MockMinecraft {
|
||||||
|
mock := &MockMinecraft{ctrl: ctrl}
|
||||||
|
mock.recorder = &MockMinecraftMockRecorder{mock}
|
||||||
|
return mock
|
||||||
|
}
|
||||||
|
|
||||||
|
// EXPECT returns an object that allows the caller to indicate expected use.
|
||||||
|
func (m *MockMinecraft) EXPECT() *MockMinecraftMockRecorder {
|
||||||
|
return m.recorder
|
||||||
|
}
|
||||||
|
|
||||||
|
// Whitelist mocks base method.
|
||||||
|
func (m *MockMinecraft) Whitelist(user string, server store.Server) (string, error) {
|
||||||
|
m.ctrl.T.Helper()
|
||||||
|
ret := m.ctrl.Call(m, "Whitelist", user, server)
|
||||||
|
ret0, _ := ret[0].(string)
|
||||||
|
ret1, _ := ret[1].(error)
|
||||||
|
return ret0, ret1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Whitelist indicates an expected call of Whitelist.
|
||||||
|
func (mr *MockMinecraftMockRecorder) Whitelist(user, server interface{}) *gomock.Call {
|
||||||
|
mr.mock.ctrl.T.Helper()
|
||||||
|
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Whitelist", reflect.TypeOf((*MockMinecraft)(nil).Whitelist), user, server)
|
||||||
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@ import (
|
||||||
type Handler struct {
|
type Handler struct {
|
||||||
store store.Storer
|
store store.Storer
|
||||||
manager invite.InviteManager
|
manager invite.InviteManager
|
||||||
|
mc minecraft.Minecraft
|
||||||
}
|
}
|
||||||
|
|
||||||
type Handle interface {
|
type Handle interface {
|
||||||
|
@ -41,10 +42,11 @@ type Handle interface {
|
||||||
InviteLog(w http.ResponseWriter, r *http.Request)
|
InviteLog(w http.ResponseWriter, r *http.Request)
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(store store.Storer, im invite.InviteManager) *Handler {
|
func New(store store.Storer, im invite.InviteManager, mc minecraft.Minecraft) *Handler {
|
||||||
return &Handler{
|
return &Handler{
|
||||||
store: store,
|
store: store,
|
||||||
manager: im,
|
manager: im,
|
||||||
|
mc: mc,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,7 +159,7 @@ func (h *Handler) AcceptInvite(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
user := r.Context().Value("user").(store.User)
|
user := r.Context().Value("user").(store.User)
|
||||||
log.Println(user.DisplayName)
|
log.Println(user.DisplayName)
|
||||||
resp, err := minecraft.Whitelist(user.DisplayName, server)
|
resp, err := h.mc.Whitelist(user.DisplayName, server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
|
|
|
@ -15,6 +15,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
"whitelistmanager/invite"
|
"whitelistmanager/invite"
|
||||||
mock_invite "whitelistmanager/mocks/invite"
|
mock_invite "whitelistmanager/mocks/invite"
|
||||||
|
mock_minecraft "whitelistmanager/mocks/minecraft"
|
||||||
mock_store "whitelistmanager/mocks/store"
|
mock_store "whitelistmanager/mocks/store"
|
||||||
"whitelistmanager/store"
|
"whitelistmanager/store"
|
||||||
"whitelistmanager/transport"
|
"whitelistmanager/transport"
|
||||||
|
@ -30,6 +31,7 @@ func TestInvites(t *testing.T) {
|
||||||
ctrl := gomock.NewController(t)
|
ctrl := gomock.NewController(t)
|
||||||
st := mock_store.NewMockStorer(ctrl)
|
st := mock_store.NewMockStorer(ctrl)
|
||||||
im := mock_invite.NewMockInviteManager(ctrl)
|
im := mock_invite.NewMockInviteManager(ctrl)
|
||||||
|
mc := mock_minecraft.NewMockMinecraft(ctrl)
|
||||||
|
|
||||||
user := store.User{
|
user := store.User{
|
||||||
Id: "1",
|
Id: "1",
|
||||||
|
@ -67,7 +69,7 @@ func TestInvites(t *testing.T) {
|
||||||
|
|
||||||
t.Run("create invite correctly", func(t *testing.T) {
|
t.Run("create invite correctly", func(t *testing.T) {
|
||||||
im.EXPECT().Create(invNoToken, user).Return(inv.Token, nil)
|
im.EXPECT().Create(invNoToken, user).Return(inv.Token, nil)
|
||||||
handler := transport.New(st, im)
|
handler := transport.New(st, im, mc)
|
||||||
|
|
||||||
jsonData, err := json.Marshal(invPayload)
|
jsonData, err := json.Marshal(invPayload)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -102,7 +104,7 @@ func TestInvites(t *testing.T) {
|
||||||
|
|
||||||
t.Run("user is not server owner", func(t *testing.T) {
|
t.Run("user is not server owner", func(t *testing.T) {
|
||||||
im.EXPECT().Create(invNoToken, user).Return("", errors.New(invite.NotOwnerofServer))
|
im.EXPECT().Create(invNoToken, user).Return("", errors.New(invite.NotOwnerofServer))
|
||||||
handler := transport.New(st, im)
|
handler := transport.New(st, im, mc)
|
||||||
|
|
||||||
jsonData, err := json.Marshal(invPayload)
|
jsonData, err := json.Marshal(invPayload)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -138,7 +140,7 @@ func TestInvites(t *testing.T) {
|
||||||
t.Run("get existing invite", func(t *testing.T) {
|
t.Run("get existing invite", func(t *testing.T) {
|
||||||
m := flow.New()
|
m := flow.New()
|
||||||
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
||||||
handler := transport.New(st, im)
|
handler := transport.New(st, im, mc)
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -171,7 +173,7 @@ func TestInvites(t *testing.T) {
|
||||||
t.Run("existing invite", func(t *testing.T) {
|
t.Run("existing invite", func(t *testing.T) {
|
||||||
m := flow.New()
|
m := flow.New()
|
||||||
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
||||||
handler := transport.New(st, im)
|
handler := transport.New(st, im, mc)
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -204,7 +206,7 @@ func TestInvites(t *testing.T) {
|
||||||
t.Run("non existent invite", func(t *testing.T) {
|
t.Run("non existent invite", func(t *testing.T) {
|
||||||
m := flow.New()
|
m := flow.New()
|
||||||
st.EXPECT().GetInvite(inv.Token).Return(store.Invite{}, sql.ErrNoRows)
|
st.EXPECT().GetInvite(inv.Token).Return(store.Invite{}, sql.ErrNoRows)
|
||||||
handler := transport.New(st, im)
|
handler := transport.New(st, im, mc)
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -227,7 +229,7 @@ func TestInvites(t *testing.T) {
|
||||||
t.Run("user not logged in when getting invite", func(t *testing.T) {
|
t.Run("user not logged in when getting invite", func(t *testing.T) {
|
||||||
m := flow.New()
|
m := flow.New()
|
||||||
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
||||||
handler := transport.New(st, im)
|
handler := transport.New(st, im, mc)
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
req, err := http.NewRequest("GET", "/api/v1/invite/foo", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -253,37 +255,35 @@ func TestInvites(t *testing.T) {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
//t.Run("user can accept invite", func(t *testing.T) {
|
t.Run("user can accept invite", func(t *testing.T) {
|
||||||
// m := flow.New()
|
m := flow.New()
|
||||||
// st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
st.EXPECT().GetInvite(inv.Token).Return(inv, nil)
|
||||||
// im.EXPECT().RemainingUses(inv).Return(1, nil)
|
im.EXPECT().RemainingUses(inv).Return(1, nil)
|
||||||
// st.EXPECT().GetServer(server.Id).Return(server, nil)
|
st.EXPECT().GetServer(server.Id).Return(server, nil)
|
||||||
// handler := transport.New(st, im)
|
mc.EXPECT().Whitelist(user.DisplayName, server).Return("success", nil)
|
||||||
//
|
handler := transport.New(st, im, mc)
|
||||||
// req, err := http.NewRequest("POST", "/api/v1/invite/foo/accept", nil)
|
|
||||||
// if err != nil {
|
req, err := http.NewRequest("POST", "/api/v1/invite/foo/accept", nil)
|
||||||
// t.Fatal(err)
|
if err != nil {
|
||||||
// }
|
t.Fatal(err)
|
||||||
//
|
}
|
||||||
// ctx := req.Context()
|
|
||||||
// ctx = context.WithValue(ctx, "user", user)
|
ctx := req.Context()
|
||||||
// req = req.WithContext(ctx)
|
ctx = context.WithValue(ctx, "user", user)
|
||||||
// rr := httptest.NewRecorder()
|
req = req.WithContext(ctx)
|
||||||
// m.HandleFunc("/api/v1/invite/:id/accept", handler.AcceptInvite, "POST")
|
rr := httptest.NewRecorder()
|
||||||
// m.ServeHTTP(rr, req)
|
m.HandleFunc("/api/v1/invite/:id/accept", handler.AcceptInvite, "POST")
|
||||||
//
|
m.ServeHTTP(rr, req)
|
||||||
// if status := rr.Code; status != http.StatusForbidden {
|
|
||||||
// t.Errorf("handler returned wrong status code: got %v want %v",
|
if status := rr.Code; status != http.StatusOK {
|
||||||
// status, http.StatusNotFound)
|
t.Errorf("handler returned wrong status code: got %v want %v",
|
||||||
// }
|
status, http.StatusOK)
|
||||||
//
|
}
|
||||||
// expected, err := json.Marshal(inv)
|
|
||||||
// if err != nil {
|
expected := "success"
|
||||||
// t.Fatal(err)
|
if rr.Body.String() != expected {
|
||||||
// }
|
t.Errorf("handler returned unexpected body: got %v want %v",
|
||||||
// if rr.Body.String() != string(expected)+"\n" {
|
rr.Body.String(), expected)
|
||||||
// t.Errorf("handler returned unexpected body: got %v want %v",
|
}
|
||||||
// rr.Body.String(), string(expected))
|
})
|
||||||
// }
|
|
||||||
//})
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue