diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | cmd/client/main.go | 2 | ||||
| -rw-r--r-- | cmd/server/main.go | 7 | ||||
| -rw-r--r-- | internal/client/client.go | 5 | ||||
| -rw-r--r-- | internal/client/gateway/server.crt | 21 | ||||
| -rw-r--r-- | internal/server/certs/server.crt | 21 | ||||
| -rw-r--r-- | internal/server/certs/server.key | 28 | ||||
| -rw-r--r-- | internal/server/certs/sslgen.cnf | 24 | ||||
| -rw-r--r-- | internal/server/server.go | 4 |
9 files changed, 14 insertions, 103 deletions
@@ -1,3 +1,4 @@ -internal/server/sslgen.cnf -internal/server/server.key +internal/server/certs/ +*.crt *.log +*.db diff --git a/cmd/client/main.go b/cmd/client/main.go index da73ae0..de800e7 100644 --- a/cmd/client/main.go +++ b/cmd/client/main.go @@ -8,7 +8,7 @@ import ( ) func main() { - logFile, err := os.OpenFile("client.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666) + logFile, err := os.OpenFile("logs/client.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666) if err != nil { log.Fatalln(err) } diff --git a/cmd/server/main.go b/cmd/server/main.go index e9cb4ad..4b504f6 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -13,6 +13,13 @@ import ( const port = 7223 func main() { + logFile, err := os.OpenFile("logs/server.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666) + if err != nil { + log.Fatalln(err) + } + defer logFile.Close() + log.SetOutput(logFile) + server := server.NewServer(port) ctx, cancel := context.WithCancel(context.Background()) diff --git a/internal/client/client.go b/internal/client/client.go index 1276f01..4d75205 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -104,8 +104,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.textarea.SetWidth(msg.Width) log.Println("resized to:", msg.Width, "x", msg.Height) - var vpCmd tea.Cmd - var taCmd tea.Cmd + var vpCmd, taCmd tea.Cmd m.viewport, vpCmd = m.viewport.Update(msg) m.textarea, taCmd = m.textarea.Update(msg) return m, tea.Batch(vpCmd, taCmd) @@ -127,7 +126,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return m, api.SendMessage(content) default: - // Send all other keypresses to the textarea. var cmd tea.Cmd m.textarea, cmd = m.textarea.Update(msg) return m, cmd @@ -157,7 +155,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { } case cursor.BlinkMsg: - // Textarea should also process cursor blinks. var cmd tea.Cmd m.textarea, cmd = m.textarea.Update(msg) return m, cmd diff --git a/internal/client/gateway/server.crt b/internal/client/gateway/server.crt deleted file mode 100644 index caf2384..0000000 --- a/internal/client/gateway/server.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDbTCCAlWgAwIBAgIUZyvzq7LOxKqTttTRjChoJWOO4pYwDQYJKoZIhvcNAQEL -BQAwOjEhMB8GCSqGSIb3DQEJARYSa3lyZW4yMjNAcHJvdG9uLm1lMRUwEwYDVQQD -DAxreXJlbjIyMy5kZXYwHhcNMjQxMDA5MjE1NzQzWhcNMjUxMDA5MjE1NzQzWjA6 -MSEwHwYJKoZIhvcNAQkBFhJreXJlbjIyM0Bwcm90b24ubWUxFTATBgNVBAMMDGt5 -cmVuMjIzLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7hd+zT -kqrn/8EhLEO0uMKKHgfoyczYWTlA9uPFADOsjdzXRLuR/Y3rK0PBE4u55xcjYZSf -mzJmVHuv1rEFOt634YOoE2UwJd9V2M0p+cD716XIEDNPfVCUe77FoZoYaH1h8QF5 -Mrx2eDH5JZt690F05O39zYzbb7+RlChWlt1kBcmLEZ1GKJeXznbL6lLMh20deYX9 -7oemqYMqP9DFbFeHkubeZ20yQvKW9cOWae9M+IhE9dAa8fm5WdfiDoTdAHfbIawx -r1OB4YqfXlXler9wAHfHWeCS0KgZCTdghF1h6wtYlwyQZcUuv+dHN7SP7zVo8pOD -b7NUqjFAMGlNgf0CAwEAAaNrMGkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwMAYD -VR0RBCkwJ4IJbG9jYWxob3N0ggsqLmxvY2FsaG9zdIINZWtvLmxvY2FsaG9zdDAd -BgNVHQ4EFgQUf32SXO976zgO0K/wlgWdyT3EPzcwDQYJKoZIhvcNAQELBQADggEB -AHVMGCkaZv5eIOQwevfrsEJQo3dNG34om8wBVGS5iQyho0VJZpKZSiQ16yv4x2kc -UICfVEFcfO/7/hRlA5yLWE/wpeqCgTSgtQ74gvc8D6H26wCznSPj9MIRWxYhSmPM -YO+7UKqyvFoaKiW4OkqJvCRzrpwr/lbXcGpD47UqT5gRvjJ91ULCHIUt8qDUS6+8 -mEGJAe/xFkiJ6zT0bThlqMaCA4v5g9tHGXzooIZ+YSgTvlWhAM6mVwt34l2rDSOw -4YNGUJXKCoGpy8U0NteIOOs6HhaslJpKe1mSSxmMQcgBcaf6yBT08mYfQPSsaeOk -OSoncuVBnT64liAtShpsgTc= ------END CERTIFICATE----- diff --git a/internal/server/certs/server.crt b/internal/server/certs/server.crt deleted file mode 100644 index caf2384..0000000 --- a/internal/server/certs/server.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDbTCCAlWgAwIBAgIUZyvzq7LOxKqTttTRjChoJWOO4pYwDQYJKoZIhvcNAQEL -BQAwOjEhMB8GCSqGSIb3DQEJARYSa3lyZW4yMjNAcHJvdG9uLm1lMRUwEwYDVQQD -DAxreXJlbjIyMy5kZXYwHhcNMjQxMDA5MjE1NzQzWhcNMjUxMDA5MjE1NzQzWjA6 -MSEwHwYJKoZIhvcNAQkBFhJreXJlbjIyM0Bwcm90b24ubWUxFTATBgNVBAMMDGt5 -cmVuMjIzLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7hd+zT -kqrn/8EhLEO0uMKKHgfoyczYWTlA9uPFADOsjdzXRLuR/Y3rK0PBE4u55xcjYZSf -mzJmVHuv1rEFOt634YOoE2UwJd9V2M0p+cD716XIEDNPfVCUe77FoZoYaH1h8QF5 -Mrx2eDH5JZt690F05O39zYzbb7+RlChWlt1kBcmLEZ1GKJeXznbL6lLMh20deYX9 -7oemqYMqP9DFbFeHkubeZ20yQvKW9cOWae9M+IhE9dAa8fm5WdfiDoTdAHfbIawx -r1OB4YqfXlXler9wAHfHWeCS0KgZCTdghF1h6wtYlwyQZcUuv+dHN7SP7zVo8pOD -b7NUqjFAMGlNgf0CAwEAAaNrMGkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwMAYD -VR0RBCkwJ4IJbG9jYWxob3N0ggsqLmxvY2FsaG9zdIINZWtvLmxvY2FsaG9zdDAd -BgNVHQ4EFgQUf32SXO976zgO0K/wlgWdyT3EPzcwDQYJKoZIhvcNAQELBQADggEB -AHVMGCkaZv5eIOQwevfrsEJQo3dNG34om8wBVGS5iQyho0VJZpKZSiQ16yv4x2kc -UICfVEFcfO/7/hRlA5yLWE/wpeqCgTSgtQ74gvc8D6H26wCznSPj9MIRWxYhSmPM -YO+7UKqyvFoaKiW4OkqJvCRzrpwr/lbXcGpD47UqT5gRvjJ91ULCHIUt8qDUS6+8 -mEGJAe/xFkiJ6zT0bThlqMaCA4v5g9tHGXzooIZ+YSgTvlWhAM6mVwt34l2rDSOw -4YNGUJXKCoGpy8U0NteIOOs6HhaslJpKe1mSSxmMQcgBcaf6yBT08mYfQPSsaeOk -OSoncuVBnT64liAtShpsgTc= ------END CERTIFICATE----- diff --git a/internal/server/certs/server.key b/internal/server/certs/server.key deleted file mode 100644 index 6f85667..0000000 --- a/internal/server/certs/server.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCu4Xfs05Kq5//B -ISxDtLjCih4H6MnM2Fk5QPbjxQAzrI3c10S7kf2N6ytDwROLuecXI2GUn5syZlR7 -r9axBTret+GDqBNlMCXfVdjNKfnA+9elyBAzT31QlHu+xaGaGGh9YfEBeTK8dngx -+SWbevdBdOTt/c2M22+/kZQoVpbdZAXJixGdRiiXl852y+pSzIdtHXmF/e6HpqmD -Kj/QxWxXh5Lm3mdtMkLylvXDlmnvTPiIRPXQGvH5uVnX4g6E3QB32yGsMa9TgeGK -n15V5Xq/cAB3x1ngktCoGQk3YIRdYesLWJcMkGXFLr/nRze0j+81aPKTg2+zVKox -QDBpTYH9AgMBAAECggEAAqxqVgg5mEitFZAPw+ADgq0Nq3pI4RhRON/zRkuKZr/V -eJHthSteSg9vA5cNv1eYUeq8QNzo+8eQgazDZl5mZkw/Jteb2eXdoyeGH0QFtohD -GJyeRS9XnGYNhD7NayePXvqJCC6icqFVa6vCG7l9n5ZAmU2fGSJ4d8aRq/iZT6Lq -DMJ8g0vd2NXeQZXiLto6TGzLiIfBOmCSshSX9UxZNnXuzp2SYtAAAKHjft74rXfi -6ptLP5wKiHTazDJXOTezWa/FUn1leDgZUFrFw8RFRFkj209txcVbleHHtaLLtB4m -lkyvWzFpAcB9V8PAJDikc227yUY1gLKCo/XPEVMI8QKBgQDUCktxTUlUwF0Htblw -ebaSrtOo31ObzeDLUZLltiCNAH4LfML/Friqp/3b3RCk7ttMJ0x40W2ryyVcfFJD -ByLIzJn56oKMDp3+oK4EvhBdCLgUWxe7OPLE1en44RP3dtTgrwL8NF4Swn0XSMqN -JXoxZSh6ZX9t3CsbBvUNsLrmaQKBgQDTIv391c5Jh7wyVm+RZbFSRhIFdZwM77zA -xTRoKNLJG55SxCFVypwi+fW+XCTxUseu9hYWm/loFt6WCj9G8NspVn603JxRFDJ5 -ZfKLxCEzHv37r4Ikfkz9Ur3zILDUamh5n9k0xaehijG5UN0E6oMb2aijkGpfR9C7 -lMeDUpIUdQKBgQCc33jtPEaygxbQq2ukgQfIAbvqRj9vF6PmCFXryRDQALs/+G+z -lbXN3Dd+QFEeFPD9qF11TUwcO1FK2Vdq646ajHSmZw9qWy4cwfe83njwu5CkzrgB -9aH2amSNksfY33ujNxe4S24F5wnw/hOM1VtPzA1kcE8Ukjz54+3M0SGVcQKBgQCX -Tr5iyHQ7MbDnChaORihbY6fKjcw1YSENrMWv14Gnacl+Wtvg1YAreKJptzMqVj6P -3f9aWJDVzX3aXKGYP0dwSnInPuovGKBLa4n0K6v3LMCrO82yRWj7Ke7Ca60NrOwO -LUXFkdhd5eFYguDBgyZOMR+vh/ETMy4dH7QTIntZeQKBgEPalCWl85u9MuU/bEWQ -qY5XO4+ocPRzJQKpIrM6rsIPWcnEXuNWa/cRaBEsUjqk+2pR54v8aX98kAYqGlbs -SaWXn/UN2Ml3lkusXReJoILrEWT5bpwwDCwDi47avMLJj5CGd8fhDHSRDpZJa1Ox -Sb7kfjRNjO9LjUcNpqIXxtlE ------END PRIVATE KEY----- diff --git a/internal/server/certs/sslgen.cnf b/internal/server/certs/sslgen.cnf deleted file mode 100644 index 888d519..0000000 --- a/internal/server/certs/sslgen.cnf +++ /dev/null @@ -1,24 +0,0 @@ -# https://stackoverflow.com/questions/46100377/how-to-create-an-openssl-self-signed-certificate-using-san -[CA_default] -copy_extensions = copy - -[req] -default_bits = 2048 -prompt = no -default_md = sha256 -distinguished_name = req_distinguished_name -x509_extensions = v3_ca - -[req_distinguished_name] -emailAddress = kyren223@proton.me -CN = kyren223.dev - -[v3_ca] -basicConstraints = CA:FALSE -keyUsage = digitalSignature, keyEncipherment -subjectAltName = @alternate_names - -[alternate_names] -DNS.1 = localhost -DNS.2 = *.localhost -DNS.3 = eko.localhost diff --git a/internal/server/server.go b/internal/server/server.go index 7805e27..05af434 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -281,14 +281,14 @@ func processPacket(ctx context.Context, pkt packet.Packet) packet.Packet { } assert.NotNil(response, "response must always be assigned to") - log.Println(session.Addr, "sending ", response.Type(), "response:", response) + log.Println(session.Addr(), "sending ", response.Type(), "response:", response) return packet.NewPacket(packet.NewMsgPackEncoder(response)) } func processRequest(ctx context.Context, request packet.Payload) packet.Payload { session, ok := session.FromContext(ctx) assert.Assert(ok, "context in process packet should always have a session") - log.Println(session.Addr, "processing", request.Type(), "request:", request) + log.Println(session.Addr(), "processing", request.Type(), "request:", request) switch request := request.(type) { case *packet.SendMessage: |