2FAS/2fas-server
1
0
Fork 0
mirror of https://github.com/twofas/2fas-server.git synced 2024-12-04 16:20:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

code review fixes

Browse Source
This commit is contained in:
Krzysztof Dryś 2024-01-22 14:20:13 +01:00
parent ca51ed9c79
commit 806b80befc
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/pass/pass_test.go
View File

@ -5,10 +5,12 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"net/http" "net/http"
"testing" "testing"
"time" "time"
"github.com/google/uuid"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )
@ -22,10 +24,10 @@ var (
wsDialer = websocket.DefaultDialer wsDialer = websocket.DefaultDialer
) )
func TestPassHappyFlow(t *testing.T) { const api = "localhost:8082"
const api = "localhost:8082"
resp, err := configureBrowserExtension("http://" + api + "/browser_extension/configure") func TestPassHappyFlow(t *testing.T) {
resp, err := configureBrowserExtension()
if err != nil { if err != nil {
t.Fatalf("Failed to configure browser extension: %v", err) t.Fatalf("Failed to configure browser extension: %v", err)
} }
@ -36,7 +38,7 @@ func TestPassHappyFlow(t *testing.T) {
go func() { go func() {
defer close(browserExtensionDone) defer close(browserExtensionDone)
err := browserExtensionWaitForConfirm("ws://"+api+"/browser_extension/wait_for_connection", resp.BrowserExtensionPairingToken) err := browserExtensionWaitForConfirm(resp.BrowserExtensionPairingToken)
if err != nil { if err != nil {
t.Errorf("Error when Browser Extension waited for confirm: %v", err) t.Errorf("Error when Browser Extension waited for confirm: %v", err)
return return
@ -56,7 +58,7 @@ func TestPassHappyFlow(t *testing.T) {
go func() { go func() {
defer close(mobileDone) defer close(mobileDone)
err := confirmMobile("http://"+api+"/mobile/confirm", resp.ConnectionToken) err := confirmMobile(resp.ConnectionToken)
if err != nil { if err != nil {
t.Errorf("Mobile: confirm failed: %v", err) t.Errorf("Mobile: confirm failed: %v", err)
return return
@ -78,7 +80,9 @@ func TestPassHappyFlow(t *testing.T) {
<-mobileDone <-mobileDone
} }
func browserExtensionWaitForConfirm(url, token string) error { func browserExtensionWaitForConfirm(token string) error {
url := "ws://" + api + "/browser_extension/wait_for_connection"
var resp struct { var resp struct {
Status string `json:"status"` Status string `json:"status"`
} }
@ -104,8 +108,10 @@ func browserExtensionWaitForConfirm(url, token string) error {
return nil return nil
} }
func configureBrowserExtension(endpoint string) (ConfigureBrowserExtensionResponse, error) { func configureBrowserExtension() (ConfigureBrowserExtensionResponse, error) {
req, err := http.NewRequest("POST", endpoint, bytes.NewBufferString(`{"extension_id":"9317f6c1-0470-41c3-b735-542f2c6b70c3"}`)) url := "http://" + api + "/browser_extension/configure"
req, err := http.NewRequest("POST", url, bytesPrintf(`{"extension_id":"%s"}`, uuid.New().String()))
if err != nil { if err != nil {
return ConfigureBrowserExtensionResponse{}, fmt.Errorf("failed to create http request: %w", err) return ConfigureBrowserExtensionResponse{}, fmt.Errorf("failed to create http request: %w", err)
} }
@ -115,17 +121,27 @@ func configureBrowserExtension(endpoint string) (ConfigureBrowserExtensionRespon
} }
defer httpResp.Body.Close() defer httpResp.Body.Close()
bb, err := io.ReadAll(httpResp.Body)
if err != nil {
return ConfigureBrowserExtensionResponse{}, fmt.Errorf("failed to read body from response: %w", err)
}
if httpResp.StatusCode >= 300 {
return ConfigureBrowserExtensionResponse{}, fmt.Errorf("received status %s and body %q", httpResp.Status, string(bb))
}
var resp ConfigureBrowserExtensionResponse var resp ConfigureBrowserExtensionResponse
m := json.NewDecoder(httpResp.Body) if err := json.Unmarshal(bb, &resp); err != nil {
if err := m.Decode(&resp); err != nil {
return resp, fmt.Errorf("failed to decode the response: %w", err) return resp, fmt.Errorf("failed to decode the response: %w", err)
} }
return resp, nil return resp, nil
} }
func confirmMobile(endpoint, connectionToken string) error { func confirmMobile(connectionToken string) error {
req, err := http.NewRequest("POST", endpoint, bytes.NewBufferString(`{"device_id":"d317f6c1-0470-41c3-b735-542f2c6b70c8"})`)) url := "http://" + api + "/mobile/confirm"
req, err := http.NewRequest("POST", url, bytesPrintf(`{"device_id":"%s"}`, uuid.New().String()))
if err != nil { if err != nil {
return fmt.Errorf("failed to prepare the reqest: %w", err) return fmt.Errorf("failed to prepare the reqest: %w", err)
} }
@ -144,8 +160,10 @@ func confirmMobile(endpoint, connectionToken string) error {
return nil return nil
} }
func proxyWebSocket(endpoint string, token string, writeMsg, expectedReadMsg string) error { // proxyWebSocket will dial `endpoint`, using `token` for auth. It will then write exactly one message and
conn, err := dialWS(endpoint, token) // read exactly one message (and then check it is `expectedReadMsg`).
func proxyWebSocket(url, token string, writeMsg, expectedReadMsg string) error {
conn, err := dialWS(url, token)
if err != nil { if err != nil {
return nil return nil
} }
@ -190,3 +208,8 @@ func dialWS(url, auth string) (*websocket.Conn, error) {
} }
return conn, nil return conn, nil
} }
func bytesPrintf(format string, ii ...interface{}) io.Reader {
s := fmt.Sprintf(format, ii...)
return bytes.NewBufferString(s)
}