Mostly implemented client

This commit is contained in:
Kevin F 2023-01-01 15:25:32 -06:00
parent 96f611f1a1
commit bf0ce5ca85
5 changed files with 96 additions and 4 deletions

View File

@ -1,18 +1,97 @@
# GoSmartKeyboard Client # GoSmartKeyboard Client
When GoSmartKeyboard is started in client mode, it does the following:
This is the base client, it only connects and authenticates. 1. Load the connection URL from the second CLI argument.
2. Load the auth token from the environment variable `KEYBOARD_AUTH` or stdin.
3. Connect to the server.
4 Send the auth token to the server.
5. If the server responds with "authenticated", we start reading keys from stdin and sending them to the server until EOF.
The authentication token is loaded from the environment variable `KEYBOARD_AUTH`, if it does not exist we read it from stdin in base64 form, ended with a newline. ## Connecting
The base64 authentication token is loaded from the environment variable `KEYBOARD_AUTH`, if it does not exist we read it from stdin (base64 encoded), ended with a newline.
``` go ``` go
--- start client --- start client
@{load connection URL from second CLI argument}
@{get authTokenInput from environment}
if !authTokenInputExists {
fmt.Print("Enter authentication token: ")
_, err := fmt.Scanln(&authTokenInput)
if err != nil {
log.Fatal(err)
}
}
client, _, err := websocket.DefaultDialer.Dial(connectionURL, nil)
if err != nil {
log.Fatal("dial:", err)
}
defer client.Close()
err = client.WriteMessage(websocket.TextMessage, []byte(authTokenInput))
if err != nil {
log.Fatal("write:", err)
}
_, authResponse, err := client.ReadMessage()
if err != nil {
log.Fatal("read:", err)
}
if string(authResponse) != "authenticated" {
log.Fatal("authentication failed")
}
--- ---
--- load connection URL from second CLI argument --- noWeave
if len(os.Args) < 3 {
log.Fatal("missing connection URL")
}
connectionURL := os.Args[2]
if !strings.HasPrefix(connectionURL, "ws://") && !strings.HasPrefix(connectionURL, "wss://") {
log.Fatal("connection URL must start with ws:// or wss://")
}
---
```
## Sending keys
We read keys from stdin and send them to the server until we get EOF
``` go
--- start client +=
for {
var key string
_, err := fmt.Scanln(&key)
if err != nil {
if err == io.EOF {
break
}
log.Fatal(err)
}
err = client.WriteMessage(websocket.TextMessage, []byte(key))
if err != nil {
log.Fatal("write:", err)
}
}
---
``` ```

View File

@ -15,6 +15,14 @@ authTokenFile, authTokenFileIsSet := os.LookupEnv("KEYBOARD_AUTH_TOKEN_FILE")
--- ---
``` ```
## Authentication token input (for client)
--- get authTokenInput from environment
authTokenInput, authTokenInputExists := os.LookupEnv("KEYBOARD_AUTH")
---
## HTTP Bind Settings ## HTTP Bind Settings

View File

@ -1,8 +1,8 @@
weave: weave:
srcweave --formatter srcweave-format --weave docs/ ReadMe.md security/Authentication.md EnvironmentVariables.md Dependencies.md Server.md Streaming.md ThreatModel.md srcweave --formatter srcweave-format --weave docs/ ReadMe.md security/Authentication.md EnvironmentVariables.md Dependencies.md Server.md Streaming.md ThreatModel.md Client.md
util/removefencedcode.py util/removefencedcode.py
tangle: tangle:
srcweave --formatter srcweave-format --tangle smartkeyboard/ ReadMe.md security/Authentication.md EnvironmentVariables.md Dependencies.md Server.md Streaming.md ThreatModel.md srcweave --formatter srcweave-format --tangle smartkeyboard/ ReadMe.md security/Authentication.md EnvironmentVariables.md Dependencies.md Server.md Streaming.md ThreatModel.md Client.md
clean: clean:
rm -rf docs rm -rf docs
find smartkeyboard/ -type f -not -name "*_test.go" -delete find smartkeyboard/ -type f -not -name "*_test.go" -delete

View File

@ -82,6 +82,10 @@ Then we can start the web server and listen for websocket connections.
import( import(
"os" "os"
"fmt" "fmt"
"io"
"strings"
"log"
@{gorilla/websocket import string}
"keyboard.voidnet.tech/server" "keyboard.voidnet.tech/server"
"keyboard.voidnet.tech/auth" "keyboard.voidnet.tech/auth"
) )

View File

@ -26,6 +26,7 @@ func clientConnected(w http.ResponseWriter, r *http.Request) {
if auth.CheckAuthToken(string(message)) != nil { if auth.CheckAuthToken(string(message)) != nil {
log.Println("invalid token") log.Println("invalid token")
c.WriteMessage(websocket.TextMessage, []byte("invalid token"))
return return
} }
c.WriteMessage(websocket.TextMessage, []byte("authenticated")) c.WriteMessage(websocket.TextMessage, []byte("authenticated"))